Update create transaction Manual flow to ask for merchant after asking for amount v2

[nkdengineer]

Explanation of Change

Update create transaction Manual flow to ask for merchant after asking for amount

Fixed Issues

$ #76050
PROPOSAL: #76050 (comment)

Tests

Pre-requisites

• Have at least one workspace with a policy expense chat
• Have access to a personal (P2P) chat
• Set up a default workspace in settings

Test Case 1: Manual Expense from Workspace Chat (Primary Flow)

Steps:

1. Open a workspace expense chat
2. Tap the + button in the composer
3. Select Create expense → Manual tab
4. Enter an amount (e.g., $50) and tap Next
5. Expected: You should be navigated to the Merchant step
6. Enter a merchant name and tap Save
7. Expected: You should be navigated to the Confirmation page
8. Tap the back button on the Confirmation page
9. Expected: You should go back to the Merchant page (not Amount)
10. Tap the back button on the Merchant page
11. Expected: You should go back to the Amount page
12. Enter an amount (e.g., $50) and tap Next
13. Expected: You should be navigated to the Confirmation page

Test Case 2: Global Create with Default Workspace

Steps:

1. Set a workspace as your default (Settings → Workspaces → select one as default)
2. Tap the global + button
3. Select Create expense → Manual tab
4. Enter an amount and tap Next
5. Expected: You should be navigated to the Merchant step
6. Enter a merchant and tap Save
7. Expected: You should be navigated to the Confirmation page
8. Tap the back button on the Confirmation page
9. Expected: You should go back to the Merchant page (not Amount)
10. Tap the back button on the Merchant page
11. Expected: You should go back to the Amount page
12. Enter an amount (e.g., $50) and tap Next
13. Expected: You should be navigated to the Confirmation page

Test Case 3: Global Create without Default Workspace (Participants Flow)

Steps:

1. Remove any default workspace or use an account with a personal policy only
2. From any screen, tap the global + button
3. Select Create expense → Manual tab
4. Enter an amount and tap Next
5. Expected: You should be navigated to the Participants step
6. Select a workspace expense chat as the participant
7. Tap Next
8. Expected: You should be navigated to the Merchant step
9. Enter a merchant and tap Save
10. Expected: You should be navigated to the Confirmation page
11. Verify back navigation (Confirmation → Merchant → Participants)

Test Case 4: P2P (Personal) Transaction – No Merchant Step

Steps:

1. Open a personal 1:1 chat (not a workspace chat)
2. Tap the + button
3. Select Create expense → Manual tab
4. Enter an amount and tap Next
5. Expected: You should be navigated directly to the Confirmation page (no Merchant step)

Test Case 5: Scan Request – No Merchant Step

Steps:

1. Open a workspace expense chat
2. Tap the + button
3. Select Create expense → Scan tab
4. Add a receipt
5. Expected: You should be navigated to the Confirmation page (no Merchant step before confirmation)
6. Repeat using the global + button → Participants → select a workspace
7. Expected: There should still be no Merchant step for scan requests

Test Case 6: Participants – Select Personal Chat (No Merchant Step)

Steps:

1. From global + → Create expense → Manual tab
2. Enter an amount and tap Next
3. On the Participants step, select a user (not a workspace)
4. Tap Next
5. Expected: You should be navigated directly to the Confirmation page (no Merchant step)

Test Case 7: Self DM Expense – Move to Workspace (Without Merchant)

Steps:

1. Go to your Self DM (personal chat with yourself)
2. Tap + → Create expense → Manual tab
3. Enter an amount and complete the expense (without merchant)
4. Tap it and choose Submit or Categorize to move it to a workspace
5. Select a workspace
6. Expected: You should be navigated to the Merchant step
7. Tap the back button on the merchant page
8. Expected: You should go back to the ** Participants** page
9. Select a P2P chat
10. Expected: You should be navigated to the Confirmation page
11. Tap the back button on the Confirmation page
12. Expected: You should go back to the Participants page (not Merchant)
13. Select a workspace
14. Expected: You should be navigated to the Merchant step

Test Case 8: Self DM Expense – Move to Workspace (With Merchant)

Steps:

1. Go to your Self DM (personal chat with yourself)
2. Tap + → Create expense → Manual tab
3. Enter an amount and complete the expense (with merchant)
4. Tap it and choose Submit or Categorize to move it to a workspace
5. Select a workspace
6. Expected: You should be navigated to the Confirmation page
7. Tap the back button on the Confirmation page
8. Expected: You should go back to the Participants page
9. Select a P2P chat
10. Expected: You should be navigated to the Confirmation page
11. Clear the merchant and tap Save
12. Tap the back button on the Confirmation page
13. Expected: You should go back to the Participants page
14. Select a workspace
15. Expected: You should be navigated to the Merchant step

Test Case 9: Track Expense from Workspace Chat and FAB (Both)

Steps:

1. Open a workspace expense chat
2. Tap the + button in the composer
3. Select Track expense → Map tab
4. Select waypoints and tap Next
5. Expected: You should be navigated to the Confirmation page

Test Case 10: Track Expense (Manual) from Workspace Chat and FAB (Both)

Steps:

1. Open a workspace expense chat
2. Tap the + button in the composer
3. Select Track expense → Manual tab
4. Enter distance and tap Next
5. Expected: You should be navigated to the Confirmation page

• Per diem - Merchant field opens and can be edited when submitting from self DM #80291

Precondition:

• Workspace has per diem rates.

1. Go to workspace chat.
2. Create a per diem expense.
3. Open the per diem expense.
4. Go to self DM.
5. Open the unreported per diem expense.
6. Click Report > Remove from report/
7. Click on the report header > Submit it to someone.
8. Select any participant
9. Verify that the merchant step isn't displayed

• Merchant page does not open after entering amount when creating expense from empty report #80283

1. Go to workspace chat.
2. Create an empty report.
3. Open the empty report.
4. Click Add expense > Create expense > Manual.
5. Enter amount > Next.
6. Verify that the merchant page is displayed

• Invoice - Merchant page opens when sending from FAB, but does not open when sending from invoice room #80284

Precondition:

• User has received an invoice.

1. Open FAB > Send invoice.
2. Enter amount > Next.
3. Enter merchant > Next.
4. Select user.
5. On confirm page, click Send invoice.
6. On invoice room, click + > Send invoice.
7. Enter amount > Next.
8. Verify that the merchant step isn't displayed in both cases

• Merchant page opens after selecting workspace chat when submitting distance expense #80280

1. Go to self DM.
2. Create a manual or map distance expense.
3. Click Submit it to someone.
4. Select workspace chat.
5. Verify that the merchant step isn't displayed

• Expense - Merchant page opens when expense already has merchant when submitting expense #80279

1. Go to self DM.
2. Create a manual expense with merchant.
3. Click Submit it to someone.
4. Select workspace chat.
5. Verify that the merchant step isn't displayed.

• Expense - App returns to merchant page after selecting a user on confirm page #80282

Precondition:

• User has a workspace.

1. Open FAB > Create expense > Manual.
2. Enter amount > Next.
3. Enter merchant > Next.
4. On confirm page, click To field.
5. Select a user (not self DM).
6. Verify that the merchant step isn't displayed

• Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same as test

• 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

Screen.Recording.2025-12-03.at.15.27.09.mov

Android: mWeb Chrome

Screen.Recording.2025-12-03.at.15.26.38.mov

iOS: Native

Screen.Recording.2025-12-03.at.15.25.37.mov

iOS: mWeb Safari

Screen.Recording.2025-12-03.at.15.24.18.mov

MacOS: Chrome / Safari

Screen.Recording.2025-12-03.at.15.23.20.mov

Screen.Recording.2025-12-03.at.15.35.10.mov

Screen.Recording.2026-01-28.at.01.05.58.mov

Screen.Recording.2026-01-28.at.01.06.29.mov

Screen.Recording.2026-01-28.at.01.06.56.mov

Screen.Recording.2026-01-28.at.01.07.22.mov

Screen.Recording.2026-01-28.at.01.07.42.mov

Screen.Recording.2026-01-28.at.01.09.16.mov

[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 Δ
...rc/pages/iou/request/step/IOURequestStepAmount.tsx	3.47% <0.00%> (-0.10%)	⬇️
.../pages/iou/request/step/IOURequestStepMerchant.tsx	0.00% <0.00%> (ø)
src/libs/IOUUtils.ts	73.86% <0.00%> (-3.52%)	⬇️
...es/iou/request/step/IOURequestStepParticipants.tsx	0.00% <0.00%> (ø)
... and 9 files with indirect coverage changes

[melvin-bot]

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

[nkdengineer]

@Krishna2323 To avoid reverting again, I think we can request the QA to test this PR after the review is done.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 702485c5eb

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

[trjExpensify]

V2 of a product change agreed upon in slack. 👍

[nkdengineer]

@Krishna2323 Friendly bump.

[Krishna2323]

Will be reviewing this today.

[Krishna2323]

Reviewing...

[Krishna2323]

@nkdengineer The merchant field shows as required for the P2P option.

Steps to reproduce:

1. Choose Create expense from the FAB
2. Enter an amount → enter a merchant → open the Participants page
3. Select the P2P option → open the Merchant page → clear the value and save
4. Tap the header back button → try to save with an empty merchant

Monosnap.screencast.2026-01-30.18-41-11.mp4

[Krishna2323]

@nkdengineer bump

[nkdengineer]

@Krishna2323 I updated.

[Krishna2323]

@nkdengineer could you please merge main? I can't start the send invoice flow:

Monosnap.screencast.2026-02-05.04-10-12.mp4

[cead22]

@Krishna2323 can you please give it a final review?

[Krishna2323]

Reviewing...

[Krishna2323]

LGTM and works well! 🚀

[github-actions]

🚧 @cead22 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 #80480.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-0debe39-e94b19524ee3431794db4bc63a2df47273d23466/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-0debe39-9f3235b005d3324a1145bd8a84674ee37c39aa30/index.html

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

---

👀 View the workflow run that generated this build 👀

[OSBotify]

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

[OSBotify]

🚀 Deployed to staging by https://github.com/cead22 in version: 9.3.17-0 🚀

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

[jponikarchuk]

This PR failing (Test Case 7) because of the issue
This issue is reproducible in: All platforms

1.mp4

[nkdengineer]

Test Case 8: Self DM Expense – Move to Workspace (With Merchant)
Steps:
Go to your Self DM (personal chat with yourself)
Tap + → Create expense → Manual tab
Enter an amount and complete the expense (with merchant)
Tap it and choose Submit or Categorize to move it to a workspace
Select a workspace
Expected: You should be navigated to the Confirmation page
Tap the back button on the Confirmation page
Expected: You should go back to the Participants page
Select a P2P chat
Expected: You should be navigated to the Confirmation page
Clear the merchant and tap Save
Tap the back button on the Confirmation page
Expected: You should go back to the Participants page
Select a workspace
Expected: You should be navigated to the Merchant step

@jponikarchuk, sorry the test step is wrong. I updated this test case, this one is working as expected.

[jponikarchuk]

@nkdengineer Thanks

[jponikarchuk]

Could you please confirm if we should enter Merchant and save at step 6 (Test Case 7) to tap the back button on the Confirmation page as at step 7? Looks like we should tap the back button on the Merchant page. If steps are correct we can't get Merchant page at the step 16, we navigating to Confirmation page, as Merchant is saved

Bug7074523_1770806879005.bandicam_2026-02-11_13-42-39-186.mp4

[nkdengineer]

@jponikarchuk You're right, I updated the test steps

[OSBotify]

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

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