migrate money request part 2

[huult]

Explanation of Change

Fixed Issues

$ #83858
PROPOSAL:

Tests

Same QA step

• Verify that no errors appear in the JS console

Offline tests

QA Steps

Pre-requisites

• A paid/Collect workspace with Tax enabled (≥2 tax rates) and Categories enabled (≥2 categories).
• A second account on a free plan (no paid workspace) to trigger the Upgrade flow.

MONEY_REQUEST_STEP_TAX_RATE

1. Open the Expensify app.
2. Open any workspace chat.
3. Start the Create Expense flow.
4. On the confirmation step, tap Tax rate.
5. Navigate back.
6. Verify that the Tax rate page step and returns to the confirmation step correctly.

MONEY_REQUEST_STEP_TAX_AMOUNT

1. Open the Expensify app.
2. Open any workspace chat.
3. Start the Create Expense flow.
4. On the confirmation step, tap Tax amount.
5. Navigate back.
6. Verify that the Tax amount step opens and returns to the confirmation step correctly.

MONEY_REQUEST_STEP_CATEGORY

1. Open the Expensify app.
2. Open any workspace chat.
3. Start the Create Expense flow.
4. On the confirmation step, tap Category.
5. Navigate back.
6. Verify that the Category step opens and returns to the confirmation step correctly.

MONEY_REQUEST_ATTENDEE

Precondition:

• In the workspace settings, enable Rules and turn on Attendee Tracking

1. Open the Expensify app.
2. Open any workspace chat.
3. Start the Create Expense flow.
4. On the confirmation step, tap Attendee.
5. Navigate back.
6. Verify that the Attendee step opens and returns to the confirmation step correctly.

MONEY_REQUEST_ACCOUNTANT

Precondition:

• Enable Track Expense flows in Permissions

1. Open the Expensify app.
2. Open your self-DM (chat with yourself).
3. Create an expense.
4. Open the expense you just created.
5. Open the expense details page.
6. Tap Share it with my accountant.
7. Verify that the Share it with my accountant page opens correctly and that navigating back returns you to the expense details page.

MONEY_REQUEST_UPGRADE

Precondition:

• The account has no workspace.

1. Open the Expensify app.
2. Open your self-DM (chat with yourself).
3. Create an expense.
4. On the confirmation page, open Category.
5. Change the category.
6. Verify that the category is updated correctly and the workspace flow works as expected.

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

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-06-01.at.14.53.39.mov

[melvin-bot]

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

[huult]

@MelvinBot I migrated MONEY_REQUEST_STEP_TAX_RATE, MONEY_REQUEST_STEP_TAX_AMOUNT, MONEY_REQUEST_STEP_CATEGORY, MONEY_REQUEST_ATTENDEE, MONEY_REQUEST_ACCOUNTANT and MONEY_REQUEST_UPGRADE to use dynamic routes in this PR.

Could you help create some test steps so I can verify everything works correctly? Thanks!

[MelvinBot]

Here are test steps to verify the dynamic-route migration. The behavior that actually changed is return navigation — these routes no longer carry a backTo param; the destination is now derived from the screen you opened them from (the entryScreens list in src/ROUTES.ts). So every test should confirm: (1) the page opens, (2) the selection saves, and (3) Back returns you to the exact screen you came from — not a blank page or the wrong report.

Pre-requisites

• A paid/Collect workspace with Tax enabled (≥2 tax rates) and Categories enabled (≥2 categories).
• A second account on a free plan (no paid workspace) to trigger the Upgrade flow.

Common verification (apply to every step below)

• Page opens with the correct current value pre-selected.
• Selecting/changing a value saves and is reflected back on the confirmation page / expense view.
• Back button returns to the originating screen (confirmation page, expense report view, or Search view — whichever you opened it from).
• Deep link: paste the page URL directly into the browser (logged in) and confirm it loads; Back still lands somewhere sensible.
• No JS console errors, and no Invalid transactionID or reportID... warning in the console.

---

1. Tax Rate (MONEY_REQUEST_STEP_TAX_RATE)

• Creating an expense: Submit expense → on the confirmation page tap Tax rate → pick a different rate → Back → rate is updated.
• Editing an expense: Open an existing expense → tap Tax rate → change it → Back → returns to the expense view with the new rate.
• Repeat the edit flow from a transaction opened via Search.

2. Tax Amount (MONEY_REQUEST_STEP_TAX_AMOUNT)

• Creating an expense: confirmation page → tap Tax (amount) → edit the amount → Back → amount updates.
• Editing an expense: expense view → tap Tax → edit → Back returns correctly.

3. Category (MONEY_REQUEST_STEP_CATEGORY)

• Creating an expense: confirmation page → tap Category → select a category → Back → category updates.
• Editing an expense: expense view → Category → change → Back returns to the expense view.
• Split expense edit: from a split expense, open Category → select → Back returns to the split edit page.
• Confirm the optional reportActionID segment still works (categorizing a tracked expense / from a report action).

4. Attendees (MONEY_REQUEST_ATTENDEE)

• Creating an expense: confirmation page → tap Attendees → add/remove an attendee → Back → list updates and amount-per-attendee recalculates.
• Editing an expense: expense view → Attendees → modify → Back returns correctly.

5. Accountant (MONEY_REQUEST_ACCOUNTANT)

• Trigger the share / "submit to accountant" flow (the SHARE action that routes here) → the accountant page opens → complete or Back → returns to the originating screen.

6. Upgrade (MONEY_REQUEST_UPGRADE)

This route has the most entry points, so test it broadly using the free-plan account:

• From the confirmation page, tap a feature that requires upgrade (e.g. Category or Distance rate) → the Upgrade page opens → Back returns to confirmation.
• Verify the upgradePath differs correctly: Categories vs Distance rates entry points open the matching upgrade screen.
• Verify the shouldSubmitExpense=true query param case (distance/track-expense path) — after upgrading, the expense submission continues as expected.
• Trigger Upgrade from Search / create-report entry points (SearchActionsBarCreateButton, change-report flow) → opens and Back works.

---

Offline

• Go offline, repeat one edit per step above (e.g. change a category) → the selection is applied optimistically and the page still navigates back correctly.

Regression

• Confirm the non-migrated sibling steps still work (e.g. Category → Create new category MONEY_REQUEST_STEP_CATEGORY_CREATE, which was intentionally left on the old route).

Note: I haven't run these against a live build — they're derived from reading the diff. If you'd like, reply with @MelvinBot verify the back-navigation flows in the browser and I'll have the app-web-tester drive the confirmation-page → tax/category/attendees → Back flows and post screenshots.

[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/SCREENS.ts	100.00% <ø> (ø)
...RequestConfirmationList/sections/AttendeeField.tsx	85.18% <ø> (-7.41%)	⬇️
...RequestConfirmationList/sections/CategoryField.tsx	0.00% <ø> (ø)
...oneyRequestConfirmationList/sections/RateField.tsx	78.94% <ø> (ø)
...oneyRequestConfirmationList/sections/TaxFields.tsx	86.66% <ø> (ø)
.../components/MoneyRequestHeaderSecondaryActions.tsx	0.52% <ø> (ø)
...nents/Navigation/QuickCreationActionsBar/index.tsx	85.36% <ø> (ø)
...c/components/ReportActionItem/MoneyRequestView.tsx	75.88% <ø> (ø)
.../SearchPageHeader/SearchActionsBarCreateButton.tsx	96.05% <ø> (ø)
src/hooks/useCreateReport.tsx	100.00% <ø> (ø)
... and 16 more
... and 16 files with indirect coverage changes

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6d19e5f55c

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

[huult]

@mananjadhav This PR is ready for review

[trjExpensify]

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.