Migrate per diem subrate step to dynamic routes (#83850 part 3) by suneox · Pull Request #98629 · Expensify/App

suneox · 2026-08-14T04:36:21Z

Explanation of Change

This is part 3 of migrating the per diem money request steps to dynamic URL navigation (after part 1 — destination and part 2 — time). It replaces the static MONEY_REQUEST_STEP_SUBRATE and MONEY_REQUEST_STEP_SUBRATE_EDIT routes with the per-diem-subrate/:pageIndex and per-diem-subrate-edit/:pageIndex dynamic suffixes. The wizard suffix is stacked on the dynamic time route (entryScreens: [MONEY_REQUEST.DYNAMIC_STEP_TIME]) and the edit suffix on the confirmation route (entryScreens: [MONEY_REQUEST.STEP_CONFIRMATION]), so both drop backTo and derive their back path from the current URL through useDynamicBackPath; the page distinguishes edit mode by route name instead of by backTo.

IOURequestStepSubrate is renamed to DynamicIOURequestStepSubrate, and PerDiemFields no longer needs the action / iouType / reportID props now that all three per diem fields navigate through dynamic routes. Legacy subrate URLs (including the optional backToReport segment and the edit variant) are redirected through OldRoutes, with unit tests covering both the redirect shape and the no-false-positive case for the already-migrated paths.

Fixed Issues

$ #83850
PROPOSAL:

Tests

DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE — wizard subrate step

Case 1.1 — Time → Subrate forward (multi-policy base)

Target: src/pages/iou/request/step/DynamicIOURequestStepTime.tsx (updateTime)

Precondition: the account has 2 or more workspaces with per diem enabled (so the flow goes through the workspace selector → Destination → Time).

Steps:

Open the app and sign in.
Tap the FAB (+) → Create expense → Per diem tab.
Pick a workspace → pick a Destination → on the Time step enter start/end date-time → Save.

Expected: the Subrate step opens (Subrate picker + Quantity input), the URL ends with /per-diem-time/per-diem-subrate/0, and the header title is the tab title (not "Subrate").

Case 1.2 — Time → Subrate forward (single-policy base, opened from the start page)

Precondition: the account has exactly one workspace with per diem enabled (Destination renders inline on the start page, so Time is built on the start base).

Steps:

FAB (+) → Create expense → Per diem tab.
Pick the destination on the start page → Time step → enter date-time → Save.

Expected: Subrate opens, URL is /create/submit/start/<txn>/<rpt>/per-diem-time/per-diem-subrate/0 (no per-diem-destination segment).

Case 1.3 — Subrate back → Time

Target: src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx

Steps:

From case 1.1 (on Subrate), tap Back in the header.

Expected: back on the Time step; exactly the /per-diem-subrate/0 segment is removed from the URL and the base is unchanged. No /not-found.

Case 1.4 — Subrate submit → Confirmation

Steps:

On Subrate, pick a Subrate and enter a Quantity (e.g. 2) → Save.

Expected: the Confirmation step opens (still a static route) and the subrate shows up in the per diem fields.

Case 1.5 — Confirmation back → Subrate

Target: src/pages/iou/request/step/IOURequestStepConfirmation.tsx (navigateBack)

Steps:

From case 1.4 (Confirmation), tap Back.

Expected: back on Subrate (the route is already on the stack, so it pops to it). No /not-found and no duplicated suffix.

Case 1.6 — Refresh while on Subrate

Steps:

From case 1.1, refresh the browser (F5).

Expected: still on the Subrate step and the stack is restored (Back goes to Time).

Case 1.7 — Legacy deep link redirect (pageIndex preserved)

Target: src/libs/Navigation/linkingConfig/OldRoutes.ts

Steps:

Paste the legacy URL: /create/submit/subrate/<txn>/<rpt>/0.

Expected: redirected to /create/submit/start/<txn>/<rpt>/per-diem-time/per-diem-subrate/0. ⚠️ getMatchingNewRoute re-appends the original query, so a legacy URL that still carries ?backTo= keeps it on the redirected route (and on its base route). This matches the destination and time redirects already on main; no call site emits that query anymore.

Case 1.8 — Legacy deep link with a `backToReport` segment

Steps:

Paste /create/submit/subrate/<txn>/<rpt>/<backToReportID>/2.

Expected: redirected to /create/submit/start/<txn>/<rpt>/<backToReportID>/per-diem-time/per-diem-subrate/2.

Case 1.9 — Offline forward/back

Steps:

Go offline (DevTools → Network → Offline).
Repeat cases 1.1 → 1.3 → 1.4.

Expected: navigation still works offline and the offline indicator shows.

DYNAMIC_ROUTES.MONEY_REQUEST_STEP_SUBRATE_EDIT — edit a subrate from Confirmation

Case 2.1 — Confirmation → edit Subrate (correct index)

Target: src/components/MoneyRequestConfirmationList/sections/PerDiemFields.tsx

Precondition: a per diem Confirmation with at least one subrate (run case 1.4 first).

Steps:

On Confirmation, tap the first Subrate field (index 0).

Expected: the Subrate page opens in edit mode, header title "Subrate", URL /create/submit/confirmation/<txn>/<rpt>/per-diem-subrate-edit/0, and the picker/quantity are prefilled with subrate 0.

Case 2.2 — Edit save → back on Confirmation

Steps:

From case 2.1, change the Quantity (e.g. 2 → 3) → Save.

Expected: back on Confirmation (the /per-diem-subrate-edit/0 segment is removed) and the field shows the new quantity.

Case 2.3 — Edit back without saving

Steps:

From case 2.1, tap Back without saving.

Expected: back on Confirmation with the subrate unchanged.

Case 2.4 — Edit the second subrate (pageIndex > 0)

Precondition: the rate has 2 or more subrates and the expense already has 2 subrates.

Steps:

On Confirmation, tap the second Subrate field.

Expected: URL .../per-diem-subrate-edit/1 and subrate index 1 is shown (not index 0).

Case 2.5 — Delete a subrate (three-dots menu)

Steps:

From case 2.4 (editing subrate 1, more than one subrate present), tap the three-dots menu → Delete subrate → confirm.

Expected: the subrate is deleted and the app goes back to Confirmation with the remaining subrates listed.

Case 2.6 — Legacy edit deep link redirect

Steps:

Paste /create/submit/subrate/<txn>/<rpt>/edit/2.

Expected: redirected to /create/submit/confirmation/<txn>/<rpt>/per-diem-subrate-edit/2.

Regression

R-1: editing Destination from Confirmation still works (per-diem-destination-edit) — PerDiemFields props changed.
R-2: editing Time from Confirmation still works (per-diem-time-edit).
R-3: deploy blocker [Due for payment 2026-08-21] Web- Per Diem - Not here page appears when tapping the back button on the Time page #97558 does not come back: global create → workspace selector (switch workspace) → Destination → Time → Back returns to Destination and the URL does not duplicate per-diem-destination.

Verify that no errors appear in the JS console

Offline tests

Same as tests — navigation refactor, offline behavior unchanged.

QA Steps

Test case 1: Create a per diem expense and reach the subrate step

Sign in with an account that has a workspace with per diem enabled (with rates that have at least two subrates).
Tap the green + button → Create expense → open the Per diem tab.
Pick the workspace (if you are asked to) and pick a destination.
Enter a start and end date-time and tap Save.
Verify the Subrate page opens with a subrate picker and a quantity field, and that the browser URL ends with /per-diem-time/per-diem-subrate/0.
Tap Back and verify you return to the time step, with the /per-diem-subrate/0 part removed from the URL.

Test case 2: Edit a subrate from the confirmation page

Continue from test case 1: on the subrate page pick a subrate, enter a quantity and tap Save.
Verify the confirmation page opens and shows the subrate you just entered.
Tap the Subrate field on the confirmation page.
Verify the subrate page opens with the header title Subrate, the values prefilled, and the browser URL ending with /per-diem-subrate-edit/0.
Change the quantity and tap Save.
Verify you are back on the confirmation page and the subrate field shows the new quantity.

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

CleanShot.2026-08-17.at.14.09.11.1.mp4

+++ Case 1.1 — Time → Subrate forward (multi-policy base)

+++

+++ Case 1.2 — Time → Subrate forward (single-policy base)

+++

+++ Case 1.3 — Subrate back → Time

+++

+++ Case 1.4 — Subrate submit → Confirmation

+++

+++ Case 1.5 — Confirmation back → Subrate

+++

+++ Case 1.6 — Refresh while on Subrate

+++

+++ Case 1.7 — Legacy deep link redirect

+++

+++ Case 1.8 — Legacy deep link with backToReport

Not support create deeplink with subrate

+++

+++ Case 1.9 — Offline forward/back

+++

+++ Case 2.1 — Confirmation → edit Subrate

+++

+++ Case 2.2 — Edit save → back on Confirmation

+++

+++ Case 2.3 — Edit back without saving

+++

+++ Case 2.4 — Edit the second subrate

+++

+++ Case 2.5 — Delete a subrate

2 5-3-after-back-confirmation-lunch-deleted

+++

+++ Case 2.6 — Legacy edit deep link redirect

Not support create via deep link with edit subrate

+++

+++ Regression

+++

melvin-bot · 2026-08-14T04:36:28Z

@huult 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: 14e4d0067f

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

codecov · 2026-08-14T05:06:55Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/OldRoutes.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`66.66% <ø> (ø)`
...iou/request/step/withFullTransactionOrNotFound.tsx	`96.00% <ø> (ø)`
.../iou/request/step/withWritableReportOrNotFound.tsx	`87.50% <ø> (ø)`
...RequestConfirmationList/sections/PerDiemFields.tsx	`0.00% <0.00%> (ø)`
...ConfirmationListFooter/sections/PerDiemSection.tsx	`33.33% <0.00%> (ø)`
...ges/iou/request/step/DynamicIOURequestStepTime.tsx	`0.00% <0.00%> (ø)`
...es/iou/request/step/IOURequestStepConfirmation.tsx	`73.98% <0.00%> (ø)`
src/ROUTES.ts	`23.22% <0.00%> (+0.04%)`	⬆️
... and 3 more
... and 7 files with indirect coverage changes

JmillsExpensify

No product review required.

huult · 2026-08-14T08:46:55Z

Tag me when it's ready

…BRATE_EDIT routes with the and dynamic suffixes, following parts 1 (destination) and 2 (time). - The wizard suffix is stacked on the dynamic time route, the edit suffix on the confirmation route, so both drop and derive their back path from the URL via useDynamicBackPath. - Rename IOURequestStepSubrate to DynamicIOURequestStepSubrate and switch the edit-mode check from to the route name. - PerDiemFields no longer needs action/iouType/reportID now that all three per diem fields navigate through dynamic routes. - Add OldRoutes redirects (including the legacy backToReport variant) plus unit tests.

suneox · 2026-08-17T07:40:33Z

Tag me when it's ready

It's ready

huult · 2026-08-17T08:19:44Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

huult · 2026-08-17T08:33:11Z

Screen.Recording.2026-08-17.at.15.32.06.mov

Screen.Recording.2026-08-17.at.15.35.18.mov

BUG: Not Found appears when opening the Per Diem subrate

suneox · 2026-08-17T08:42:30Z

BUG: Not Found appears when opening the Per Diem subrate

@huult Could you check your build and confirm if the bundle is ready? I haven't encountered any bugs.

CleanShot.2026-08-17.at.15.37.57.1.mp4

huult · 2026-08-17T08:45:17Z

Screen.Recording.2026-08-17.at.15.44.29.mov

@suneox I’m still able to reproduce this issue

…-request-part-3-v2-suneox

suneox · 2026-08-17T10:51:01Z

@huult The issue has been fixed for both single and multiple workspaces with per-diem enabled

CleanShot.2026-08-17.at.17.26.10.1.mp4

suneox requested review from a team as code owners August 14, 2026 04:36

melvin-bot Bot assigned suneox Aug 14, 2026

melvin-bot Bot requested review from JmillsExpensify and huult and removed request for a team August 14, 2026 04:36

suneox marked this pull request as draft August 14, 2026 04:37

github-actions Bot reviewed Aug 14, 2026

View reviewed changes

Comment thread src/libs/Navigation/linkingConfig/OldRoutes.ts Outdated

github-actions Bot reviewed Aug 14, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx Outdated

chatgpt-codex-connector Bot reviewed Aug 14, 2026

View reviewed changes

Comment thread src/libs/Navigation/linkingConfig/OldRoutes.ts

suneox force-pushed the 83850-migrate-money-request-part-3-v2-suneox branch from 14e4d00 to 4b3c9c1 Compare August 14, 2026 05:03

JmillsExpensify removed their request for review August 14, 2026 08:41

JmillsExpensify reviewed Aug 14, 2026

View reviewed changes

suneox added 2 commits August 17, 2026 12:18

Address review: split comment sentences, drop stale query claim

ee9023a

suneox force-pushed the 83850-migrate-money-request-part-3-v2-suneox branch from 4b3c9c1 to ee9023a Compare August 17, 2026 07:27

suneox marked this pull request as ready for review August 17, 2026 07:37

huult reviewed Aug 17, 2026

View reviewed changes

Comment thread src/libs/Navigation/linkingConfig/OldRoutes.ts Outdated

huult reviewed Aug 17, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/DynamicIOURequestStepSubrate.tsx Outdated

huult reviewed Aug 17, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/DynamicIOURequestStepTime.tsx Outdated

huult reviewed Aug 17, 2026

View reviewed changes

Comment thread src/pages/iou/request/step/IOURequestStepConfirmation.tsx Outdated

suneox added 4 commits August 17, 2026 16:07

cleanup redundant comments

2672671

Fix per diem subrate not-found and back navigation after report retarget

4dfc5cd

cleanup redundant comments

9027f17

Merge remote-tracking branch 'upstream/main' into 83850-migrate-money…

35a3904

…-request-part-3-v2-suneox

Uh oh!

Conversation

suneox commented Aug 14, 2026 • edited by JmillsExpensify Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Case 1.1 — Time → Subrate forward (multi-policy base)

Case 1.2 — Time → Subrate forward (single-policy base, opened from the start page)

Case 1.3 — Subrate back → Time

Case 1.4 — Subrate submit → Confirmation

Case 1.5 — Confirmation back → Subrate

Case 1.6 — Refresh while on Subrate

Case 1.7 — Legacy deep link redirect (pageIndex preserved)

Case 1.8 — Legacy deep link with a backToReport segment

Case 1.9 — Offline forward/back

Case 2.1 — Confirmation → edit Subrate (correct index)

Case 2.2 — Edit save → back on Confirmation

Case 2.3 — Edit back without saving

Case 2.4 — Edit the second subrate (pageIndex > 0)

Case 2.5 — Delete a subrate (three-dots menu)

Case 2.6 — Legacy edit deep link redirect

Offline tests

QA Steps

Test case 1: Create a per diem expense and reach the subrate step

Test case 2: Edit a subrate from the confirmation page

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Aug 14, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov Bot commented Aug 14, 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!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

huult commented Aug 14, 2026

Uh oh!

suneox commented Aug 17, 2026

Uh oh!

huult commented Aug 17, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

huult commented Aug 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

suneox commented Aug 17, 2026

Uh oh!

huult commented Aug 17, 2026

Uh oh!

suneox commented Aug 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

suneox commented Aug 14, 2026 •

edited by JmillsExpensify

Loading

Case 1.8 — Legacy deep link with a `backToReport` segment

codecov Bot commented Aug 14, 2026 •

edited by github-actions Bot

Loading

huult commented Aug 17, 2026 •

edited

Loading