Skip to content

fix(android-sample): let a guest cart take the shop market - #570

Merged
kieran-osgood-shopify merged 1 commit into
mainfrom
kieran-osgood/android-guest-cart-market
Aug 18, 2026
Merged

fix(android-sample): let a guest cart take the shop market#570
kieran-osgood-shopify merged 1 commit into
mainfrom
kieran-osgood/android-guest-cart-market

Conversation

@kieran-osgood-shopify

@kieran-osgood-shopify kieran-osgood-shopify commented Aug 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

TLDR

Android sample diverges from other samples by giving a guest cart a hardcoded Canadian buyer identity.
I'm removing the hardcode.

- buyerIdentity = Optional.present(CartBuyerIdentityInput(countryCode = Optional.present(CountryCode.CA)))
+ buyerIdentity = Optional.Absent

Why

A country on the buyer identity picks the market. The market decides the currency, the address form, and the labels on its fields. So the Android sample rendered a Canadian checkout, while the shared E2E fixture types a United States address.

This was detected as a fault in some of the tests

`e2e/FLAKES.md`: `checkout-guest` failed on Kotlin Android at
`Scrolling DOWN until "Country/Region" is visible`, and passed on React Native Android.

React Native also skipped the country picker step, because United States was already selected. The Kotlin failure screenshot shows a total in CAD.

Scope

This change is scoped to

  • Sample app
  • Guest path

@github-actions github-actions Bot added the #gsd:50662 Rebase Checkout Kit on UCP label Aug 4, 2026
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-customer-account branch from 6f86347 to 7a16bc3 Compare August 4, 2026 17:04
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 70d84ed to 4ac9954 Compare August 4, 2026 17:04
This was referenced Aug 4, 2026
Merged
Closed
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@kieran-osgood-shopify Graphite App

kieran-osgood-shopify commented Aug 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@kieran-osgood-shopify kieran-osgood-shopify mentioned this pull request Aug 4, 2026
Merged
11 tasks
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/e2e-checkout-customer-account to graphite-base/570 August 5, 2026 09:22
This was referenced Aug 5, 2026
Merged
Merged
Closed
Open
Closed
Open
Closed
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 4ac9954 to 6643cfb Compare August 5, 2026 09:53
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from graphite-base/570 to kieran-osgood/e2e-checkout-customer-account August 5, 2026 09:53
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/e2e-checkout-customer-account to graphite-base/570 August 5, 2026 11:06
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 6643cfb to 6bff379 Compare August 6, 2026 15:48
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from graphite-base/570 to kieran-osgood/e2e-checkout-customer-account August 6, 2026 15:49
@kieran-osgood-shopify kieran-osgood-shopify mentioned this pull request Aug 6, 2026
Closed
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from graphite-base/570 to kieran-osgood/e2e-checkout-customer-account August 12, 2026 12:28
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-customer-account branch from 1ef701e to 4adf1f2 Compare August 12, 2026 12:35
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 5f180c4 to 5027eb8 Compare August 12, 2026 12:36
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-customer-account branch from 4adf1f2 to 185f661 Compare August 12, 2026 13:52
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch 2 times, most recently from 5a7653a to 6d74a3a Compare August 12, 2026 14:54
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-customer-account branch from 185f661 to 83a0670 Compare August 12, 2026 14:54
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/e2e-checkout-customer-account to graphite-base/570 August 13, 2026 16:21
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 6d74a3a to 54b7f98 Compare August 14, 2026 14:35
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from graphite-base/570 to kieran-osgood/e2e-checkout-guest August 14, 2026 14:35
@kieran-osgood-shopify kieran-osgood-shopify mentioned this pull request Aug 14, 2026
Closed
11 tasks
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-guest branch from 6ffb33e to df7a799 Compare August 14, 2026 15:09
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch 2 times, most recently from bb475d8 to e12e84c Compare August 17, 2026 12:51
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-guest branch from df7a799 to 81de4d9 Compare August 17, 2026 12:51
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from e12e84c to 1f574c7 Compare August 17, 2026 13:13
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-guest branch 2 times, most recently from 7238234 to 111f3ea Compare August 18, 2026 09:27
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 1f574c7 to 244eee2 Compare August 18, 2026 09:27
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/e2e-checkout-guest branch 2 times, most recently from ee190fc to 4d3d211 Compare August 18, 2026 10:25
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 244eee2 to 74ad1a2 Compare August 18, 2026 10:25
@kieran-osgood-shopify @claude
fix(sample-android): let a guest cart take the shop market
b8abd00 
The Android sample gave a guest cart a Canadian buyer identity. A country on
the buyer identity picks the market, and the market decides the currency, the
address form and its labels, so the Kotlin checkout rendered a Canadian form
and totalled in CAD.

The Swift and React Native samples send no buyer identity for a guest, so this
one now sends none either. This is flake B4: the shared E2E fixture is a United
States address, and checkout-guest failed on Kotlin Android while React Native
Android passed the same test.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Assisted-By: devx/5b4b8d5b-690a-4389-841e-039723ade1da
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from kieran-osgood/e2e-checkout-guest to graphite-base/570 August 18, 2026 16:24
@kieran-osgood-shopify
kieran-osgood-shopify force-pushed the kieran-osgood/android-guest-cart-market branch from 74ad1a2 to b8abd00 Compare August 18, 2026 16:24
@kieran-osgood-shopify
kieran-osgood-shopify changed the base branch from graphite-base/570 to main August 18, 2026 16:24
@kieran-osgood-shopify
kieran-osgood-shopify merged commit d40e03b into main Aug 18, 2026
43 of 49 checks passed
@kieran-osgood-shopify
kieran-osgood-shopify deleted the kieran-osgood/android-guest-cart-market branch August 18, 2026 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kiftio kiftio kiftio approved these changes
@kyle-schellen kyle-schellen kyle-schellen approved these changes

Assignees

No one assigned

Labels

#gsd:50662 Rebase Checkout Kit on UCP

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@kieran-osgood-shopify @kiftio @kyle-schellen