[CP Staging] fix: Expense - Back button reopens expense after opening expense and tapping View on growl by mhawryluk · Pull Request #102847 · Expensify/App

mhawryluk · 2026-10-02T08:35:44Z

Explanation of Change

On a narrow layout, tapping an expense preview quickly opens the new expense's thread in the RHP, on top of its expense report. Pressing "View" on the "Expense added" growl after that opened the same thread a second time, on top of the RHP. The extra screens stayed in the back stack, so pressing back reopened the expense instead of returning to the LHN.

navigateToCreatedExpense already skips navigation when the user is looking at the expense. That check missed this case because Navigation.getFocusedReportId() reads navigationRef.getState(), which didn't yet include the RHP that had just opened. It returned the expense report behind the RHP, so the check didn't match.

This change passes navigationRef.getRootState() instead. The check now finds the thread in the RHP, and "View" does nothing because the user is already on that expense.

Fixed Issues

$ #102833
PROPOSAL: N/A

Tests

Go to workspace chat.
Create an expense.
Go back to LHN.
Create an expense and submit it to workspace chat from FAB.
Quickly tap on the expense preview.
Tap View on the growl.
Verify it doesn't do anything but closing the growl.
Tap app back button three times.
Verify the expense is not reopened, we correctly navigate back to LHN.

Offline tests

N/A

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Nagranie.z.ekranu.2026-10-2.o.10.28.57.mov

…tapping View on growl

melvin-bot · 2026-10-02T08:38:25Z

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

JmillsExpensify

Product experience LGTM

situchan · 2026-10-02T12:23:54Z

        : false;
-    const focusedReportID = Navigation.getFocusedReportId();
+    // getState() can miss a just-opened RHP's nested state, so read the full tree.
+    const focusedReportID = Navigation.getFocusedReportId(navigationRef.getRootState());


@MelvinBot find possible regressions from this change

situchan · 2026-10-02T12:34:25Z

Maybe this is not bug (at least not blocker)

Go to workspace chat
Create an expense A
Go back to LHN
Create an expense B and submit it to workspace chat from FAB
Quickly tap expense A (not B, this is different step from OP) on the expense preview
Tap View on the growl
Tap app back button 3 times
App returns to the expense A

Screen.Recording.2026-10-02.at.3.29.14.PM.mov

situchan

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

Android: HybridApp

Screen.Recording.2026-10-02.at.3.26.35.PM.mov

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

MelvinBot · 2026-10-02T12:53:15Z

I found no likely regressions. The change only affects the early-return check in navigateToCreatedExpense. Every navigation branch after it is unchanged.

Why the risk is low

In @react-navigation/core 7.21.12, getRootState() reads the live state of the mounted navigators. getState() returns the container's synced copy, which can lag. The new call is never staler than the old one.
navigateToCreatedExpense.ts:55 already calls isReportOpenInRHP(navigationRef.getRootState()). Now both checks in the function read the same state.

Behavior changes worth a QA pass

Back, then quickly "View": if you close the RHP and press "View" right away, it now opens the expense. Before, the stale state could still show the RHP, so "View" did nothing. This is a fix.
Non-report page on top of the thread: getFocusedReportParams.ts:52 picks the last report screen in the RHP. It ignores any edit page above it. So if you open an edit page (for example, amount) over the thread, "View" does nothing. This already happened once the state synced, so it isn't new.

Gap the PR doesn't cover (not a regression)

ExpenseAddedGrowl.tsx:116 still calls getFocusedReportId() with getState() to decide whether to show the growl. In the same race, the growl can still appear for an expense you've already opened. Consider passing navigationRef.getRootState() there too.

Web test results (wide layout): ⚠️ partial

Step	Status
Create an expense from the FAB, press "View" on the growl, and the expense opens The growl appeared. "View" opened the new $15.00 expense.	✅
Open the new expense yourself, then press "View", and nothing new opens Not tested. The growl closes after 6 seconds, before the tester could press "View". The PR's new unit test covers this case.	⚠️
With an older expense open in the RHP, press "View" for a new expense, and the new expense replaces it Not tested. While a report was open, the tester couldn't create an expense that showed the growl.	⚠️

I couldn't run Jest in this environment, so I didn't run the PR's unit test locally. In 7 create-and-"View" cycles, the tester saw no stacked RHPs and no wrong destinations.

view run · view recording

mhawryluk · 2026-10-02T13:08:29Z

Maybe this is not bug (at least not blocker)

Go to workspace chat

Create an expense A

Go back to LHN

Create an expense B and submit it to workspace chat from FAB

Quickly tap expense A (not B, this is different step from OP) on the expense preview

Tap View on the growl

Tap app back button 3 times

App returns to the expense A

yeah, I think it's a slightly different case and I'm pretty sure this PR will fix it: #102854 I'll check it

mhawryluk · 2026-10-02T13:12:18Z

Maybe this is not bug (at least not blocker)

Go to workspace chat

Create an expense A

Go back to LHN

Create an expense B and submit it to workspace chat from FAB

Quickly tap expense A (not B, this is different step from OP) on the expense preview

Tap View on the growl

Tap app back button 3 times

App returns to the expense A

yeah, I think it's a slightly different case and I'm pretty sure this PR will fix it: #102854 I'll check it

yes, on that branch it's like this:

Nagranie.z.ekranu.2026-10-2.o.15.08.54.mov

so the previous report is replaced and we don't go back to A

btw it also in a way fixes the issue for this PR, but I think this PR is still nice to have, it's better to not do anything when we're already on the expense, instead of scheduling the navigation to replace it with itself

MelvinBot · 2026-10-02T13:21:17Z

I found no regressions caused by this PR. The back-stack problem in situchan's steps (tap expense A, then "View" for expense B) already happens on main. This PR doesn't cause or fix it.

Why this PR is safe

This change can only skip navigation when the focused report is thread B, or the IOU report when it has one transaction. In situchan's flow, neither the old nor the new state source returns either one, so "View" navigates the same way as before.
getRootState() builds the live navigation tree, while getState() is the container's synced copy, which can lag. A navigator that isn't mounted yet has no state, so it can only cause a missed match, never a false one. I found no case where "View" now wrongly does nothing.

What causes the back-stack problem in situchan's steps (already on main)

On narrow layout, tapping expense A pushes the expense report as a central screen, then opens thread A in the RHP (MoneyRequestReportPreview/index.tsx:286-294).
"View" for B calls REPORT_WITH_ID with forceReplace: true (navigateToCreatedExpense.ts:66).
linkTo sets the action to REPLACE, but then changes it to PUSH whenever the RHP is on top and the target is the tab navigator (linkTo/index.ts:222-251). The stack becomes tab navigator → RHP with thread A → new tab navigator with thread B.
Each back press then moves within the new tab: thread B → expense report → chat. Then that tab pops, and the RHP with thread A reappears.

Fix idea for a follow-up
On narrow layout, close the RHP before opening thread B, and don't reuse thread A's backTo. Just honoring forceReplace isn't enough: back would then land on the expense report, not the LHN.

Testing

The web tester couldn't run the PR's steps or situchan's steps at mobile width. The growl closes after 6 seconds, which wasn't enough time for both taps.
A web test at desktop width in the earlier run confirmed that "View" still opens a newly created expense.
The steps above come from reading the code at 073b8f9, not from a live run. To confirm, log navigationRef.getRootState().routes.map((r) => r.name) after pressing "View". It should show the tab navigator, the RHP, then a second tab navigator.

view run · view recording

mountiny

Thanks for a quick follow up

…wl-view-when-opened [CP Staging] fix: Expense - Back button reopens expense after opening expense and tapping View on growl (cherry picked from commit ff25286) (cherry-picked to staging by mountiny)

OSBotify · 2026-10-02T13:46:52Z

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

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

MelvinBot · 2026-10-02T13:50:46Z

No help site update is needed. This bug fix stops "View" on the "Expense added" message from reopening an expense you're already viewing, and no article under docs/articles mentions that message.

view run

github-actions · 2026-10-02T13:54:18Z

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

github-actions · 2026-10-02T13:59:38Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ff25286-b3f41e8-80aefeb2b7a6febf14d9b4bd79a0a0384188c7a3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ff25286-b3f41e8-be2201bb5abe50144cbb7881b0eac9bbf93324ae/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-05T00:04:22Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.5.1-9 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-10-05T00:21:53Z

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

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

MelvinBot · 2026-10-05T00:25:49Z

No help site update needed. This PR fixes a navigation bug so the back button returns to the inbox as users already expect, and no existing article describes this behavior.

view run

OSBotify · 2026-10-05T23:15:31Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.5.2-4 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

fix: Expense - Back button reopens expense after opening expense and …

073b8f9

…tapping View on growl

melvin-bot Bot assigned mhawryluk Oct 2, 2026

mhawryluk marked this pull request as ready for review October 2, 2026 08:38

mhawryluk requested review from a team as code owners October 2, 2026 08:38

melvin-bot Bot requested review from JmillsExpensify and situchan and removed request for a team October 2, 2026 08:38

melvin-bot Bot removed the request for review from a team October 2, 2026 08:38

mhawryluk mentioned this pull request Oct 2, 2026

Confirm new expenses with a “View” toast instead of scrolling to and highlighting the row v2 #100015

Merged

43 tasks done

JmillsExpensify approved these changes Oct 2, 2026

View reviewed changes

situchan reviewed Oct 2, 2026

View reviewed changes

situchan approved these changes Oct 2, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny October 2, 2026 12:35

mountiny changed the title ~~fix: Expense - Back button reopens expense after opening expense and tapping View on growl~~ [CP Staging] fix: Expense - Back button reopens expense after opening expense and tapping View on growl Oct 2, 2026

mountiny approved these changes Oct 2, 2026

View reviewed changes

mountiny merged commit ff25286 into Expensify:main Oct 2, 2026
42 of 45 checks passed

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

OSBotify mentioned this pull request Oct 2, 2026

Deploy Checklist: New Expensify 2026-10-01 #102818

Closed

73 tasks done

melvin-bot Bot mentioned this pull request Oct 5, 2026

[Due for payment 2026-10-12] Expense - Back button reopens expense after opening expense and tapping View on growl #102833

Closed

1 of 7 tasks

MelvinBot mentioned this pull request Oct 23, 2026

[Due for payment 2026-10-31] Confirm new expenses with a “View” toast on Spend instead of scrolling to and highlighting the row #91408

Closed

Conversation

mhawryluk commented Oct 2, 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 2, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

situchan Oct 2, 2026

Choose a reason for hiding this comment

Uh oh!

situchan commented Oct 2, 2026

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

mhawryluk commented Oct 2, 2026

Uh oh!

mhawryluk commented Oct 2, 2026

Uh oh!

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

Uh oh!

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Oct 2, 2026

Uh oh!

MelvinBot commented Oct 2, 2026

Uh oh!

github-actions Bot commented Oct 2, 2026

Uh oh!

github-actions Bot commented Oct 2, 2026

Uh oh!

OSBotify commented Oct 5, 2026

Uh oh!

OSBotify commented Oct 5, 2026

Uh oh!

MelvinBot commented Oct 5, 2026

Uh oh!

OSBotify commented Oct 5, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mhawryluk commented Oct 2, 2026 •

edited

Loading

MelvinBot commented Oct 2, 2026 •

edited

Loading

MelvinBot commented Oct 2, 2026 •

edited

Loading