fix: prevent delivery method flipping on address change#1407
Merged
Conversation
🦋 Changeset detectedLatest commit: a056ca9 The changes in this PR will be included in the next version bump. This PR includes changesets to release 2 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
wcole1-godaddy
approved these changes
Jul 8, 2026
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.
Summary
Fixes a checkout delivery-method regression when both
enableLocalPickupandenableShippingare enabled.Previously, if a shopper selected local pickup first, causing a pickup fulfillment location to be applied, then switched to shipping and entered a shipping address, a draft-order refetch could
rehydrate
deliveryMethodfrom the order’s line-item fulfillment mode. Because the order still looked like pickup at that moment, the UI could flick back from shipping to local pickup.This change prevents draft-order refetch hydration from overwriting the shopper’s explicit delivery-method selection while still allowing the delivery method form to default/correct the method when
only one delivery option is available.
Changeset
Test Plan
Added regression and edge-case coverage for delivery-method stability during draft-order sync/refetch flows:
Validated with: