Merge branch 'develop' into feat/google-play-test-mode-live-account-c…

…ompatibility-notice

changelog/fix-pmme-on-cart-block

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Init PMME container in cart block so that it can be dynamically rendered once the requirements are met.

changelog/fix-wc9.7-ece-script-dependencies

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+fix: GooglePay/ApplePay script dependencies with WooCommerce 9.7

client/cart/blocks/index.js

@@ -2,26 +2,10 @@
  * Internal dependencies
  */
 import { renderBNPLCartMessaging } from './product-details';
-import { getUPEConfig } from 'wcpay/utils/checkout';
 
 const { registerPlugin } = window.wp.plugins;
 
-const paymentMethods = getUPEConfig( 'paymentMethodsConfig' ) || {};
-
-const BNPL_PAYMENT_METHODS = {
-	AFFIRM: 'affirm',
-	AFTERPAY: 'afterpay_clearpay',
-	KLARNA: 'klarna',
-};
-
-const bnplPaymentMethods = Object.values( BNPL_PAYMENT_METHODS ).filter(
-	( method ) => method in paymentMethods
-);
-
-if ( bnplPaymentMethods.length ) {
-	// Register BNPL site messaging on the cart block.
-	registerPlugin( 'bnpl-site-messaging', {
-		render: renderBNPLCartMessaging,
-		scope: 'woocommerce-checkout',
-	} );
-}
+registerPlugin( 'bnpl-site-messaging', {
+	render: renderBNPLCartMessaging,
+	scope: 'woocommerce-checkout',
+} );

includes/express-checkout/class-wc-payments-express-checkout-button-handler.php

@@ -307,6 +307,7 @@ public function scripts() {
 		}
 
 		wp_localize_script( 'WCPAY_EXPRESS_CHECKOUT_ECE', 'wcpayExpressCheckoutParams', $express_checkout_params );
+		wp_localize_script( 'WCPAY_BLOCKS_CHECKOUT', 'wcpayExpressCheckoutParams', $express_checkout_params );
 
 		wp_set_script_translations( 'WCPAY_EXPRESS_CHECKOUT_ECE', 'woocommerce-payments' );