Consistent back navigation from workspace pages by WojtekBoman · Pull Request #81535 · Expensify/App

WojtekBoman · 2026-02-05T14:07:08Z

Explanation of Change

With changes introduced in this PR, popToSidebar is called from Navigation.goBack function only if shouldPopToSidebar is true. Thanks to that, goBack behaviour is consistent across all screens from Account and Workspaces tabs.

Fixed Issues

$ #72081
$ #73091
$ #72559
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Android - Expense - Tapping device back button from workflow directs to workspace page

Launch app in both mweb and android
Create a expense in workspace chat
Tap submit
Open the expense details - more - change approver
Tap workflow settings link
Tap device back button
Verify if the change approver page has been displayed.

User not navigated to workspace settings on tapping back button in More features page

Launch Hybrid app or navigate to staging.new.expensify.com
Create new user
Select Skip on work email page
Select the option "Manage my team's expenses" >> "1-10 employees" >> Quickbooks Desktop accounting software >>Continue >>Skip on take a test drive modal
Go to Concierge chat
Select “Invite your team” task >> Take me to workspace members link >> click back button
Verify if you have been redirected to the previous page.
Go back to Concierge chat >> Select "Add expense approvals"" task
Click on "Take me to more features" link
User redirected to More features page>> observe workflows option is enabled
Tap on back button
Verify if you have been redirected to the previous page.

Chat - Tapping tapping app's top left arrow navigates to workspace settings

Launch app
Go to workspace settings
Tap company card
Use region bank and assign a direct feed card
Open workspace chat
Tap company card link
Tap device back button
Note user directed to same company card link page
Again tap on company card link
Tap app's top left arrow
Verify if you have been redirected to the Company Card Link page

Offline tests

QA Steps

// 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

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-05.at.14.55.57.mov

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-06.at.09.14.47.mov

hungvu193 · 2026-02-06T07:14:06Z

@WojtekBoman Can move #72081 to the first of Fixed Issues on your author checlist so it will request the correct reviewer once you mark it as ready?

WojtekBoman · 2026-02-06T07:28:37Z

@WojtekBoman Can move #72081 to the first of Fixed Issues on your author checlist so it will request the correct reviewer once you mark it as ready?

Sure! Thanks for noticing that!

codecov · 2026-02-06T08:15:05Z

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 Δ
src/pages/TeachersUnite/SaveTheWorldPage.tsx	`0.00% <ø> (ø)`
src/pages/domain/BaseDomainMembersPage.tsx	`0.00% <ø> (ø)`
src/pages/domain/DomainSamlPage.tsx	`0.00% <ø> (ø)`
src/pages/inbox/ReportScreen.tsx	`66.20% <ø> (-0.08%)`	⬇️
src/pages/settings/AboutPage/AboutPage.tsx	`0.00% <ø> (ø)`
src/pages/settings/Preferences/PreferencesPage.tsx	`0.00% <ø> (ø)`
src/pages/settings/Rules/ExpenseRulesPage.tsx	`0.00% <ø> (ø)`
...c/pages/settings/Security/SecuritySettingsPage.tsx	`0.00% <ø> (ø)`
...c/pages/settings/Troubleshoot/TroubleshootPage.tsx	`0.00% <ø> (ø)`
src/pages/settings/Wallet/WalletPage/index.tsx	`0.00% <ø> (ø)`
... and 19 more
... and 96 files with indirect coverage changes

melvin-bot · 2026-02-06T08:45:37Z

@hungvu193 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

💡 Codex Review

App/src/pages/workspace/WorkspaceMembersPage.tsx

Lines 811 to 816 in 9266f1d

    
           return ( 
        
               <WorkspacePageWithSections 
        
                   headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.members')} 
        
                   route={route} 
        
                   icon={!selectionModeHeader ? illustrations.ReceiptWrangler : undefined} 
        
                   headerContent={!shouldUseNarrowLayout && getHeaderButtons()}

Preserve selection mode behavior on header back

In WorkspaceMembersPage, the header back button now relies on WorkspacePageWithSections' default handler because no onBackButtonPress is passed. That handler always navigates away (pop to sidebar / goBack), so on iOS/web (and Android UI back arrow) a user in mobile selection mode will be navigated off the page instead of clearing the selection and staying put. The Android hardware back path is still covered by useSearchBackPress, but the header back path is no longer, which is a regression from the prior inline handler that cleared selection first.

ℹ️ 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".

hungvu193 · 2026-02-09T06:47:45Z

@WojtekBoman Do you think we should also fix the case for the Accounting page as well?

Screen.Recording.2026-02-09.at.13.46.17.mov

WojtekBoman · 2026-02-09T09:56:11Z

@WojtekBoman Do you think we should also fix the case for the Accounting page as well?

Screen.Recording.2026-02-09.at.13.46.17.mov

Definitely! Thanks for pointing this out :)

trjExpensify

PR for a coordinated project cleaning up back button logic. 👍

WojtekBoman · 2026-02-09T15:29:30Z

@hungvu193 It should be ready now and all cases have been covered 🫡

hungvu193 · 2026-02-09T16:04:47Z

Thank you 🙏 I'll be reviewing again

hungvu193 · 2026-02-09T17:40:01Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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

Screen.Recording.2026-02-09.at.13.39.02.mov

Screen.Recording.2026-02-09.at.13.40.27.mov

Screen.Recording.2026-02-09.at.13.44.32.mov

Android: mWeb Chrome

72081.-.Android.mov

iOS: HybridApp

Screen.Recording.2026-02-10.at.00.39.15.mov

iOS: mWeb Safari

Screen.Recording.2026-02-10.at.00.35.15.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-09.at.13.18.28.mov

arosiclair · 2026-02-09T19:17:55Z

src/libs/Navigation/NavigationRoot.tsx

+        const lastRoute = navigationRef?.current?.getRootState().routes.at(-1);
+
+        if (!isSplitNavigatorName(lastRoute?.name)) {
+            return;
+        }


Can we add a comment explaining this extra condition?

arosiclair · 2026-02-09T20:08:23Z

src/libs/Navigation/NavigationRoot.tsx

+        const lastRoute = navigationRef?.current?.getRootState().routes.at(-1);
+
+        if (!isSplitNavigatorName(lastRoute?.name)) {
+            return;
+        }


Can we add a comment explaining this extra condition?

github-actions · 2026-02-10T16:04:14Z

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

github-actions · 2026-02-10T16:08:20Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-58f0040-27c4bed4e1bad1547533f64eeead688916046d3b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-58f0040-d61873b20eca4b461028c5927fe580bab8fc178b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-10T16:10:02Z

✋ 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-02-11T06:54:36Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.3.17-0 🚀

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

OSBotify · 2026-02-12T15:23:56Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.17-9 🚀

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

melvin-bot bot assigned WojtekBoman Feb 5, 2026

WojtekBoman marked this pull request as ready for review February 6, 2026 08:45

WojtekBoman requested review from a team as code owners February 6, 2026 08:45

melvin-bot bot requested review from hungvu193 and trjExpensify February 6, 2026 08:45

melvin-bot bot removed request for a team February 6, 2026 08:45

chatgpt-codex-connector bot reviewed Feb 6, 2026

View reviewed changes

WojtekBoman force-pushed the fix/navigating-back-from-workspaces-screens branch from 9266f1d to 1efea7c Compare February 6, 2026 14:17

trjExpensify previously approved these changes Feb 9, 2026

View reviewed changes

WojtekBoman dismissed trjExpensify’s stale review via f7be15d February 9, 2026 12:56

WojtekBoman force-pushed the fix/navigating-back-from-workspaces-screens branch 5 times, most recently from 33057c2 to cff06e7 Compare February 9, 2026 14:52

WojtekBoman added 2 commits February 9, 2026 16:10

Consistent back navigation from workspace pages

9f110a5

Fix navigating back from WalletPage

6cda2d0

WojtekBoman force-pushed the fix/navigating-back-from-workspaces-screens branch 2 times, most recently from a0e8a12 to 89e5a38 Compare February 9, 2026 15:16

hungvu193 approved these changes Feb 9, 2026

View reviewed changes

melvin-bot bot requested a review from arosiclair February 9, 2026 17:40

arosiclair requested changes Feb 9, 2026

View reviewed changes

trjExpensify mentioned this pull request Feb 10, 2026

[$250] Workspace - App reopens workspace settings when swiping back after enabling workspace feature #63365

Open

16 tasks

Call popToSidebar from goBack

6681c0f

WojtekBoman force-pushed the fix/navigating-back-from-workspaces-screens branch from 89e5a38 to 6681c0f Compare February 10, 2026 10:09

arosiclair approved these changes Feb 10, 2026

View reviewed changes

arosiclair merged commit 58f0040 into Expensify:main Feb 10, 2026
30 checks passed

OSBotify mentioned this pull request Feb 11, 2026

Deploy Checklist: New Expensify 2026-02-11 #82079

Closed

	return (
	<WorkspacePageWithSections
	headerText={selectionModeHeader ? translate('common.selectMultiple') : translate('workspace.common.members')}
	route={route}
	icon={!selectionModeHeader ? illustrations.ReceiptWrangler : undefined}
	headerContent={!shouldUseNarrowLayout && getHeaderButtons()}

Conversation

WojtekBoman commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Android - Expense - Tapping device back button from workflow directs to workspace page

User not navigated to workspace settings on tapping back button in More features page

Chat - Tapping tapping app's top left arrow navigates to workspace settings

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

hungvu193 commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

WojtekBoman commented Feb 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Feb 6, 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!

melvin-bot bot commented Feb 6, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

hungvu193 commented Feb 9, 2026

Uh oh!

WojtekBoman commented Feb 9, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

WojtekBoman commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hungvu193 commented Feb 9, 2026

Uh oh!

hungvu193 commented Feb 9, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

arosiclair Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

WojtekBoman Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 10, 2026

Uh oh!

github-actions bot commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

OSBotify commented Feb 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

WojtekBoman commented Feb 5, 2026 •

edited

Loading

hungvu193 commented Feb 6, 2026 •

edited

Loading

WojtekBoman commented Feb 6, 2026 •

edited

Loading

codecov bot commented Feb 6, 2026 •

edited by github-actions bot

Loading

WojtekBoman commented Feb 9, 2026 •

edited

Loading