Fix ECEs and PRBs for WooCommerce 9.8.0+ (#4212)

* Fix ECEs and PRBs for WooCommerce 9.8.0+

* Add comment

* Add readme and changelog entries

* Update changelog and readme to specify block pages scope

Author: annemirasol

changelog.txt

@@ -1,5 +1,8 @@
 *** Changelog ***
 
+= 9.3.2 - xxxx-xx-xx =
+* Fix - Fix express checkout for block cart and block checkout for WooCommerce 9.8.0+.
+
 = 9.3.1 - 2025-03-14 =
 * Fix - Temporarily disables the subscriptions detached notice feature due to long loading times on stores with many subscriptions.
 * Fix - Update ACH capability check key

client/blocks/payment-request/index.js

@@ -1,4 +1,3 @@
-import { getSetting } from '@woocommerce/settings';
 import { __ } from '@wordpress/i18n';
 import { PAYMENT_METHOD_NAME } from './constants';
 import { PaymentRequestExpress } from './payment-request-express';
@@ -56,7 +55,8 @@ const paymentRequestPaymentMethod = {
 						pending: true,
 					},
 					currency: cartData?.cartTotals?.currency_code?.toLowerCase(),
-					country_code: getSetting( 'baseLocation', {} )?.country,
+					country_code: getBlocksConfiguration()?.baseLocation
+						?.country,
 					displayItems: [],
 				},
 				shipping_required: false,

client/blocks/upe/index.js

@@ -54,21 +54,24 @@ if ( getBlocksConfiguration()?.isSPEEnabled ) {
 		} );
 }
 
-// Register Express Checkout Elements.
-if (
-	getBlocksConfiguration()?.isAmazonPayAvailable && // Hide behind feature flag so the editor does not show the button.
-	getBlocksConfiguration()?.isAmazonPayEnabled
-) {
-	registerExpressPaymentMethod( expressCheckoutElementAmazonPay( api ) );
-}
-if ( getBlocksConfiguration()?.isPaymentRequestEnabled ) {
-	registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
-	registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
-}
-if ( getBlocksConfiguration()?.isLinkEnabled ) {
-	registerExpressPaymentMethod( expressCheckoutElementStripeLink( api ) );
+if ( getBlocksConfiguration()?.isECEEnabled ) {
+	// Register Express Checkout Elements.
+	if (
+		getBlocksConfiguration()?.isAmazonPayAvailable && // Hide behind feature flag so the editor does not show the button.
+		getBlocksConfiguration()?.isAmazonPayEnabled
+	) {
+		registerExpressPaymentMethod( expressCheckoutElementAmazonPay( api ) );
+	}
+	if ( getBlocksConfiguration()?.isPaymentRequestEnabled ) {
+		registerExpressPaymentMethod( expressCheckoutElementApplePay( api ) );
+		registerExpressPaymentMethod( expressCheckoutElementGooglePay( api ) );
+	}
+	if ( getBlocksConfiguration()?.isLinkEnabled ) {
+		registerExpressPaymentMethod( expressCheckoutElementStripeLink( api ) );
+	}
 } else {
 	// Register Stripe Payment Request.
+	// TODO: We can remove this once we're sure everyone on the new checkout (UPE) has been migrated to ECE.
 	registerExpressPaymentMethod( paymentRequestPaymentMethod );
 }
 

includes/class-wc-stripe-blocks-support.php

@@ -200,6 +200,7 @@ public function get_payment_method_data() {
 					'customLabel' => $this->payment_request_configuration->get_button_label(),
 				],
 				'style'                           => $this->get_style(),
+				'baseLocation'                    => wc_get_base_location(),
 			]
 		);
 	}

readme.txt

@@ -110,11 +110,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 
 == Changelog ==
 
-= 9.3.1 - 2025-03-14 =
-* Fix - Temporarily disables the subscriptions detached notice feature due to long loading times on stores with many subscriptions.
-* Fix - Update ACH capability check key
-* Fix - Update legacy checkout documentation links and deprecation notice display logic
-* Fix - Fixes an issue where the order signature retrieval method could throw a fatal error when the received order parameter is actually an OrderRefund object (instead of a WC_Order).
-* Fix - Fixes an error with the `filter_thankyou_order_received_text` filter when it does not receive a valid WC_Order instance.
+= 9.3.2 - xxxx-xx-xx =
+* Fix - Fix express checkout for block cart and block checkout for WooCommerce 9.8.0+.
 
 [See changelog for all versions](https://raw.githubusercontent.com/woocommerce/woocommerce-gateway-stripe/trunk/changelog.txt).