@salesforce/retail-react-app 8.1.0 → 8.2.0-nightly-20250929080228

package/CHANGELOG.md

@@ -1,3 +1,5 @@
+## v8.2.0-dev (Sep 26, 2025)
+
 ## v8.1.0 (Sep 25, 2025)
 - Updated search UX - prices, images, suggestions new layout [#3271](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3271)
 - Updated the UI for StoreDisplay component which displays pickup in-store information on different pages. [#3248](https://github.com/SalesforceCommerceCloud/pwa-kit/pull/3248)

package/app/pages/cart/index.jsx

@@ -1146,7 +1146,6 @@ const Cart = () => {
                                                             />
                                                         )
                                                     )}
-
                                                     {/* Render grouped bonus products from this shipment */}
                                                     {shipmentInfo.categorizedProducts.bonusProducts
                                                         ?.filter(
@@ -1191,7 +1190,6 @@ const Cart = () => {
                                                                 }}
                                                             />
                                                         ))}
-
                                                     {/* Render SelectBonusProductsCard for each bonusDiscountLineItem */}
                                                     {basket.bonusDiscountLineItems?.map(
                                                         (bonusDiscountLineItem) => {
@@ -1241,7 +1239,6 @@ const Cart = () => {
                                                             )
                                                         }
                                                     )}
-
                                                     {/* Render orphaned bonus products (bonus products without bonusDiscountLineItemId) */}
                                                     {(() => {
                                                         const orphanedBonusProducts =

package/app/pages/checkout/index.test.js

@@ -552,7 +552,8 @@ test('Can edit address during checkout as a registered customer', async () => {
         expect(screen.getByTestId('sf-toggle-card-step-2-content')).not.toBeEmptyDOMElement()
     })
 
-    expect(screen.getByText('369 Main Street')).toBeInTheDocument()
+    const shippingAddressCard = screen.getByTestId('sf-toggle-card-step-1-content')
+    expect(within(shippingAddressCard).getByText('369 Main Street')).toBeInTheDocument()
 })
 
 test('Can add address during checkout as a registered customer', async () => {

package/app/pages/checkout/partials/shipping-methods.jsx

@@ -192,6 +192,34 @@ export default function ShippingMethods() {
         )
         if (hasNewFields) {
             form.reset(newDefaults)
+            deliveryShipments.forEach(async (shipment) => {
+                const methodId = newDefaults[`shippingMethodId_${shipment.shipmentId}`]
+                const hasMethodInBasket = shipment.shippingMethod && shipment.shippingMethod.id
+
+                // auto-submit if;
+                // - default method to submit present
+                // - the shipment doesn't already have a method in basket
+                // - user hasn't manually selected
+                if (
+                    methodId &&
+                    !hasMethodInBasket &&
+                    methodId === shippingMethods?.defaultShippingMethodId
+                ) {
+                    try {
+                        await updateShippingMethod.mutateAsync({
+                            parameters: {
+                                basketId: basket.basketId,
+                                shipmentId: shipment.shipmentId
+                            },
+                            body: {
+                                id: methodId
+                            }
+                        })
+                    } catch (error) {
+                        console.warn(error)
+                    }
+                }
+            })
         }
     }, [deliveryShipments.length, shippingMethods?.defaultShippingMethodId])
 

package/app/pages/checkout/partials/shipping-methods.test.js

@@ -12,7 +12,11 @@ import ShippingMethods from '@salesforce/retail-react-app/app/pages/checkout/par
 import {useCheckout} from '@salesforce/retail-react-app/app/pages/checkout/util/checkout-context'
 import {useCurrentBasket} from '@salesforce/retail-react-app/app/hooks/use-current-basket'
 import {useCurrency} from '@salesforce/retail-react-app/app/hooks'
-import {useShippingMethodsForShipment, useProducts} from '@salesforce/commerce-sdk-react'
+import {
+    useShippingMethodsForShipment,
+    useProducts,
+    useShopperBasketsMutation
+} from '@salesforce/commerce-sdk-react'
 
 // Mock the hooks
 jest.mock('@salesforce/retail-react-app/app/pages/checkout/util/checkout-context')
@@ -25,6 +29,7 @@ const mockUseCurrentBasket = useCurrentBasket
 const mockUseCurrency = useCurrency
 const mockUseShippingMethodsForShipment = useShippingMethodsForShipment
 const mockUseProducts = useProducts
+const mockUseShopperBasketsMutation = useShopperBasketsMutation
 
 // Mock data
 const mockBasket = {
@@ -169,6 +174,7 @@ describe('ShippingMethods', () => {
             data: mockProductsMap,
             isLoading: false
         })
+        mockUseShopperBasketsMutation.mockReturnValue(jest.fn().mockResolvedValue({}))
     })
 
     afterEach(() => {
@@ -538,4 +544,160 @@ describe('ShippingMethods', () => {
             expect(screen.getByText('Standard Shipping')).toBeInTheDocument()
         })
     })
+
+    describe('auto-submit functionality', () => {
+        test('should auto-submit default shipping method when available', async () => {
+            const basketWithoutMethods = {
+                ...mockBasket,
+                shipments: [
+                    {
+                        ...mockBasket.shipments[0],
+                        shippingMethod: null
+                    }
+                ]
+            }
+
+            const mockShippingMethods = {
+                defaultShippingMethodId: 'default-shipping-method',
+                applicableShippingMethods: [
+                    {
+                        id: 'default-shipping-method',
+                        name: 'Default Shipping'
+                    }
+                ]
+            }
+
+            const mockMutateAsync = jest.fn().mockResolvedValue({})
+            mockUseShopperBasketsMutation.mockReturnValue({
+                updateShippingMethod: {mutateAsync: mockMutateAsync}
+            })
+
+            // after auto-submit, step should advance to PAYMENT (summary mode)
+            mockUseCheckout.mockReturnValue({
+                step: 'PAYMENT',
+                STEPS: {SHIPPING_OPTIONS: 'SHIPPING_OPTIONS', PAYMENT: 'PAYMENT'},
+                goToStep: jest.fn(),
+                goToNextStep: jest.fn()
+            })
+
+            mockUseCurrentBasket.mockReturnValue({
+                data: basketWithoutMethods,
+                derivedData: {
+                    totalShippingCost: 5.99,
+                    isMissingShippingMethod: false
+                },
+                isLoading: false
+            })
+
+            mockUseShippingMethodsForShipment.mockReturnValue({
+                data: mockShippingMethods,
+                isLoading: false
+            })
+
+            renderWithIntl(<ShippingMethods />)
+
+            // component is in SUMMARY mode (collapsed) after auto-submit
+            expect(screen.getByRole('button', {name: 'Edit Shipping Options'})).toBeInTheDocument()
+            expect(
+                screen.queryByRole('radio', {name: 'Default Shipping $5.99'})
+            ).not.toBeInTheDocument()
+            expect(
+                screen.queryByRole('button', {name: 'Continue to Payment'})
+            ).not.toBeInTheDocument()
+        })
+
+        test('should not auto-submit if shipment already has a method', async () => {
+            // Mock basket that already has a shipping method
+            const basketWithMethod = {
+                ...mockBasket,
+                shipments: [
+                    {
+                        ...mockBasket.shipments[0],
+                        shippingMethod: {
+                            id: 'existing-method',
+                            name: 'Existing Shipping'
+                        }
+                    }
+                ]
+            }
+
+            const mockUpdateShippingMethod = jest.fn().mockResolvedValue({})
+            mockUpdateShippingMethod.mutateAsync = jest.fn().mockResolvedValue({})
+
+            // Mock the mutation hook
+            mockUseShopperBasketsMutation.mockReturnValue(mockUpdateShippingMethod)
+
+            mockUseCurrentBasket.mockReturnValue({
+                data: basketWithMethod,
+                derivedData: {totalShippingCost: 0},
+                isLoading: false
+            })
+
+            mockUseShippingMethodsForShipment.mockReturnValue({
+                data: {
+                    defaultShippingMethodId: 'default-method',
+                    applicableShippingMethods: []
+                },
+                isLoading: false
+            })
+
+            renderWithIntl(<ShippingMethods />)
+
+            // no auto-submit happens
+            await waitFor(() => {
+                expect(mockUpdateShippingMethod).not.toHaveBeenCalled()
+            })
+        })
+
+        test('should not auto-submit if user has manually selected a different method', async () => {
+            const basketWithoutMethods = {
+                ...mockBasket,
+                shipments: [
+                    {
+                        ...mockBasket.shipments[0],
+                        shippingMethod: null
+                    }
+                ]
+            }
+
+            // Mock shipping methods with default
+            const mockShippingMethods = {
+                defaultShippingMethodId: 'default-method',
+                applicableShippingMethods: [
+                    {
+                        id: 'default-method',
+                        name: 'Default Shipping'
+                    },
+                    {
+                        id: 'user-selected-method',
+                        name: 'User Selected Shipping'
+                    }
+                ]
+            }
+
+            const mockUpdateShippingMethod = jest.fn().mockResolvedValue({})
+            mockUpdateShippingMethod.mutateAsync = jest.fn().mockResolvedValue({})
+
+            // Mock the mutation hook
+            mockUseShopperBasketsMutation.mockReturnValue(mockUpdateShippingMethod)
+
+            mockUseCurrentBasket.mockReturnValue({
+                data: basketWithoutMethods,
+                derivedData: {totalShippingCost: 0},
+                isLoading: false
+            })
+
+            mockUseShippingMethodsForShipment.mockReturnValue({
+                data: mockShippingMethods,
+                isLoading: false
+            })
+
+            renderWithIntl(<ShippingMethods />)
+
+            // no auto-submit happens because the form would have user-selected-method, not default-method)
+            await waitFor(() => {
+                expect(mockUpdateShippingMethod).not.toHaveBeenCalled()
+            })
+        })
+    })
 })

package/app/utils/bonus-product/cart.test.js

@@ -58,7 +58,6 @@ describe('Bonus Product Cart Utilities', () => {
             expect(result[0].quantity).toBe(2)
         })
     })
-
     describe('getBonusProductsForSpecificCartItem', () => {
         const extendedBasket = {
             bonusDiscountLineItems: [
@@ -1543,7 +1542,6 @@ describe('Bonus Product Cart Utilities', () => {
             })
         })
     })
-
     describe('findAllBonusProductItemsToRemove', () => {
         test('finds all bonus products with same productId and promotionId', () => {
             const targetBonusProduct = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/retail-react-app",
-  "version": "8.1.0",
+  "version": "8.2.0-nightly-20250929080228",
   "license": "See license in LICENSE",
   "author": "cc-pwa-kit@salesforce.com",
   "ccExtensibility": {
@@ -46,10 +46,10 @@
     "@loadable/component": "^5.15.3",
     "@peculiar/webcrypto": "^1.4.2",
     "@salesforce/cc-datacloud-typescript": "1.1.2",
-    "@salesforce/commerce-sdk-react": "4.1.0",
-    "@salesforce/pwa-kit-dev": "3.13.0",
-    "@salesforce/pwa-kit-react-sdk": "3.13.0",
-    "@salesforce/pwa-kit-runtime": "3.13.0",
+    "@salesforce/commerce-sdk-react": "4.2.0-nightly-20250929080228",
+    "@salesforce/pwa-kit-dev": "3.14.0-nightly-20250929080228",
+    "@salesforce/pwa-kit-react-sdk": "3.14.0-nightly-20250929080228",
+    "@salesforce/pwa-kit-runtime": "3.14.0-nightly-20250929080228",
     "@tanstack/react-query": "^4.28.0",
     "@tanstack/react-query-devtools": "^4.29.1",
     "@testing-library/dom": "^9.0.1",
@@ -107,5 +107,5 @@
       "maxSize": "335 kB"
     }
   ],
-  "gitHead": "aec99418a128126c0cc4bbee70086d2c83112018"
+  "gitHead": "92d2291c0f1ffeccd9e43cc0e40eb9d8bca643e7"
 }