Merge branch 'main' into lighthouse-report

Author: flozia

.github/pull_request_template.md

@@ -21,6 +21,7 @@ Not applicable.
 - [ ] Commits in this PR are minimal and [have descriptive commit messages](https://chris.beams.io/posts/git-commit/).
 - [ ] I've added or updated the relevant sections in readme and/or code comments
 - [ ] I've added a unit test to test for potential regressions of this bug.
+- [ ] If this PR implements a feature flag or experimentation, I've checked that it still works with the flag both on, and with the flag off.
 - [ ] If this PR implements a feature flag or experimentation, the Ship Behind Feature Flag status in Jira has been set
 - [ ] Product Owner accepted the User Story (demo of functionality completed) or waived the privilege.
 - [ ] All acceptance criteria are met.

locales/ko/exposure-card.ftl

@@ -28,9 +28,10 @@ exposure-card-other = 기타
 exposure-card-description-data-breach-action-needed = 정보가 { $data_breach_date }에 발생한 <data_breach_link>{ $data_breach_company } 데이터 유출로 인해 </data_breach_link>에 노출되었습니다. 해결을 위한 단계를 안내해 드리겠습니다.
 exposure-card-description-data-breach-fixed = <data_breach_link>이 유출</data_breach_link>을 해결하기 위한 조치를 취했습니다. 데이터 유출을 지속적으로 모니터링하고 새로운 유출이 일어날 경우 알려드리겠습니다.
 exposure-card-your-exposed-info = 노출된 정보:
+exposure-card-found-the-following-data = { -brand-monitor }에서 다음과 같은 노출된 데이터를 발견했습니다:
 exposure-card-exposure-type-data-broker = 판매 정보
 exposure-card-exposure-type-data-breach = 데이터 유출
-exposure-card-cta = 모든 유출 해결
+exposure-card-resolve-exposures-cta = 노출 문제 해결
 exposure-card-label-company-logo = 회사 로고
 exposure-card-label-company = 회사
 # Status of the exposure card, could be In Progress, Fixed or Action Needed
@@ -39,3 +40,4 @@ exposure-card-label-status = 상태
 # $category_label is the data breach exposure type that was leaked. Eg. Email, IP Address.
 # $count is the number of times that the data type was leaked.
 exposure-card-label-and-count = { $category_label }: { $count }
+exposure-card-manual-resolution-praise = <b>잘하셨습니다!</b> 이 노출 문제를 해결하셨습니다.

locales/ko/fix.ftl

@@ -7,6 +7,7 @@ fix-flow-nav-leaked-passwords = 유출된 비밀번호
 fix-flow-nav-security-recommendations = 보안 관련 권장 사항
 guided-resolution-flow-exit = 대시보드로 돌아가기
 guided-resolution-flow-next-arrow = 다음 단계로 넘어가기
+guided-resolution-flow-next-arrow-sub-step = 다음 결과로 가기
 guided-resolution-flow-step-navigation-label = 단계별 안내
 
 # Celebration screens

locales/ko/settings.ftl

@@ -53,3 +53,13 @@ settings-delete-monitor-account-confirmation-toast-dismiss-label = 닫기
 
 settings-alert-preferences-allow-monthly-monitor-report-title = 월간 { -brand-monitor } 보고서
 settings-alert-preferences-allow-monthly-monitor-report-subtitle = 새로운 유출, 고쳐진 사항, 주의가 필요한 사항에 대한 월별 업데이트입니다.
+
+## Settings page redesign
+
+settings-tab-label-edit-info = 정보 수정
+settings-tab-label-notifications = 알림 설정
+settings-tab-label-manage-account = 계정 관리
+settings-tab-subtitle-manage-account = { -product-name } 계정을 관리하세요.
+settings-tab-notifications-marketing-title = 마케팅 커뮤니케이션
+settings-tab-notifications-marketing-text = { -brand-monitor }와 { -brand-mozilla }, 다른 보안 제품에 대한 정기적인 업데이트를 제공합니다.
+settings-tab-notifications-marketing-link-label = { -brand-mozilla } 이메일 설정으로 이동

package-lock.json

@@ -70,8 +70,8 @@
     "npm": "10.1.0"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.722.0",
-    "@aws-sdk/lib-storage": "^3.722.0",
+    "@aws-sdk/client-s3": "^3.731.1",
+    "@aws-sdk/lib-storage": "^3.731.1",
     "@fluent/bundle": "^0.18.0",
     "@fluent/langneg": "^0.7.0",
     "@fluent/react": "^0.15.2",
@@ -125,8 +125,8 @@
     "@storybook/nextjs": "^8.4.7",
     "@storybook/react": "^8.4.6",
     "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.1.0",
-    "@testing-library/user-event": "^14.5.2",
+    "@testing-library/react": "^16.2.0",
+    "@testing-library/user-event": "^14.6.0",
     "@types/adm-zip": "^0.5.7",
     "@types/canvas-confetti": "^1.9.0",
     "@types/jest-axe": "^3.5.9",
@@ -160,9 +160,9 @@
     "prettier": "3.4.2",
     "sass": "^1.83.1",
     "storybook": "^8.4.6",
-    "stylelint": "^16.12.0",
+    "stylelint": "^16.13.2",
     "stylelint-config-recommended-scss": "^14.1.0",
-    "stylelint-scss": "^6.10.0",
+    "stylelint-scss": "^6.10.1",
     "tsx": "^4.19.2",
     "typescript": "^5.7.3",
     "yaml": "^2.7.0"

package.json

@@ -167,7 +167,7 @@ export default async function DashboardPage({ params, searchParams }: Props) {
       totalNumberOfPerformedScans={profileStats?.total}
       isNewUser={isNewUser}
       elapsedTimeInDaysSinceInitialScan={elapsedTimeInDaysSinceInitialScan}
-      experimentData={experimentData}
+      experimentData={experimentData["Features"]}
       activeTab={activeTab}
       hasFirstMonitoringScan={hasFirstMonitoringScan}
       signInCount={signInCount}

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/[[...slug]]/page.tsx

@@ -125,7 +125,7 @@ export default async function SettingsPage({ params, searchParams }: Props) {
       yearlySubscriptionUrl={`${yearlySubscriptionUrl}&${additionalSubplatParams.toString()}`}
       subscriptionBillingAmount={getSubscriptionBillingAmount()}
       enabledFeatureFlags={enabledFeatureFlags}
-      experimentData={experimentData}
+      experimentData={experimentData["Features"]}
       lastScanDate={lastOneRepScan?.created_at}
       isMonthlySubscriber={isMonthlySubscriber}
       activeTab={activeTab}

src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/settings/[[...slug]]/page.tsx

@@ -77,7 +77,7 @@ export default async function Onboarding({ params, searchParams }: Props) {
       breachesTotalCount={allBreachesCount}
       stepId={firstSlug === FreeScanSlug ? "enterInfo" : "getStarted"}
       previousRoute={previousRoute}
-      experimentData={experimentData}
+      experimentData={experimentData["Features"]}
     />
   );
 }

src/app/(proper_react)/(redesign)/(authenticated)/user/welcome/[[...slug]]/page.tsx

@@ -59,39 +59,41 @@ export default async function Page({ searchParams }: Props) {
     oneRepActivations > monthlySubscribersQuota;
   return (
     <AccountsMetricsFlowProvider
-      enabled={experimentData["landing-page-free-scan-cta"].enabled}
+      enabled={experimentData["Features"]["landing-page-free-scan-cta"].enabled}
       metricsFlowParams={{
         entrypoint: CONST_URL_MONITOR_LANDING_PAGE_ID,
         entrypoint_experiment: "landing-page-free-scan-cta",
         entrypoint_variation:
-          experimentData["landing-page-free-scan-cta"].variant,
+          experimentData["Features"]["landing-page-free-scan-cta"].variant,
         form_type:
-          experimentData["landing-page-free-scan-cta"].variant ===
+          experimentData["Features"]["landing-page-free-scan-cta"].variant ===
           "ctaWithEmail"
             ? "email"
             : "button",
         service: process.env.OAUTH_CLIENT_ID as string,
       }}
     >
       {enabledFeatureFlags.includes("LandingPageRedesign") &&
-      experimentData["landing-page-redesign-plus-eligible-experiment"]
-        .enabled &&
-      experimentData["landing-page-redesign-plus-eligible-experiment"]
-        .variant === "redesign" ? (
+      experimentData["Features"][
+        "landing-page-redesign-plus-eligible-experiment"
+      ].enabled &&
+      experimentData["Features"][
+        "landing-page-redesign-plus-eligible-experiment"
+      ].variant === "redesign" ? (
         <LandingViewRedesign
           eligibleForPremium={eligibleForPremium}
           l10n={getL10n()}
           countryCode={countryCode}
           scanLimitReached={scanLimitReached}
-          experimentData={experimentData}
+          experimentData={experimentData["Features"]}
         />
       ) : (
         <LandingView
           eligibleForPremium={eligibleForPremium}
           l10n={getL10n()}
           countryCode={countryCode}
           scanLimitReached={scanLimitReached}
-          experimentData={experimentData}
+          experimentData={experimentData["Features"]}
         />
       )}
     </AccountsMetricsFlowProvider>