Merge branch 'main' into MNTOR-3556

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.6.x'
+          node-version: '20.9.x'
       - run: npm ci
       - run: npm run build-glean
       # Verify that the build (incl. type-checking) succeeds

.github/workflows/e2e_cron.yml

@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.6.x
+          node-version: 20.9.x
 
       - name: Install dependencies
         run: npm ci

.github/workflows/e2e_pr.yml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 22.6.x
+          node-version: 20.9.x
 
       - name: Install dependencies
         run: npm ci

.github/workflows/lint.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.6.x'
+          node-version: '20.9.x'
       - run: npm ci
       - run: npm run build-glean
       - run: npm run build-nimbus

.github/workflows/unittests.yaml

@@ -12,7 +12,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '22.6.x'
+          node-version: '20.9.x'
       - run: npm ci
       - run: npm run build-glean
       - run: npm test

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.6-alpine
+FROM node:20.9-alpine
 
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app

Dockerfile.cloudrun

@@ -1,4 +1,4 @@
-FROM node:22.6-alpine
+FROM node:20.9-alpine
 
 RUN addgroup -g 10001 app && \
     adduser -D -G app -h /app -u 10001 app

config/nimbus.yaml

@@ -20,19 +20,32 @@ features:
       - channel: production
         value: { "enabled": false }
   welcome-scan-optional-info:
-    description: Show additional optional inputs to provide middle name and name suffix for broker scan
+    description: Show additional optional input fields for the data broker scan
     variables:
       enabled:
         description: If the feature is enabled
         type: Boolean
         default: false
+      variant:
+        description: The optional fields to show
+        type: OptionalBrokerScanInfoFields
+        default: none
     defaults:
       - channel: local
-        value: { "enabled": true }
+        value: {
+          "enabled": true,
+          "variant": middleName,
+        }
       - channel: staging
-        value: { "enabled": false }
+        value: {
+          "enabled": false,
+          "variant": none,
+        }
       - channel: production
-        value: { "enabled": false }
+        value: {
+          "enabled": false,
+          "variant": none,
+        }
   data-privacy-petition-banner:
     description: Show the data privacy petition banner to US users
     variables:
@@ -75,6 +88,17 @@ features:
           "variant": ctaWithEmail,
         }
 enums:
+  OptionalBrokerScanInfoFields:
+    description: An enum of optional broker scan info fields
+    variants:
+      suffix:
+        description: Only show the optional suffix field
+      middleName:
+        description: Only show the optional middle name field
+      suffixAndMiddleName:
+        description: Show the optional suffix and middle name fields
+      none:
+        description: Do not show any optional fields
   FreeScanCtaType:
     description: An enum of free scan CTA types
     variants:

docs/dependency-updates.md

@@ -56,7 +56,7 @@ Alpine Linux distribution with the latest version of Node.
 
 GitHub's Dependabot only updates `Dockerfile`, but the Node version is specified in many
 different config files. The PR that Dependabot opens will always fail the lint check because
-the script `scripts/check-node-version-alignment.js` will fail if the Node version isn't
+the script `./src/scripts/build/checkNodeVersionAlignment.js` will fail if the Node version isn't
 set consistently across all config files.
 
 1. clone the branch that Dependabot creates
@@ -70,7 +70,7 @@ git clone dependabot/docker/node-22.6-alpine
 2. Run the Node version alignment script and fix any problems it finds
 
 ```sh
-node scripts/check-node-version-alignment.js
+node ./src/scripts/build/checkNodeVersionAlignment.js
 ```
 
 3. Commit and push to branch Dependabot opened

esbuild.cronjobs.js

@@ -21,6 +21,6 @@ build({
   format: "esm",
   outdir: "dist/scripts/cronjobs/",
   sourcemap: true,
-  target: "node22.6",
+  target: "node20.9",
   packages: "external",
 });

locales/cy/landing-all.ftl

@@ -30,7 +30,7 @@ landing-all-faq-title = Cwestiynau cyffredin
 landing-all-faq-see-all = Gweld yr holl gwestiynau cyffredin
 landing-all-data-breach-definition-qn = Beth yn union yw tor-data?
 landing-all-data-breach-definition-ans = Mae tor-data yn digwydd pan fydd manylion personol neu breifat yn cael eu datgelu, eu dwyn neu eu copïo heb ganiatâd. Gall y digwyddiadau diogelwch hyn ddeillio o ymosodiadau seibr ar wefannau, apiau neu unrhyw gronfa ddata lle mae manylion personol pobl yn byw. Gall tor-data ddigwydd yn ddamweiniol hefyd, fel pan fydd manylion mewngofnodi rhywun yn cael eu rhyddhau'n gyhoeddus.
-landing-all-data-breach-next-steps-qn = Rwyf newydd ddeall fy mod i mewn tor-data. Beth ddylwn i ei wneud nesaf?
+landing-all-data-breach-next-steps-qn = Rwy newydd ddeall fy mod i'n rhan dor-data. Beth ddylwn i ei wneud nesaf?
 landing-all-data-breach-next-steps-ans = Ewch i { -brand-mozilla-monitor } i ddysgu beth i'w wneud ar ôl tor-data a chael camau gweithredu i ddatrys datgeliad eich manylion personol. Mae hacwyr yn dibynnu ar bobl yn ailddefnyddio cyfrineiriau, felly mae'n bwysig creu cyfrineiriau cryf, unigryw ar gyfer eich holl gyfrifon. Cadwch eich cyfrineiriau mewn man diogel y mai dim ond chi sydd â mynediad ato; gall hwn fod yr un man lle rydych yn cadw dogfennau pwysig, neu defnyddiwch reolwr cyfrinair.
 landing-all-data-breach-info-qn = Pa fanylion sy'n cael eu datgelu mewn achosion o dor-data?
 landing-all-data-breach-info-ans = Nid yw pob tor-data yn amlygu'r un wybodaeth i gyd. Mae'n dibynnu ar yr hyn y gall hacwyr gael mynediad ato. Mae llawer o achosion o dor-data yn amlygu cyfeiriadau e-bost a chyfrineiriau. Mae eraill yn datgelu manylion mwy sensitif fel rhifau cardiau credyd, rhifau PIN, a rhifau nawdd cymdeithasol.

locales/en-CA/app.ftl

@@ -10,20 +10,27 @@
 ## unless otherwise indicated.
 
 -product-name = Mozilla Monitor
--product-name-nowrap = <span class="nowrap">{ -product-name }</span>
 -product-short-name = Monitor
 -brand-name = Firefox
--brand-Mozilla = Mozilla
 -brand-HIBP = Have I Been Pwned
 -brand-fxa = Firefox Account
 -brand-pocket = Pocket
 -brand-lockwise = Firefox Lockwise
--brand-send = Firefox Send
--brand-fpn = Firefox Private Network
+-brand-firefox = Firefox
+-brand-monitor = Monitor
+-brand-fx-monitor = Mozilla Monitor
+-brand-mozilla = Mozilla
+-brand-premium = Premium
+-brand-monitor-premium = Monitor Premium
+-brand-mozilla-foundation = Mozilla Foundation
+-brand-github = GitHub
+-brand-mozilla-vpn = Mozilla VPN
+-brand-relay = Firefox Relay
+-brand-mozilla-monitor = Mozilla Monitor
+-brand-monitor-plus = Monitor Plus
 
 ##
 
-error-could-not-add-email = Could not add email address to database.
 error-not-subscribed = This email address is not subscribed to { -product-name }.
 error-hibp-throttled = Too many connections to { -brand-HIBP }.
 error-hibp-connect = Error connecting to { -brand-HIBP }.
@@ -34,8 +41,6 @@ user-add-verification-email-just-sent = Another verification email can’t be se
 user-add-unknown-error = Something went wrong adding another email address. Please try again later.
 user-delete-unknown-error = Something went wrong removing an email address. Please try again later.
 user-verify-token-error = Verification token is required.
-user-unsubscribe-token-error = Unsubscribing requires a token.
-user-unsubscribe-token-email-error = Unsubscribing requires a token and emailHash.
 # compromised-data = the kind of user data exposed to hackers in data breach.
 compromised-data = Compromised data:
 # Breach data provided by Have I Been Pwned.
@@ -47,8 +52,6 @@ sign-out = Sign Out
 # Manage Firefox Account, link to page where account holders can change their account settings.
 manage-fxa = Manage { -brand-fxa }
 # Link title
-frequently-asked-questions = Frequently Asked Questions
-# Link title
 preferences = Preferences
 # Link title
 home = Home
@@ -146,24 +149,6 @@ rec-section-subhead-no-pw = Though passwords weren’t exposed in this breach, t
 # A status indicator that appears in the top right corner of new breach cards
 new-breach = New
 
-# Monitor V2
-
-
-## The following messages are brands and should be kept entirely in English
-
--brand-firefox = Firefox
--brand-monitor = Monitor
--brand-fx-monitor = Mozilla Monitor
--brand-mozilla = Mozilla
--brand-premium = Premium
--brand-monitor-premium = Monitor Premium
--brand-mozilla-foundation = Mozilla Foundation
--brand-github = GitHub
--brand-mozilla-vpn = Mozilla VPN
--brand-relay = Firefox Relay
--brand-mozilla-monitor = Mozilla Monitor
--brand-monitor-plus = Monitor Plus
-
 ##
 
 # “account” can be localized, “Mozilla” must be treated as a brand,
@@ -214,7 +199,7 @@ mozilla = { -brand-mozilla }
 terms-of-service = Terms of Service
 privacy-notice = Privacy Notice
 github = { -brand-github }
-footer-nav-all-breaches = All Breaches
+footer-nav-recent-breaches = Recent Data Breaches
 footer-external-link-faq-label = FAQs
 footer-external-link-faq-tooltip = Frequently asked questions
 

locales/th/dashboard.ftl

@@ -5,10 +5,29 @@
 
 # Chart summarizing total exposures
 
+# Variables:
+#   $nr (number) - Number of fixed exposures found for the user
+exposure-chart-heading-fixed = <nr>{ $nr }</nr> <label>ได้รับการแก้ไขแล้ว</label>
+exposure-chart-legend-heading-nr = ตัวเลข
+exposure-chart-caption = แผนภูมินี้แสดงจำนวนครั้งที่ข้อมูลของคุณถูกเปิดเผยอย่างเป็นปัจจุบัน
+exposure-chart-returning-user-upgrade-prompt = ไม่รวมที่อยู่บ้าน สมาชิกในครอบครัว และอื่นๆ
+exposure-chart-returning-user-upgrade-prompt-cta = เริ่มการสแกนฟรี
+exposure-chart-scan-in-progress-prompt = <b>กำลังสแกนอยู่</b>: ยังไม่รวมที่อยู่ สมาชิกในครอบครัว และอื่นๆ
 progress-card-manually-fixed-headline = แก้ไขด้วยตนเอง
+dashboard-exposures-filter-date-found-last-year = เมื่อปีที่แล้ว
+dashboard-exposures-filter-status = สถานะ
+popover-open-filter-settings-alt = เลือกตัวกรอง
+dashboard-exposures-filter-show-all = แสดงทั้งหมด
+dashboard-exposures-filter-show-results = แสดงผล
+dashboard-exposures-filter-reset = ตั้งค่าใหม่
 
 ## Top banner on the dashboard
 
+dashboard-top-banner-section-label = สรุปแดชบอร์ด
+dashboard-top-banner-scan-in-progress-title = การสแกนของคุณยังอยู่ระหว่างดำเนินการ
+dashboard-top-banner-your-data-is-protected-title = ข้อมูลของคุณได้รับการปกป้องแล้ว
+dashboard-top-banner-your-data-is-protected-cta = ดูสิ่งที่ได้รับการแก้ไขแล้ว
+dashboard-top-banner-lets-keep-protecting-title = เรามาปกป้องข้อมูลของคุณกันต่อไป
 
 # About Exposure Indicators Modal
 

netlify.toml

@@ -18,4 +18,4 @@
   # Default build command.
   command = "npm ci; npm run build-storybook"
 
-  environment = { NODE_VERSION = "22.6.0", NPM_VERSION = "10.8.1" }
+  environment = { NODE_VERSION = "20.9.0", NPM_VERSION = "10.1.0" }

next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/app/building-your-application/configuring/typescript for more information.