Skip to content

Fix Copilot account switcher keyboard interactions - #102654

Merged
iwiznia merged 20 commits into
Expensify:mainfrom
emkhalid:fix/96225-account-switcher-keyboard-navigation
Nov 19, 2026
Merged

iwiznia merged 20 commits into
Expensify:mainfrom
emkhalid:fix/96225-account-switcher-keyboard-navigation

Conversation

@emkhalid

@emkhalid emkhalid commented Sep 30, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixes keyboard interactions in the searchable Copilot account switcher:

  • Allows the Clear button and account rows to handle the first native tap while the keyboard is open.
  • Shows the visually focused account while Arrow Up and Arrow Down are used without moving focus away from the search input.
  • Preserves valid row measurements after filtering so keyboard navigation scrolls off-screen results into view.
  • Keeps non-search popovers and general modal behavior unchanged.

Fixed Issues

$ #96225
$ #99964
$ #99974
PROPOSAL: #96225 (comment)

Tests

Precondition:

  • Sign in to an account with at least 12 accounts available through Copilot access.

Native — first-tap handling:

  1. Open Settings > Account.
  2. Open the account switcher.
  3. Focus the search input and enter a query.
  4. Tap the Clear button once.
  5. Verify the query clears on the first tap and the complete list returns.
  6. Enter another query.
  7. Tap a matching account once.
  8. Verify the account is selected on the first tap and the switcher closes normally.

Web — keyboard navigation:

  1. Open the account switcher.
  2. Focus the search input.
  3. Enter a query that returns more results than can fit in the visible list.
  4. Press Arrow Down until the highlighted result moves beyond the initial viewport.
  5. Verify the list scrolls and the highlighted result remains visible.
  6. Press Arrow Up and verify the list scrolls upward when required.
  7. Type another character and verify the search input retained focus.
  8. Press Enter and verify the highlighted account is selected.
  9. Clear the query and repeat keyboard navigation with the complete list.

Regression checks:

  1. Open the switcher with fewer than 12 available accounts.
  2. Verify it behaves normally without a search input.
  3. Verify mouse/touch scrolling and account selection still work.
  4. Search for a query with no results and verify the empty state appears.
  5. Clear the query and verify keyboard navigation works again.
  6. Verify the popover width and placement remain unchanged.
  • Verify that no errors appear in the JS console

Offline tests

  1. Disable the network connection.
  2. Open the searchable account switcher.
  3. Search and navigate through accounts using the keyboard or touch.
  4. Attempt to select another account.
  5. Verify the existing offline warning appears and the account is not switched.
  6. Reconnect and verify account switching works normally.

QA Steps

Same as Tests and Offline tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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).
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
android.mov
Android: mWeb Chrome
android-web.mov
iOS: Native
ios-native.mov
iOS: mWeb Safari
ios-web.mov
MacOS: Chrome / Safari
web.mov

@emkhalid
emkhalid marked this pull request as ready for review September 30, 2026 13:03
@emkhalid
emkhalid requested review from a team as code owners September 30, 2026 13:03
@melvin-bot
melvin-bot Bot requested review from eh2077 and removed request for a team September 30, 2026 13:03
@melvin-bot

melvin-bot Bot commented Sep 30, 2026

Copy link
Copy Markdown

@eh2077 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]

@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and removed request for a team September 30, 2026 13:03
@codecov

codecov Bot commented Sep 30, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/pages/settings/InitialSettingsPage.tsx 85.71% <ø> (ø)
src/components/PopoverMenu/index.tsx 91.91% <81.25%> (+2.83%) ⬆️
... and 7 files with indirect coverage changes

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Testing steps look good to me.

@eh2077

eh2077 commented Oct 1, 2026 •

Copy link
Copy Markdown
Contributor

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 any copy / text that was added to the app 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 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 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

Android: HybridApp

Uploading Screen Recording 2026-11-16 at 6.58.32 PM.mov…

Android: mWeb Chrome
Screen.Recording.2026-11-16.at.6.54.51.PM.mov
iOS: HybridApp

Uploading Screen Recording 2026-11-16 at 6.49.51 PM.mov…

iOS: mWeb Safari
Screen.Recording.2026-11-16.at.6.45.51.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-16.at.6.37.29.PM.mov

@eh2077

eh2077 commented Oct 12, 2026

Copy link
Copy Markdown
Contributor

sorry for the delay. @emkhalid can you have a look at the conflicts please?

@emkhalid

Copy link
Copy Markdown
Contributor Author

sorry for the delay. @emkhalid can you have a look at the conflicts please?

Done, thanks!

@emkhalid

Copy link
Copy Markdown
Contributor Author

The failure is also unrelated to our PR changes.

@eh2077

eh2077 commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

Bug: Press enter on clear icon doesn't clear search text but switch account

Screen.Recording.2026-10-13.at.11.19.49.PM.mov

@eh2077

eh2077 commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

Bug: switch items with Tab and Enter doesn't work

  1. Click switch button to open popover of list
  2. Switch item by pressing Tab key
  3. Press Enter to switch to the focus account
  4. Popover close without switching to another account
Screen.Recording.2026-10-13.at.11.28.16.PM.mov

@eh2077

eh2077 commented Oct 13, 2026

Copy link
Copy Markdown
Contributor

@codex review VoiceOver issues

@chatgpt-codex-connector

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

Copy link
Copy Markdown

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-13T16:09:22.141246Z b5a4318 Manual request
ℹ️ 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.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b5a4318f9e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically 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".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/components/PopoverMenu/index.tsx Resolved
@emkhalid

Copy link
Copy Markdown
Contributor Author

Bug: Press enter on clear icon doesn't clear search text but switch account

Thanks for the review! Fixed this one:

clear-resolved.mov

@emkhalid

Copy link
Copy Markdown
Contributor Author

Bug: switch items with Tab and Enter doesn't work

  1. Click switch button to open popover of list
  2. Switch item by pressing Tab key
  3. Press Enter to switch to the focus account
  4. Popover close without switching to another account

Also resolved this one:

switch-fix.mov

@emkhalid

emkhalid commented Nov 6, 2026

Copy link
Copy Markdown
Contributor Author

Bug?: Press tab alway skip the first item of search result

Screen.Recording.2026-11-05.at.8.26.14.PM.mov
Screen.Recording.2026-11-05.at.8.28.57.PM.mov

@eh2077 Thanks for the thorough review. I addressed the confirmed keyboard-focus issues:

  • Tab no longer skips the first account after the Clear button.
  • Tab now keeps the visual background, focus outline, and logical focused row synchronized in the two-account switcher.
  • Arrow and Enter navigation continue from the row that actually has focus.

One behavior still needs your confirmation: when the search input is focused and no Arrow key has been pressed, should the first result already be active—so Enter selects it and Arrow Down moves to the second result—or should Enter do nothing and the first Arrow Down activate the first result?

Screen.Recording.2026-11-06.at.10.14.59.PM.mov

@emkhalid

emkhalid commented Nov 9, 2026

Copy link
Copy Markdown
Contributor Author

@eh2077 All fixes and related regression cases have now been tested on web, iOS, and Android, and everything works as expected. Could you please review again? Thanks!

@eh2077

eh2077 commented Nov 10, 2026

Copy link
Copy Markdown
Contributor

thanks for the update, will check again shortly

@eh2077 eh2077 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works well, thanks!

@melvin-bot

melvin-bot Bot commented Nov 16, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #96225 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

innerContainerStyle={styles.pb0}
shouldUseScrollView
shouldUpdateFocusedIndex={false}
shouldUpdateFocusedIndex={shouldShowSearchInput}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was set to false back in #48292, are we sure turning it on (when search shows) does not bring back whatever that was fixing on iOS?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thanks!

@emkhalid

Copy link
Copy Markdown
Contributor Author

@iwiznia Thanks! I kept the original native safeguard and made the focus update web-only. I tested on iOS, Android, and web—all passed. Ready for your review.

iwiznia
iwiznia previously approved these changes Nov 19, 2026
@iwiznia

iwiznia commented Nov 19, 2026

Copy link
Copy Markdown
Contributor

Conflicts

@emkhalid

Copy link
Copy Markdown
Contributor Author

@iwiznia, Resolved the conflicts, thanks!

@iwiznia
iwiznia merged commit dd3885e into Expensify:main Nov 19, 2026
37 of 38 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.5.43-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR restores expected keyboard, touch, and screen-reader behavior in the existing account switcher without adding a workflow or making any existing article sentence incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.5.47-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.5.51-0 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.5.51-1 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants