Merge branch 'develop' into update/6320-rule-card-behavior-if-affecte…

…d-by-other-config
Automattic · Dec 5, 2023 · ede42f0 · ede42f0
2 parents 2c9afd5 + e6f80ba
commit ede42f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 22 deletions.
diff --git a/changelog/revert-prefetch-session-for-button b/changelog/revert-prefetch-session-for-button
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Revemoved pre-fretch session for button to prevent draft order creation
diff --git a/client/checkout/woopay/express-button/test/woopay-express-checkout-button.test.js b/client/checkout/woopay/express-button/test/woopay-express-checkout-button.test.js
@@ -82,7 +82,7 @@ describe( 'WoopayExpressCheckoutButton', () => {
 		).toBeInTheDocument();
 	} );
 
-	test( 'prefetch session data by default', async () => {
+	test( 'does not prefetch session data by default', async () => {
 		getConfig.mockImplementation( ( v ) => {
 			switch ( v ) {
 				case 'wcAjaxUrl':
@@ -104,14 +104,12 @@ describe( 'WoopayExpressCheckoutButton', () => {
 		);
 
 		await waitFor( () => {
-			expect( request ).toHaveBeenCalledWith( 'woopay.url', {
-				_ajax_nonce: 'sessionnonce',
-			} );
+			expect( request ).not.toHaveBeenCalled();
 			expect( expressCheckoutIframe ).not.toHaveBeenCalled();
 		} );
 	} );
 
-	test( 'request session data on button click', async () => {
+	test( 'should not request session data on button click', async () => {
 		getConfig.mockImplementation( ( v ) => {
 			switch ( v ) {
 				case 'wcAjaxUrl':
@@ -138,9 +136,7 @@ describe( 'WoopayExpressCheckoutButton', () => {
 		userEvent.click( expressButton );
 
 		await waitFor( () => {
-			expect( request ).toHaveBeenCalledWith( 'woopay.url', {
-				_ajax_nonce: 'sessionnonce',
-			} );
+			expect( request ).not.toHaveBeenCalled();
 			expect( expressCheckoutIframe ).not.toHaveBeenCalled();
 		} );
 	} );

diff --git a/client/checkout/woopay/express-button/woopay-express-checkout-button.js b/client/checkout/woopay/express-button/woopay-express-checkout-button.js
@@ -41,7 +41,6 @@ export const WoopayExpressCheckoutButton = ( {
 		narrow: 'narrow',
 		wide: 'wide',
 	};
-	const sessionDataPromiseRef = useRef( null );
 	const initWoopayRef = useRef( null );
 	const buttonRef = useRef( null );
 	const initialOnClickEventRef = useRef( null );
@@ -305,9 +304,16 @@ export const WoopayExpressCheckoutButton = ( {
 							} );
 					} );
 				} else {
-					// Non-product pages already have pre-fetched session data.
-					sessionDataPromiseRef.current
-						?.then( ( response ) => {
+					request(
+						buildAjaxURL(
+							getConfig( 'wcAjaxUrl' ),
+							'get_woopay_session'
+						),
+						{
+							_ajax_nonce: getConfig( 'woopaySessionNonce' ),
+						}
+					)
+						.then( ( response ) => {
 							iframe.contentWindow.postMessage(
 								{
 									action: 'setPreemptiveSessionData',
@@ -349,16 +355,6 @@ export const WoopayExpressCheckoutButton = ( {
 			return;
 		}
 
-		if ( ! isProductPage ) {
-			// Start to pre-fetch session data for non-product pages.
-			sessionDataPromiseRef.current = request(
-				buildAjaxURL( getConfig( 'wcAjaxUrl' ), 'get_woopay_session' ),
-				{
-					_ajax_nonce: getConfig( 'woopaySessionNonce' ),
-				}
-			).then( ( response ) => response );
-		}
-
 		buttonRef.current.parentElement.style.position = 'relative';
 		buttonRef.current.parentElement.appendChild( newIframe() );