fix: per diem from report preview lands on workspace chat

[MobileMage]

Explanation of Change

Creating a Per Diem expense from a report preview's Add expense menu was opening the resulting expense report after submission, instead of leaving the user in the workspace chat (the screen they started from). This differed from Manual, Scan, and Distance, which all correctly stay in the workspace chat.

It's caused when the per-diem flow is launched from a report preview, backToReport (the workspace chat ID) is set on the parent route but gets dropped by the per-diem intermediate step screens (STEP_DESTINATION, STEP_TIME, STEP_SUBRATE don't carry it). By the time IOURequestStepConfirmation renders, backToReport is undefined, so the pre-insert destination (destinationReportID) falls back to report?.reportID — the expense report — and the SubmitExpenseOrchestrator reveals that route on submit.

To fix we align destinationReportID in IOURequestStepConfirmation.tsx with the same "where is the user actually viewing right now" logic that useExpenseSubmission.submitPerDiemExpense already uses for its activeReportID. When backToReport is missing and report is an expense/IOU/invoice report that the user is not currently viewing, fall back to its parent chat (report.chatReportID) instead of the expense report itself. When the user is viewing the expense report, keep the existing behavior (stay on it).

Also kept the matching backToReport ?? activeReportID change in useExpenseSubmission.ts so the slow-path navigation honors backToReport too, consistent with requestMoney / createDistanceRequest.

Fixed Issues

$ #91093
PROPOSAL: #91093 (comment)

Tests

Precondition — give a workspace per diem rates:

1. Sign in as a workspace admin on a Control / Corporate workspace (or create one — per diem is a Control-tier feature).
2. Workspace settings → More features → enable Per diem under Spend.
3. Open the new Per diem row → Import per diem rates → upload a CSV with at least one rate (destination, subRate, amount, currency).

Repro:

1. From the LHN, open the workspace chat for that workspace (the policy expense chat, not #admins).
2. In the composer, tap + → Create report → submit to create an empty expense report; a report preview card appears in the chat.
3. On the preview card, tap Add expense → Create expense → Per diem.
4. Pick a destination → subrate → date → tap Submit.
5. Verify the app stays on the workspace chat, with the report preview updated to include the new per-diem expense (matching the behavior of Manual / Scan / Distance from the same entry point).
6. Verify the app does not navigate into the expense report.
7. Repeat steps 2–4 but with Manual, Scan, and Distance to confirm no regression — each should still land on the workspace chat.
8. While viewing the expense report directly (open it from the preview), submit another per-diem expense to that report and verify the app stays on the expense report (i.e., the topmost-report check still keeps users where they were).

• Verify that no errors appear in the JS console

Offline tests

Same as Tests, performed while offline:

1. Go offline.
2. Repro steps 1–5 above.
3. Verify the per-diem expense is created optimistically and the app stays on the workspace chat.
4. Reconnect and verify the expense persists with no errors.

QA Steps

Same as Tests.

• Verify that no errors appear in the JS console

PR Author Checklist

• I linked the correct issue in the ### Fixed Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I added steps for the expected offline behavior in the Offline steps section
  • I added steps for Staging and/or Production testing in the QA steps section
  • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android: Native
  • Android: mWeb Chrome
  • iOS: Native
  • iOS: mWeb Safari
  • MacOS: Chrome / Safari
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I followed proper code patterns (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
    • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
  • 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 followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• 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
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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 new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• 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.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Kapture.2026-05-21.at.07.40.16.mp4

Android: mWeb Chrome

iOS: Native

Kapture.2026-05-21.at.07.04.20.mp4

iOS: mWeb Safari

MacOS: Chrome / Safari

Kapture.2026-05-21.at.06.52.40.mp4

[melvin-bot]

@brunovjk 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: 5757632851

ℹ️ 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]

Align pending-new flag with overridden destination report

When backToReport is provided, this call now navigates using backToReport ?? activeReportID, but shouldAddPendingNewTransactionIDs is still computed from the pre-override activeReportID. In cases where backToReport overrides the destination, the app can open the overridden report without adding the pending transaction marker for that report, so the new expense may not be highlighted/treated as new in the destination report preview state.

Useful? React with 👍 / 👎.

[codecov]

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 Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx	64.30% <100.00%> (+0.11%)	⬆️
.../request/step/confirmation/useExpenseSubmission.ts	64.60% <0.00%> (-0.27%)	⬇️
... and 10 files with indirect coverage changes

[joekaufmanexpensify]

Makes sense 👍

[brunovjk]

@codex review

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Breezy!

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

[brunovjk]

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.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-26.at.20.29.25.mov

[marcaaron]

Sorry this fell off my radar! Changes look good, but there are conflicts now

[MobileMage]

No worries! Rebased on latest main and resolved the conflict in useExpenseSubmission.ts - the shouldHandleNav param got renamed to shouldHandleNavigation upstream. Updated accordingly.

[github-actions]

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

[marcaaron]

CI is red

[MobileMage]

All fixed @marcaaron

[github-actions]

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

[github-actions]

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-8d59e717e9f-aefc2a3-0a15d54e8a0f72a72459bb1764053c09d872d9c1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-8d59e71-aefc2a3-f3d85ee3c63385f692362ca5796488c93228c8ac/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/marcaaron in version: 9.3.99-0 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

🤖 Help site review: no changes required.

This PR is a navigation-consistency bug fix — a Per Diem expense created from a report preview's Add expense menu now stays on the workspace chat after submission (matching Manual, Scan, and Distance), instead of opening the resulting expense report. The change is entirely in navigation logic (IOURequestStepConfirmation.tsx and useExpenseSubmission.ts).

Why no docs update is needed

• The relevant help article, Create a Per Diem Expense, documents how to create a per diem expense (steps to pick a workspace, destination, dates, and sub-rates). It does not document which screen the user lands on after submission.
• No feature name, tab name, settings label, or button (Create expense, Add expense, Per diem, Submit) was added, removed, or renamed — so no copy in the articles becomes inaccurate.
• The fix only changes post-submission landing behavior, which is an internal UX detail not covered anywhere under App/docs/articles.

I reviewed all per-diem and expense-creation articles under App/docs/articles/new-expensify/reports-and-expenses/ and confirmed none describe the landing/navigation behavior this PR touches.

Because no documentation is affected, I did not open a draft help site PR.

@MobileMage, if you believe the landing/navigation behavior should be documented (e.g., a new note in the Per Diem article), reply with @MelvinBot and the wording you'd like, and I'll create the draft help site PR.

[mitarachim]

Deploy Blocker #92641 was identified to be related to this PR.

[OSBotify]

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.99-9 🚀

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