Merge pull request #6183 from mozilla/mntor-5029

chore(flags): remove EnableRemovalUnderMaintenanceStep flag

Author: kschelonka

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

@@ -178,7 +178,6 @@ export const View = (props: Props) => {
     arraySortedByDate.filter((exposure: Exposure) => {
       const exposureStatus = getExposureStatus(
         exposure,
-        isDataBrokerUnderMaintenance(exposure),
         props.enabledFeatureFlags,
       );
 
@@ -598,13 +597,3 @@ export const View = (props: Props) => {
     </div>
   );
 };
-
-export function isDataBrokerUnderMaintenance(
-  exposure: Exposure | OnerepScanResultDataBrokerRow,
-): boolean {
-  return (
-    isScanResult(exposure) &&
-    exposure.broker_status === "removal_under_maintenance" &&
-    exposure.status !== "removed"
-  );
-}

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

@@ -18,14 +18,13 @@ import {
   StepLink,
 } from "../../../../../../../functions/server/getRelevantGuidedSteps";
 import { useTelemetry } from "../../../../../../../hooks/useTelemetry";
-import { TelemetryButton } from "../../../../../../../components/client/TelemetryButton";
 import { FeatureFlagName } from "../../../../../../../../db/tables/featureFlags";
 
 export type FixViewProps = {
   children: ReactNode;
   subscriberEmails: string[];
   data: StepDeterminationData;
-  nextStep: StepLink | (() => void);
+  nextStep: StepLink;
   currentSection:
     | "data-broker-profiles"
     | "high-risk-data-breach"
@@ -93,47 +92,22 @@ export const FixView = (props: FixViewProps) => {
         {!props.hideNavClose && navigationClose()}
         <section className={styles.fixSection}>
           <div className={styles.viewWrapper}>{props.children}</div>
-          {!props.hideNextNavigationRightArrow &&
-            (isNextStepALink(props.nextStep) ? (
-              <Link
-                className={`${styles.navArrow} ${styles.navArrowNext}`}
-                href={props.nextStep.href}
-                aria-label={l10n.getString("guided-resolution-flow-next-arrow")}
-                onClick={() => {
-                  recordTelemetry("button", "click", {
-                    button_id: "next_arrow",
-                  });
-                }}
-              >
-                <Image alt="" src={ImageArrowRight} />
-              </Link>
-            ) : (
-              <TelemetryButton
-                className={`${styles.navArrow} ${styles.navArrowNext}`}
-                event={{
-                  module: "button",
-                  name: "click",
-                  data: {
-                    button_id: "go_to_next_result",
-                  },
-                }}
-                variant="link"
-                onPress={props.nextStep}
-                aria-label={l10n.getString(
-                  "guided-resolution-flow-next-arrow-sub-step",
-                )}
-              >
-                <Image alt="" src={ImageArrowRight} />
-              </TelemetryButton>
-            ))}
+          {!props.hideNextNavigationRightArrow && (
+            <Link
+              className={`${styles.navArrow} ${styles.navArrowNext}`}
+              href={props.nextStep.href}
+              aria-label={l10n.getString("guided-resolution-flow-next-arrow")}
+              onClick={() => {
+                recordTelemetry("button", "click", {
+                  button_id: "next_arrow",
+                });
+              }}
+            >
+              <Image alt="" src={ImageArrowRight} />
+            </Link>
+          )}
         </section>
       </div>
     </div>
   );
 };
-
-function isNextStepALink(
-  nextStep: StepLink | (() => void),
-): nextStep is StepLink {
-  return "href" in nextStep;
-}