Merge branch 'main' into l10n_automation

mozilla · Jan 15, 2025 · 47e45ba · 47e45ba
2 parents 269d61e + ca3bbf3
commit 47e45ba
Show file tree

Hide file tree

Showing 23 changed files with 974 additions and 590 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,12 +81,12 @@
     "@leeoniya/ufuzzy": "^1.0.17",
     "@mozilla/glean": "^5.0.3",
     "@next/third-parties": "^14.2.15",
-    "@sentry/nextjs": "^8.47.0",
+    "@sentry/nextjs": "^8.48.0",
     "@sentry/node": "^8.0.0",
-    "@sentry/utils": "^8.47.0",
+    "@sentry/utils": "^8.48.0",
     "@stripe/stripe-js": "^5.5.0",
     "@types/jsdom": "^21.1.7",
-    "@types/node": "^22.10.2",
+    "@types/node": "^22.10.5",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "canvas-confetti": "^1.9.3",
@@ -163,7 +163,7 @@
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-scss": "^6.10.0",
     "tsx": "^4.19.2",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "yaml": "^2.7.0"
   }
 }
diff --git a/...uthenticated)/user/(dashboard)/dashboard/DashboardTopBanner/DashboardTopBannerContent.tsx b/...uthenticated)/user/(dashboard)/dashboard/DashboardTopBanner/DashboardTopBannerContent.tsx
@@ -80,7 +80,10 @@ export const DashboardTopBannerContent = (props: DashboardTopBannerProps) => {
     );
   }
 
-  const relevantGuidedStep = getNextGuidedStep(stepDeterminationData);
+  const relevantGuidedStep = getNextGuidedStep(
+    stepDeterminationData,
+    props.enabledFeatureFlags,
+  );
 
   const contentProps = {
     relevantGuidedStep,

diff --git a/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx b/src/app/(proper_react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/View.tsx
@@ -198,6 +198,7 @@ export const View = (props: Props) => {
     const removalTimeEstimate = isScanResult(exposure)
       ? props.removalTimeEstimates.find(({ d }) => d === exposure.data_broker)
       : undefined;
+
     return (
       <li key={exposureCardKey} className={styles.exposureListItem}>
         <ExposureCard
@@ -253,6 +254,7 @@ export const View = (props: Props) => {
   const dataSummary = getDashboardSummary(
     adjustedScanResults,
     props.userBreaches,
+    props.enabledFeatureFlags,
   );
 
   const hasExposures = combinedArray.length > 0;
@@ -513,6 +515,7 @@ export const View = (props: Props) => {
           bannerData={getDashboardSummary(
             adjustedScanResults,
             props.userBreaches,
+            props.enabledFeatureFlags,
           )}
           stepDeterminationData={{
             countryCode,

diff --git a/..._react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/ResolutionContainer.tsx b/..._react)/(redesign)/(authenticated)/user/(dashboard)/dashboard/fix/ResolutionContainer.tsx
@@ -12,6 +12,7 @@ import styles from "./ResolutionContainer.module.scss";
 import { ProgressCard } from "../../../../../../../components/client/ProgressCard";
 import { StepDeterminationData } from "../../../../../../../functions/server/getRelevantGuidedSteps";
 import { getDashboardSummary } from "../../../../../../../functions/server/dashboard";
+import { FeatureFlagName } from "../../../../../../../../db/tables/featureFlags";
 
 type ResolutionContainerProps = {
   type: "highRisk" | "leakedPasswords" | "securityRecommendations";
@@ -25,6 +26,7 @@ type ResolutionContainerProps = {
   data: StepDeterminationData;
   label?: string;
   cta?: ReactNode;
+  enabledFeatureFlags: FeatureFlagName[];
 };
 
 export const ResolutionContainer = (props: ResolutionContainerProps) => {
@@ -40,6 +42,7 @@ export const ResolutionContainer = (props: ResolutionContainerProps) => {
   const resolutionSummary = getDashboardSummary(
     props.data.latestScanData?.results ?? [],
     props.data.subscriberBreaches,
+    props.enabledFeatureFlags,
   );
 
   return (

diff --git a/...d)/user/(dashboard)/dashboard/fix/data-broker-profiles/manual-remove/ManualRemoveView.tsx b/...d)/user/(dashboard)/dashboard/fix/data-broker-profiles/manual-remove/ManualRemoveView.tsx
@@ -43,7 +43,11 @@ export function ManualRemoveView(props: Props) {
   const l10n = useL10n();
   const [activeExposureCardKey, setActiveExposureCardKey] = useState(0);
 
-  const summary = getDashboardSummary(props.scanData.results, props.breaches);
+  const summary = getDashboardSummary(
+    props.scanData.results,
+    props.breaches,
+    props.enabledFeatureFlags,
+  );
 
   const countOfDataBrokerProfiles = props.scanData.results.length;
   const estimatedTime = countOfDataBrokerProfiles * 10; // 10 minutes per data broker site.

diff --git a/...user/(dashboard)/dashboard/fix/data-broker-profiles/welcome-to-plus/WelcomeToPlusView.tsx b/...user/(dashboard)/dashboard/fix/data-broker-profiles/welcome-to-plus/WelcomeToPlusView.tsx
@@ -39,6 +39,7 @@ export function WelcomeToPlusView(props: Props) {
   const summary = getDashboardSummary(
     scanResultsInProgress,
     props.data.subscriberBreaches,
+    props.enabledFeatureFlags,
   );
   const dataPointReduction = getDataPointReduction(summary);