[CP Stg] fixed proper navigations after creating reports by mukhrr · Pull Request #90928 · Expensify/App

mukhrr · 2026-05-18T05:24:10Z

Explanation of Change

Fixed Issues

Tests

#90852:
1.Sign in with a brand-new account that has no workspace.(e.g. use Something else option)
2.From the FAB and from the Reports/Expenses page, verify the Create report option is visible.
3.Click Create report.
4.Tap Upgrade, then Got it, thanks on the confirmation step.
5.Press back from the report and verify

Verify you return to the originating screen, not the upgrade step

#90854:
1.Create a new account.
2.Create a new workspace.
3.Go to Spend > Reports.
4.Click Create report.
→ New report opens in RHP on Spend tab.
5.Delete the report.
6.Delete the workspace.
7.Go to Spend > Reports.
8.Click Create report.
9.Click Upgrade > Confirm > Got it, thanks.

Verify new report will open in RHP on Spend tab.
Verify that no errors appear in the JS console

Offline tests

QA Steps

The same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_app.mp4

Android: mWeb Chrome

android_web.mp4

iOS: Native

IOS_app.mp4

iOS: mWeb Safari

ios_web.mp4

MacOS: Chrome / Safari

web.mp4

melvin-bot · 2026-05-18T05:24:16Z

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

codecov · 2026-05-18T05:31:46Z

Codecov Report

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

Files with missing lines	Coverage Δ
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <0.00%> (ø)`
... and 25 files with indirect coverage changes

aimane-chnaif · 2026-05-18T22:17:32Z

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

android1.mov

android2.mov

Android: mWeb Chrome

iOS: HybridApp

ios1.mov

ios2.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web1.mov

web2.mov

aimane-chnaif · 2026-05-18T22:46:00Z

+                    if (isSearchTopmostFullScreenRoute()) {
+                        // Spend/Search tab: replace the upgrade screen within the RHP (same navigator,
+                        // so forceReplace holds). Back returns to Spend > Reports.
+                        Navigation.setNavigationActionToMicrotaskQueue(() => {
+                            Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT.getRoute({reportID: newReportID}), {forceReplace: true});
+                        });
+                    } else {
+                        // Elsewhere (e.g. FAB): dismiss the upgrade RHP first, then open in Inbox,
+                        // so back doesn't return to the upgrade step.
+                        Navigation.dismissModalWithReport({reportID: newReportID});


@MelvinBot is this existing pattern throughout the app?

Yes — this is a well-established pattern throughout the app. isSearchTopmostFullScreenRoute() is used in 20+ files to branch navigation based on whether the user is in Search/Spend context vs elsewhere.

The closest analogues to this exact usage (report creation → navigate to the new report) are:

NewReportWorkspaceSelectionPage.tsx:98 — same ternary: isSearchTopmostFullScreenRoute() ? SEARCH_MONEY_REQUEST_REPORT : REPORT_WITH_ID

CreateReportMenuItem.tsx:89 — identical branching for FAB "Create report"

SearchActionsBarCreateButton.tsx:89 — same pattern from the Search actions bar

@MelvinBot ok but what about dismissModalWithReport?
3 instances you provided doesn't have this pattern.

@MelvinBot bump

MelvinBot · 2026-05-18T22:46:54Z

PR Review

Summary: This PR fixes two navigation regressions in the upgrade flow for report creation (IOURequestStepUpgrade). The single-file change at IOURequestStepUpgrade.tsx:200-214 replaces a one-size-fits-all Navigation.navigate with context-aware routing:

Spend/Search tab → navigates to SEARCH_MONEY_REQUEST_REPORT (RHP), so the report opens where the user started (fixes [Due for payment 2026-05-26] [Due for payment 2026-05-26] Expense - New report opens on Inbox when created via upgrade flow on Spend tab #90854)
Elsewhere (e.g. FAB) → uses dismissModalWithReport to dismiss the upgrade RHP first, so back doesn't return to the upgrade step (fixes [Due for payment 2026-05-26] [Due for payment 2026-05-26] Report - Back button return the user to Upgrade page #90852)

Verdict: Looks good. The approach is sound — using isSearchTopmostFullScreenRoute() to branch navigation is the right pattern here and is consistent with how the codebase already distinguishes Search context from other contexts.

Minor observations (non-blocking)

The createReportForCurrentUser dependency was already present; the new isSearchTopmostFullScreenRoute import is a lightweight synchronous check against nav state — no new hooks or side effects introduced.
The forceReplace: true option on the Search path correctly prevents the upgrade screen from remaining in the RHP history stack.
dismissModalWithReport on the non-Search path handles both dismissing the modal and opening the report in a single atomic navigation action, which avoids the flickering that separate dismiss+navigate calls can cause.

chatgpt-codex-connector · 2026-05-18T22:48:37Z

Codex Review: Didn't find any major issues. 🎉

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

MelvinBot · 2026-05-18T23:00:55Z

dismissModalWithReport is a well-established pattern in this codebase — it's used in 20+ call sites. Here are some examples that follow the same pattern as this PR (dismiss a modal/RHP and then open a report):

Report/index.ts:4319 — after navigating to a policy report
Split.ts:757 — after creating a split chat report
NewChatPage/index.tsx:293 — after selecting a chat option
submitDismissStrategies.ts:34 — in IOU submission flow
TaskAssigneeSelectorModal.tsx:91 — task assignee selection

The 3 non-blocking observations in my earlier comment were about the overall change (import, forceReplace, and dismissModalWithReport), not 3 alternative patterns. Apologies if that was unclear — the use of dismissModalWithReport here is consistent with the rest of the codebase.

marcaaron

LGTM

github-actions · 2026-05-18T23:42:19Z

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

[CP Stg] fixed proper navigations after creating reports (cherry picked from commit d25c9f9) (cherry-picked to staging by marcaaron)

github-actions · 2026-05-18T23:46:30Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d25c9f9-f767e6f-798df4196d897ecf93ec8d7a3bab7537e0a7cf7b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d25c9f9-f767e6f-06152786a0af561bc743968d167c55d98338b292/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-18T23:50:58Z

✋ 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-05-19T00:11:34Z

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 9.3.75-13 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T00:14:13Z

No help site changes required. This PR is a navigation bug fix only — it corrects which screen the app routes to after report creation in the upgrade flow (back button behavior + correct tab). No user-facing features, button labels, workflows, or documented steps were added or changed. The existing help articles under docs/articles don't document internal navigation behavior at this level of detail.

OSBotify · 2026-05-19T07:29:58Z

🚀 Cherry-picked to staging by https://github.com/marcaaron in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T07:31:19Z

No help site changes are required for this PR.

The changes are limited to internal navigation logic in IOURequestStepUpgrade.tsx — fixing how the app routes users after upgrading to create a report (handling the Spend/Search tab vs FAB differently). No user-facing features, labels, workflows, or terminology were added or modified.

OSBotify · 2026-05-19T08:03:27Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.75-14 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-05-19T08:10:29Z

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

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

OSBotify · 2026-05-19T22:02:51Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.77-3 🚀

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

fixed proper navigations after creating reports

669d6d4

mukhrr requested review from a team as code owners May 18, 2026 05:24

melvin-bot Bot assigned mukhrr May 18, 2026

melvin-bot Bot requested review from JmillsExpensify and eVoloshchak and removed request for a team May 18, 2026 05:24

mukhrr mentioned this pull request May 18, 2026

Reports - Workspace does not become default workspace after selecting it from Create button #84139

Open

7 tasks

roryabraham changed the title ~~fixed proper navigations after creating reports • create report deploy blocker fixes~~ [CP Stg] fixed proper navigations after creating reports May 18, 2026

roryabraham requested review from aimane-chnaif and removed request for JmillsExpensify and eVoloshchak May 18, 2026 22:14

aimane-chnaif reviewed May 18, 2026

View reviewed changes

aimane-chnaif approved these changes May 18, 2026

View reviewed changes

melvin-bot Bot requested a review from marcaaron May 18, 2026 23:02

roryabraham approved these changes May 18, 2026

View reviewed changes

marcaaron approved these changes May 18, 2026

View reviewed changes

marcaaron merged commit d25c9f9 into Expensify:main May 18, 2026
75 checks passed

OSBotify pushed a commit that referenced this pull request May 18, 2026

Merge pull request #90928 from mukhrr/fix/create-report-regressions

a5ab13b

[CP Stg] fixed proper navigations after creating reports (cherry picked from commit d25c9f9) (cherry-picked to staging by marcaaron)

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

OSBotify mentioned this pull request May 18, 2026

Deploy Checklist: New Expensify 2026-05-15 #90795

Closed

aimane-chnaif mentioned this pull request May 21, 2026

Reapply: Show Create Report CTA for users without a workspace #88374

Merged

53 tasks

Conversation

mukhrr commented May 18, 2026 • edited by roryabraham 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 18, 2026

Uh oh!

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

aimane-chnaif commented May 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif May 18, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif May 18, 2026

Choose a reason for hiding this comment

Uh oh!

marcaaron May 18, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented May 18, 2026

PR Review

Uh oh!

chatgpt-codex-connector Bot commented May 18, 2026

Uh oh!

MelvinBot commented May 18, 2026

Uh oh!

marcaaron left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

OSBotify commented May 18, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mukhrr commented May 18, 2026 •

edited by roryabraham

Loading

codecov Bot commented May 18, 2026 •

edited by github-actions Bot

Loading

aimane-chnaif commented May 18, 2026 •

edited

Loading

MelvinBot May 18, 2026 •

edited

Loading