From bdf472c3dcffd0b7ef549309a34b767d1e097d70 Mon Sep 17 00:00:00 2001
From: Pedro Silva <p.silva@inpsyde.com>
Date: Fri, 13 Oct 2023 14:58:17 +0100
Subject: [PATCH] Fix default shipping method

---
 .../ppcp-googlepay/src/Endpoint/UpdatePaymentDataEndpoint.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/ppcp-googlepay/src/Endpoint/UpdatePaymentDataEndpoint.php b/modules/ppcp-googlepay/src/Endpoint/UpdatePaymentDataEndpoint.php
index 63b461738..803a73f3f 100644
--- a/modules/ppcp-googlepay/src/Endpoint/UpdatePaymentDataEndpoint.php
+++ b/modules/ppcp-googlepay/src/Endpoint/UpdatePaymentDataEndpoint.php
@@ -163,8 +163,10 @@ class UpdatePaymentDataEndpoint {
 			return array();
 		}
 
+		$chosen_shipping_methods = WC()->session->get( 'chosen_shipping_methods' );
+
 		return array(
-			'defaultSelectedOptionId' => $shipping_options[0]['id'],
+			'defaultSelectedOptionId' => ( $chosen_shipping_methods[0] ?? null ) ? $chosen_shipping_methods[0] : $shipping_options[0]['id'],
 			'shippingOptions'         => $shipping_options,
 		);
 	}