[CP staging] Revert "[BATCH 2] Migrate Navigation usage, part 1" by neil-marcellini · Pull Request #92110 · Expensify/App

neil-marcellini · 2026-05-29T18:59:06Z

Explanation of Change

This reverts #88538 ("[BATCH 2] Migrate Navigation usage, part 1"), which introduced a regression causing an endless loading state instead of redirecting to the workspace chat when a logged-out user clicks the invite link in an invitation email.

The PR migrated Navigation usage across Session/Report/Task action modules and several inbox/report components. Reverting restores the prior navigation behavior so the invite deep link resolves correctly.

The merge commit was reverted with git revert -m 1. The only conflict was in config/eslint/eslint.seatbelt.tsv, resolved by restoring the pre-PR grandfathered lint entries.

Fixed Issues

$ #92047

PROPOSAL: #92047 (comment)

Tests

Log in as an admin of a workspace (or create one).
In Workspace Settings > Members, click Invite Member and invite an email address that does not have an Expensify account (use a real inbox).
On a separate logged-out device/browser, open the invitation email and click the link at the bottom.
Verify the app redirects to the workspace chat and does not get stuck in an endless loading state.

Verify that no errors appear in the JS console

Offline tests

N/A — navigation revert, behavior is unchanged offline.

QA Steps

Same as Tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

…oneur/transition-tracker-batch-2" This reverts commit 6768020, reversing changes made to ff4cf19.

melvin-bot · 2026-05-29T18:59:13Z

@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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9276965d5d

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

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

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-05-29T19:06:36Z

+        InteractionManager.runAfterInteractions(() => {
+            requestAnimationFrame(() => {
+                clearDeleteTransactionNavigateBackUrl();
+            });
        });


Wait for the navigation transition before clearing

When an expense deletion navigates away from this report, the screen loses focus as soon as the transition starts, but InteractionManager.runAfterInteractions is not tied to that just-started navigation transition. That can clear NVP_DELETE_TRANSACTION_NAVIGATE_BACK_URL while the deleted report is still visible during the closing animation, which is the Not Found flash this comment says we are avoiding; use the transition tracker/after-transition hook so the URL is cleared only after the navigation finishes.

Useful? React with 👍 / 👎.

codecov · 2026-05-29T19:10:06Z

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/components/MoneyRequestHeader.tsx	`0.00% <ø> (ø)`
src/components/MoneyRequestHeaderActions.tsx	`6.66% <ø> (ø)`
.../components/MoneyRequestHeaderSecondaryActions.tsx	`0.52% <ø> (+<0.01%)`	⬆️
src/libs/Navigation/TransitionTracker.ts	`100.00% <100.00%> (+3.07%)`	⬆️
src/libs/actions/Report/index.ts	`69.53% <100.00%> (+0.44%)`	⬆️
src/libs/actions/Task.ts	`59.47% <100.00%> (+1.74%)`	⬆️
...ges/inbox/DeleteTransactionNavigateBackHandler.tsx	`80.00% <ø> (ø)`
src/pages/inbox/ReportHeader.tsx	`71.05% <100.00%> (+13.15%)`	⬆️
...space/companyCards/assignCard/ConfirmationStep.tsx	`79.54% <ø> (+79.54%)`	⬆️
.../components/SidePanel/SidePanelContextProvider.tsx	`86.00% <66.66%> (-1.76%)`	⬇️
... and 7 more
... and 304 files with indirect coverage changes

neil-marcellini · 2026-05-29T19:57:20Z

Kicking off an adhoc build to verify this fix. I was able to reproduce something close to the original issue on android.

github-actions · 2026-05-29T19:58:05Z

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

neil-marcellini · 2026-05-29T20:22:28Z

Ah damn, I have to test this on Android dev because the link won't open the Adhoc app

neil-marcellini · 2026-05-29T20:43:03Z

Re-assigning to @mkhutornyi to help me test Android as requested here. I saw @ikevin127 was offline.

mkhutornyi · 2026-05-29T21:39:28Z

Tested this branch on android dev mode.

Original issue (Endless loading) is fixed but I noticed that there's backend bug.

open it in Expensify link's exitTo is workspace admin's workspace chat link instead of member's workspace chat.
So it leads to not found page when open deeplink from member side.
At least app is usable after close it.

android.mov

mkhutornyi · 2026-05-29T21:41:07Z

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
- MacOS: Desktop
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

android.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

android.mov

mkhutornyi

Approving based on #92110 (comment)

melvin-bot · 2026-05-29T21:42:28Z

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

neil-marcellini · 2026-05-29T21:49:08Z

open it in Expensify link's exitTo is workspace admin's workspace chat link instead of member's workspace chat.
So it leads to not found page when open deeplink from member side.

I just tested with the latest dev backend environment and it correctly generates the members workspace chat link. Maybe there's some kind of quirk because you are testing against the staging or production API.

2026-05-29_14-45-27.mp4

github-actions · 2026-05-29T21:54:57Z

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

github-actions · 2026-05-29T22:00:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-e1bf6cefcdf-2a3bd36-40a269528418172bee5b3d5a2c266caf47af33af/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e1bf6ce-2a3bd36-9e99f0778de8f7435ec5b2b63a5e28c767441523/index.html

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

👀 View the workflow run that generated this build 👀

…ker-batch-2 [No QA] Revert "[BATCH 2] Migrate Navigation usage, part 1" (cherry picked from commit e1bf6ce) (cherry-picked to staging by Julesssss)

OSBotify · 2026-05-29T23:30:51Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-29T23:33:35Z

🤖 Help site review: no changes required

This PR reverts an internal navigation refactor (#88538) to restore the prior behavior of the workspace invite deep link for logged-out users.

Why no docs updates are needed:

This is a code-only revert of a navigation migration — no new features, no UI changes, no workflow changes.
The user-facing behavior being restored (clicking the invite link in an invitation email redirects to the workspace chat) is the prior, already-documented behavior, not a new flow.
Files changed are all internal: navigation utilities, action modules (Session, Report, Task), inbox components, and lint config — none of which are described in App/docs/articles.

No draft help site PR has been opened.

@neil-marcellini, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-06-01T10:02:10Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.89-7 🚀

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

OSBotify · 2026-06-01T10:22:53Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-01T10:24:25Z

🤖 Help site review: no documentation changes required.

I reviewed the changes in this PR against the help site articles under docs/articles. This is a code-only revert of #88538 ("[BATCH 2] Migrate Navigation usage, part 1") that fixes the endless-loading regression when a logged-out user clicks a workspace invite link.

The diff is entirely internal and has no documentation impact:

Lint config — config/eslint/eslint.seatbelt.tsv grandfathered entries restored.
Navigation internals — reverted InteractionManager.runAfterInteractions / Navigation usage in Session/Report/Task action modules and several inbox/report components.
Type signatures — onBackButtonPress callback signature reverted (removed the options?: {afterTransition?: () => void} parameter).

There are no new features, settings, tab/label changes, or user-facing behavior changes to document. Reverting simply restores the previously-correct invite deep-link navigation, which the existing help articles already reflect. No draft help site PR was created.

@neil-marcellini, since no help site updates are needed for this change, there's no linked docs PR to review. If you believe a specific article should be updated, let me know which one and I'll take another look.

OSBotify · 2026-06-02T06:05:14Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.90-3 🚀

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

…ion-tracker-batch-2" This reverts commit e1bf6ce, reversing changes made to 39db014.

OSBotify · 2026-06-10T01:01:03Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-10T01:03:11Z

Help site review: no changes required

I reviewed the changes in this PR against the help site files under docs/articles. No documentation updates are needed.

Why: This PR is a code-only revert of #88538 ("[BATCH 2] Migrate Navigation usage, part 1"). All 20 changed files are internal .ts/.tsx modules — navigation libraries, components, hooks, and action modules — plus an ESLint config file. The revert restores the prior navigation behavior so the logged-out invite deep link resolves to the workspace chat instead of getting stuck in an endless loading state.

There are no new or changed user-facing features, settings, tab names, button labels, or workflows. The PR returns behavior to its previously documented state rather than introducing anything new, so no help articles reference or describe any behavior altered by this change.

Because no help site changes are required, I did not create a draft docs PR.

@neil-marcellini, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

(Note: no help site PR was created, as no documentation changes were required for this code-only navigation revert.)

OSBotify · 2026-06-10T19:54:24Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.4-1 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-10T19:57:03Z

🤖 No help site changes required.

This PR reverts #88538 to fix a regression where logged-out users clicking a workspace invite link got stuck in an endless loading state instead of being redirected to the workspace chat.

All changes are internal code only — navigation utilities, Session/Report/Task action modules, and inbox/report components. There are no new features, settings, tabs, button labels, or user-facing behavior changes. The revert simply restores the previously-correct deep-link navigation behavior, which already matches what the help site describes.

Because nothing user-facing changed, no updates to App/docs/articles are needed and no draft docs PR was created.

@neil-marcellini, if you believe a specific help article is affected by this revert, let me know which one and I'll take another look.

OSBotify · 2026-06-10T23:18:31Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.4-3 🚀

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

Revert "Merge pull request #88538 from software-mansion-labs/collecti…

9276965

…oneur/transition-tracker-batch-2" This reverts commit 6768020, reversing changes made to ff4cf19.

neil-marcellini requested review from a team as code owners May 29, 2026 18:59

melvin-bot Bot assigned neil-marcellini May 29, 2026

melvin-bot Bot requested review from ikevin127 and trjExpensify and removed request for a team and trjExpensify May 29, 2026 18:59

melvin-bot Bot removed the request for review from a team May 29, 2026 18:59

chatgpt-codex-connector Bot reviewed May 29, 2026

View reviewed changes

MelvinBot mentioned this pull request May 29, 2026

Stop scroll jump on search filter participant selection #92045

Merged

51 tasks

neil-marcellini added the Ready To Build label May 29, 2026

Update eslint-seatbelt baseline for reverted runAfterInteractions usages

b52fcf9

This comment has been minimized.

Sign in to view

neil-marcellini requested review from mkhutornyi and removed request for ikevin127 May 29, 2026 20:42

mkhutornyi approved these changes May 29, 2026

View reviewed changes

melvin-bot Bot requested a review from marcochavezf May 29, 2026 21:42

luacmartins approved these changes May 29, 2026

View reviewed changes

neil-marcellini merged commit e1bf6ce into main May 29, 2026
47 of 49 checks passed

neil-marcellini deleted the revert-88538-transition-tracker-batch-2 branch May 29, 2026 21:53

neil-marcellini changed the title ~~[No QA] Revert "[BATCH 2] Migrate Navigation usage, part 1"~~ [CP staging] Revert "[BATCH 2] Migrate Navigation usage, part 1" May 29, 2026

github-actions Bot mentioned this pull request May 29, 2026

Investigate workflow job failing on main: test / test (job 7) #92118

Closed

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

OSBotify mentioned this pull request May 29, 2026

Deploy Checklist: New Expensify 2026-05-28 #92014

Closed

73 tasks

neil-marcellini mentioned this pull request May 29, 2026

[Due for payment 2026-06-11] Fix flaky UnreadIndicatorsTest - mark as unread last message deleted #92122

Closed

neil-marcellini mentioned this pull request May 29, 2026

Fix flaky UnreadIndicators mark-as-unread test #92125

Merged

51 tasks

melvin-bot Bot mentioned this pull request Jun 1, 2026

[Due for payment 2026-06-17] [Due for payment 2026-06-09] [Due for payment 2026-06-08] Email- Endless loading instead redirect to the workspace chat when user click invite link #92047

Open

7 tasks

neil-marcellini pushed a commit that referenced this pull request Jun 9, 2026

Revert "Merge pull request #92110 from Expensify/revert-88538-transit…

75ec98a

…ion-tracker-batch-2" This reverts commit e1bf6ce, reversing changes made to 39db014.

OSBotify mentioned this pull request Jun 10, 2026

Deploy Checklist: New Expensify 2026-06-10 #93122

Closed

70 tasks

Conversation

neil-marcellini commented May 29, 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 May 29, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot May 29, 2026

Choose a reason for hiding this comment

Uh oh!

codecov Bot commented May 29, 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!

neil-marcellini commented May 29, 2026

Uh oh!

github-actions Bot commented May 29, 2026

Uh oh!

This comment has been minimized.

neil-marcellini commented May 29, 2026

Uh oh!

neil-marcellini commented May 29, 2026

Uh oh!

mkhutornyi commented May 29, 2026

Uh oh!

mkhutornyi commented May 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mkhutornyi left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented May 29, 2026

Uh oh!

neil-marcellini commented May 29, 2026

Uh oh!

Uh oh!

github-actions Bot commented May 29, 2026

Uh oh!

github-actions Bot commented May 29, 2026

Uh oh!

OSBotify commented May 29, 2026

Uh oh!

MelvinBot commented May 29, 2026

Uh oh!

OSBotify commented Jun 1, 2026

Uh oh!

OSBotify commented Jun 1, 2026

Uh oh!

MelvinBot commented Jun 1, 2026

Uh oh!

OSBotify commented Jun 2, 2026

Uh oh!

OSBotify commented Jun 10, 2026

Uh oh!

MelvinBot commented Jun 10, 2026

Help site review: no changes required

Uh oh!

OSBotify commented Jun 10, 2026

Uh oh!

MelvinBot commented Jun 10, 2026

Uh oh!

OSBotify commented Jun 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

neil-marcellini commented May 29, 2026 •

edited

Loading

codecov Bot commented May 29, 2026 •

edited by github-actions Bot

Loading

mkhutornyi commented May 29, 2026 •

edited

Loading