Fix logic to retrieve initial shipping rates for ECE on shortcode car…

…t and checkout pages (#9322)

changelog/fix-ece-shortcode-get-shipping-rates

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix shipping rates retrieval method for shortcode cart/checkout.

client/express-checkout/index.js

@@ -210,10 +210,7 @@ jQuery( ( $ ) => {
 				}
 
 				return options.displayItems
-					.filter(
-						( i ) =>
-							i.label === __( 'Shipping', 'woocommerce-payments' )
-					)
+					.filter( ( i ) => i.key === 'total_shipping' )
 					.map( ( i ) => ( {
 						id: `rate-${ i.label }`,
 						amount: i.amount,
@@ -228,7 +225,7 @@ jQuery( ( $ ) => {
 			// Relying on what's provided in the cart response seems safest since it should always include a valid shipping
 			// rate if one is required and available.
 			// If no shipping rate is found we can't render the button so we just exit.
-			if ( options.requestShipping && ! shippingRates ) {
+			if ( options.requestShipping && ! shippingRates.length ) {
 				return;
 			}
 

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

@@ -117,6 +117,7 @@ public function build_display_items( $itemized_display_items = false ) {
 		if ( WC()->cart->needs_shipping() ) {
 			$shipping_tax = $this->cart_prices_include_tax() ? WC()->cart->shipping_tax_total : 0;
 			$items[]      = [
+				'key'    => 'total_shipping',
 				'label'  => esc_html( __( 'Shipping', 'woocommerce-payments' ) ),
 				'amount' => WC_Payments_Utils::prepare_amount( $shipping + $shipping_tax, $currency ),
 			];

tests/unit/test-class-wc-payments-payment-request-button-handler.php

@@ -430,6 +430,7 @@ public function test_get_shipping_options_returns_chosen_option() {
 			[
 				'label'  => 'Shipping',
 				'amount' => $flat_rate['amount'],
+				'key'    => 'total_shipping',
 			],
 		];