Merge pull request #6155 from mozilla/mntor-4968

Remove yearly and bundle plans

Author: flozia

.env

@@ -113,7 +113,6 @@ E2E_TEST_ACCOUNT_BASE_PASSWORD=test-password
 
 # Monitor Premium features
 # Link to start user on the subscription process. PREMIUM_ENABLED must be set to `true`.
-SUBSCRIPTION_BILLING_AMOUNT_YEARLY_US=13.37
 SUBSCRIPTION_BILLING_AMOUNT_MONTHLY_US=42.42
 SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_INDIVIDUAL_MONTHLY_US=424
 SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_MONTHLY_US=42

.env.local.example

@@ -39,7 +39,6 @@ NEXTAUTH_SECRET=r7nKAKDWV0Bl53GHgQ/kA/EJCM2zvuH+8G3wZtwbXEA=
 EMAIL_FROM="Mozilla Monitor Stage <[email protected]>"
 # Whether GA4 sends data or not. NOTE: must be set in build environment.
 NEXT_PUBLIC_GA4_DEBUG_MODE=true
-SUBSCRIPTION_BILLING_AMOUNT_YEARLY_US=13.37
 SUBSCRIPTION_BILLING_AMOUNT_MONTHLY_US=42.42
 SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_INDIVIDUAL_MONTHLY_US=424
 SUBSCRIPTION_BILLING_AMOUNT_BUNDLE_MONTHLY_US=42

functional-tests/fixtures/baseTest.ts

@@ -22,7 +22,6 @@ export const defaultLocalForcedFeatureFlags: FeatureFlagName[] = [
   "EditScanProfileDetails",
   "SubPlat3",
   "Announcements",
-  "PrivacyProductsBundle",
 ];
 
 const test = baseTest.extend<{

functional-tests/tests/subscriptions.spec.ts

@@ -10,7 +10,7 @@ import { FeatureFlagName } from "../../src/db/tables/featureFlags";
 const extraFeatureFlags: FeatureFlagName[] = ["GA4SubscriptionEvents"];
 test.use({ extraLocalForcedFeatureFlags: extraFeatureFlags });
 
-const productPlans = ["Monitor Plus", "Privacy Protection Plan"];
+const productPlans = ["Monitor Plus"];
 
 // General tests to confirm the E2E test setup works as expected
 test.describe(`Verify subscription flows [${process.env.E2E_TEST_ENV}]`, () => {

src/TestComponentWrapper.tsx

@@ -20,7 +20,6 @@ export const TestComponentWrapper = (props: { children: ReactNode }) => {
           <CookiesProvider>
             <SubscriptionBillingProvider
               value={{
-                yearly: 0,
                 monthly: 0,
                 bundle: {
                   monthly: 0,

src/app/(bundle)/bundle/onboarding/BundleOnboardingView.stories.tsx

@@ -17,6 +17,5 @@ type Story = StoryObj<typeof BundleOnboardingView>;
 export const BundleOnboarding: Story = {
   args: {
     l10n: getL10n(),
-    enabledFeatureFlags: ["PrivacyProductsBundle"],
   },
 };

src/app/(bundle)/bundle/onboarding/page.tsx

@@ -11,7 +11,6 @@ import {
 } from "../../../functions/l10n/serverComponents";
 import { BundleOnboardingView } from "./BundleOnboardingView";
 import { getEnabledFeatureFlags } from "../../../../db/tables/featureFlags";
-import NotFound from "../../../not-found";
 import { getServerSession } from "../../../functions/server/getServerSession";
 
 export default async function Page() {
@@ -24,9 +23,7 @@ export default async function Page() {
         }
       : { isSignedOut: true },
   );
-  if (!enabledFeatureFlags.includes("PrivacyProductsBundle")) {
-    return NotFound();
-  }
+
   const headersList = await headers();
   const countryCode = getCountryCode(headersList);
   const l10n = getL10n(await getAcceptLangHeaderInServerComponents());

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

@@ -31,10 +31,6 @@ export default async function FeatureFlagPage() {
     type: "monthly",
     enabledFeatureFlags: [],
   });
-  const yearlySubscriptionUrl = getPremiumSubscriptionUrl({
-    type: "yearly",
-    enabledFeatureFlags: [],
-  });
   const fxaSettingsUrl = process.env.FXA_SETTINGS_URL!;
 
   if (!session?.user?.email || !session.user.subscriber?.id) {
@@ -86,7 +82,6 @@ export default async function FeatureFlagPage() {
           <Toolbar
             user={session.user}
             monthlySubscriptionUrl={monthlySubscriptionUrl}
-            yearlySubscriptionUrl={yearlySubscriptionUrl}
             subscriptionBillingAmount={getSubscriptionBillingAmount()}
             fxaSettingsUrl={fxaSettingsUrl}
             // Since this page is only accessed by contributors, no need to load

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

@@ -234,12 +234,10 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             isEligibleForPremium={props.countryCode === "us"}
             isEligibleForFreeScan={props.countryCode === "us" && !scanData.scan}
             monthlySubscriptionUrl=""
-            yearlySubscriptionUrl=""
             fxaSettingsUrl=""
             scanCount={scanCount}
             totalNumberOfPerformedScans={props.totalNumberOfPerformedScans}
             subscriptionBillingAmount={{
-              yearly: 13.37,
               monthly: 42.42,
             }}
             isNewUser={true}

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

@@ -196,12 +196,10 @@ const DashboardWrapper = (props: DashboardWrapperProps) => {
             isEligibleForPremium={props.countryCode === "us"}
             isEligibleForFreeScan={props.countryCode === "us" && !scanData.scan}
             monthlySubscriptionUrl=""
-            yearlySubscriptionUrl=""
             fxaSettingsUrl=""
             scanCount={scanCount}
             totalNumberOfPerformedScans={props.totalNumberOfPerformedScans}
             subscriptionBillingAmount={{
-              yearly: 13.37,
               monthly: 42.42,
             }}
             isNewUser={true}