refactor: move per diem expense navigation into the UI

[TaduJR]

Explanation of Change

Seventh PR of #84631

The two per diem submit actions used to handle their own navigation and cleanup after saving an expense dismissing the screen, clearing the draft, and reading the current screen to decide which report to notify.

This moves all of that into the UI, so the actions only write the expense (API + Onyx) and the screen decides where to go next. Same behavior for the user, just handled in the right place.

To keep it safe, a submit that would do nothing (missing policy or an incomplete per diem entry) is now checked in the UI first, so we don't clear the draft or navigate away on a no-op.

Fixed Issues

$ #84631
PROPOSAL: #84631 (comment)

Tests

Setup (one time — skip if your test workspace already has Per diem set up)

1. Go to Workspaces and open a workspace on the Control plan.
2. Open More features, and under Spend, turn Per diem ON.
3. A Per diem item now appears in that workspace's settings — open it and add at least one rate (a destination with a subrate and amount) using Import spreadsheet.

Test 1 — Per diem on a workspace (started from the Inbox)

1. Go to the Inbox and open the workspace chat for the workspace that has Per diem enabled.
2. Tap the + and choose Create expense, then select the Per diem tab.
3. Pick a Destination from the list.
4. Set the Start date/time, then set the End date/time so it is after the start — the app requires the end to be at least one minute after the start (e.g. change the End time to a later time). Tap Save.
5. Choose a Subrate, enter a Quantity, then tap Save.
6. On the Confirm details screen, tap Create expense.
7. Verify: the create screen closes on its own — you're not left on the confirm screen, and there's no extra/blank screen to dismiss.
8. Verify: you land on the workspace's expense report, and the new per diem expense is shown there (destination, dates, amount).
9. Verify: the report is scrolled to / shows the new expense.
10. Verify: reopening + → Create expense → Per diem starts completely fresh (none of the destination, dates, or subrate from the expense you just made are still filled in).

Test 2 — Per diem started from Spend (lands on Spend > Expenses)

1. Open the Spend tab (Spend > Expenses).
2. Tap the green + → Create expense → Per diem tab.
3. Complete the Destination, Time (end after start), and Subrate/Quantity steps as in Test 1.
4. On the Confirm details screen, tap Create expense.
5. Verify: the create screen closes and you land on Spend > Expenses — you are not pushed into the workspace report.
6. Verify: the new per diem expense appears at the top of the expenses list.
7. Verify: reopening the per diem create flow starts fresh.

Test 3 — Per diem tracked to your Personal space (only if your setup routes per diem to Personal space)

1. From the Inbox, tap the green + → Create expense → Per diem tab.
2. Complete the Destination, Time, and Subrate/Quantity steps, with the expense going to your Personal space (your own space, not a workspace — shown as the recipient on the Confirm details screen).
3. Tap Create expense.
4. Verify: the create screen closes on its own and you land on your Personal space, with the new per diem expense visible.
5. Verify: reopening Create expense → Per diem starts fresh.

• 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

• 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
  • MacOS: Desktop
• 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 verified there are no new alerts related to the canBeMissing param for useOnyx
• 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

Android-Native.mp4

Android: mWeb Chrome

Android-mWeb.mp4

iOS: Native

iOS-Native.mp4

iOS: mWeb Safari

iOS-Safari.mp4

MacOS: Chrome / Safari

Mac-Chrome.mp4

[melvin-bot]

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

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 Δ
src/libs/actions/IOU/PerDiem.ts	72.40% <90.90%> (+1.85%)	⬆️
.../request/step/confirmation/useExpenseSubmission.ts	74.68% <66.66%> (-0.40%)	⬇️
... and 96 files with indirect coverage changes

[JmillsExpensify]

Why aren't we landing the user on the Spend > Expenses page for all these flows? I think that's preferred.

[linhvovan29546]

Why aren't we landing the user on the Spend > Expenses page for all these flows? I think that's preferred.

Our PR just refactors the code and doesn’t change the navigation behavior, so I think this behavior already exists on main. @TaduJR, can you confirm this?

[TaduJR]

Our PR just refactors the code and doesn’t change the navigation behavior, so I think this behavior already exists on main. @TaduJR, can you confirm this?

@linhvovan29546 is right we are just refactoring the code, and landing on Spend > Expense only happens if we are creating using FAB from Home, Spend, Workspace, and Account but for Inbox it lands on the destination workspace.

I think the current main behaviour landing destination workspace on the is correct if we are creating from Inbox using FAB or on Workspace Chat +.

WDYT @JmillsExpensify

[JmillsExpensify]

Yes that's correct. Let's just make sure the testing steps communicate that correctly. Test 1 and Test 2 don't make that clear, so let's just clarity that the starting point is the Inbox, not other more common pages.

[JmillsExpensify]

LGTM with the testing steps clarification.

[TaduJR]

Thanks @JmillsExpensify

Clarified more.

[linhvovan29546]

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.
• 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

telegram-cloud-document-5-6091405803560909075.mp4

Android: mWeb Chrome

telegram-cloud-document-5-6091405803560909078.mp4

iOS: HybridApp

Screen.Recording.2026-08-27.at.20.55.27.mov

iOS: mWeb Safari

Screen.Recording.2026-08-27.at.20.30.23.mov

MacOS: Chrome / Safari

Screen.Recording.2026-08-27.at.20.24.55.mov

Screen.Recording.2026-08-27.at.20.26.11.mov

Screen.Recording.2026-08-27.at.20.27.42.mov

[Valforte]

We should do something on the UI otherwise the user is stuck in the same place with no idea that something is happening. Can we surface that some error has happened?