Rename clearedCart to userHasClearedCart

Automattic · Jan 17, 2025 · 1a976af · 1a976af
1 parent 3c483a7
commit 1a976af
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/client/layout/masterbar/checkout.tsx b/client/layout/masterbar/checkout.tsx
@@ -54,13 +54,13 @@ const CheckoutMasterbar = ( {
 	const { responseCart, replaceProductsInCart } = useShoppingCart( cartKey );
 	const [ isModalVisible, setIsModalVisible ] = useState( false );
 
-	const closeAndLeave = ( clearedCart: boolean = false ) =>
+	const closeAndLeave = ( userHasClearedCart: boolean = false ) =>
 		leaveCheckout( {
 			siteSlug,
 			forceCheckoutBackUrl,
 			previousPath,
 			tracksEvent: 'calypso_masterbar_close_clicked',
-			clearedCart: clearedCart,
+			userHasClearedCart: userHasClearedCart,
 		} );
 
 	const clickClose = () => {

diff --git a/client/my-sites/checkout/src/lib/leave-checkout.ts b/client/my-sites/checkout/src/lib/leave-checkout.ts
@@ -17,11 +17,11 @@ import { sendMessageToOpener } from './popup';
 const debug = debugFactory( 'calypso:leave-checkout' );
 
 const getCloseURL = ( {
-	clearedCart,
+	userHasClearedCart,
 	previousPath,
 	siteSlug,
 }: {
-	clearedCart: boolean;
+	userHasClearedCart: boolean;
 	previousPath?: string;
 	siteSlug?: string;
 } ): string => {
@@ -34,7 +34,7 @@ const getCloseURL = ( {
 		/* Regex to match /domains/add/abc123/email/def456? */
 		const emailUpsellRegex = /\/domains\/add\/[^/]+\/email\/[^/]+(\?|\/|$)/;
 
-		if ( clearedCart && emailUpsellRegex.test( previousPath ) ) {
+		if ( userHasClearedCart && emailUpsellRegex.test( previousPath ) ) {
 			return '/domains/add/' + siteSlug;
 		}
 		return previousPath;
@@ -49,14 +49,14 @@ export const leaveCheckout = ( {
 	previousPath,
 	tracksEvent,
 	createUserAndSiteBeforeTransaction,
-	clearedCart = false,
+	userHasClearedCart = false,
 }: {
 	siteSlug?: string;
 	forceCheckoutBackUrl?: string;
 	previousPath?: string;
 	tracksEvent: string;
 	createUserAndSiteBeforeTransaction?: boolean;
-	clearedCart?: boolean;
+	userHasClearedCart?: boolean;
 } ): void => {
 	recordTracksEvent( tracksEvent );
 	debug( 'leaving checkout with args', {
@@ -97,7 +97,7 @@ export const leaveCheckout = ( {
 		return;
 	}
 
-	const closeUrl = getCloseURL( { clearedCart, previousPath, siteSlug } );
+	const closeUrl = getCloseURL( { userHasClearedCart, previousPath, siteSlug } );
 
 	try {
 		const searchParams = new URLSearchParams( window.location.search );

diff --git a/client/my-sites/checkout/src/test/leave-checkout.ts b/client/my-sites/checkout/src/test/leave-checkout.ts
@@ -70,7 +70,7 @@ describe( 'leaveCheckout', () => {
 			leaveCheckout( {
 				siteSlug: siteSlug,
 				tracksEvent: 'checkout_cancel',
-				clearedCart: true,
+				userHasClearedCart: true,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( `/plans/${ siteSlug }` );
@@ -79,7 +79,7 @@ describe( 'leaveCheckout', () => {
 		it( 'returns to /start if missing site slug', () => {
 			leaveCheckout( {
 				tracksEvent: 'checkout_cancel',
-				clearedCart: true,
+				userHasClearedCart: true,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( '/start' );
@@ -92,7 +92,7 @@ describe( 'leaveCheckout', () => {
 				siteSlug: siteSlug,
 				tracksEvent: 'checkout_cancel',
 				previousPath: '/domains/add/my-search-domain/email/mywpsite.wordpress.com?',
-				clearedCart: true,
+				userHasClearedCart: true,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( `/domains/add/${ siteSlug }` );
@@ -104,7 +104,7 @@ describe( 'leaveCheckout', () => {
 			leaveCheckout( {
 				tracksEvent: 'checkout_cancel',
 				previousPath: previousPath,
-				clearedCart: false,
+				userHasClearedCart: false,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( previousPath );
@@ -119,7 +119,7 @@ describe( 'leaveCheckout', () => {
 				siteSlug: siteSlug,
 				tracksEvent: 'checkout_cancel',
 				previousPath: previousPath,
-				clearedCart: false,
+				userHasClearedCart: false,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( previousPath );
@@ -134,7 +134,7 @@ describe( 'leaveCheckout', () => {
 				siteSlug: siteSlug,
 				tracksEvent: 'checkout_cancel',
 				previousPath: previousPath,
-				clearedCart: false,
+				userHasClearedCart: false,
 			} );
 
 			expect( navigate ).toHaveBeenCalledWith( previousPath );