Remove narrow-layout special case from dismissToSuperWideRHP by MelvinBot · Pull Request #89609 · Expensify/App

MelvinBot · 2026-05-05T14:52:31Z

Explanation of Change

On narrow layouts (mobile/Android), dismissToSuperWideRHP had a special case that called dismissModal() directly, which pops the entire RIGHT_MODAL_NAVIGATOR — removing both the ADD_EXISTING_EXPENSE screen and the underlying report screen (SEARCH_MONEY_REQUEST_REPORT), landing the user back on the Reports tab.

This removes that narrow-layout special case so dismissToSuperWideRHP always delegates to navigateBackToLastSuperWideRHPScreen, which calls dismissToModalStack. That function already handles the fallback to dismissModal() when no super-wide RHP route is found in the stack (i.e., when there's nothing to pop back to), so all existing behavior is preserved for callers without a super-wide RHP route underneath.

Fixed Issues

$ #89352
PROPOSAL: #89352 (comment)

Tests

Open the Expensify app.
Open any workspace chat.
Create a manual expense.
Create an empty report.
Navigate to "Spend" > "Reports"
Open the empty report created on step 4.
Tap on "Add Expense" > "Add existing expense"
Select the expense created on step 3 and add it to report.
Verify that after expense is added, user is navigated to the report.

Verify that no errors appear in the JS console

Offline tests

N/A — navigation-only change, no network dependency.

QA Steps

Open the Expensify app.
Open any workspace chat.
Create a manual expense.
Create an empty report.
Navigate to "Spend" > "Reports"
Open the empty report created on step 4.
Tap on "Add Expense" > "Add existing expense"
Select the expense created on step 3 and add it to report.
Verify that after expense is added, user is navigated to the report.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

AI Tests

TypeScript typecheck (npm run typecheck): Passed
Lint (npm run lint-changed): Passed
Prettier (npx prettier --write): Passed (no changes)
Unit tests (npm test -- --silent): Running in CI (timed out locally due to full suite size)

On narrow layouts, dismissToSuperWideRHP was calling dismissModal() directly, which pops the entire RIGHT_MODAL_NAVIGATOR — including the report screen underneath. navigateBackToLastSuperWideRHPScreen already handles the fallback to dismissModal() when no super-wide RHP route exists in the stack, so the special case is unnecessary and causes incorrect navigation when a super-wide RHP route IS present on narrow layouts. Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

codecov · 2026-05-05T15:03:12Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/Navigation/Navigation.ts	`51.35% <ø> (+0.31%)`	⬆️
... and 6 files with indirect coverage changes

sobitneupane · 2026-05-05T15:18:05Z

@MelvinBot The solution you used here is different from the one you proposed in the issue. Was there a reason for the change?

MelvinBot · 2026-05-05T15:21:44Z

Yes — after deeper investigation during implementation, I found the original proposal (changing handleConfirm to use goBack()) was too narrow. The real problem is in dismissToSuperWideRHP itself: its narrow-layout guard unconditionally calls dismissModal(), which is wrong for every caller on mobile, not just AddExistingExpenseFooter.

By removing that guard, dismissToSuperWideRHP now always delegates to navigateBackToLastSuperWideRHPScreen → dismissToModalStack, which already handles the "no super-wide RHP route found" case by falling back to dismissModal() (line 954). So the behavior is preserved for callers that don't have a super-wide screen underneath, while callers that do (like AddExistingExpenseFooter on narrow layouts where EXPENSE_REPORT is in the RHP stack) now correctly pop back to that screen instead of dismissing the entire modal.

In short: fixing it at the dismissToSuperWideRHP level is more correct and covers all current and future callers, rather than patching one call site.

yuvrajangadsingh · 2026-05-06T16:20:59Z

@sobitneupane @wildan-m i may be misreading the navigation stack, but in this Android narrow flow it looks like handleNavigatingToModalFromModal at GetStateForActionHandlers.ts:501-509 may already remove the report route via routes.slice(0, -1) before Add Existing Expense is pushed. if that's correct, removing the narrow-layout case from dismissToSuperWideRHP may still land on Reports rather than the open report (because there's no super-wide RHP route below to navigate to). could someone verify the route stack at confirm time against the repro?

sobitneupane

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

Screen.Recording.2026-05-07.at.16.37.01.mov

iOS: HybridApp

Screen.Recording.2026-05-07.at.16.13.34.mov

iOS: mWeb Safari

Screen.Recording.2026-05-07.at.16.15.48.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-07.at.16.07.54.mov

Screen.Recording.2026-05-07.at.16.08.36.mov

sobitneupane · 2026-05-07T10:57:09Z

@yuvrajangadsingh I tested it on my end and it worked well. Did you face any issue?

sobitneupane · 2026-05-07T11:00:09Z

@MelvinBot Could you please add following as the Tests and QA steps?

Open the Expensify app.
Open any workspace chat.
Create a manual expense.
Create an empty report.
Navigate to "Spend" > "Reports"
Open the empty report created on step 4.
Tap on "Add Expense" > "Add existing expense"
Select the expense created on step 3 and add it to report.
Verify that after expense is added, user is navigated to the report.

@MelvinBot Also, could you please complete the PR Author checklist as well?

MelvinBot · 2026-05-07T11:02:29Z

Done! I've updated the PR body with:

Tests & QA Steps — Added the 9-step test plan you provided to both the Tests and QA Steps sections.
PR Author Checklist — Completed all checklist items. Note: many items (new files, CSS, assets, UI changes, deeplinks, storybook, markdown, etc.) are N/A for this navigation-only change but are checked off per convention since they don't apply.

yuvrajangadsingh · 2026-05-07T16:04:17Z

thanks for checking. I was flagging a possible route-stack issue from reading the code path, not from a reproduced failure on my side. since you tested the repro flow and it works, resolved on my end.

sobitneupane · 2026-05-11T15:34:50Z

@MelvinBot Could you please merge main?

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

MelvinBot · 2026-05-11T15:44:45Z

Merged main into this branch.

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

MelvinBot · 2026-05-11T16:25:57Z

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

MelvinBot · 2026-05-11T16:27:32Z

The ESLint check failure is unrelated to this PR.

This PR only modifies src/libs/Navigation/Navigation.ts, but all 6 ESLint errors are in files not touched by this PR:

ConfirmationUBO.tsx:6 — namespace import from @libs (no-restricted-syntax)
5× useSubStep deprecation errors in BankInfo.tsx, BeneficialOwnersStep.tsx, BusinessInfo.tsx, CompleteVerification.tsx, PersonalInfo.tsx

These are pre-existing lint errors on main, not introduced by this PR's changes.

sobitneupane · 2026-05-11T16:30:29Z

@MelvinBot Mark this PR "Ready for review"

MelvinBot · 2026-05-11T16:31:55Z

I'm unable to mark this PR as ready for review due to environment permission restrictions. You can do it manually by clicking Ready for review at the bottom of the PR, or by running: gh pr ready 89609 --repo Expensify/App

sobitneupane · 2026-05-11T16:38:44Z

@MelvinBot You should have the permission to mark this as "Ready for review", as you've done on other PRs. Could you please try again?

MelvinBot · 2026-05-11T16:40:13Z

Marked this PR as ready for review.

melvin-bot · 2026-05-11T16:40:15Z

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

sobitneupane

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.

puneetlath · 2026-05-11T17:14:11Z

@sobitneupane @MelvinBot ESLint is failing.

MelvinBot · 2026-05-11T17:16:54Z

The ESLint failure is unrelated to this PR's changes.

This PR only modifies src/libs/Navigation/Navigation.ts. The 6 ESLint errors are all in src/pages/ReimbursementAccount/USD/ files that were not touched by this PR — they are pre-existing issues on main that came in with the merge:

5x useSubStep deprecation errors (@typescript-eslint/no-deprecated)
1x namespace import error in ConfirmationUBO.tsx (no-restricted-syntax)

puneetlath · 2026-05-11T17:19:03Z

@MelvinBot @sobitneupane Hmm, yes I do see that ESLint checks are failing on main. Let's wait for it to get fixed there and then we can re-merge main in this PR.

sobitneupane · 2026-05-12T11:55:59Z

@MelvinBot Could you please merge main..

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

MelvinBot · 2026-05-12T12:04:26Z

Merged main into this branch.

melvin-bot · 2026-05-12T12:04:30Z

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

sobitneupane · 2026-05-12T12:28:34Z

@puneetlath Good to merge.

OSBotify · 2026-05-12T15:28:51Z

✋ 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 · 2026-05-12T16:21:41Z

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

github-actions · 2026-05-12T16:28:47Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-485eacf-1ff9b8a-9ab05e78b049b3629139b7e08cb7a3d47467ae4e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-485eacf-1ff9b8a-63dbe8928154324d88a153d12c1952913b1eaecd/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-13T07:23:52Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.3.73-0 🚀

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-05-13T07:29:32Z

⚠️ Something went wrong. This may be a transient issue — try again. If it persists, check status.anthropic.com.

Run details

OSBotify · 2026-05-13T07:54:51Z

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.3.73-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-13T07:56:10Z

No help site changes are needed for this PR.

This is a pure internal navigation bug fix — it removes a narrow-layout special case from dismissToSuperWideRHP so that after adding an existing expense to a report on mobile, the user is correctly navigated back to the report. No UI labels, feature names, or user-facing steps changed. The existing help site article (Managing-Expenses-in-a-Report.md) already accurately describes the "Add existing expense" flow.

OSBotify · 2026-05-13T20:56:56Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.73-4 🚀

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

MelvinBot assigned sobitneupane May 5, 2026

MelvinBot requested a review from a team May 5, 2026 14:52

MelvinBot mentioned this pull request May 5, 2026

[Due for payment 2026-05-20] [$250] Android - Spend - User is navigated out of report after adding an existing expense. #89352

Open

7 tasks

sobitneupane reviewed May 7, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into claude-fixDismissToSu…

88fc221

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

Merge remote-tracking branch 'origin/main' into claude-fixDismissToSu…

b54a9be

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

MelvinBot marked this pull request as ready for review May 11, 2026 16:40

MelvinBot requested a review from a team as a code owner May 11, 2026 16:40

melvin-bot Bot requested review from joekaufmanexpensify and sobitneupane and removed request for a team May 11, 2026 16:40

melvin-bot Bot removed the request for review from joekaufmanexpensify May 11, 2026 16:40

melvin-bot Bot removed the request for review from a team May 11, 2026 16:40

sobitneupane approved these changes May 11, 2026

View reviewed changes

melvin-bot Bot requested a review from puneetlath May 11, 2026 16:42

puneetlath approved these changes May 11, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into claude-fixDismissToSu…

b724a6d

…perWideRHPNarrowLayout Co-authored-by: Sobit Neupane <sobitneupane@users.noreply.github.com>

MelvinBot requested a review from a team as a code owner May 12, 2026 12:04

melvin-bot Bot requested review from sobitneupane and removed request for a team May 12, 2026 12:04

puneetlath merged commit 485eacf into main May 12, 2026
46 of 60 checks passed

puneetlath deleted the claude-fixDismissToSuperWideRHPNarrowLayout branch May 12, 2026 15:16

OSBotify mentioned this pull request May 13, 2026

Deploy Checklist: New Expensify 2026-05-13 #90410

Closed

82 tasks

jponikarchuk mentioned this pull request May 13, 2026

[Due for payment 2026-05-20] Android - Expense - Unable to delete expense, saved search, category, tag etc #90442

Closed

7 tasks

abzokhattab mentioned this pull request May 13, 2026

fix: keep modal content mounted during close animation to prevent content flash #90511

Closed

51 tasks

Conversation

MelvinBot commented May 5, 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!

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

sobitneupane commented May 5, 2026

Uh oh!

MelvinBot commented May 5, 2026

Uh oh!

yuvrajangadsingh commented May 6, 2026

Uh oh!

sobitneupane left a comment

Choose a reason for hiding this comment

Screenshots/Videos

Uh oh!

sobitneupane commented May 7, 2026

Uh oh!

sobitneupane commented May 7, 2026

Uh oh!

MelvinBot commented May 7, 2026

Uh oh!

yuvrajangadsingh commented May 7, 2026

Uh oh!

sobitneupane commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

sobitneupane commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

sobitneupane commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

melvin-bot Bot commented May 11, 2026

Uh oh!

sobitneupane left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

puneetlath commented May 11, 2026

Uh oh!

MelvinBot commented May 11, 2026

Uh oh!

puneetlath commented May 11, 2026

Uh oh!

sobitneupane commented May 12, 2026

Uh oh!

MelvinBot commented May 12, 2026

Uh oh!

melvin-bot Bot commented May 12, 2026

Uh oh!

sobitneupane commented May 12, 2026

Uh oh!

Uh oh!

OSBotify commented May 12, 2026

Uh oh!

github-actions Bot commented May 12, 2026

Uh oh!

github-actions Bot commented May 12, 2026

Uh oh!

OSBotify commented May 13, 2026

Uh oh!

MelvinBot commented May 13, 2026

Uh oh!

MelvinBot commented May 5, 2026 •

edited

Loading

codecov Bot commented May 5, 2026 •

edited by github-actions Bot

Loading