Merge branch 'main' into disable-flaky-unit-test-2

Author: Vinnl

locales/el/data-classes.ftl

@@ -145,7 +145,7 @@ social-media-profiles = Προφίλ κοινωνικών δικτύων
 social-security-numbers = Αριθμοί κοινωνικής ασφάλισης
 spoken-languages = Ομιλούμενες γλώσσες
 spouses-names = Ονόματα συζύγων
-support-tickets = Αιτήσεις υποστήριξης
+support-tickets = Αιτήματα υποστήριξης
 survey-results = Αποτελέσματα έρευνας
 taxation-records = Φορολογικά αρχεία
 telecommunications-carrier = Πάροχοι τηλεπικοινωνιών

locales/gn/dashboard.ftl

@@ -31,6 +31,13 @@ exposure-chart-returning-user-upgrade-prompt = Pe óga, pehẽnguekuéra ha ambu
 exposure-chart-returning-user-upgrade-prompt-cta = Emoha’ãnga reiete
 exposure-chart-scan-in-progress-prompt = <b>Oñemoha’ãngahína:</b> kundaharape, pehẽnguekuéra ha hetave ndoikéi gueteri.
 modal-active-number-of-exposures-title = Mboyjeýmapa ipapapy jehechauka hendýva
+# Variables:
+#   $limit (number) - Number of email addresses included in the plan
+modal-active-number-of-exposures-part-one-all =
+    { $limit ->
+        [one] Ko gráfico ogueroike mboy jeýpa rojuhu peteĩteĩva mba’ekuaarã osẽkuaáva opaite mba’ekuaarã { $limit }-pe g̃uarã ñanduti veve kundaharape emongu’éva ko’ág̃a.
+       *[other] Ko gráfico ogueroike mboy jeýpa rojuhu peteĩteĩva mba’ekuaarã osẽkuaáva opaite mba’ekuaarã { $limit }-pe g̃uarã ñanduti veve kundaharape emongu’éva ko’ág̃a.
+    }
 modal-active-number-of-exposures-part-three-all = Oñemoĩporã vove, oñembojuajúta nde papapy jehechapy oĩporãmava kuatiarogue Moĩporãhápe.
 modal-fixed-number-of-exposures-title = Mboyjeýmapa ipapapy jehechauka opytáva
 modal-cta-ok = MONEĨ
@@ -81,6 +88,13 @@ dashboard-top-banner-scan-in-progress-title = Ne ñemoha’ãnga oiko gueteri
 dashboard-top-banner-your-data-is-protected-title = Ne mba’ekuaarã oñemo’ã
 dashboard-top-banner-your-data-is-protected-cta = Ehecha oĩporãmava
 dashboard-top-banner-lets-keep-protecting-title = Romo’ãta gueteri ne mba’ekuaarã
+# Variables:
+# $exposures_unresolved_num is the remaining number of exposures the user has to resolve.
+dashboard-top-banner-lets-keep-protecting-description =
+    { $exposures_unresolved_num ->
+        [one] Ereko gueteri { $exposures_unresolved_num } techaukarã emyatyrõtava. Eku’ejey ha eñemo’ã. Rombohapéta eku’évo.
+       *[other] Ereko gueteri { $exposures_unresolved_num } techaukarã emyatyrõtava. Eku’ejey ha eñemo’ã. Rombohapéta eku’évo.
+    }
 dashboard-top-banner-lets-keep-protecting-cta = Jaku’ejeýke
 dashboard-top-banner-protect-your-data-title = Romo’ãta ne mba’ekuaarã
 dashboard-top-banner-protect-your-data-cta = Romoĩ porãta
@@ -92,6 +106,14 @@ dashboard-top-banner-non-us-protect-your-data-description-line1 =
         [one] Rojuhu { $exposures_unresolved_num } ne mba’ekuaarã jehechauka.
        *[other] Rojuhu { $exposures_unresolved_num } ne mba’ekuaarã jehechauka.
     }
+# Note: this line is preceded by `dashboard-top-banner-non-us-protect-your-data-description-line1`.
+# Variables:
+#   $data_breach_unresolved_num (number) - the total number of data breaches the user has.
+dashboard-top-banner-non-us-protect-your-data-description-line2 =
+    { $data_breach_unresolved_num ->
+        [one] Nderupyty’imi { $data_breach_unresolved_num } mba’ekuaarã ñembogua. Rombohapéta eku’évo emoĩporã hag̃ua.
+       *[other] Nderupyty’imi { $data_breach_unresolved_num } mba’ekuaarã ñembogua. Rombohapéta eku’évo emoĩporã hag̃ua.
+    }
 dashboard-top-banner-no-exposures-found-title = Ndojejuhúi máva jehechauka
 dashboard-top-banner-non-us-no-exposures-found-description = ¡Mba’éichapa! Roheka umi mba’ekuaarã ñembogua ojekuaáva ha ndorojuhúi mba’evairã. Rohapykuehóta ne ñanduti veve kundaharape ha romomarandúta oĩramo ñembogua.
 dashboard-no-exposures-label = Ndojejuhúi máva jehechauka

package-lock.json

@@ -73,8 +73,8 @@
     "npm": "10.1.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.835.0",
-    "@aws-sdk/lib-storage": "^3.835.0",
+    "@aws-sdk/client-s3": "^3.840.0",
+    "@aws-sdk/lib-storage": "^3.840.0",
     "@fluent/bundle": "^0.19.1",
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
@@ -84,7 +84,7 @@
     "@leeoniya/ufuzzy": "^1.0.18",
     "@mozilla/glean": "^5.0.4",
     "@next/third-parties": "15.3.2",
-    "@sentry/nextjs": "^9.32.0",
+    "@sentry/nextjs": "^9.33.0",
     "@sentry/node": "^9.0.0",
     "@sentry/utils": "^8.55.0",
     "@stripe/stripe-js": "^7.3.0",
@@ -101,7 +101,7 @@
     "knex": "^3.1.0",
     "lodash.isequal": "^4.5.0",
     "mjml": "^4.15.3",
-    "next": "15.3.2",
+    "next": "15.3.4",
     "next-auth": "^4.24.11",
     "nodemailer": "^6.10.1",
     "pg": "^8.16.0",
@@ -143,18 +143,18 @@
     "@types/mjml": "^4.7.4",
     "@types/mjml-browser": "^4.15.0",
     "@types/nodemailer": "^6.4.17",
-    "@typescript-eslint/eslint-plugin": "^8.35.0",
+    "@typescript-eslint/eslint-plugin": "^8.35.1",
     "@typescript-eslint/parser": "^8.32.1",
     "adm-zip": "^0.5.16",
     "esbuild": "0.25.4",
-    "eslint": "^9.29.0",
+    "eslint": "^9.30.0",
     "eslint-config-next": "^15.3.2",
-    "eslint-import-resolver-typescript": "^4.4.3",
+    "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-check-file": "^3.3.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest": "^29.0.1",
-    "eslint-plugin-jsdoc": "^51.2.3",
+    "eslint-plugin-jsdoc": "^51.3.1",
     "fast-check": "^4.1.1",
     "husky": "^9.1.7",
     "ioredis-mock": "^8.9.0",

package.json

@@ -309,6 +309,7 @@ export const DashboardTopBannerContent = (props: DashboardTopBannerProps) => {
                 monthlySubscriptionUrl={monthlySubscriptionUrl}
                 yearlySubscriptionUrl={yearlySubscriptionUrl}
                 subscriptionBillingAmount={subscriptionBillingAmount}
+                enabledFeatureFlags={props.enabledFeatureFlags}
               />
             </div>
           </>
@@ -428,6 +429,7 @@ export const DashboardTopBannerContent = (props: DashboardTopBannerProps) => {
                 monthlySubscriptionUrl={monthlySubscriptionUrl}
                 yearlySubscriptionUrl={yearlySubscriptionUrl}
                 subscriptionBillingAmount={subscriptionBillingAmount}
+                enabledFeatureFlags={props.enabledFeatureFlags}
               />
             </div>
           </>

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/DashboardTopBanner/DashboardTopBannerContent.tsx

@@ -53,6 +53,7 @@ const UpsellCtaWrapper = (props: UpsellCtaWrapperProps) => {
             monthlySubscriptionUrl={monthlySubscriptionUrl}
             yearlySubscriptionUrl={yearlySubscriptionUrl}
             subscriptionBillingAmount={subscriptionBillingAmount}
+            enabledFeatureFlags={props.enabledFeatureFlags}
           />
         )}
       </CountryCodeProvider>
@@ -71,6 +72,7 @@ export const UpsellCtaButton: Story = {
   args: {
     countryCode: "us",
     user: { email: "example@example.com" },
+    enabledFeatureFlags: [],
   },
 };
 
@@ -79,6 +81,7 @@ export const UpsellBadgeNonUsUser: Story = {
     countryCode: "nl",
     user: { email: "example@example.com" },
     isBadge: true,
+    enabledFeatureFlags: [],
   },
 };
 
@@ -87,6 +90,7 @@ export const UpsellBadgeUsUserNoSubscriber: Story = {
     countryCode: "us",
     user: { email: "example@example.com" },
     isBadge: true,
+    enabledFeatureFlags: [],
   },
 };
 
@@ -95,5 +99,6 @@ export const UpsellBadgeActiveSubscriber: Story = {
     countryCode: "us",
     user: createUserWithPremiumSubscription(),
     isBadge: true,
+    enabledFeatureFlags: [],
   },
 };

src/app/components/client/stories/UpsellCta.stories.tsx

@@ -25,6 +25,7 @@ import { sendGAEvent } from "../GoogleAnalyticsWorkaround";
 import { getLocale } from "../../../functions/universal/getLocale";
 import { ExperimentData } from "../../../../telemetry/generated/nimbus/experiments";
 import { FeatureFlagName } from "../../../../db/tables/featureFlags";
+import { WaitlistDialog } from "../SubscriberWaitlistDialog";
 
 export type UpsellButtonProps = {
   monthlySubscriptionUrl: string;
@@ -33,6 +34,7 @@ export type UpsellButtonProps = {
     yearly: number;
     monthly: number;
   };
+  enabledFeatureFlags: FeatureFlagName[];
 };
 
 export function UpsellButton(
@@ -66,15 +68,20 @@ export function UpsellButton(
       <Button {...triggerProps} variant="primary" small>
         {props.label}
       </Button>
-      {dialogState.isOpen && (
-        <UpsellDialog
-          {...overlayProps}
-          state={dialogState}
-          monthlySubscriptionUrl={props.monthlySubscriptionUrl}
-          yearlySubscriptionUrl={props.yearlySubscriptionUrl}
-          subscriptionBillingAmount={props.subscriptionBillingAmount}
-        />
-      )}
+      {/* Test already handled in Dashboard tests */
+      /* c8 ignore next 4 */}
+      {dialogState.isOpen &&
+        (props.enabledFeatureFlags.includes("DisableOneRepScans") ? (
+          <WaitlistDialog dialogTriggerState={dialogState} {...overlayProps} />
+        ) : (
+          <UpsellDialog
+            {...overlayProps}
+            state={dialogState}
+            monthlySubscriptionUrl={props.monthlySubscriptionUrl}
+            yearlySubscriptionUrl={props.yearlySubscriptionUrl}
+            subscriptionBillingAmount={props.subscriptionBillingAmount}
+          />
+        ))}
     </>
   );
 }

src/app/components/client/toolbar/UpsellBadge.tsx

@@ -109,9 +109,9 @@ export async function initializeUserAnnouncements(
         case "free_users":
           return !isPremium && isUS;
         case "has_run_scan":
-          return hasRunScan && isUS;
+          return !isPremium && hasRunScan && isUS;
         case "has_not_run_scan":
-          return !hasRunScan && isUS;
+          return !isPremium && !hasRunScan && isUS;
         case "non_us":
           return !isUS;
         case "monthly_user":