Fix/90650

[ChavdaSachin]

Explanation of Change

Fixed Issues

$ #90650
#90661

PROPOSAL:

Tests

• Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Precondition:

• Run Onyx.merge('betas', ['newManualExpenseFlow']); in console.

1. Go to staging.new.expensify.com
2. Go to workspace chat.
3. Click + > Create expense > Scan.
4. Upload a receipt.
5. Click Create expense.
6. Verify the expense is created successfully, and there's no "This field is required" error.

Run Onyx.merge('betas', ['newManualExpenseFlow']); in console.
Enable Invoices in workspace settings.
User has sent an invoice to another user.

1. Go to staging.new.expensify.com
2. Go to invoice room.
3. Click + > Send invoice.
4. Enter amount > Next.
5. On confirm page, change the amount to 0.
6. Click "send invoice" button.
7. Verify "Invalid amount" error pops up.

• 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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-21.at.9.12.54.PM.mov

Screen.Recording.2026-05-22.at.6.17.38.PM.mov

[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]

[trjExpensify]

In-ine push input edit bug fix. 👍

[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-05-22.at.5.05.37.PM.mov

[ChavdaSachin]

@ShridharGoel, I have just pushed the extensive automated tests. Please take a look at them once.

[ChavdaSachin]

Wait @ShridharGoel I am adding the soln for one more issue here

[ChavdaSachin]

@ShridharGoel, back to you
I have moved the #90661 from #91326 here for a clean solution and to avoid conflicts.

[ChavdaSachin]

@codex review

[ChavdaSachin]

Amount field validation — test matrix

Reference for amount-related behavior on the money request confirmation screen (useConfirmationValidation) and supporting logic (AmountField, setMoneyRequestAmount / clearMoneyRequestAmount, isParticipantP2P).

Test files

File	What it covers
tests/unit/hooks/useConfirmationValidation.test.ts	Confirm CTA validation (errorKey)
tests/actions/IOU/MoneyRequestTest.ts	Draft isAmountSet Onyx updates
tests/unit/IOURequestStepAmountTest.ts	isParticipantP2P() (inline amount errors in AmountField)

Participant types (first transaction.participants[0])

Label	Flags
Policy expense chat	isPolicyExpenseChat: true
P2P	accountID set, isPolicyExpenseChat: false, isSelfDM: false
Self-DM	isSelfDM: true, not policy expense chat

P2P detection: accountID && !isPolicyExpenseChat && !isSelfDM

---

Validation order (useConfirmationValidation)

Checks run in this order (first match wins):

1. routeError / missing transactionID → null
2. No selectedParticipants → iou.error.noParticipantSelected
3. P2P zero guard — manual-like, iouAmount === 0, P2P → common.error.invalidAmount
4. New manual flow, unset amount — beta on, iouRequestType: manual, !isAmountSet → common.error.fieldRequired
5. New manual flow, invalid set amount — beta on, manual, isAmountSet, !isValidMoneyRequestAmount(...) (invoice/split/P2P submit, etc.) → common.error.invalidAmount (skipped when isEditingSplitBill)
6. Merchant / category / tag / attendees / tax / per-diem sub-rates
7. Distance / time / per-diem amount limits
8. Edit split bill — empty required fields → smartscan error; iouAmount === 0 → iou.error.invalidAmount

---

useConfirmationValidation — amount tests

Default unless noted: iouRequestType: manual, merchant valid, newManualExpenseFlow = on for rows in the “new manual flow” section.

New manual expense flow (isNewManualExpenseFlowEnabled: true)

Scenario	Participant (1st on txn)	iouType	iouAmount	isAmountSet	Result
Workspace, amount empty	Policy expense chat	submit, create, track, split, invoice	0	false	common.error.fieldRequired
Workspace PAY, amount empty	Policy expense chat	pay	0	false	common.error.fieldRequired
Workspace submit, user set $0	Policy expense chat	submit	0	true	null
Workspace invoice, user set $0	Policy expense chat	invoice	0	true	common.error.invalidAmount
P2P, amount empty	P2P	submit, create, pay, split	0	false	common.error.invalidAmount
P2P, user set positive	P2P	submit	2500	true	null
P2P, user set $0	P2P	submit	0	true	common.error.invalidAmount
P2P invoice, user set $0	P2P	invoice	0	true	common.error.invalidAmount
Self-DM, amount empty	Self-DM	submit	0	false	common.error.fieldRequired
Self-DM, user set $0	Self-DM	submit	0	true	null
Beta off, P2P empty	P2P	submit	0	false	common.error.invalidAmount (no fieldRequired)

P2P zero guard (legacy / non-manual bypass)

Scenario	Participant	Request type	iouAmount	isAmountSet	Other	Result
P2P manual, beta off	P2P	manual	0	true	—	common.error.invalidAmount
Workspace manual $0	Policy expense chat	manual	0	true	—	null
P2P scan	P2P	scan	0	—	receipt	null
P2P distance	P2P	distance	0	—	isDistanceRequest: true	null
P2P time	P2P	time	0	—	isTimeRequest: true	null

Programmatic types (beta on; no isAmountSet requirement)

Scenario	Participant	Request type	iouAmount	Result
Scan	Policy expense chat	scan	1000	null
Distance	Policy expense chat	distance	5000	null
Time	P2P	time	3600	null
Per diem	Policy expense chat	per-diem	5000	null
Scan (standalone)	base (P2P in params)	scan	1000	null
Per diem (standalone)	base	per-diem	5000	null

Distance / time / per diem limits

Scenario	Request type	iouAmount	Other	Result
Distance too long	distance	123456789012345	isDistanceRequest: true	common.error.invalidAmount
Distance pending route	distance	MAX_SAFE_AMOUNT	isDistanceRequestWithPendingRoute: true	null
Distance too large (safe max)	distance	MAX_SAFE_AMOUNT + 1	—	iou.error.distanceAmountTooLarge
Time too large	time	MAX_SAFE_AMOUNT + 1	isTimeRequest: true	iou.timeTracking.amountTooLargeError
Per diem invalid total	per-diem	0	huge subRates	iou.error.invalidQuantity
Per diem no sub-rates	per-diem	100	empty subRates	iou.error.invalidSubrateLength

Split bill

Scenario	1st participant	iouType	iouAmount	isAmountSet	isEditingSplitBill	txn.amount	Result
Edit split, $0 total	P2P	submit	0	—	true	100	common.error.invalidAmount
New split, unset	P2P (multi)	split	0	false	false	0	common.error.invalidAmount
New split, unset	Policy expense chat	split	0	false	false	0	common.error.fieldRequired
New split, user set $0	Policy expense chat (multi)	split	0	true	false	0	common.error.invalidAmount
Edit split, $0 total	Policy expense chat (multi)	submit	0	true	true	100	iou.error.invalidAmount

---

Quick matrix — manual request, new manual flow (beta on)

Participant	Unset amount (isAmountSet: false, iouAmount: 0)	User set $0 (isAmountSet: true)
Policy expense chat + submit	fieldRequired	Valid (null)
Policy expense chat + invoice	fieldRequired	invalidAmount
Policy expense chat + split	fieldRequired	invalidAmount
P2P + submit	invalidAmount	invalidAmount
P2P + invoice	invalidAmount	invalidAmount
Self-DM + submit	fieldRequired	Valid (null)

---

MoneyRequestTest — draft amount actions

Action	Input	Expected draft
setMoneyRequestAmount(txn, 1500, 'USD')	User enters amount	amount: 1500, isAmountSet: true
setMoneyRequestAmount(txn, 0, 'USD')	User explicitly sets $0	amount: 0, isAmountSet: true
clearMoneyRequestAmount(txn) after set	User clears field	amount: 0, isAmountSet: false

---

IOURequestStepAmountTest — isParticipantP2P

Participant	Result
P2P (accountID, isPolicyExpenseChat: false)	true
undefined	false
No accountID	false
Policy expense chat	false
accountID: 0	false
accountID only (no policy flag)	true
Self-DM (isSelfDM: true)	false

---

AmountField UI (not unit-tested here)

Condition	Amount display
Beta on, manual, !isAmountSet	Empty field (not $0.00)
Beta on, manual, isAmountSet	Shows formatted amount
Inline error	Maps formError → fieldRequired / invalidAmount

P2P inline $0 uses isParticipantP2P() (same rules as table above, including self-DM exclusion).

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. Nice work!

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

@JS00001 for visibility