Multi-year Plans Default Experiment: Ensure only the onboarding flo…

…w is eligible (#98563)
Automattic · Jan 22, 2025 · 41d9273 · 41d9273
1 parent 33f35e3
commit 41d9273
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/.../stepper/declarative-flow/internals/steps-repository/unified-plans/unified-plans-step.tsx b/.../stepper/declarative-flow/internals/steps-repository/unified-plans/unified-plans-step.tsx
@@ -224,7 +224,7 @@ function UnifiedPlansStep( {
 }: UnifiedPlansStepProps ) {
 	const [ isDesktop, setIsDesktop ] = useState< boolean | undefined >( isDesktopViewport() );
 	const dispatch = reduxUseDispatch();
-	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment();
+	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment( flowName );
 	const translate = useTranslate();
 	const initializedSitesBackUrl = useSelector( ( state ) =>
 		getCurrentUserSiteCount( state ) ? '/sites/' : null

diff --git a/...my-sites/plans-features-main/hooks/experiments/use-longer-plan-term-default-experiment.ts b/...my-sites/plans-features-main/hooks/experiments/use-longer-plan-term-default-experiment.ts
@@ -1,3 +1,4 @@
+import { ONBOARDING_FLOW } from '@automattic/onboarding';
 import { useExperiment } from 'calypso/lib/explat';
 
 const useTermFromExperimentVariant = (
@@ -23,7 +24,9 @@ const useTermFromExperimentVariant = (
  * define the default term in the grid/plans page.
  *
  */
-const useLongerPlanTermDefaultExperiment = (): {
+const useLongerPlanTermDefaultExperiment = (
+	flowName?: string | null
+): {
 	isLoadingExperiment: boolean;
 	term?: string | null;
 	// TODO: Consider removing this and always return concrete term values (where undefined/null would mean no term savings)
@@ -33,7 +36,10 @@ const useLongerPlanTermDefaultExperiment = (): {
 	// variation names 'default_to_three_year_plans', 'default_to_two_year_plans'
 	// and 'emphasize_savings_only'.
 	const [ isLoadingExperimentAssignment, experimentAssignment ] = useExperiment(
-		'calypso_plans_page_emphasize_longer_plan_savings'
+		'calypso_plans_page_emphasize_longer_plan_savings',
+		{
+			isEligible: flowName === ONBOARDING_FLOW,
+		}
 	);
 	const term = useTermFromExperimentVariant( experimentAssignment?.variationName );
 

diff --git a/client/my-sites/plans-features-main/hooks/use-eligibility-for-term-savings-price-display.ts b/client/my-sites/plans-features-main/hooks/use-eligibility-for-term-savings-price-display.ts
@@ -1,4 +1,3 @@
-import { isEnabled } from '@automattic/calypso-config';
 import {
 	getPlanSlugForTermVariant,
 	PlanSlug,
@@ -17,6 +16,7 @@ import useLongerPlanTermDefaultExperiment from './experiments/use-longer-plan-te
 import useCheckPlanAvailabilityForPurchase from './use-check-plan-availability-for-purchase';
 
 const useEligibilityForTermSavingsPriceDisplay = ( {
+	flowName,
 	hiddenPlans,
 	intent,
 	isSubdomainNotGenerated,
@@ -27,6 +27,7 @@ const useEligibilityForTermSavingsPriceDisplay = ( {
 	siteId,
 	isInSignup,
 }: {
+	flowName?: string | null;
 	hiddenPlans?: HiddenPlans;
 	intent?: PlansIntent;
 	isSubdomainNotGenerated?: boolean;
@@ -37,7 +38,7 @@ const useEligibilityForTermSavingsPriceDisplay = ( {
 	siteId?: number | null;
 	isInSignup?: boolean;
 } ) => {
-	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment();
+	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment( flowName );
 	const availablePlanSlugs = usePlansFromTypes( {
 		planTypes: usePlanTypesWithIntent( {
 			intent,
@@ -78,11 +79,7 @@ const useEligibilityForTermSavingsPriceDisplay = ( {
 		return false;
 	}
 
-	return (
-		( isEnabled( 'plans/term-savings-price-display' ) ||
-			longerPlanTermDefaultExperiment.isEligibleForTermSavings ) &&
-		isInSignup
-	);
+	return longerPlanTermDefaultExperiment.isEligibleForTermSavings && isInSignup;
 };
 
 export default useEligibilityForTermSavingsPriceDisplay;
diff --git a/client/my-sites/plans-features-main/index.tsx b/client/my-sites/plans-features-main/index.tsx
@@ -246,7 +246,7 @@ const PlansFeaturesMain = ( {
 	const showUpgradeableStorage = config.isEnabled( 'plans/upgradeable-storage' );
 	const getPlanTypeDestination = usePlanTypeDestinationCallback();
 
-	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment();
+	const longerPlanTermDefaultExperiment = useLongerPlanTermDefaultExperiment( flowName );
 
 	const resolveModal = useModalResolutionCallback( {
 		isCustomDomainAllowedOnFreePlan,
@@ -415,6 +415,7 @@ const PlansFeaturesMain = ( {
 	};
 
 	const enableTermSavingsPriceDisplay = useEligibilityForTermSavingsPriceDisplay( {
+		flowName: flowName,
 		selectedPlan,
 		hiddenPlans,
 		isSubdomainNotGenerated: ! resolvedSubdomainName.result,