big sweep

Author: codemist

src/TestComponentWrapper.tsx

@@ -8,7 +8,6 @@ import { SessionProvider } from "next-auth/react";
 import { ReactAriaI18nProvider } from "./contextProviders/react-aria";
 import { getL10nBundles } from "./app/functions/l10n/storybookAndJest";
 import { CookiesProvider } from "./contextProviders/cookies";
-import { SubscriptionBillingProvider } from "./contextProviders/subscription-billing-context";
 
 const l10nBundles = getL10nBundles();
 
@@ -17,19 +16,7 @@ export const TestComponentWrapper = (props: { children: ReactNode }) => {
     <L10nProvider bundleSources={l10nBundles}>
       <SessionProvider session={null}>
         <ReactAriaI18nProvider locale="en">
-          <CookiesProvider>
-            <SubscriptionBillingProvider
-              value={{
-                monthly: 0,
-                bundle: {
-                  monthly: 0,
-                  individual: 0,
-                },
-              }}
-            >
-              {props.children}
-            </SubscriptionBillingProvider>
-          </CookiesProvider>
+          <CookiesProvider>{props.children}</CookiesProvider>
         </ReactAriaI18nProvider>
       </SessionProvider>
     </L10nProvider>

src/app/(proper_react)/(redesign)/(authenticated)/admin/announcements/page.tsx

@@ -7,13 +7,10 @@ import { notFound, redirect } from "next/navigation";
 import { isAdmin } from "../../../../../api/utils/auth";
 import { getAllAnnouncements } from "../../../../../../db/tables/announcements";
 import { AnnouncementsAdmin } from "./AnnouncementsAdmin";
-import { SubscriptionBillingProvider } from "../../../../../../contextProviders/subscription-billing-context";
-import { getSubscriptionBillingAmount } from "../../../../../functions/server/getPremiumSubscriptionInfo";
 import { getFluentStrings } from "./getFluentStrings";
 
 export default async function DevPage() {
   const session = await getServerSession();
-  const billing = getSubscriptionBillingAmount();
 
   if (!session?.user?.email || !session.user.subscriber?.id) {
     return redirect("/");
@@ -27,11 +24,9 @@ export default async function DevPage() {
   const fluentStrings = await getFluentStrings();
 
   return (
-    <SubscriptionBillingProvider value={billing}>
-      <AnnouncementsAdmin
-        announcements={announcements}
-        fluentStrings={fluentStrings}
-      />
-    </SubscriptionBillingProvider>
+    <AnnouncementsAdmin
+      announcements={announcements}
+      fluentStrings={fluentStrings}
+    />
   );
 }

src/app/(proper_react)/(redesign)/(authenticated)/admin/feature-flags/page.tsx

@@ -13,10 +13,6 @@ import {
 import { isAdmin } from "../../../../../api/utils/auth";
 import { Toolbar } from "../../../../../components/client/toolbar/Toolbar";
 import styles from "./page.module.scss";
-import {
-  getSubscriptionBillingAmount,
-  getPremiumSubscriptionUrl,
-} from "../../../../../functions/server/getPremiumSubscriptionInfo";
 import { defaultExperimentData } from "../../../../../../telemetry/generated/nimbus/experiments";
 import { ExistingFlagEditor, NewFlagEditor } from "./components/FlagEditor";
 
@@ -26,11 +22,6 @@ export const metadata = {
 
 export default async function FeatureFlagPage() {
   const session = await getServerSession();
-
-  const monthlySubscriptionUrl = getPremiumSubscriptionUrl({
-    type: "monthly",
-    enabledFeatureFlags: [],
-  });
   const fxaSettingsUrl = process.env.FXA_SETTINGS_URL!;
 
   if (!session?.user?.email || !session.user.subscriber?.id) {
@@ -81,8 +72,6 @@ export default async function FeatureFlagPage() {
         <div className={styles.end}>
           <Toolbar
             user={session.user}
-            monthlySubscriptionUrl={monthlySubscriptionUrl}
-            subscriptionBillingAmount={getSubscriptionBillingAmount()}
             fxaSettingsUrl={fxaSettingsUrl}
             // Since this page is only accessed by contributors, no need to load
             // their latest scan date from the DB:

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

@@ -4,8 +4,7 @@
 
 "use client";
 
-import { useContext, useEffect, useRef, useState } from "react";
-import Link from "next/link";
+import { useContext, useEffect, useState } from "react";
 import { usePathname } from "next/navigation";
 import Image from "next/image";
 import { Session } from "next-auth";
@@ -24,55 +23,32 @@ import { TabList } from "../../../../../../components/client/TabList";
 import { filterExposures } from "./filterExposures";
 import { SubscriberBreach } from "../../../../../../../utils/subscriberBreaches";
 import { hasPremium } from "../../../../../../functions/universal/user";
-import type { LatestOnerepScanData } from "../../../../../../../db/tables/onerep_scans";
 import { getLocale } from "../../../../../../functions/universal/getLocale";
 import { Button } from "../../../../../../components/client/Button";
 
 import NoExposuresIllustration from "./images/dashboard-no-exposures.svg";
 import { CountryCodeContext } from "../../../../../../../contextProviders/country-code";
 import { FeatureFlagName } from "../../../../../../../db/tables/featureFlags";
 import { getNextGuidedStep } from "../../../../../../functions/server/getRelevantGuidedSteps";
-import { CsatSurvey } from "../../../../../../components/client/csat_survey/CsatSurvey";
-import { WaitlistDialog } from "../../../../../../components/client/SubscriberWaitlistDialog";
-import { useOverlayTriggerState } from "react-stately";
-import { useOverlayTrigger } from "react-aria";
 import { useTelemetry } from "../../../../../../hooks/useTelemetry";
-import {
-  CONST_ONEREP_DATA_BROKER_COUNT,
-  CONST_ONEREP_MAX_SCANS_THRESHOLD,
-} from "../../../../../../../constants";
 import { ExperimentData } from "../../../../../../../telemetry/generated/nimbus/experiments";
-import { DataBrokerRemovalTime } from "../../../../../../functions/server/getDataBrokerRemovalTimeEstimates";
 import { UserAnnouncementWithDetails } from "../../../../../../../db/tables/user_announcements";
-import { parseIso8601Datetime } from "../../../../../../../utils/parse";
 import { PlusShutdownBanner } from "../../../../../../components/client/PlusShutdownBanner";
 import { ShutdownState } from "../../../../../../functions/server/getPlusShutdownState";
 
 export type TabType = "action-needed" | "fixed";
 
 export type Props = {
+  shutdownState: ShutdownState;
   enabledFeatureFlags: FeatureFlagName[];
   experimentData: ExperimentData["Features"];
   user: Session["user"];
   userBreaches: SubscriberBreach[];
-  userScanData: LatestOnerepScanData;
   countryCode: string;
-  isEligibleForFreeScan: boolean;
-  isEligibleForPremium: boolean;
-  monthlySubscriptionUrl: string;
-  subscriptionBillingAmount: {
-    monthly: number;
-  };
-  shutdownState: ShutdownState;
   fxaSettingsUrl: string;
-  scanCount: number;
   isNewUser: boolean;
-  hasFirstMonitoringScan: boolean;
-  elapsedTimeInDaysSinceInitialScan?: number;
-  totalNumberOfPerformedScans?: number;
   activeTab: TabType;
   signInCount: number | null;
-  removalTimeEstimates: DataBrokerRemovalTime[];
   userAnnouncements: UserAnnouncementWithDetails[];
 };
 
@@ -174,8 +150,6 @@ export const View = (props: Props) => {
               }
             }}
             locale={getLocale(l10n)}
-            isPremiumUser={hasPremium(props.user)}
-            isEligibleForPremium={props.isEligibleForPremium}
             resolutionCta={
               <Button
                 variant="primary"
@@ -246,104 +220,15 @@ export const View = (props: Props) => {
   const TabContentFixed = () => (
     <>
       <h2 className={styles.exposuresAreaHeadline}>
-        {l10n.getString(
-          props.isEligibleForPremium
-            ? "dashboard-fixed-area-headline-premium"
-            : "dashboard-fixed-area-headline-all",
-        )}
+        {l10n.getString("dashboard-fixed-area-headline-all")}
       </h2>
     </>
   );
-
-  const waitlistTriggerRef = useRef<HTMLAnchorElement>(null);
-  const dialogTriggerState = useOverlayTriggerState({});
-  const overlayTrigger = useOverlayTrigger(
-    { type: "dialog" },
-    dialogTriggerState,
-    waitlistTriggerRef,
-  );
-
-  const freeScanCta = props.isEligibleForFreeScan && (
-    <>
-      <WaitlistDialog
-        dialogTriggerState={dialogTriggerState}
-        {...overlayTrigger.overlayProps}
-      />
-      <p>
-        {
-          /* c8 ignore start */
-          props.enabledFeatureFlags.includes("MaskDataBrokerCount")
-            ? l10n.getFragment(
-                "dashboard-exposures-all-fixed-free-scan-masked",
-                {
-                  elems: {
-                    a:
-                      !props.enabledFeatureFlags.includes(
-                        "DisableOneRepScans",
-                      ) &&
-                      (typeof props.totalNumberOfPerformedScans ===
-                        "undefined" ||
-                        props.totalNumberOfPerformedScans <
-                          CONST_ONEREP_MAX_SCANS_THRESHOLD) ? (
-                        <Link
-                          ref={waitlistTriggerRef}
-                          href="/user/welcome/free-scan?referrer=dashboard"
-                          onClick={() => {
-                            recordTelemetry("link", "click", {
-                              link_id: "exposures_all_fixed_free_scan",
-                            });
-                          }}
-                        />
-                      ) : (
-                        <Button
-                          variant="link"
-                          buttonRef={waitlistTriggerRef}
-                          {...overlayTrigger.triggerProps}
-                        />
-                      ),
-                  },
-                },
-              )
-            : l10n.getFragment("dashboard-exposures-all-fixed-free-scan", {
-                vars: {
-                  data_broker_total_num: CONST_ONEREP_DATA_BROKER_COUNT,
-                },
-                elems: {
-                  a:
-                    !props.enabledFeatureFlags.includes("DisableOneRepScans") &&
-                    (typeof props.totalNumberOfPerformedScans === "undefined" ||
-                      props.totalNumberOfPerformedScans <
-                        CONST_ONEREP_MAX_SCANS_THRESHOLD) ? (
-                      <Link
-                        ref={waitlistTriggerRef}
-                        href="/user/welcome/free-scan?referrer=dashboard"
-                        onClick={() => {
-                          recordTelemetry("link", "click", {
-                            link_id: "exposures_all_fixed_free_scan",
-                          });
-                        }}
-                      />
-                    ) : (
-                      <Button
-                        variant="link"
-                        buttonRef={waitlistTriggerRef}
-                        {...overlayTrigger.triggerProps}
-                      />
-                    ),
-                },
-              })
-          /* c8 ignore stop */
-        }
-      </p>
-    </>
-  );
-
   const getZeroStateIndicator = () => {
     return (
       <>
         <Image src={NoExposuresIllustration} alt="" />
         <strong>{l10n.getString("dashboard-no-exposures-label")}</strong>
-        {freeScanCta}
       </>
     );
   };
@@ -352,14 +237,7 @@ export const View = (props: Props) => {
     <div className={styles.wrapper}>
       <Toolbar
         user={props.user}
-        monthlySubscriptionUrl={props.monthlySubscriptionUrl}
-        subscriptionBillingAmount={props.subscriptionBillingAmount}
         fxaSettingsUrl={props.fxaSettingsUrl}
-        lastScanDate={
-          props.userScanData.scan
-            ? parseIso8601Datetime(props.userScanData.scan.created_at)
-            : null
-        }
         experimentData={props.experimentData}
         enabledFeatureFlags={props.enabledFeatureFlags}
         announcements={announcements}
@@ -381,23 +259,7 @@ export const View = (props: Props) => {
         countryCode={props.countryCode}
         shutdownState={props.shutdownState}
       />
-      <CsatSurvey
-        user={props.user}
-        activeTab={activeTab}
-        enabledFeatureFlags={props.enabledFeatureFlags}
-        experimentData={props.experimentData}
-        elapsedTimeInDaysSinceInitialScan={
-          props.elapsedTimeInDaysSinceInitialScan ?? null
-        }
-        hasFirstMonitoringScan={props.hasFirstMonitoringScan}
-        lastScanDate={
-          props.userScanData.scan
-            ? parseIso8601Datetime(props.userScanData.scan.created_at)
-            : null
-        }
-        signInCount={props.signInCount}
-        isEligibleForPremium={props.isEligibleForPremium}
-      />
+
       <div className={styles.dashboardContent}>
         <DashboardTopBanner
           tabType={activeTab}
@@ -437,8 +299,6 @@ export const View = (props: Props) => {
             initialFilterValues={initialFilterState}
             filterValues={filters}
             setFilterValues={setFilters}
-            isEligibleForPremium={props.isEligibleForPremium}
-            isPlusSubscriber={hasPremium(props.user)}
           />
         </div>
         {noUnresolvedExposures ? (