Merge branch 'develop' into update/pass-previous-error-to-exception

Automattic · May 22, 2024 · 3b1598e · 3b1598e
2 parents ac703a2 + 80f9999
commit 3b1598e
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 5 deletions.
diff --git a/changelog/fix-blocks-checkout-ece-error-when-prb-disabled b/changelog/fix-blocks-checkout-ece-error-when-prb-disabled
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix ECE error in the blocks checkout when PRBs are disabled.
diff --git a/changelog/fix-blocks-page-detection-for-woopay b/changelog/fix-blocks-page-detection-for-woopay
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Fixes an unreleased bug
+
+
diff --git a/client/checkout/woopay/express-button/express-checkout-iframe.js b/client/checkout/woopay/express-button/express-checkout-iframe.js
@@ -172,7 +172,7 @@ export const expressCheckoutIframe = async ( api, context, emailSelector ) => {
 			userEmail = email;
 			urlParams.append( 'email', email );
 		}
-		urlParams.append( 'is_blocks', !! wcSettings.wcBlocksConfig );
+		urlParams.append( 'is_blocks', !! window.wcSettings?.wcBlocksConfig );
 		urlParams.append( 'is_express', 'true' );
 		urlParams.append( 'express_context', context );
 		urlParams.append( 'source_url', window.location.href );

diff --git a/client/express-checkout/blocks/index.js b/client/express-checkout/blocks/index.js
@@ -1,4 +1,4 @@
-/* global wcpayConfig */
+/* global wcpayConfig, wcpayExpressCheckoutParams */
 
 /**
  * Internal dependencies
@@ -16,7 +16,17 @@ const expressCheckoutElementPaymentMethod = ( api ) => ( {
 	supports: {
 		features: getConfig( 'features' ),
 	},
-	canMakePayment: () => wcpayConfig.isExpressCheckoutElementEnabled,
+	canMakePayment: () => {
+		if ( typeof wcpayExpressCheckoutParams === 'undefined' ) {
+			return false;
+		}
+
+		if ( typeof wcpayConfig !== 'undefined' ) {
+			return wcpayConfig.isExpressCheckoutElementEnabled;
+		}
+
+		return false;
+	},
 } );
 
 export default expressCheckoutElementPaymentMethod;
diff --git a/client/payment-request/blocks/index.js b/client/payment-request/blocks/index.js
@@ -1,4 +1,4 @@
-/* global wcpayConfig */
+/* global wcpayConfig, wcpayPaymentRequestParams */
 
 /**
  * Internal dependencies
@@ -28,7 +28,10 @@ const paymentRequestPaymentMethod = ( api ) => ( {
 			return false;
 		}
 
-		if ( wcpayConfig.isExpressCheckoutElementEnabled ) {
+		if (
+			typeof wcpayConfig !== 'undefined' &&
+			wcpayConfig.isExpressCheckoutElementEnabled
+		) {
 			return false;
 		}