[Payment due @Pujan92] Add Cancel payment action for pending P2P wallet payments by KioCoan · Pull Request #95005 · Expensify/App

KioCoan · 2026-06-30T19:11:56Z

Explanation of Change

This adds a Cancel payment secondary action (report header "More" menu) for the sender of a peer-to-peer "send money" payment that was made with the Expensify Wallet and is waiting for the receiver to set up their wallet. While the payment is held, the sender can cancel it, which returns the held funds.

Note: this relies on the companion backend change (Auth CancelReimbursement) so the user-initiated cancel actually returns the held wallet funds.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/629371

Tests

As User A (with an activated Expensify Wallet), use Send money to pay User B, who has not set up a wallet yet, choosing Expensify Wallet as the payment method.
Open the resulting payment (IOU) report as User A.
Open the report header More menu.
Verify a Cancel payment option is shown.
Tap Cancel payment and confirm in the modal.
Verify the report moves to the cancelled state, the held funds are returned, and Cancel payment no longer appears.

Verify that no errors appear in the JS console

Offline tests

QA Steps

As User A (with an activated Expensify Wallet), use Send money to pay User B, who has not set up a wallet yet, choosing Expensify Wallet as the payment method.
Open the resulting payment (IOU) report as User A.
Open the report header More menu.
Verify a Cancel payment option is shown.
Tap Cancel payment and confirm in the modal.
Verify the report moves to the cancelled state, the held funds are returned, and Cancel payment no longer appears.

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

codecov · 2026-06-30T21:55:35Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/ReportSecondaryActionUtils.ts	`95.55% <100.00%> (+0.08%)`	⬆️
src/libs/actions/IOU/PayMoneyRequest.ts	`81.73% <100.00%> (+1.02%)`	⬆️
... and 5 files with indirect coverage changes

melvin-bot · 2026-06-30T22:54:46Z

@Pujan92 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 · 2026-07-13T17:59:35Z

What's the hold up here? Looks like that Auth PR has been waiting for a review for a couple of weeks. CC: @danieldoglas

danieldoglas · 2026-07-13T18:10:41Z

I was involved in a few fires in the last weeks, so I missed reviewing the auth PR. Doing so now.

Pujan92 · 2026-07-23T06:07:00Z

@KioCoan plz merge main and fix the conflicts

KioCoan · 2026-07-23T10:08:13Z

@Pujan92 done.

trjExpensify

Cool, makes sense that we need to add this. 👍

KioCoan · 2026-07-30T19:33:53Z

Friendly bump @Pujan92

Pujan92 · 2026-07-31T18:03:14Z

@KioCoan I am getting an error "Cannot mix test and non-test wallets in a payment." for sendMoneyWithWallet api

KioCoan · 2026-07-31T23:33:46Z

@KioCoan I am getting an error "Cannot mix test and non-test wallets in a payment." for sendMoneyWithWallet api

That error isn't coming from this PR. PayWithWallet has a guard that rejects a payment when one wallet is a test wallet and the other isn't, and it's been there since last year. Your payer wallet is a test wallet (activated with the Alberta Charleson test PII, which swaps in the test wallet account number), and the receiver in this flow has to be someone who never set up a wallet, so their wallet can never be a test wallet. That combination always throws, which means the held payment state can't be created on staging at all.

Making the payer a non-test wallet would need real KYC and real funds, so this one isn't testable on staging. Here's what I'd suggest instead:

I ran the full flow locally against dev, sending money with the wallet to someone who hasn't set theirs up and then cancelling. Evidence below: the held wallet reimbursement row exists while the payment is waiting, it's deleted after the cancel so nothing debits the payer's wallet, and Auth pushes back isWaitingOnBankAccount: null, isCancelledIOU: true and a REIMBURSEMENTDEQUEUED action, which is exactly what the App's optimistic data expects. isIntegrationTest wasn't used, so that's the normal production path.
For the App side you can still verify the gating on staging: pay someone with the wallet, then turn on Debug mode (Settings > Troubleshoot > Debug mode), open the IOU report's debug page and set isWaitingOnBankAccount to true. Cancel payment should show up in the More menu for the sender only, and confirming should fire CancelPayment. The backend half is covered by CancelReimbursementTest in the Auth PR.

Do you know if we would need an internal QA for this @danieldoglas?

Pujan92 · 2026-08-01T13:29:24Z

@KioCoan Agree that the error isn't of this PR but shared as in the natural flow I might not be able to test. Thanks, I will test with the onyx update of isWaitingOnBankAccount manually for that IOUReport to test the cancel payment option in the secondary actions.

Need to fix ESLint and TypeScript failures

KioCoan · 2026-08-04T00:26:02Z

@Pujan92 the errors were from main. They seem to be fixed now.

Pujan92 · 2026-08-04T13:37:59Z

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 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 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 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.
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-08-01.at.18.00.08.mov

Pujan92

LGTM!

melvin-bot · 2026-08-04T13:38:45Z

🎯 @Pujan92, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/629371.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

danieldoglas · 2026-08-05T20:55:15Z

@coleaeason do you have wallets setup in your account? I can't test this too, so it'd be nice to have someone who can test it.

coleaeason · 2026-08-18T21:37:12Z

Testing looks great:

danieldoglas · 2026-08-18T22:28:37Z

@KioCoan can you please merge main here? I think that will fix the peer review issue

github-actions · 2026-08-18T22:46:51Z

🚧 danieldoglas has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-08-18T22:52:39Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #95005.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-5fe613b-1b4256e-9ddc4c16ee84ccc97226a5dca80c66ecb87967ad/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-5fe613b-1b4256e-e121758fdf0475b6a11fc5512d04ae6fe9d1a501/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-08-18T22:56:16Z

✋ 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 · 2026-08-18T23:33:21Z

🚀 Deployed to staging by https://github.com/danieldoglas in version: 9.4.56-0 🚀

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

MelvinBot · 2026-08-18T23:38:22Z

Help site review — docs update required ✅

Yes, this change is user-facing and warrants a help site update. This PR adds a Cancel payment action letting the sender cancel a peer-to-peer personal Wallet payment while it's held waiting for the recipient to set up their Wallet — a behavior not documented anywhere in App/docs/articles.

Draft help site PR: #98928

What it documents — a new section in Pay-Expenses.md, How to cancel a personal payment before the recipient sets up their Wallet:

The payment is held until the recipient sets up their Wallet
Sender cancels via Open the payment report → More → Cancel payment → confirm
Held funds are returned; the option disappears once the payment completes
Only the sender sees Cancel payment

UI copy (Cancel payment, the confirmation prompt, and the report header More menu) was verified against src/languages/en.ts, applying HELPSITE_NAMING_CONVENTIONS.md, HELP_AUTHORING_GUIDELINES.md, and TEMPLATE.md. I placed it in the existing personal-payments article rather than a new one since it's a nuance of the same workflow.

@KioCoan, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

mitarachim · 2026-08-19T09:41:40Z

@KioCoan This PR is failing in Step 1 because of a regression issue #98966

The issue is reproducible in: Web, Android, iOS

Bug7237070_1787131969332.98919_-_PR95005_-_IOU_-_An_expected_error_when_Pay_with_wallet_to_user_without_wallet.mp4

KioCoan added 4 commits June 29, 2026 11:03

Add cancel payment action

29a1dd8

Update report utils

d6a0774

Update report utils tests

5235517

Refactor gate check

79a09cd

melvin-bot Bot assigned KioCoan Jun 30, 2026

KioCoan changed the title ~~Add Cancel payment action for pending P2P wallet payments~~ [Hold Auth#22573] Add Cancel payment action for pending P2P wallet payments Jun 30, 2026

Fix early return check

ef9d7a9

Increase code coverage for PayMoneyRequest

c02aab7

KioCoan marked this pull request as ready for review June 30, 2026 22:54

KioCoan requested review from a team as code owners June 30, 2026 22:54

melvin-bot Bot requested review from Pujan92 and trjExpensify and removed request for a team June 30, 2026 22:54

github-actions Bot reviewed Jun 30, 2026

View reviewed changes

Comment thread src/libs/ReportSecondaryActionUtils.ts Outdated

Refactor ReportSecondaryActionUtils to dedup code

c35fd4b

danieldoglas changed the title ~~[Hold Auth#22573] Add Cancel payment action for pending P2P wallet payments~~ Add Cancel payment action for pending P2P wallet payments Jul 13, 2026

danieldoglas changed the title ~~Add Cancel payment action for pending P2P wallet payments~~ [Hold Auth#22573] Add Cancel payment action for pending P2P wallet payments Jul 13, 2026

Merge branch 'main' into cancelButtonForP2P

bca1ba4

KioCoan changed the title ~~[Hold Auth#22573] Add Cancel payment action for pending P2P wallet payments~~ Add Cancel payment action for pending P2P wallet payments Jul 23, 2026

KioCoan added 2 commits July 23, 2026 06:38

Merge remote-tracking branch 'upstream/main' into cancelButtonForP2P

35c48f9

Fix test

409e38c

trjExpensify previously approved these changes Jul 23, 2026

View reviewed changes

Update return status

f7e502a

KioCoan dismissed trjExpensify’s stale review via f7e502a July 31, 2026 23:33

KioCoan added 2 commits August 3, 2026 19:12

Merge branch 'main' into cancelButtonForP2P

ed2354f

Merge branch 'main' into cancelButtonForP2P

df38d6f

Pujan92 approved these changes Aug 4, 2026

View reviewed changes

melvin-bot Bot changed the title ~~Add Cancel payment action for pending P2P wallet payments~~ [Payment due @Pujan92] Add Cancel payment action for pending P2P wallet payments Aug 4, 2026

danieldoglas approved these changes Aug 18, 2026

View reviewed changes

Merge branch 'main' into cancelButtonForP2P

31cdc29

danieldoglas merged commit 5fe613b into Expensify:main Aug 18, 2026
34 checks passed

KioCoan deleted the cancelButtonForP2P branch August 18, 2026 23:01

OSBotify mentioned this pull request Aug 18, 2026

Deploy Checklist: New Expensify 2026-08-18 #98919

Open

64 tasks

MelvinBot mentioned this pull request Aug 18, 2026

[No QA] Docs updates for E/A#95005 Cancel a pending P2P wallet payment #98928

Draft

applause-bot Bot mentioned this pull request Aug 19, 2026

IOU - An expected error when Pay with wallet to user without wallet #98966

Open

7 tasks

Uh oh!

Conversation

KioCoan commented Jun 30, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Jun 30, 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!

melvin-bot Bot commented Jun 30, 2026

Uh oh!

Uh oh!

trjExpensify commented Jul 13, 2026

Uh oh!

danieldoglas commented Jul 13, 2026

Uh oh!

Pujan92 commented Jul 23, 2026

Uh oh!

KioCoan commented Jul 23, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

KioCoan commented Jul 30, 2026

Uh oh!

Pujan92 commented Jul 31, 2026

Uh oh!

KioCoan commented Jul 31, 2026

Uh oh!

Pujan92 commented Aug 1, 2026

Uh oh!

KioCoan commented Aug 4, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Aug 4, 2026

Uh oh!

danieldoglas commented Aug 5, 2026

Uh oh!

coleaeason commented Aug 18, 2026

Uh oh!

danieldoglas commented Aug 18, 2026

Uh oh!

Uh oh!

github-actions Bot commented Aug 18, 2026

Uh oh!

github-actions Bot commented Aug 18, 2026

Uh oh!

OSBotify commented Aug 18, 2026

Uh oh!

OSBotify commented Aug 18, 2026

Uh oh!

MelvinBot commented Aug 18, 2026

Help site review — docs update required ✅

Uh oh!

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

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov Bot commented Jun 30, 2026 •

edited by github-actions Bot

Loading

Pujan92 commented Aug 4, 2026 •

edited

Loading

mitarachim commented Aug 19, 2026 •

edited

Loading