[Due for payment 2026-06-17] [Due for payment 2026-06-16] Profile - State field is not cleared after changing address

[applause-bot]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: 9.4.0-0
Reproducible in staging?: Yes
Reproducible in production?: No
If this was caught during regression testing, add the test name, ID and link from BrowserStack: #91646
Email or phone of affected tester (no customers): jsodinjosdjsoinjsiojs@gmail.com
Issue reported by: Applause Internal Team
Bug source: Exploratory - Significant User Experience Deterioration
Device used: Mac 26.5 / Chrome
App Component: User Settings

Action Performed:

1. Go to staging.new.expensify.com
2. Go to Account > Profile.
3. Click Address.
4. Enter US address.
5. Click Country.
6. Change to non-US country.

Expected Result:

State field will be cleared after changing address.

Actual Result:

State field is not cleared after changing address.

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome Safari

Screenshots/Videos

Bug7172900_1780684639033.15.mp4

View all open jobs on GitHub

Applause Internal Information
Exported by: Mita Rachim
Bug ID: 7172900

[applause-bot]

While Applause doesn't embed attachments for this bug, here are the links for quick view:
https://platform.applause.com/services/links/v1/external/cfe71ae3244a2c2f205e473536204ce15552d454c363fe1b8857219d5aa49d05

[melvin-bot]

You have been assigned to this deploy blocker because you recently merged this PR: #91646

[melvin-bot]

💬 A slack conversation has been started in #expensify-open-source

[github-actions]

👋 Friendly reminder that deploy blockers are time-sensitive ⏱ issues! Check out the open `StagingDeployCash` deploy checklist to see the list of PRs included in this release, then work quickly to do one of the following:

1. Identify the pull request that introduced this issue and revert it.
2. Find someone who can quickly fix the issue.
3. Fix the issue yourself.

[MelvinBot]

Proposal

Root Cause: The country selector's onValueChange only ever sets the state when switching to the US — it never clears it when switching to a non‑US country. When the US StateSelector (value={selectedState}) is swapped for the non‑US TextInput, both share the same inputID={INPUT_IDS.STATE} with shouldSaveDraft, so the previously‑selected US state (e.g. CA) survives the swap and shows in the new "State / Province" field.

This is a regression from PR #91646, which rewrote this page with an inline address form instead of the shared AddressForm component.

What is the root cause of that problem?

The CountrySelector onValueChange handler at PrivatePersonalDetailsPage.tsx:408-417 only handles the newCountry === US branch (resolving the 2‑letter state code). There is no branch to clear the state when moving to a non‑US country.

Because the US (L366-L375) and non‑US (L376-L389) inputs reuse the same INPUT_IDS.STATE and persist as a form draft, the stale US state value stays registered after the input is swapped, so the field is not cleared.

What changes do you think we should make in order to solve the problem?

In the country onValueChange handler, add an else branch: when newCountry !== CONST.COUNTRY.US, clear the state both in local state and in the form draft. setDraftValues and clearDraftValues are already imported (L23).

• setSelectedState('')
• setDraftValues(ONYXKEYS.FORMS.PERSONAL_DETAILS_FORM, {[INPUT_IDS.STATE]: ''}) so the form's registered value for INPUT_IDS.STATE is reset (clearing the local selectedState alone won't reset the non‑US TextInput, which reads from the draft, not from selectedState).

Why clearing local state isn't enough

The non‑US branch renders TextInput with defaultValue={state} (the saved Onyx value), not value={selectedState}. With shouldSaveDraft, the FormProvider seeds the input from the existing draft value, which still holds the US state. So the draft must be explicitly cleared for the field to appear empty. Confidence: Medium‑High (code‑level root cause confirmed; not yet verified live in‑browser).

What alternative solutions did you explore? (Optional)

Resetting the State field's value whenever selectedCountry transitions away from US via a useEffect keyed on selectedCountry — equivalent behaviour, but doing it inline in the existing handler is simpler and avoids an extra render cycle.

---

Next Steps for Contributor+ team:
To accept: @MelvinBot implement [this](https://github.com/Expensify/App/issues/92821) to create a draft PR.
To refine: @MelvinBot <your feedback>
To reject: Explain why you are rejecting Melvin's proposal.

[jasperhuangg]

working on a fix