@W-21294742: No error toast for non-applicable shipping method by dannyphan2000 · Pull Request #3673 · SalesforceCommerceCloud/pwa-kit

dannyphan2000 · 2026-02-18T20:15:05Z

Fix no error toast for non-applicable shipping method.

Description

Currently in V3, this is what’s being done if there’s no applicable shipping method:

User is told via toast to enter a different address.
Form state is cleared and no method can be selected or submitted.
Progression is blocked until they change the address (e.g. by going back to the Shipping Address step in the checkout flow). There is no in-place "change address" link in this component; navigation back is via the checkout stepper/context (e.g. goToStep).

In Shipping Address, fill out the information and select a state (like HI - Hawaii) that there is no shipping method (other than the Store Pickup one that should be filtered out in the list of applicable shipping methods).

Expected: the behavior above
Actual: an empty Shipping Methods component is shown. No error toast or going back is being done.

Added fix for multi-shipment as well:

Caveats:

Editing from a valid state (i.e., a state with delivery options) -> invalid state (i.e., a state with no delivery options), for both single-shipment and multi-shipment (as long as we have 1 valid shipment, that’s gonna create a shipping method already)…
Switching from bopis -> delivery, then shipping method will auto-populate
Both of these are happening in https://pwa-kit.mobify-storefront.com/ (traditional checkout) as well.

Types of Changes

Bug fix (non-breaking change that fixes an issue)
New feature (non-breaking change that adds functionality)
Documentation update
Breaking change (could cause existing functionality to not work as expected)
Other changes (non-breaking changes that does not fit any of the above)

Breaking changes include:

Removing a public function or component or prop

Adding a required argument to a function

Changing the data type of a function parameter or return value

Adding a new peer dependency to package.json

Changes

Modify logic to correctly display error toast for non-applicable shipping method for both single- and multi-shipment delivery orders
Update error text

How to Test-Drive This PR

Choose a state that does not have an applicable (non-pickup) shipping method for a delivery order (single and multi-shipment orders)
The error toast should be displayed at the top right
Changing the address to a state with a valid/applicable shipping method would resolve the issue

Checklists

General

Changes are covered by test cases
CHANGELOG.md updated with a short description of changes (not required for documentation updates)

Accessibility Compliance

You must check off all items in one of the follow two lists:

There are no changes to UI

or...

Changes were tested with a Screen Reader (iOS VoiceOver or Android Talkback) and had no issues
Changes comply with WCAG 2.0 guidelines levels A and AA
Changes to common UI patterns and interactions comply with WAI-ARIA best practices

Localization

Changes include a UI text update in the Retail React App (which requires translation)

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

dannyphan2000 · 2026-02-18T20:20:16Z

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

            onSuccess: (data) => {
-                const noMethods =
-                    !data?.applicableShippingMethods || data.applicableShippingMethods.length === 0
+                const deliveryOnly = getDeliveryShippingMethods(data?.applicableShippingMethods)


We only display shipping methods for delivery/shipping orders.

cc-prodsec · 2026-02-18T20:31:22Z

✅ Snyk checks have passed. No issues have been found so far.

Status	Scanner	Critical	High	Medium	Low	Total (0)
✅	Open Source Security	0	0	0	0	0 issues
✅	Licenses	0	0	0	0	0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

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

dannyphan2000 · 2026-02-24T18:48:26Z

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

                return
            }

+            // Don't assign methods until at least one delivery shipment has an address


The change to Cart page I mentioned @patricksullivansf

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

patricksullivansf

Looks great to me. I had some complexity concerns for you to consider. no blockers.

patricksullivansf · 2026-02-24T19:37:09Z

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

+    const hasMultipleDeliveryShipments = deliveryShipments.length > 1
+    const [isMultiShipping, setIsMultiShipping] = useState(hasMultipleDeliveryShipments)
+    const [openedByUser, setOpenedByUser] = useState(false)


patricksullivansf · 2026-02-24T19:45:47Z

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

 }

-const ShipmentMethods = ({shipment, index, currency}) => {
+const ShipmentMethods = ({shipment, index, currency, onShipmentMethodsResolved}) => {


nit: onShipmentMethodsResolved seems unnecessarily complicated.

Also, is this a breaking change to the component contract?

Hmm this is exclusive to one-click checkout, and it's not a breaking change..

As for the onShipmentMethodsResolved : The parent needs to know, per delivery shipment, whether that shipment has no applicable delivery methods (from the API). It uses that to:

Hide the Continue button when any shipment has no methods

Show the error toast once when that happens

Show “No shipping method selected” in MultiShipmentSummary for the right shipments
Removing the callback without changing behavior would mean a more complex setup (e.g. context or parent-owned fetches)
^ Got this from Cursor explanation

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

…g-method-fix Signed-off-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>

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

…g-method-fix

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

…21294742.error-no-shipping-method-fix Signed-off-by: d.phan <d.phan@salesforce.com>

…g-method-fix

shethj · 2026-03-02T18:50:08Z

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

+        if (wasMulti && !hasMultipleDeliveryShipments) {
+            return
+        }
+        if (step === STEPS.SHIPPING_OPTIONS) return


This useEffect has deliveryAddressStateKey as a dependency.

If the user edits their address while already on SHIPPING_OPTIONS (which seems to be the scenario this PR targets), the effect fires and immediately returns. noMethodsToastShown stays true, so the second useEffect that actually shows the toast short-circuits via if (!singleShipmentNoMethods || noMethodsToastShown) return. The toast will only ever fire once per component mount.

Is that expected ?

@shethj From my local testing, the path you mentioned is still working fine (error toast fired again after changing delivery address to another invalid state).
AFAIK: it's because the user is sent back to SHIPPING_ADDRESS stage to edit, then when they leave SHIPPING_OPTIONS, the other branch of the effect runs and resets noMethodsToastShown. When they come back to SHIPPING_OPTIONS with the new address, the toast can show again. So in this flow you’d never see the bug...

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

* @W-21294742: No error toast for non-applicable shipping method Signed-off-by: d.phan <d.phan@salesforce.com> * add changelog Signed-off-by: d.phan <d.phan@salesforce.com> * fix for multi-shipment Signed-off-by: d.phan <d.phan@salesforce.com> * fix edge cases Signed-off-by: d.phan <d.phan@salesforce.com> * minor comment remove Signed-off-by: d.phan <d.phan@salesforce.com> * fixes Signed-off-by: d.phan <d.phan@salesforce.com> * fix duplicate error toast Signed-off-by: d.phan <d.phan@salesforce.com> * fix for false positives error toast Signed-off-by: d.phan <d.phan@salesforce.com> * reuse util func Signed-off-by: d.phan <d.phan@salesforce.com> * lint fix test Signed-off-by: d.phan <d.phan@salesforce.com> * fix a11y cart issue Signed-off-by: d.phan <d.phan@salesforce.com> * skip test temporarily Signed-off-by: d.phan <d.phan@salesforce.com> --------- Signed-off-by: d.phan <d.phan@salesforce.com> Signed-off-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>

@W-21294742: No error toast for non-applicable shipping method

6ac7ee3

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

dannyphan2000 requested review from a team as code owners February 18, 2026 20:15

add changelog

6d96809

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

dannyphan2000 commented Feb 18, 2026

View reviewed changes

dannyphan2000 added 2 commits February 19, 2026 10:25

fix for multi-shipment

c1059b8

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

fix edge cases

61c0584

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

dannyphan2000 requested a review from patricksullivansf February 24, 2026 18:48

dannyphan2000 commented Feb 24, 2026

View reviewed changes

minor comment remove

36599d9

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

patricksullivansf reviewed Feb 24, 2026

View reviewed changes

dannyphan2000 and others added 7 commits February 25, 2026 17:53

fixes

9e6caa2

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

Merge branch 'develop' into dannyphan2000.W-21294742.error-no-shippin…

b010a1c

…g-method-fix Signed-off-by: Danny Phan <125327707+dannyphan2000@users.noreply.github.com>

fix duplicate error toast

d9bb37f

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

fix for false positives error toast

d1e34b1

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

Merge branch 'develop' into dannyphan2000.W-21294742.error-no-shippin…

9cfb92d

…g-method-fix

reuse util func

8b86c8c

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

Merge remote-tracking branch 'upstream/develop' into dannyphan2000.W-…

0c42066

…21294742.error-no-shipping-method-fix Signed-off-by: d.phan <d.phan@salesforce.com>

syadupathi-sf previously approved these changes Feb 27, 2026

View reviewed changes

Merge branch 'develop' into dannyphan2000.W-21294742.error-no-shippin…

8700420

…g-method-fix

shethj reviewed Mar 2, 2026

View reviewed changes

lint fix test

39a7ba2

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

dannyphan2000 dismissed syadupathi-sf’s stale review via 39a7ba2 March 2, 2026 19:25

dannyphan2000 requested review from shethj and syadupathi-sf March 2, 2026 19:29

syadupathi-sf previously approved these changes Mar 2, 2026

View reviewed changes

shethj previously approved these changes Mar 2, 2026

View reviewed changes

fix a11y cart issue

b2f8482

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

dannyphan2000 dismissed shethj’s stale review via b2f8482 March 2, 2026 21:28

dannyphan2000 dismissed syadupathi-sf’s stale review via b2f8482 March 2, 2026 21:28

skip test temporarily

736abe4

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

shethj approved these changes Mar 2, 2026

View reviewed changes

dannyphan2000 requested a review from syadupathi-sf March 2, 2026 23:11

syadupathi-sf approved these changes Mar 2, 2026

View reviewed changes

dannyphan2000 merged commit 927689e into develop Mar 2, 2026
42 checks passed

dannyphan2000 deleted the dannyphan2000.W-21294742.error-no-shipping-method-fix branch March 2, 2026 23:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

@W-21294742: No error toast for non-applicable shipping method#3673

@W-21294742: No error toast for non-applicable shipping method#3673
dannyphan2000 merged 16 commits intodevelopfrom
dannyphan2000.W-21294742.error-no-shipping-method-fix

dannyphan2000 commented Feb 18, 2026 •

edited

Loading

Uh oh!

dannyphan2000 Feb 18, 2026

Uh oh!

cc-prodsec commented Feb 18, 2026 •

edited

Loading

Uh oh!

dannyphan2000 Feb 24, 2026

Uh oh!

patricksullivansf left a comment

Uh oh!

patricksullivansf Feb 24, 2026

Uh oh!

patricksullivansf Feb 24, 2026

Uh oh!

dannyphan2000 Feb 25, 2026

Uh oh!

shethj Mar 2, 2026

Uh oh!

dannyphan2000 Mar 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

dannyphan2000 commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of Changes

Changes

How to Test-Drive This PR

Checklists

General

Accessibility Compliance

Localization

Uh oh!

dannyphan2000 Feb 18, 2026

Choose a reason for hiding this comment

Uh oh!

cc-prodsec commented Feb 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Snyk checks have passed. No issues have been found so far.

Uh oh!

dannyphan2000 Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

patricksullivansf left a comment

Choose a reason for hiding this comment

Uh oh!

patricksullivansf Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

patricksullivansf Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

dannyphan2000 Feb 25, 2026

Choose a reason for hiding this comment

Uh oh!

shethj Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

dannyphan2000 Mar 2, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dannyphan2000 commented Feb 18, 2026 •

edited

Loading

cc-prodsec commented Feb 18, 2026 •

edited

Loading