@W-21188588 Default to ECOM Shipping when OMS does not return shipping#3639
Merged
sf-deepali-bharmal merged 5 commits intodevelopfrom Feb 5, 2026
Merged
@W-21188588 Default to ECOM Shipping when OMS does not return shipping#3639sf-deepali-bharmal merged 5 commits intodevelopfrom
sf-deepali-bharmal merged 5 commits intodevelopfrom
Conversation
Collaborator
✅ Snyk checks have passed. No issues have been found so far.
💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse. |
sf-xingquan-jin
previously approved these changes
Feb 5, 2026
ddiazccrz
previously approved these changes
Feb 5, 2026
sf-cboscenco
previously approved these changes
Feb 5, 2026
cd88961
sf-madhuri-uppu
previously approved these changes
Feb 5, 2026
| () => (order?.omsData?.shipments?.length ?? 0) > 0, | ||
| [order?.omsData?.shipments?.length] | ||
| ) | ||
|
|
Contributor
There was a problem hiding this comment.
Can we do the optional chaining at one place? Something like:
const shipmentCount = order?.omsData?.shipments?.length ?? 0;
const hasOmsShipment = useMemo(() => shipmentCount > 0, [shipmentCount]);
| [order?.omsData?.shipments?.length, order?.shipments?.length] | ||
| ) | ||
|
|
||
| const showShipmentsFromOmsOnly = isOmsOrder && hasOmsShipment && isMultiShipmentOrder |
Contributor
There was a problem hiding this comment.
The name of this variable could be showMultiShipmentsFromOmsOnly
e51b66e to
9f206e1
Compare
ddiazccrz
approved these changes
Feb 5, 2026
sf-cboscenco
approved these changes
Feb 5, 2026
unandyala
pushed a commit
that referenced
this pull request
Feb 10, 2026
#3639) * Default to ECOM Shipping when OMS does not return shipping * Add changelog * lint fix * nit optional check * variable rename
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Summary
When an order has OMS data but no OMS shipments (e.g. omsData.shipments is empty), the order details page now defaults to the ECOM shipment display instead of the OMS-only view.
Shoppers see the normal delivery block with Shipping Method and Shipping Address from ECOM for both single- and multi-shipment orders.
Types of Changes
Changes
How to Test-Drive This PR
Checklists
General
Accessibility Compliance
You must check off all items in one of the follow two lists:
or...
Localization