From e4b9cb33982cebfa97f43267c4b180ed97a7aead Mon Sep 17 00:00:00 2001
From: Alex P <alex.pantec@gmail.com>
Date: Thu, 23 Mar 2023 10:52:19 +0200
Subject: [PATCH] Set missing address fields to empty for express block

Fixes compatibility with latest wc blocks version
---
 .../resources/js/Helper/Address.js            | 21 +++++++++++++++----
 .../resources/js/checkout-block.js            |  3 +--
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/ppcp-blocks/resources/js/Helper/Address.js b/modules/ppcp-blocks/resources/js/Helper/Address.js
index d545d0787..b7ecc1645 100644
--- a/modules/ppcp-blocks/resources/js/Helper/Address.js
+++ b/modules/ppcp-blocks/resources/js/Helper/Address.js
@@ -32,9 +32,22 @@ export const paypalAddressToWc = (address) => {
         if (address[paypalKey]) {
             result[wcKey] = address[paypalKey];
         }
-    })
+    });
 
-    return result;
+    const defaultAddress = {
+        first_name: '',
+        last_name: '',
+        company: '',
+        address_1: '',
+        address_2: '',
+        city: '',
+        state: '',
+        postcode: '',
+        country: '',
+        phone: '',
+    };
+
+    return {...defaultAddress, ...result};
 }
 
 /**
@@ -44,9 +57,9 @@ export const paypalAddressToWc = (address) => {
 export const paypalShippingToWc = (shipping) => {
     const [firstName, lastName] = splitFullName(shipping.name.full_name);
     return {
+        ...paypalAddressToWc(shipping.address),
         first_name: firstName,
         last_name: lastName,
-        ...paypalAddressToWc(shipping.address),
     }
 }
 
@@ -59,10 +72,10 @@ export const paypalPayerToWc = (payer) => {
     const lastName = payer.name.surname;
     const address = payer.address ? paypalAddressToWc(payer.address) : {};
     return {
+        ...address,
         first_name: firstName,
         last_name: lastName,
         email: payer.email_address,
-        ...address,
     }
 }
 
diff --git a/modules/ppcp-blocks/resources/js/checkout-block.js b/modules/ppcp-blocks/resources/js/checkout-block.js
index 3eee02221..e9b6d1cc6 100644
--- a/modules/ppcp-blocks/resources/js/checkout-block.js
+++ b/modules/ppcp-blocks/resources/js/checkout-block.js
@@ -117,9 +117,8 @@ const PayPalComponent = ({
                     paymentMethodData: {
                         'paypal_order_id': paypalOrder.id,
                     },
-                    shippingData: {address: shippingAddress},
+                    shippingAddress,
                     billingAddress,
-                    billingData: billingAddress,
                 },
             };
         });