Create expense - Keyboard navigation is broken when user add a currency by thelullabyy · Pull Request #104313 · Expensify/App

thelullabyy · 2026-10-18T12:10:17Z

Explanation of Change

Scope: this PR fixes focus return for the currency field only (#96614). Closing the currency picker now returns focus to the currency button instead of dropping it at the top of the form.

The other fields on the confirmation page that have the same focus-return problem are out of scope here and will be handled in a follow-up issue.

Fixed Issues

$ #96614
PROPOSAL:

Tests

Go to https://staging.new.expensify.com/
Open the manual create expense dialog
Type in an amount and press tab
Press enter and type in a currency
Verify focus returns to the currency button, and pressing Tab moves to the next field

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to https://staging.new.expensify.com/
Open the manual create expense dialog
Type in an amount and press tab
Press enter and type in a currency
Verify focus returns to the currency button, and pressing Tab moves to the next field

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

Screen.Recording.2026-10-28.at.23.49.44.mov

MacOS: Chrome / Safari

Screen.Recording.2026-10-18.at.20.14.47.mov

melvin-bot · 2026-10-18T12:16:20Z

@ikevin127 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector · 2026-10-18T12:16:24Z

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-18T12:29:28.933491Z	`a260cad`	Draft marked ready

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

ikevin127 · 2026-10-19T21:12:23Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Screen.Recording.2026-10-19.at.14.26.46.mov

ikevin127 · 2026-10-19T21:13:28Z

            onClose={hidePickerModal}
            onModalHide={hidePickerModal}
            shouldEnableNewFocusManagement
+            shouldReturnFocus={!!launcherRef}


src/pages/iou/request/step/IOURequestStepCurrencyModal.tsx:57

🟢 shouldReturnFocus used to be false on this modal and is now true, so focus also comes back after a mouse or touch selection. The currency button's onMouseDown calls preventDefault, so if the amount input had focus, the input is still document.activeElement when the trap activates.

The active element takes priority over launcherRef, so focus goes back to the amount input after a currency is picked. On Android mWeb, that programmatic focus can pop the soft keyboard back up right after the picker closes.

Can you check this on Android and iOS mWeb and add videos ? Every platform section in the PR is empty except MacOS.

@thelullabyy 🟠 This thread got resolved without a reply, and the Android mWeb section in the PR is still empty.

Can you add an Android mWeb video for the touch path: focus the amount input, tap the currency button, pick a currency?

If focus goes back to the amount input and the keyboard pops up, shouldReturnFocus needs to stay off for non-keyboard selections.

If it lands on the currency button with no keyboard, just reply here with the video.

_{👁️ Written by AI, reviewed by Kevin.}

ikevin127

I'm requesting changes for the code-comments and the item below. ~~Working on the checklist in the meantime.~~ ✅ Reviewer checklist completed - tests well. Tag me once addressed 🙌

General

🟢 On the issue, a contributor showed the same lost-focus bug on category, tag, the date dropdown, the date clear (X) button, tax rate, tax amount, distance rate and attendees. You commented that you'd check those.

Please say in the PR whether they'll be fixed here or in a follow-up issue, so this PR doesn't close #96614 while those fields are still broken.

thelullabyy · 2026-10-28T16:07:54Z

Hi @ikevin127, I added the fix, updated PR description to reflect the scope, add new recording,... Kindly help check again

ikevin127

The code side is close, the PR description still needs work. I posted 2 comments below.

PR description

🟠 Tests and QA step 5, "Verify that User is back and being in the currency field", is unclear and QA will run it word for word. Please change it to "Verify focus returns to the currency button, and pressing Tab moves to the next field".

🟡 State the scope explicitly: currency only, with a follow-up issue for the other fields. Otherwise this closes #96614 while they are still broken.

@thelullabyy Verdict: Ready after these 4 items

Android mWeb touch-path video, and a reply on the shouldReturnFocus thread.
Fix Tests and QA step 5.
State the follow-up for the other fields. This is my call with the internal engineer.
Type the test mocks from production props.

ikevin127 · 2026-10-28T23:25:43Z

            onClose={hidePickerModal}
            onModalHide={hidePickerModal}
            shouldEnableNewFocusManagement
+            shouldReturnFocus={!!launcherRef}


@thelullabyy 🟠 This thread got resolved without a reply, and the Android mWeb section in the PR is still empty.

Can you add an Android mWeb video for the touch path: focus the amount input, tap the currency button, pick a currency?

If focus goes back to the amount input and the keyboard pops up, shouldReturnFocus needs to stay off for non-keyboard selections.

If it lands on the currency button with no keyboard, just reply here with the video.

_{👁️ Written by AI, reviewed by Kevin.}

ikevin127

🟢 LGTM - Thanks for addressing the comments

@thelullabyy Looks like Oxfmt CI is 🔴

lakchote

Thanks @thelullabyy, looks good.

github-actions · 2026-10-30T08:31:33Z

🚧 lakchote has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-10-30T08:37:27Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #104313 with the pinned Mobile-Expensify submodule.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cd94d261-b074b1f-28cd454f22481b22f007b45066ed5e6053b24bd3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cd94d261-b074b1f-aa64b6920365b78754c0f497628815afbfeb2741/index.html

Web 🕸️
https://104313.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-30T08:37:35Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-10-31T07:20:35Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.5.27-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

MelvinBot · 2026-10-31T07:23:33Z

No help site update needed. This PR is a keyboard-accessibility bug fix that returns focus to the currency button after you pick a currency, which is what users already expect, and no help article describes this focus behavior.

view run

m-natarajan · 2026-11-02T18:03:05Z

@ikevin127 @thelullabyy This PR is failing because of a regression issue #96614 (comment)

OSBotify · 2026-11-02T18:22:08Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.5.27-2 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

fix: 96614

a260cad

melvin-bot Bot assigned thelullabyy Oct 18, 2026

thelullabyy marked this pull request as ready for review October 18, 2026 12:16

thelullabyy requested review from a team as code owners October 18, 2026 12:16

melvin-bot Bot requested review from ikevin127 and joekaufmanexpensify October 18, 2026 12:16

melvin-bot Bot removed request for a team and joekaufmanexpensify October 18, 2026 12:16

thelullabyy mentioned this pull request Oct 18, 2026

[Due for payment 2026-11-09] Create expense - Keyboard navigation is broken when user add a currency #96614

Open

1 of 7 tasks

ikevin127 reviewed Oct 19, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepCurrencyModal.tsx Resolved

ikevin127 reviewed Oct 19, 2026

View reviewed changes

Comment thread src/components/MoneyRequestConfirmationList/sections/AmountField.tsx Resolved

ikevin127 suggested changes Oct 19, 2026

View reviewed changes

thelullabyy added 2 commits October 28, 2026 22:36

resolve conflits

a54b140

fix: IOURequestStepCurrencyModal

faa75fc

ikevin127 suggested changes Oct 29, 2026

View reviewed changes

thelullabyy added 2 commits October 30, 2026 02:57

Merge branch 'main' of https://github.com/Expensify/App into fix/96614

09075d5

Type AmountField test mocks from production props

843903a

ikevin127 approved these changes Oct 29, 2026

View reviewed changes

melvin-bot Bot requested a review from lakchote October 29, 2026 20:20

fix: fmt

eaec9d2

lakchote approved these changes Oct 30, 2026

View reviewed changes

lakchote merged commit cd94d26 into Expensify:main Oct 30, 2026
36 of 38 checks passed

OSBotify mentioned this pull request Oct 31, 2026

Deploy Checklist: New Expensify 2026-10-31 #105544

Closed

77 tasks done

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Oct 18, 2026

Uh oh!

chatgpt-codex-connector Bot commented Oct 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

ikevin127 commented Oct 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

ikevin127 Oct 19, 2026

Choose a reason for hiding this comment

Uh oh!

ikevin127 Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

ikevin127 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

General

Uh oh!

thelullabyy commented Oct 28, 2026

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

PR description

Uh oh!

Uh oh!

ikevin127 Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

ikevin127 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Oct 30, 2026

Uh oh!

github-actions Bot commented Oct 30, 2026

Uh oh!

OSBotify commented Oct 30, 2026

Uh oh!

OSBotify commented Oct 31, 2026

Uh oh!

MelvinBot commented Oct 31, 2026

Uh oh!

m-natarajan commented Nov 2, 2026

Uh oh!

OSBotify commented Nov 2, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

thelullabyy commented Oct 18, 2026 •

edited

Loading

chatgpt-codex-connector Bot commented Oct 18, 2026 •

edited

Loading

ikevin127 commented Oct 19, 2026 •

edited

Loading

ikevin127 left a comment •

edited

Loading

ikevin127 left a comment •

edited

Loading