Skip to content

[Payment due @huult] Hide Pay and Unapprove while a cancelled payment is processing - #102489

Merged
puneetlath merged 15 commits into
Expensify:mainfrom
allgandalf:waiting-for-cancelled-reimbursement
Oct 20, 2026
Merged

puneetlath merged 15 commits into
Expensify:mainfrom
allgandalf:waiting-for-cancelled-reimbursement

Conversation

@allgandalf

@allgandalf allgandalf commented Sep 29, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

When a payment is cancelled after the money left the payer's account, it takes a few days to come back, and Pay and Unapprove both fail until then. This hides both while isWaitingForCancelledReimbursement is true and adds the waitingForCancelledReimbursement next step message.

Keeping this as draft until the backend change that sends the flag and next step is deployed.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/671582
PROPOSAL: N/A

Tests

  1. Pay an expense report with a business bank account
  2. After the withdrawal posts, cancel the payment
  3. Open the report
  4. Verify Pay and Unapprove are not shown and the next step says "Waiting for the cancelled payment to finish processing"
  5. After the money is back in the payer's account, open the report again
  6. Verify Pay and Unapprove are shown again
  • Verify that no errors appear in the JS console

Offline tests

N/A, the flag and next step come from the server.

QA Steps

Same as tests

  • 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 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 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

@melvin-bot

melvin-bot Bot commented Sep 29, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

@cead22
cead22 requested a review from huult October 7, 2026 15:33
@huult

huult commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

Tag me when it's ready! thank you

@allgandalf

Copy link
Copy Markdown
Contributor Author

@huult lets connect to my local VM tomorrow, the BE is yet not deployed, can you DM me when you start your day tomorrow ?

@huult

huult commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

@huult lets connect to my local VM tomorrow, the BE is yet not deployed, can you DM me when you start your day tomorrow ?

Sure, I’ll DM you when I start at 14:00 GMT+7 today.

@allgandalf
allgandalf marked this pull request as ready for review October 8, 2026 08:04
@allgandalf
allgandalf requested review from a team as code owners October 8, 2026 08:04
@chatgpt-codex-connector

Copy link
Copy Markdown

Codex usage limits have been reached for code reviews. Please check with the admins of this repo to increase the limits by adding credits.
Credits must be used to enable repository wide code reviews.

@melvin-bot
melvin-bot Bot requested review from dylanexpensify and jayeshmangwani and removed request for a team October 8, 2026 08:04
@melvin-bot

melvin-bot Bot commented Oct 8, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team October 8, 2026 08:04
@allgandalf
allgandalf removed the request for review from jayeshmangwani October 8, 2026 08:11
@huult

huult commented Oct 8, 2026 •

Copy link
Copy Markdown
Contributor

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 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
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Screen.Recording.2026-10-20.at.11.03.33.mov

Comment thread src/libs/ReportPreviewActionUtils.ts Outdated
const isExpense = isExpenseReport(report);

if (isPayBlockedByArchivedState(report, policy, isReportArchived)) {
if (isPayBlockedByArchivedState(report, policy, isReportArchived) || report.isWaitingForCancelledReimbursement) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should create an isPayBlocked helper in ReportUtils, for example:

function isPayBlocked(
    report: OnyxInputOrEntry<Report>,
    policy: OnyxInputOrEntry<Policy>,
    isReportOrChatArchived: boolean,
): boolean {
    return isPayBlockedByArchivedState(report, policy, isReportOrChatArchived) || !!report?.isWaitingForCancelledReimbursement;
}

This would allow us to reuse it in ReportPreviewActionUtils, ReportPrimaryActionUtils, and ReportWorkflow.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done for preview and primary 1778c29
left canIOUBePaid, it checks archived state only at the end, so the helper would start blocking IOU pay in archived chats

dylanexpensify
dylanexpensify previously approved these changes Oct 8, 2026

@dylanexpensify dylanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from a product perspective 👍

@huult

huult commented Oct 14, 2026

Copy link
Copy Markdown
Contributor

@cretadn22 Can we use the user_good bank account to test this?

@allgandalf

allgandalf commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor Author

bump @cead22 #102489 (comment)

@cead22

cead22 commented Oct 16, 2026

Copy link
Copy Markdown
Contributor

Try it and see if it works!

@allgandalf

Copy link
Copy Markdown
Contributor Author

@huult let us know what you find in your testing

@huult

huult commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

@allgandalf I haven’t been able to reproduce it yet. Do you have any ideas on how to reproduce it?

@huult

huult commented Oct 17, 2026

Copy link
Copy Markdown
Contributor

@allgandalf Could you update the test steps so I can reproduce the issue?

@huult

huult commented Oct 19, 2026

Copy link
Copy Markdown
Contributor

Is the account where the cancel payment button is not showing the paying account? The cancel payment button should be showing for paid reports, and I believe QA should have access to reimbursement accounts so they can try to reimburse an expense and then cancel that reimbursement.

Let me know if that answers your question.

@cead22 thanks! Yes, I tested with the paying account: the workspace's USD business ACH account (ending 0000). The report is Paid, but "Cancel payment" never shows because canCancelReimbursement is false.

Which reimbursement account does QA use for this, and how can I get access to it on staging?

@cead22

cead22 commented Oct 19, 2026

Copy link
Copy Markdown
Contributor

They have many so I'm not sure, but I can ask. Why do you need that though, out of curiosity? So long as you can test on a dev account and leave good test steps for QA, they should be able to follow your steps with one of their accounts that has the right setup (or, they'd be able to set up a new account from scratch) and test this

The report is Paid, but "Cancel payment" never shows because canCancelReimbursement is false.

Is this something that's coming from the backend?

@allgandalf

Copy link
Copy Markdown
Contributor Author

I will check if i can do something with my local Backend so @huult can test this flow

@huult

huult commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

They have many so I'm not sure, but I can ask. Why do you need that though, out of curiosity? So long as you can test on a dev account and leave good test steps for QA, they should be able to follow your steps with one of their accounts that has the right setup (or, they'd be able to set up a new account from scratch) and test this

The report is Paid, but "Cancel payment" never shows because canCancelReimbursement is false.

Is this something that's coming from the backend?

@cead22 thanks for the help! I was able to test the client side with mock data (setting isWaitingForCancelledReimbursement via Onyx), so I don't need the reimbursement account anymore. And yes, canCancelReimbursement comes from the backend (OpenReport).

@huult

huult commented Oct 20, 2026 •

Copy link
Copy Markdown
Contributor

I will check if i can do something with my local Backend so @huult can test this flow

@allgandalf I was able to test it with mock data. Is this expected? Could you check the QA steps to see if QA can test this case? If not, please update the PR title to [No QA].

Screen.Recording.2026-10-20.at.11.03.33.mov

@huult huult left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@melvin-bot
melvin-bot Bot requested a review from puneetlath October 20, 2026 04:16
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot changed the title Hide Pay and Unapprove while a cancelled payment is processing [Payment due @huult] Hide Pay and Unapprove while a cancelled payment is processing Oct 20, 2026
@melvin-bot

melvin-bot Bot commented Oct 20, 2026

Copy link
Copy Markdown

🎯 @huult, 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/671582.

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.

@puneetlath
puneetlath merged commit 49a849f into Expensify:main Oct 20, 2026
37 of 39 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.5.15-1 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This change temporarily hides Pay and Unapprove while a cancelled payment is still being processed, which is a rare case. The new next step message explains it in the app, and no existing article says these actions are available after you cancel a payment.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.5.15-3 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Oct 21, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #104625

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants