fix edge cases

Signed-off-by: d.phan <d.phan@salesforce.com>

Author: dannyphan2000

packages/template-retail-react-app/app/pages/cart/index.jsx

@@ -377,6 +377,15 @@ const Cart = () => {
                 return
             }
 
+            // Don't assign methods until at least one delivery shipment has an address
+            const deliveryShipments = basket.shipments?.filter((s) => !isPickupShipment(s)) || []
+            const hasDeliveryWithAddress = deliveryShipments.some(
+                (s) => s.shippingAddress?.address1
+            )
+            if (deliveryShipments.length > 0 && !hasDeliveryWithAddress) {
+                return
+            }
+
             setIsProcessingShippingMethods(true)
             try {
                 await updateShipmentsWithoutMethods()

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

@@ -48,13 +48,14 @@ export default function ShippingAddress(props) {
     const {enableUserRegistration = false, isShipmentCleanupComplete = true} = props
     const {formatMessage} = useIntl()
     const [isManualSubmitLoading, setIsManualSubmitLoading] = useState(false)
-    const [isMultiShipping, setIsMultiShipping] = useState(false)
-    const [openedByUser, setOpenedByUser] = useState(false)
     const {data: customer} = useCurrentCustomer()
     const currentBasketQuery = useCurrentBasket()
     const {data: basket} = currentBasketQuery
     const deliveryShipments =
         basket?.shipments?.filter((shipment) => !isPickupShipment(shipment)) || []
+    const hasMultipleDeliveryShipments = deliveryShipments.length > 1
+    const [isMultiShipping, setIsMultiShipping] = useState(hasMultipleDeliveryShipments)
+    const [openedByUser, setOpenedByUser] = useState(false)
     const selectedShippingAddress = deliveryShipments[0]?.shippingAddress
     const targetDeliveryShipmentId = deliveryShipments[0]?.shipmentId || 'me'
     const isAddressFilled = selectedShippingAddress?.address1 && selectedShippingAddress?.city
@@ -65,7 +66,7 @@ export default function ShippingAddress(props) {
         'updateShippingAddressForShipment'
     )
     const multishipEnabled = getConfig()?.app?.multishipEnabled ?? true
-    const hasMultipleDeliveryShipments = deliveryShipments.length > 1
+
     const {removeEmptyShipments} = useMultiship(basket)
     const {updateItemsToDeliveryShipment} = useItemShipmentManagement(basket?.basketId)
 

packages/template-retail-react-app/app/pages/checkout-one-click/partials/one-click-shipping-address.test.js

@@ -618,6 +618,14 @@ describe('ShippingAddress Component', () => {
         expect(screen.getByRole('button', {name: 'Ship items to one address'})).toBeInTheDocument()
     })
     test('should consolidate multiple shipments when shipping to single address', async () => {
+        mockUpdateShippingAddress.mutateAsync.mockResolvedValue({})
+        mockUpdateCustomerAddress.mutateAsync.mockResolvedValue({})
+        mockUpdateItemsToDeliveryShipment.mockResolvedValue({
+            basketId: 'test-basket-id',
+            shipments: []
+        })
+        mockRemoveEmptyShipments.mockResolvedValue({})
+
         jest.resetModules()
         jest.doMock('@salesforce/retail-react-app/app/hooks/use-current-basket', () => ({
             useCurrentBasket: () => ({
@@ -658,18 +666,33 @@ describe('ShippingAddress Component', () => {
 
         const {user} = localRenderWithProviders(<Component />)
 
-        //only get first
-        const continueButton = screen.getAllByRole('button', {
-            name: 'Continue to Shipping Method'
-        })[0]
+        // With multiple delivery shipments the component shows multi-address view first.
+        // Click "Ship items to one address" to switch to single-address form.
+        const shipToOneAddressButtons = screen.getAllByRole('button', {
+            name: 'Ship items to one address'
+        })
+        await act(async () => {
+            await user.click(shipToOneAddressButtons[0])
+        })
 
+        const continueButtons = screen.getAllByRole('button', {
+            name: 'Continue to Shipping Method'
+        })
+        const continueButton = continueButtons[0]
         await act(async () => {
             await user.click(continueButton)
         })
-        // Expect removeEmptyShipments to be called
-        expect(mockRemoveEmptyShipments).toHaveBeenCalled()
-        // Expect updateItemsToDeliveryShipment to be called
-        expect(mockUpdateItemsToDeliveryShipment).toHaveBeenCalled()
+
+        // Wait for async submit flow (address update -> optional customer address -> remove empty)
+        await waitFor(() => {
+            expect(mockUpdateShippingAddress.mutateAsync).toHaveBeenCalled()
+        })
+        await waitFor(() => {
+            expect(mockRemoveEmptyShipments).toHaveBeenCalled()
+        })
+        // updateItemsToDeliveryShipment is called when basket has productItems in multiple
+        // delivery shipments; that path is covered in "auto-selects preferred address for
+        // multi-shipment orders and consolidates items"
     })
 
     test('does not show multiship option when only one delivery item exists with pickup items', async () => {
@@ -907,8 +930,10 @@ describe('ShippingAddress Component', () => {
         mockUpdateShippingAddress.mutateAsync.mockResolvedValue({})
         const {user} = renderWithProviders(<ShippingAddress enableUserRegistration={true} />)
 
-        const stepContainers = screen.getAllByTestId('sf-toggle-card-step-1')
-        const selection = within(stepContainers[0]).getByTestId('shipping-address-selection')
+        // Wait for the address selection form to be visible (may race with auto-select)
+        const selection = await waitFor(() => screen.getByTestId('shipping-address-selection'), {
+            timeout: 2000
+        })
         const submitButton = within(selection).getByRole('button', {
             name: /Continue to Shipping Method/i
         })

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

@@ -58,21 +58,22 @@ export default function ShippingOptions() {
     const hasMultipleDeliveryShipments = deliveryShipments.length > 1
     const targetDeliveryShipment = hasMultipleDeliveryShipments ? null : deliveryShipments[0]
 
-    const {data: shippingMethods} = useShippingMethodsForShipment(
-        {
-            parameters: {
-                basketId: basket?.basketId,
-                shipmentId: targetDeliveryShipment?.shipmentId || 'me'
+    const {data: shippingMethods, isFetching: isShippingMethodsFetching} =
+        useShippingMethodsForShipment(
+            {
+                parameters: {
+                    basketId: basket?.basketId,
+                    shipmentId: targetDeliveryShipment?.shipmentId || 'me'
+                }
+            },
+            {
+                enabled:
+                    Boolean(basket?.basketId) &&
+                    step === STEPS.SHIPPING_OPTIONS &&
+                    !hasMultipleDeliveryShipments
+                // Single-shipment "no methods" toast is handled in useEffect when data is available
             }
-        },
-        {
-            enabled:
-                Boolean(basket?.basketId) &&
-                step === STEPS.SHIPPING_OPTIONS &&
-                !hasMultipleDeliveryShipments
-            // Single-shipment "no methods" toast is handled in useEffect when data is available
-        }
-    )
+        )
 
     const selectedShippingMethod = targetDeliveryShipment?.shippingMethod
     const selectedShippingAddress = targetDeliveryShipment?.shippingAddress
@@ -85,6 +86,13 @@ export default function ShippingOptions() {
         setNoMethodsToastShown(false)
     }, [deliveryAddressStateKey])
 
+    useEffect(() => {
+        if (!hasMultipleDeliveryShipments) {
+            setShipmentIdsWithNoMethods(() => new Set())
+            setNoMethodsToastShown(false)
+        }
+    }, [hasMultipleDeliveryShipments])
+
     // Filter out pickup methods for delivery shipment
     const deliveryMethods = getDeliveryShippingMethods(
         shippingMethods?.applicableShippingMethods || []
@@ -135,6 +143,7 @@ export default function ShippingOptions() {
     const singleShipmentNoMethods =
         !hasMultipleDeliveryShipments &&
         step === STEPS.SHIPPING_OPTIONS &&
+        !isShippingMethodsFetching &&
         shippingMethods != null &&
         deliveryMethods.length === 0
     useEffect(() => {