Goals First: Keep paid domains in the cart when free plan is selected. (

#97872) * Keep paid domains in cart when free plan is selected * Bypass checkout page if free plan is selected but there are domain items in the cart
Automattic · Jan 1, 2025 · ff00c28 · ff00c28
1 parent 51d398d
commit ff00c28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/create-site/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/create-site/index.tsx
@@ -194,7 +194,7 @@ const CreateSite: Step = function CreateSite( { navigation, flow, data } ) {
 		! isNewHostedSiteCreationFlow( flow ) &&
 		! isSiteAssemblerFlow( flow ) &&
 		! isMigrationSignupFlow( flow );
-	const shouldGoToCheckout = Boolean( planCartItem || mergedDomainCartItems.length );
+	const shouldGoToCheckout = Boolean( planCartItem );
 
 	async function createSite() {
 		if ( isManageSiteFlow ) {

diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/unified-plans/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/unified-plans/index.tsx
@@ -48,8 +48,7 @@ export default function PlansStepAdaptor( props: StepProps ) {
 	const coupon = useQuery().get( 'coupon' ) ?? undefined;
 	const { data: defaultDesign } = useStarterDesignBySlug( 'twentytwentyfour' );
 	const [ , isGoalFirstExperiment ] = useGoalsFirstExperiment();
-	const { setDomainCartItem, setDomainCartItems, setSiteUrl, setSelectedDesign, setPendingAction } =
-		useWPDispatch( ONBOARD_STORE );
+	const { setSiteUrl, setSelectedDesign, setPendingAction } = useWPDispatch( ONBOARD_STORE );
 	const { setDesignOnSite } = useDispatch( SITE_STORE );
 	const reduxDispatch = useReduxDispatch();
 
@@ -137,15 +136,8 @@ export default function PlansStepAdaptor( props: StepProps ) {
 				setStepState( ( mostRecentState = { ...stepState, ...step } ) );
 			} }
 			submitSignupStep={ ( stepInfo ) => {
-				/* The plans step removes paid domains when the user picks a free plan
-				   after picking a paid domain */
-				if ( stepInfo.stepName === 'domains' ) {
-					if ( stepInfo.isPurchasingItem === false ) {
-						setDomainCartItem( undefined );
-						setDomainCartItems( undefined );
-					} else if ( stepInfo.siteUrl ) {
-						setSiteUrl( stepInfo.siteUrl );
-					}
+				if ( stepInfo.stepName === 'domains' && stepInfo.siteUrl ) {
+					setSiteUrl( stepInfo.siteUrl );
 				} else {
 					setStepState( ( mostRecentState = { ...stepState, ...stepInfo } ) );
 				}