Merge branch 'develop' into W-21177051-node-24-v3-update-dependencies

Author: adamraya

packages/template-retail-react-app/CHANGELOG.md

@@ -2,6 +2,7 @@
 - Update jest-fetch-mock and Jest 29 dependencies [#3663](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3663)
 - Add Node 24 support. Drop Node 16 support [#3652](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3652)
 - [Feature] Subscribe to marketing communications. Email capture component updated in footer section to use Shopper Consents API. [#3674](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3674)
+- [Bugfix] Fix for custom billing address as returning shoppers in 1CC [#3693](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3693)
 
 ## v9.0.0 (Feb 12, 2026)
 - [Feature] One Click Checkout (in Developer Preview) [#3552](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3552)

packages/template-retail-react-app/app/pages/checkout-one-click/index.jsx

@@ -284,8 +284,10 @@ const CheckoutOneClick = () => {
         }
 
         const latestBasketId = currentBasketQuery.data?.basketId || basket.basketId
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const {addressId, creationDate, lastModified, preferred, ...address} = billingAddress
         return await updateBillingAddressForBasket({
-            body: billingAddress,
+            body: address,
             parameters: {basketId: latestBasketId}
         })
     }

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-contact-info.jsx

@@ -483,12 +483,13 @@ const ContactInfo = ({isSocialEnabled = false, idps = [], onRegisteredUserChoseG
 
                     // Save phone number to basket billing address for guest shoppers
                     if (phone) {
+                        const billingBody = {...basket?.billingAddress, phone}
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                        const {addressId, creationDate, lastModified, preferred, ...address} =
+                            billingBody
                         await updateBillingAddressForBasket.mutateAsync({
                             parameters: {basketId: basket.basketId},
-                            body: {
-                                ...basket?.billingAddress,
-                                phone: phone
-                            }
+                            body: address
                         })
                     }
 

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-payment.jsx

@@ -286,14 +286,11 @@ const Payment = ({
             })
 
             if (isPickupOnly && paymentInstrument.billingAddress) {
-                const addr = {...paymentInstrument.billingAddress}
-                delete addr.addressId
-                delete addr.creationDate
-                delete addr.lastModified
-                delete addr.preferred
-
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const {addressId, creationDate, lastModified, preferred, ...address} =
+                    paymentInstrument.billingAddress
                 await updateBillingAddressForBasket({
-                    body: addr,
+                    body: address,
                     parameters: {
                         basketId: activeBasketIdRef.current || basket.basketId
                     }
@@ -349,13 +346,10 @@ const Payment = ({
                     )
                     const addr = saved?.billingAddress
                     if (addr) {
-                        const cleaned = {...addr}
-                        delete cleaned.addressId
-                        delete cleaned.creationDate
-                        delete cleaned.lastModified
-                        delete cleaned.preferred
+                        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                        const {addressId, creationDate, lastModified, preferred, ...address} = addr
                         await updateBillingAddressForBasket({
-                            body: cleaned,
+                            body: address,
                             parameters: {basketId: activeBasketIdRef.current || basket.basketId}
                         })
                         await currentBasketQuery.refetch()