fix: After switching from Time to Manual and creating manual expense, expense report opens by Eskalifer1 · Pull Request #85760 · Expensify/App

Eskalifer1 · 2026-03-19T10:59:55Z

Explanation of Change

When a user returned from creating a time expense (from the confirmation page) to the Manual tab and created a manual expense within an empty report, the user was redirected to the report. This PR fixes that bug. The reason was that the Time tab did not pass the backToReport parameter along, nor did it handle the return from the confirmation page, causing this parameter to be lost

Fixed Issues

$#81561
PROPOSAL:#81561 (comment)

Tests

Precondition:

Time tracking is enabled.

Go to workspace chat.
Create an empty report.
On the report preview, click Add expense > Create expense.
Go to Time tab.
Enter amount > Next.
Click RHP back button.
Switch to Manual tab.
Complete the flow of creating a manual expense.
Ensure you stay in workspace chat.

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

81561-android-native.mp4

Android: mWeb Chrome

81561-android-web.mp4

iOS: Native

81561-ios-native.mp4

iOS: mWeb Safari

81561-ios-web.mp4

MacOS: Chrome / Safari

81561-web.mp4

… expense report opens

melvin-bot · 2026-03-19T11:00:03Z

@aimane-chnaif 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]

trjExpensify

Makes sense to be consistent. 👍

aimane-chnaif · 2026-03-20T16:17:06Z

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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-20.at.4.22.06.pm.mov

MelvinBot · 2026-03-20T16:21:25Z

🤖 MelvinBot Code Review — PR #85760

Summary

This PR fixes a bug where navigating back from the Time tab's confirmation page to the Manual tab caused the backToReport parameter to be lost, resulting in an incorrect redirect to the expense report instead of staying in the workspace chat. The fix addresses three interrelated issues as outlined in the approved proposal.

Changes Review

1. src/ROUTES.ts — Route restructuring ✅

The backToReport parameter is removed from individual tab route patterns (e.g., distance/:backToReport? → distance) and instead placed before the tab name in the getRoute URL construction. This means backToReport is now parsed as part of the parent MONEY_REQUEST_CREATE route (:action/:iouType/start/:transactionID/:reportID/:backToReport?) rather than being duplicated in each tab. This is the key architectural fix — when switching between tabs, backToReport is preserved because it lives in the parent route's params rather than each tab's params.

The conditional backToReport ? \/${backToReport}` : ''is also cleaner than the oldbackToReport ?? ''` which could produce empty URL segments.

2. src/libs/IOUUtils.ts — navigateToStartMoneyRequestStep ✅

Adds backToReport as an optional 6th parameter and forwards it to all getRoute calls in the switch statement. This ensures the back button from the confirmation page preserves backToReport when navigating back to the start step. The DISTANCE_REQUEST routes already accept backToReport in their getRoute signatures, so passing it is safe.

3. src/libs/Navigation/types.ts ✅

Adds backToReport?: string to STEP_HOURS and STEP_HOURS_EDIT param types, enabling TypeScript-safe destructuring of the parameter.

4. src/pages/iou/request/step/IOURequestStepConfirmation.tsx ✅

Passes backToReport as the 6th argument to navigateToStartMoneyRequestStep. The useCallback dependency array is correctly updated to include backToReport.

5. src/pages/iou/request/step/IOURequestStepHours.tsx ✅

Destructures backToReport from route params and passes it to navigateToConfirmationPage in both call sites (the microtask-queued navigation and the direct call). Previously both passed undefined, losing the parameter.

CI Status

checklist — Reviewer checklist not yet completed (expected, not a blocker).
test (job 8) — Failing tests are in canEditFieldOfMoneyRequestTest.ts (field editability permissions for move expense scenarios). These are unrelated to this PR's navigation/routing changes — likely a pre-existing or separately introduced issue on main.

Verdict

Clean, focused fix that matches the approved proposal. The route restructuring correctly moves backToReport to the parent route level so it survives tab switches. No concerns found.

aimane-chnaif · 2026-03-20T16:28:46Z

@Eskalifer1 please pull main to fix tests

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 56ac4951c7

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

chatgpt-codex-connector · 2026-03-20T16:46:52Z

src/ROUTES.ts

    MONEY_REQUEST_CREATE_TAB_MANUAL: {
-        route: 'manual/:backToReport?',
+        route: 'manual',
        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backToReport?: string) =>
-            `${action as string}/${iouType as string}/start/${transactionID}/${reportID}/manual/${backToReport ?? ''}` as const,
+            `${action as string}/${iouType as string}/start/${transactionID}/${reportID}${backToReport ? `/${backToReport}` : ''}/manual` as const,


Keep the previous create-expense tab path as an alias

This moves backToReport from the tab suffix to the parent segment (.../manual/<backToReport> → .../<backToReport>/manual, and similarly for the other tabs), but there is no migration in src/libs/Navigation/helpers/getMatchingNewRoute.ts or src/libs/Navigation/linkingConfig/OldRoutes.ts. src/libs/Navigation/NavigationRoot.tsx restores lastVisitedPath on startup, so any in-progress create-expense flow saved by the previous build will stop restoring after this deploy; the same applies to browser history/deep links that still use the old tab URLs.

Useful? React with 👍 / 👎.

codecov · 2026-03-20T18:57:50Z

Codecov Report

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

Files with missing lines	Coverage Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx	`57.81% <0.00%> (ø)`
src/pages/iou/request/step/IOURequestStepHours.tsx	`85.29% <50.00%> (ø)`
src/ROUTES.ts	`16.06% <0.00%> (ø)`
src/libs/IOUUtils.ts	`73.33% <0.00%> (ø)`
... and 12 files with indirect coverage changes

github-actions · 2026-03-23T17:58:42Z

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

OSBotify · 2026-03-23T18:02:36Z

✋ 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-03-23T18:03:42Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8133cd0-d6051eb-695dba489635c9790dd4303a68636b672c19b701/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8133cd0-d6051eb-7530cdadd64ffeda4ac4e1d597322c10f5bae0b6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-25T16:10:47Z

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

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

Eskalifer1 added 2 commits March 19, 2026 12:48

fix: After switching from Time to Manual and creating manual expense,…

c193dc0

… expense report opens

fix: revert some changes

56ac495

Eskalifer1 requested review from a team as code owners March 19, 2026 10:59

melvin-bot bot assigned Eskalifer1 Mar 19, 2026

melvin-bot bot requested review from aimane-chnaif and trjExpensify and removed request for a team March 19, 2026 11:00

melvin-bot bot removed the request for review from a team March 19, 2026 11:00

trjExpensify approved these changes Mar 19, 2026

View reviewed changes

aimane-chnaif approved these changes Mar 20, 2026

View reviewed changes

melvin-bot bot requested a review from puneetlath March 20, 2026 16:26

chatgpt-codex-connector bot reviewed Mar 20, 2026

View reviewed changes

Merge remote-tracking branch 'origin' into fix/81561

cbb54bd

puneetlath approved these changes Mar 23, 2026

View reviewed changes

puneetlath merged commit 8133cd0 into Expensify:main Mar 23, 2026
32 checks passed

OSBotify mentioned this pull request Mar 24, 2026

Deploy Checklist: New Expensify 2026-03-24 #86199

Closed

53 tasks

melvin-bot bot mentioned this pull request Mar 25, 2026

[Due for payment 2026-04-01] [$250] After switching from Time to Manual and creating manual expense, expense report opens #81561

Open

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: After switching from Time to Manual and creating manual expense, expense report opens#85760

fix: After switching from Time to Manual and creating manual expense, expense report opens#85760
puneetlath merged 3 commits intoExpensify:mainfrom
Eskalifer1:fix/81561

Eskalifer1 commented Mar 19, 2026

Uh oh!

melvin-bot bot commented Mar 19, 2026

Uh oh!

trjExpensify left a comment

Uh oh!

aimane-chnaif commented Mar 20, 2026 •

edited

Loading

Uh oh!

MelvinBot commented Mar 20, 2026

Uh oh!

aimane-chnaif commented Mar 20, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

chatgpt-codex-connector bot Mar 20, 2026

Uh oh!

codecov bot commented Mar 20, 2026 •

edited by github-actions bot

Loading

Uh oh!

Uh oh!

github-actions bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

github-actions bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

Eskalifer1 commented Mar 19, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 19, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 20, 2026

🤖 MelvinBot Code Review — PR #85760

Summary

Changes Review

CI Status

Verdict

Uh oh!

aimane-chnaif commented Mar 20, 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 Mar 20, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Mar 20, 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!

Uh oh!

github-actions bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

github-actions bot commented Mar 23, 2026

Uh oh!

OSBotify commented Mar 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

aimane-chnaif commented Mar 20, 2026 •

edited

Loading

codecov bot commented Mar 20, 2026 •

edited by github-actions bot

Loading