@W-19442561 - Fix Incorrectly Disabled Continue to Shipping Method Button for Multiship (#3199)

Author: shauryemahajanSF

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

@@ -2,7 +2,7 @@
 - Add support for environment level base paths on /mobify routes [#2892](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2892)
 - Fix private client endpoint prop name [#3177](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3177)
 - This feature introduces an AI-powered shopping assistant that integrates Salesforce Embedded Messaging Service with PWA Kit applications. The shopper agent provides real-time chat support, search assistance, and personalized shopping guidance directly within the e-commerce experience. [#2658](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2658)
-- Added support for Multi-Ship [#3056](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3056)
+- Added support for Multi-Ship [#3056](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3056) [#3199] (https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3199)
 - The feature toggle for partial hydration is now found in the config file (`config.app.partialHydrationEnabled`) [#3058](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3058)
 - Mask user not found messages to prevent user enumeration from passwordless login [#3113](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3113)
 - [Bugfix] Pin `@chakra-ui/react` version to 2.7.0 to avoid breaking changes from 2.10.9 [#2658](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/2658)

packages/template-retail-react-app/app/hooks/use-product-address-assignment.js

@@ -143,8 +143,8 @@ export const useProductAddressAssignment = (basket) => {
                     const shipment = existingShipments.find((s) => s.shipmentId === item.shipmentId)
 
                     if (shipment && !isAddressEmpty(shipment.shippingAddress)) {
-                        const existingAddress = guestAddresses.find((addr) =>
-                            areAddressesEqual(addr, shipment.shippingAddress)
+                        const existingAddress = [...guestAddresses, ...newGuestAddresses].find(
+                            (addr) => areAddressesEqual(addr, shipment.shippingAddress)
                         )
 
                         if (existingAddress) {

packages/template-retail-react-app/app/hooks/use-product-address-assignment.test.js

@@ -249,6 +249,60 @@ describe('useProductAddressAssignment', () => {
 
             expect(result.current.availableAddresses).toHaveLength(initialAddressCount)
         })
+
+        test('should reuse same address for multiple items with identical shipping address', () => {
+            mockUseCurrentCustomer.mockReturnValue({
+                data: mockGuestCustomer,
+                isLoading: false
+            })
+
+            // Create a basket where both items are in the same shipment
+            const basketWithSameAddress = {
+                basketId: 'basket-1',
+                productItems: [
+                    {itemId: 'item-1', productId: 'product-1', shipmentId: 'shipment-1'},
+                    {itemId: 'item-2', productId: 'product-2', shipmentId: 'shipment-1'}
+                ],
+                shipments: [
+                    {
+                        shipmentId: 'shipment-1',
+                        shippingMethod: {id: 'delivery-method-1'},
+                        shippingAddress: {
+                            firstName: 'John',
+                            lastName: 'Doe',
+                            address1: '123 Main St',
+                            city: 'San Francisco',
+                            stateCode: 'CA',
+                            postalCode: '94105',
+                            countryCode: 'US',
+                            phone: '4155551234'
+                        }
+                    }
+                ]
+            }
+
+            const {result} = renderHook(() => useProductAddressAssignment(basketWithSameAddress))
+
+            // Should create only one address entry for both items
+            expect(result.current.availableAddresses).toHaveLength(1)
+
+            // Both items should reference the same address ID
+            const addressId1 = result.current.selectedAddresses['item-1']
+            const addressId2 = result.current.selectedAddresses['item-2']
+
+            expect(addressId1).toBeDefined()
+            expect(addressId2).toBeDefined()
+            expect(addressId1).toBe(addressId2)
+
+            // The address should match what was in the shipment
+            const address = result.current.availableAddresses[0]
+            expect(address.firstName).toBe('John')
+            expect(address.lastName).toBe('Doe')
+            expect(address.address1).toBe('123 Main St')
+
+            // All items should have addresses (button should be enabled)
+            expect(result.current.allItemsHaveAddresses).toBe(true)
+        })
     })
 
     describe('addGuestAddress', () => {

packages/template-retail-react-app/app/utils/shipment-utils.js

@@ -7,8 +7,7 @@
 
 import {
     cleanAddressForOrder,
-    areAddressesEqual,
-    isAddressEmpty
+    areAddressesEqual
 } from '@salesforce/retail-react-app/app/utils/address-utils'
 import {DEFAULT_SHIPMENT_ID} from '@salesforce/retail-react-app/app/constants'