Merge branch 'develop' into fix/9987-filter-csv-disputes

changelog/fix-tokenized-cart-multiple-variations

@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: fix: tokenized cart & multiple variations.
+
+

client/tokenized-express-checkout/index.js

@@ -326,6 +326,21 @@ jQuery( ( $ ) => {
 				'wcpay.express-checkout.update-button-data',
 				'automattic/wcpay/express-checkout',
 				async () => {
+					// if the product cannot be added to cart (because of missing variation selection, etc),
+					// don't try to add it to the cart to get new data - the call will likely fail.
+					if (
+						getExpressCheckoutData( 'button_context' ) === 'product'
+					) {
+						const addToCartButton = $(
+							'.single_add_to_cart_button'
+						);
+
+						// First check if product can be added to cart.
+						if ( addToCartButton.is( '.disabled' ) ) {
+							return;
+						}
+					}
+
 					try {
 						expressCheckoutButtonUi.blockButton();
 
@@ -375,7 +390,7 @@ jQuery( ( $ ) => {
 
 						expressCheckoutButtonUi.unblockButton();
 					} catch ( e ) {
-						expressCheckoutButtonUi.hide();
+						expressCheckoutButtonUi.hideContainer();
 					}
 				}
 			);

client/tokenized-express-checkout/transformers/wc-to-stripe.js

@@ -96,7 +96,7 @@ export const transformCartDataForDisplayItems = ( cartData ) => {
  * @return {{id: string, label: string, amount: integer, deliveryEstimate: string}} `shippingRates` for Stripe.
  */
 export const transformCartDataForShippingRates = ( cartData ) =>
-	cartData.shipping_rates?.[ 0 ].shipping_rates
+	cartData.shipping_rates?.[ 0 ]?.shipping_rates
 		.sort( ( rateA, rateB ) => {
 			if ( rateA.selected === rateB.selected ) {
 				return 0; // Keep relative order if both have the same value for 'selected'