Manual expense flow UI refactor r2

[ChavdaSachin]

Explanation of Change

This PR is 2nd release of UI improvements for Expense/IOU creation flow, which aims to replace a few push row inputs with inline inputs to improve UX for migrate users.

The new flow is walled behind newManualExpenseFlow.
Current PR refactored Fields Merchant and Description to be inline input along with addressing previous blockers listed below.

Previous blockers:
#86342
#86394
#86351

Fixed Issues

$ #82586
PROPOSAL: NA

Tests

Test 1

1. Open the App.
2. Go to workspace expense room
3. Click + from composer -> Create expense -> Manual.
4. Complete the steps to reach the confirmation page.
5. Verify confirmation page has inline text input for the field Merchant and Description.
6. Verify Merchant and Description fields are editable.
7. Clear the Merchant field and click create expense button.
8. Verify Field Required error pops up for merchant field.
9. Enter a valid merchant value and description value.
10. Click create expense button.
11. Verify expense is created successfully.

Test 2

1. Open the App.
2. Go to 1:1 Dm with any user
3. Click + from composer -> Create expense -> Manual.
4. Complete the steps to reach the confirmation page.
5. Verify confirmation page has inline text input for the field Merchant and Description.
6. Verify Merchant and Description fields are editable.
7. Clear the Merchant field and click create expense button.
8. Verify expense could be created with empty Merchant and Description values.
9. Repeat step 3-4.
10. Enter valid merchant and description values.
11. Click create expense button.
12. Verify expense is created successfully.
13. Click + from composer -> Split expense -> Manual.
14. Repeat step 4-12.

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

Note

Following is the list of known bugs, which should be ignored while QA.

1. Expense could be created with empty amount field
2. Merchant value vanishes for input values (none) and Expense
3. Merchant field is allowing empty spaces

Precondition: Log in with Expensifail account.

Test 1

1. Open the App.
2. Go to workspace expense room
3. Click + from composer -> Create expense -> Manual.
4. Complete the steps to reach the confirmation page.
5. Verify confirmation page has inline text input for the field Merchant and Description.
6. Verify Merchant and Description fields are editable.
7. Clear the Merchant field and click create expense button.
8. Verify Field Required error pops up for merchant field.
9. Enter a valid merchant value and description value.
10. Click create expense button.
11. Verify expense is created successfully.

Test 2

1. Open the App.
2. Go to 1:1 Dm with any user
3. Click + from composer -> Create expense -> Manual.
4. Complete the steps to reach the confirmation page.
5. Verify confirmation page has inline text input for the field Merchant and Description.
6. Verify Merchant and Description fields are editable.
7. Clear the Merchant field and click create expense button.
8. Verify expense could be created with empty Merchant and Description values.
9. Repeat step 3-4.
10. Enter valid merchant and description values.
11. Click create expense button.
12. Verify expense is created successfully.
13. Click + from composer -> Split expense -> Manual.
14. Repeat step 4-12.

Previous Blocker : #86342

1. Go to staging.new.expensify.com
2. Go to workspace chat.
3. Click + > Create expense > Manual.
4. Enter amount > Next -> Create button does not show amount on confirm page.
5. Open 1:1 DM with any user.
6. Click + > Split expense > Manual.
7. Enter amount > Next.
8. Verify footer button does not include the amount.

Previous Blocker: #86394
Note: Mobile device only test

1. Launch Expensify app.
2. Open 1:1 DM with any user.
3. Tap + > Create expense > Manual.
4. Enter amount > Next.
5. Verify amount field does not show flip button

Previous Blocker: #86351

1. Go to staging.new.expensify.com
2. Open 1:1 DM with any user.
3. Click + > Split expense > Scan.
4. Create a split scan expense.
5. Click on the split preview.
6. Click Show more.
7. On amount field, enter amount.
8. Enter merchant.
9. Click Split expense.
10. Verify split expense is created successfully.

• 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

Screen.Recording.2026-04-02.at.9.23.14.AM.mov

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-04-02.at.9.18.46.AM.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-04-02.at.7.42.57.AM.mov

[ChavdaSachin]

@codex review

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b93809afeb

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

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/components/NumberWithSymbolForm.tsx	51.70% <100.00%> (ø)
src/components/MoneyRequestConfirmationList.tsx	61.74% <63.15%> (+0.05%)	⬆️
.../components/MoneyRequestConfirmationListFooter.tsx	79.24% <51.21%> (-3.57%)	⬇️
... and 337 files with indirect coverage changes

[melvin-bot]

@ShridharGoel 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: 04a2701c18

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

[ChavdaSachin]

Known bugs: (to be handled in next PR, added to to do list)

1. Expense could be created with empty amount field
2. Merchant value vanishes for input values (none) and Expense
3. Merchant field is allowing empty spaces

cc. @ShridharGoel @puneetlath

[ShridharGoel]

Bug: Merchant field is allowing empty spaces

Screen.Recording.2026-04-03.at.12.17.05.AM.mov

[puneetlath]

@ChavdaSachin are you able to address that bug?

@ShridharGoel is that the only issue you found? Otherwise, it tests fine and the code looks good?

[ShridharGoel]

Yes, did not find any other issue in the first pass.

[joekaufmanexpensify]

Fixing DBs

[ChavdaSachin]

Bug: Merchant field is allowing empty spaces

@ShridharGoel I investigated the bug and it would be fixed along with the Bug#2 I mentioned here.

Some fundamental changes to how default merchant values are passed down the line is needed here.

ps. Added to To Do list

[ShridharGoel]

Can you mention it after the test steps as well, so that QA knows about it? If you plan to get QA done. Else, can also mark it as NoQA.

[ChavdaSachin]

@ShridharGoel added the note.
Please complete your review and please ping me on slack in case there's anything...

[ShridharGoel]

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 there are no new alerts related to the canBeMissing param for useOnyx
• 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-04-07.at.10.44.57.PM.mov

[puneetlath]

I'm going to go ahead and merge without having the design team test the ad-hoc since we're still behind beta. Will have them test the next PR which takes it out of beta.

[github-actions]

🚧 @puneetlath 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 #86923.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7f9ce3f-c55fd38-c6ee6fd7f772485045f1c85b226ef1659ba3dbd6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7f9ce3f-c55fd38-3e8921ae0c4155aa2d3e4412d8a82759cd2dc8b8/index.html

Web 🕸️
https://86923.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/puneetlath in version: 9.3.54-0 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

No help site changes are required for this PR.

1. Feature-flagged: All UI changes (inline TextInput for Merchant/Description) are gated behind newManualExpenseFlowEnabled and not yet GA.
2. Docs already generic: Create-an-Expense.md says "Add details like description, category, tags, tax..." without specifying push-row vs. inline input — this accommodates both UI patterns.
3. Button text aligns: The split button text change ("Split expense" instead of "Split $X.XX") matches the existing docs which already say "Click Split".
4. No new concepts: No new features, settings, or workflows are introduced — just a rendering change for existing fields.

Once newManualExpenseFlow is fully rolled out and the flag is removed, the docs should be revisited to confirm the step-by-step instructions match the finalized UI.

[mitarachim]

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

[nlemma]

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

[OSBotify]

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.54-7 🚀

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