Handle Escape key navigation in WorkspaceNavigator by WojtekBoman · Pull Request #86849 · Expensify/App

WojtekBoman · 2026-04-01T08:23:28Z

Explanation of Change

The Escape key behavior inside the Workspaces tab was broken after WorkspaceNavigator was introduced. Pressing Escape no longer navigated back correctly because the handler wasn't aware of the new navigator structure. This change fixes the regression by teaching the Escape handler to pop routes within WorkspaceNavigator appropriately — falling back to popping the entire WorkspaceNavigator from the root stack when it contains only a single route.

Fixed Issues

$ #86785
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Open the app in a browser.
Navigate to the Workspaces tab.
Open a workspace.
Press Escape — verify you are taken back to the workspaces list.
Verify that Escape still works correctly outside the Workspaces tab (e.g. closing modals, dismissing RHP flows) — no regression.

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2026-04-01.at.10.22.29.mov

melvin-bot · 2026-04-01T08:24:00Z

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

ZhenjaHorbach · 2026-04-01T08:24:43Z

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 any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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

Android: mWeb Chrome

iOS: HybridApp

2026-04-01.11.03.31.mov

iOS: mWeb Safari

2026-04-01.10.59.34.mov

MacOS: Chrome / Safari

2026-04-01.10.55.38.mov

sumo-slonik · 2026-04-01T08:31:12Z

Nice job, LGTM 🚀

codecov · 2026-04-01T08:38:58Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...ateRootStackNavigator/GetStateForActionHandlers.ts	`28.88% <ø> (ø)`
...vigator/KeyboardShortcutsHandler/EscapeHandler.tsx	`15.78% <0.00%> (-21.72%)`	⬇️
... and 20 files with indirect coverage changes

ZhenjaHorbach · 2026-04-01T09:06:40Z

LGTM!

github-actions · 2026-04-01T15:37:17Z

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

github-actions · 2026-04-01T15:41:54Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #86849.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7e16b25-08e403c-cc771e996458bf1a4f5f897b556a9613d24c6e6b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7e16b25-08e403c-1157a8c435dc03f65751a6799bea0801f6bc9ff6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-01T15:50:40Z

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

…kspaces-navigator Handle Escape key navigation in WorkspaceNavigator (cherry picked from commit 7e16b25) (cherry-picked to staging by luacmartins)

OSBotify · 2026-04-01T17:15:48Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.51-4 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-01T17:17:41Z

No help site changes are required for this PR.

This PR is a pure navigation bug fix — it corrects the Escape key regression inside the Workspaces tab caused by the WorkspaceNavigator introduction. The changes are entirely in internal navigation handler code (EscapeHandler.tsx and GetStateForActionHandlers.ts).

I reviewed the help site articles under docs/articles/ and confirmed:

No existing articles document Escape key behavior or keyboard navigation shortcuts
Workspace-related articles cover setup/configuration, not internal navigation mechanics
There are no user-facing feature additions, terminology changes, or workflow modifications that would need documentation updates

OSBotify · 2026-04-02T19:57:33Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.3.51-10 🚀

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

OSBotify · 2026-04-02T20:22:19Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-02T20:24:01Z

No help site changes are required for this PR.

This is a bug fix for Escape key navigation within the WorkspaceNavigator — no new features, settings, UI labels, or user-facing flows are introduced. The existing help site docs don't document Escape key navigation behavior, so there's nothing to update.

OSBotify · 2026-04-07T01:13:16Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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

melvin-bot bot assigned WojtekBoman Apr 1, 2026

WojtekBoman marked this pull request as ready for review April 1, 2026 08:23

WojtekBoman requested review from a team as code owners April 1, 2026 08:23

melvin-bot bot requested review from heyjennahay and mananjadhav and removed request for a team April 1, 2026 08:23

melvin-bot bot removed the request for review from a team April 1, 2026 08:24

Handle Escape key navigation in WorkspaceNavigator

40b0ac9

WojtekBoman force-pushed the fix/esc-from-workspaces-navigator branch from af313bc to 40b0ac9 Compare April 1, 2026 08:29

ZhenjaHorbach approved these changes Apr 1, 2026

View reviewed changes

melvin-bot bot requested a review from luacmartins April 1, 2026 09:06

luacmartins approved these changes Apr 1, 2026

View reviewed changes

luacmartins merged commit 7e16b25 into Expensify:main Apr 1, 2026
32 checks passed

github-actions bot mentioned this pull request Apr 1, 2026

Investigate workflow job failing on main: typecheck / typecheck #86892

Closed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Apr 1, 2026

OSBotify mentioned this pull request Apr 1, 2026

Deploy Checklist: New Expensify 2026-03-31 #86774

Closed

This was referenced Apr 2, 2026

[$250] New report not created when clicked from Home tab quick action shortcuts #86966

Open

Deploy Checklist: New Expensify 2026-04-02 #86989

Closed

melvin-bot bot mentioned this pull request Apr 7, 2026

[Due for payment 2026-04-14] Workspace - Pressing ESC key on workspace settings page does not return to workspace list #86785

Closed

7 tasks

Conversation

WojtekBoman commented Apr 1, 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 Apr 1, 2026

Uh oh!

ZhenjaHorbach commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

sumo-slonik commented Apr 1, 2026

Uh oh!

codecov bot commented Apr 1, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

ZhenjaHorbach commented Apr 1, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

OSBotify commented Apr 1, 2026

Uh oh!

OSBotify commented Apr 1, 2026

Uh oh!

MelvinBot commented Apr 1, 2026

Uh oh!

OSBotify commented Apr 2, 2026

Uh oh!

OSBotify commented Apr 2, 2026

Uh oh!

MelvinBot commented Apr 2, 2026

Uh oh!

OSBotify commented Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

WojtekBoman commented Apr 1, 2026 •

edited

Loading

ZhenjaHorbach commented Apr 1, 2026 •

edited

Loading

codecov bot commented Apr 1, 2026 •

edited by github-actions bot

Loading