feat: Allow admins to mark report with non-reimbursable expenses as paid and show decision modal if user try to pay via ACH by samranahm · Pull Request #83329 · Expensify/App

samranahm · 2026-02-24T14:37:44Z

Explanation of Change

Fixed Issues

$ #81721
PROPOSAL: #81721 (comment)

Tests

Precondition:

Workspace is connected to Business bank account
Admin Invited a member to workspace

Test:

As a member, submit a non-reimbursable expense in the workspace chat.
As an admin, open the expense report submitted by the member and approve it.
Verify that the Pay button appears on the report preview with a dropdown menu.
Select “Business bank account” and verify that an error modal appears with the message: "Cannot pay with direct payment".
Press “Got it”.
Choose “Mark as paid” and verify that the report is successfully marked as paid.
Open the expense report > More > “Cancel payment”.
Verify that the Pay button appears again in the money request report header.
Repeat steps 4–6 and verify that the Pay button behaves the same.
Cancel the payment again and open Report page > To-do > Pay.
Verify that the non-reimbursable expense is listed here and it has a Pay button with a dropdown menu.
Verify that the Pay button includes both options ACH and Mark as paid.
Repeat steps 4–6 and verify that the Pay button behaves the same.

Verify that no errors appear in the JS console

Offline tests

QA Steps

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.Native.mp4

Android: mWeb Chrome

Android.mWeb.Chrome.mp4

iOS: Native

IOS.Native.mp4

iOS: mWeb Safari

IOS.mWeb.Safari.mp4

MacOS: Chrome / Safari

macOS.Chrome.mp4

…tHoldMenu

…bursable expenses

melvin-bot · 2026-02-24T14:37:51Z

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:

Look at the code and make sure there are no malicious changes.
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 ts-node ./scripts/generateTranslations.ts --help

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

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx

Copilot

Pull request overview

Enables admins to mark expense reports that contain only non‑reimbursable expenses as paid (via “Pay elsewhere”), and shows a blocking decision modal when attempting to pay such reports via direct payment methods (e.g., ACH).

Changes:

Show Pay actions/buttons for reports with only non‑reimbursable transactions across report header/preview and search flows.
Block non‑reimbursable reports from being paid via direct payment methods by showing a localized DecisionModal.
Add new i18n strings for the non‑reimbursable payment error messaging.

Reviewed changes

Copilot reviewed 20 out of 20 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/pages/Search/SearchPage.tsx	Adjusts bulk-pay “only show pay elsewhere” logic to exclude only-non-reimbursable reports.
src/libs/actions/IOU/index.ts	Extends `canIOUBePaid()` to treat only-non-reimbursable reports as eligible when showing “pay elsewhere”.
src/libs/SearchUIUtils.ts	Adds PAY action for only-non-reimbursable reports and updates pay-elsewhere gating.
src/libs/ReportPrimaryActionUtils.ts	Allows primary Pay action for only-non-reimbursable expense reports.
src/libs/ReportPreviewActionUtils.ts	Allows preview Pay action for only-non-reimbursable expense reports.
src/libs/MoneyRequestReportUtils.ts	Adjusts preview button amount display for only-non-reimbursable reports.
src/components/SelectionListWithSections/Search/ActionCell/PayActionCell.tsx	Adds DecisionModal when attempting to pay non-reimbursable reports via direct payment methods.
src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx	Shows Pay button for only-non-reimbursable reports and displays DecisionModal on direct-payment attempts.
src/components/ProcessMoneyReportHoldMenu.tsx	Adds callback to surface the non-reimbursable direct-payment error from the hold menu flow.
src/components/MoneyReportHeader.tsx	Shows Pay button for only-non-reimbursable reports and displays DecisionModal on direct-payment attempts.
src/languages/*.ts	Adds localized strings for the new non-reimbursable payment error modal.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/libs/actions/IOU/index.ts

src/libs/SearchUIUtils.ts

src/pages/Search/SearchPage.tsx

src/libs/actions/IOU/index.ts

src/languages/en.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 6d92ab3e55

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

src/libs/SearchUIUtils.ts

…bleexpenses-mark-as-paid

codecov · 2026-02-24T15:40:08Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ReportPreview/MoneyRequestReportPreviewContent.tsx	`61.44% <100.00%> (+0.15%)`	⬆️
...RequestReportPreview/ReportPreviewActionButton.tsx	`100.00% <ø> (ø)`
src/libs/MoneyRequestReportUtils.ts	`77.94% <100.00%> (+1.01%)`	⬆️
src/libs/ReportPreviewActionUtils.ts	`92.66% <100.00%> (ø)`
src/libs/ReportPrimaryActionUtils.ts	`91.78% <100.00%> (ø)`
src/libs/ReportSecondaryActionUtils.ts	`92.91% <100.00%> (ø)`
src/libs/ReportUtils.ts	`79.60% <100.00%> (ø)`
src/libs/SearchUIUtils.ts	`68.37% <100.00%> (+0.03%)`	⬆️
src/libs/actions/IOU/index.ts	`74.57% <100.00%> (+<0.01%)`	⬆️
src/libs/actions/OnyxDerived/configs/todos.ts	`100.00% <100.00%> (ø)`
... and 7 more
... and 8 files with indirect coverage changes

samranahm · 2026-02-24T16:14:57Z

@trjExpensify @jamesdeanexpensify Can you confirm the copy please

title: "Cannot pay via direct payment"
prompt: "This report does't have reimbursable expenses and cannot be paid via direct payment. Use "Pay elsewhere" to mark it as paid instead.'"

NewDot.mp4

OldDot

…tions as parameter

jamesdeanexpensify · 2026-02-24T23:09:18Z

Cannot pay report
This report has no reimbursable expenses. Please mark it as paid instead.

trjExpensify

This is one of @joekaufmanexpensify's 👍

For this copy:

@jamesdeanexpensify I suggested a copy update here to tighten this up a bit. What do you think about the below:

Cannot pay via Expensify
The report doesn’t have reimbursable expenses. Double check the expenses, or manually mark as paid.

[Got it]

jamesdeanexpensify · 2026-02-25T00:28:13Z

That also works!

trjExpensify · 2026-02-25T00:35:23Z

Oh haha, I totally went straight to the review mode and didn't see that from earlier. I think what I like about the version I suggested is that the payment method is a bit clearer and linked. You can pay the report, just not via Expensify.

jamesdeanexpensify · 2026-02-25T01:00:02Z

Makes sense. What do you mean by the payment method is linked?

trjExpensify · 2026-02-25T01:05:21Z

The difference between:

Cannot pay via Expensify

AND

Cannot pay report

The first option is an indicator of the payment method (in-app via Expensify), the latter could be misconstrued as not being able to pay the report at all.

MelvinBot · 2026-03-28T00:03:24Z

🤖 Code Review (Updated)

Good progress since the last review. The main feedback items have been addressed:

Resolved since last review:

ProcessMoneyReportHoldMenu now accepts a transactions prop and both parent components (MoneyReportHeader, MoneyRequestReportPreviewContent) pass their hook-loaded transactions through. This fixes the inconsistent data source issue I flagged earlier.
The !isApprove guard was already added to prevent the non-reimbursable check from blocking approval flows in the hold menu.

Remaining items (low severity, non-blocking):

useSearchBulkActions bulk pay still aborts entirely — When the non-reimbursable check fires during bulk pay (line ~563), the entire operation aborts for all selected reports. This is consistent with the other early-return patterns (offline, delegate access) in the same callback, so it appears intentional. Just confirming this is the desired behavior since the error message says "One or more selected reports" suggesting partial processing might be possible.
shouldBlockDirectPayment and showNonReimbursablePaymentErrorModal are recreated on every render — In useNonReimbursablePaymentModal.tsx, both functions are plain arrow functions without useCallback. Since they're passed as props through multiple component layers (e.g., MoneyReportHeader → ProcessMoneyReportHoldMenu), they trigger unnecessary re-renders. This is minor and unlikely to cause user-visible issues, but wrapping them in useCallback would be consistent with the rest of the codebase's memoization patterns.

Overall this PR looks ready. The core logic is sound, tests cover the new paths, copy has been approved, and the earlier review feedback has been incorporated.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ed5bbfdf9b

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

src/components/MoneyReportHeader.tsx

chatgpt-codex-connector · 2026-03-28T00:25:10Z

src/libs/ReportPreviewActionUtils.ts

    const didExportFail = !isExported && hasExportError;

-    if (isExpense && isReportPayer && isPaymentsEnabled && isReportFinished && reimbursableSpend !== 0) {
+    if (isExpense && isReportPayer && isPaymentsEnabled && isReportFinished && (reimbursableSpend !== 0 || hasOnlyNonReimbursableTransactions(report?.reportID))) {


Use caller transactions when deriving preview PAY action

canPay() now depends on hasOnlyNonReimbursableTransactions(report?.reportID) but does not use the transactions that getReportPreviewAction() already receives, so it falls back to global Onyx state. If preview transactions are available before the collection is hydrated (or differ from global cache), this returns false and the PAY action is omitted for non-reimbursable-only reports. Threading the provided transactions through this check avoids stale/global-state misclassification.

Useful? React with 👍 / 👎.

I think we should address this @samranahm @situchan. We added support for passing the transactions to hasOnlyNonReimbursableTransactions. Why don't we use it and rely on the deprecatedReportsTransactions?

Updated the logic to pass transactions instead of relying on deprecatedReportsTransactions.

samranahm · 2026-03-30T14:43:27Z

@cristipaval friendly bump.

trjExpensify · 2026-03-30T19:55:59Z

Maybe not bug but it's confusing to show the same amount for both "only" and "total"

This isn't great though. @samranahm @situchan can you outline the case for it in numbered steps? CC: @joekaufmanexpensify

samranahm · 2026-03-30T21:51:37Z

@trjExpensify here are the steps to reproduce #83329 (comment)

Disable approvals
Submit two expenses in the workspace, one reimbursable and one non-reimbursable
Place the non-reimbursable expense on hold
Admin then clicks the “Pay” button

We have consistent behaviour with staging.

cristipaval · 2026-03-31T07:59:19Z

src/libs/MoneyRequestReportUtils.ts

        }

+        // For reports with only non-reimbursable expenses, show total display spend for Mark as paid.
+        if (hasOnlyNonReimbursableTransactions(report?.reportID)) {


Same as here, why do we rely on the global-deprecated-cached transactions? Can't we pass them as parameters?

We absolutely can, updated the logic.

cristipaval · 2026-03-31T08:00:27Z

src/libs/ReportPrimaryActionUtils.ts

    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);

-    if (isReportPayer && isExpenseReport && arePaymentsEnabled && isReportFinished && reimbursableSpend !== 0) {
+    if (isReportPayer && isExpenseReport && arePaymentsEnabled && isReportFinished && (reimbursableSpend !== 0 || hasOnlyNonReimbursableTransactions(report?.reportID))) {


again, we shouldn't rely on the global cached transactions since they are deprecated

cristipaval

Added some comments

joekaufmanexpensify · 2026-03-31T13:17:28Z

@trjExpensify here are the steps to reproduce #83329 (comment)

Disable approvals

Submit two expenses in the workspace, one reimbursable and one non-reimbursable

Place the non-reimbursable expense on hold

Admin then clicks the “Pay” button

We have consistent behaviour with staging.

Interesting. I agree that behavior seems incorrect. I'm not convinced the admin needs to confirm anything in that case. I wonder if we could just pay the unheld expenses and split the held non-reimbursable expenses to a new report. Alternatively, we could warn them what would happen if the admin proceeds, so they're aware. But IDT we should offer two pay buttons to pay the same amount...

If this is on staging, we prob don't need to handle it here though, yeah? Since this PR primarily deals with non-reimbursable reports.

trjExpensify · 2026-03-31T13:46:59Z

Yeah, as it's on staging, I agree with it being out of scope of this PR.

But IDT we should offer two pay buttons to pay the same amount...

Same here. Thinking about it though, I think the improvement comes sooner probably.

Be on a workspace with manual submission + approvals disabled + payments enabled.
Create a reimbursable expense
Create a non-reimbursable expense
Hold the non-reimbursable expense
Submit the report
Pay the report
Get the double button modal

^^ at step 5, we should consider keeping held expenses back. I just tried to unhold an expense on a closed report and it outright fails:

Throw ExpException - 1d43fd1c51c1c5e261ca4ece42eae341 ~~ message: '403 Transaction not accessible' source: 'auth-via-api' exceptionMessage: 'Auth UnHoldRequest returned an error' exceptionFile: '/git/releases/expensify.com/be20996/lib/Auth.php' exceptionLine: '143' exceptionCode: '403'

Hitting this code block in the UnHoldRequest command.

 // Verify that we can modify the transaction to set the hold state
    if (auth.report.verifyWrite(db, reportID, accountID, Report::STATE_APPROVED)) {
        STHROW("403 Transaction not accessible");
    }

joekaufmanexpensify · 2026-03-31T13:49:45Z

Ah, yeah that makes sense to me.

github-actions · 2026-03-31T15:06:03Z

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

github-actions · 2026-03-31T15:19:13Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	❌ FAILED ❌
The build for Android was skipped	The QR code can't be generated, because the iOS build failed

Web 🕸️
⏩ SKIPPED ⏩
The build for Web was skipped

👀 View the workflow run that generated this build 👀

…bleexpenses-mark-as-paid

cristipaval · 2026-04-01T09:45:45Z

Thanks @samranahm!

@situchan, could you quickly retest on a platform to confirm it still works as expected? 🙏

situchan · 2026-04-01T10:27:10Z

retested. works as expected

Screen.Recording.2026-04-01.at.4.25.53.PM.mov

cristipaval

Thank you all for working on this!

github-actions · 2026-04-01T10:33:51Z

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

github-actions · 2026-04-01T10:38:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1617cbc-38ead1b-920a3eb4506bafbac5fe356bcaffdced6176e7fb/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1617cbc-38ead1b-8867e13a518ff43d1003ec29f7219e5b4f31798a/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-01T10:42:03Z

✋ 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-04-02T20:18:59Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-02T20:24:25Z

🤖 I reviewed the changes in this PR and confirmed that help site updates are needed. I've created a draft PR with the required changes:

Draft PR: #86995

Changes made:

Understanding-Report-Statuses-and-Actions.md — Removed the incorrect statement that "Approved" is the final status for reports containing only non-reimbursable expenses. With this PR, admins can now mark those reports as paid, so they can reach "Paid" status.
Pay-Expenses.md — Added a new FAQ entry explaining that reports with only non-reimbursable expenses cannot be paid via ACH, and that admins should use Mark as paid instead.

I created this PR from an upstream branch since I don't have push access to your fork.

To take ownership of this branch and be able to push updates, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-helpDocsNonReimbursablePay
git checkout -b claude-helpDocsNonReimbursablePay upstream/claude-helpDocsNonReimbursablePay
git push -u origin claude-helpDocsNonReimbursablePay

Then you can close the draft PR and open a new one from your fork.

Please mark it as "Ready for review" when it is ready for review.

mitarachim · 2026-04-02T21:38:20Z

@samranahm This PR is failing because of a regression issue #87018

The issue is reproducible in: Web, Android

Bug7120186_1775162143393.bandicam_2026-04-02_23-34-18-889.mp4

samranahm added 6 commits February 24, 2026 15:46

Add non-reimbursable payment via ach DecisionModal

5b3af80

Add error handling for non-reimbursable payments in ProcessMoneyRepor…

4b4f293

…tHoldMenu

add decision modal copies in all locals

2b09ced

show total display spend for Mark as paid when there is only non-reim…

bc3ec97

…bursable expenses

handle non-reimbursable transactions in can pay helpers

55137f3

Add ach pay option for NonReimbursableTransactions in getActions

6d92ab3

Copilot AI review requested due to automatic review settings February 24, 2026 14:37

samranahm requested review from a team as code owners February 24, 2026 14:37

melvin-bot bot assigned samranahm Feb 24, 2026

melvin-bot bot requested review from situchan and trjExpensify February 24, 2026 14:37

Copilot started reviewing on behalf of samranahm February 24, 2026 14:38 View session

github-actions bot reviewed Feb 24, 2026

View reviewed changes

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx Outdated Show resolved Hide resolved

Copilot AI reviewed Feb 24, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Feb 24, 2026

View reviewed changes

src/libs/SearchUIUtils.ts Outdated Show resolved Hide resolved

samranahm added 2 commits February 24, 2026 20:27

Merge remote-tracking branch 'upstream/main' into 81721/non-reimbursa…

6ad7b4b

…bleexpenses-mark-as-paid

fix failing checks

aa4ed44

samranahm mentioned this pull request Feb 24, 2026

[CFI] NEW FEATURE: Allow admins to mark report with non-reimbursable expenses as paid #81721

Open

7 tasks

samranahm added 2 commits February 24, 2026 21:50

refactor: update hasOnlyNonReimbursableTransactions to accept transac…

3e3994d

…tions as parameter

add unit tests for non-reimbursable expense cases

69f5c89

trjExpensify reviewed Feb 25, 2026

View reviewed changes

chatgpt-codex-connector bot reviewed Mar 28, 2026

View reviewed changes

cristipaval reviewed Mar 31, 2026

View reviewed changes

cristipaval requested changes Mar 31, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

samranahm added 2 commits March 31, 2026 23:50

Merge remote-tracking branch 'upstream/main' into 81721/non-reimbursa…

d6fb246

…bleexpenses-mark-as-paid

Refactor payment action logic to include transactions param

ea019ce

cristipaval approved these changes Apr 1, 2026

View reviewed changes

cristipaval merged commit 1617cbc into Expensify:main Apr 1, 2026
33 checks passed

situchan mentioned this pull request Apr 2, 2026

Add selection mode Submit/Approve/Pay actions for mobile layout. #85796

Open

54 tasks

OSBotify mentioned this pull request Apr 2, 2026

Deploy Checklist: New Expensify 2026-04-02 #86989

Open

MelvinBot mentioned this pull request Apr 2, 2026

docs: Update help articles for non-reimbursable expense payment #86995

Draft

52 tasks

mitarachim mentioned this pull request Apr 2, 2026

Expense - The report header shows only the Mark as Paid option #87018

Open

7 tasks

Conversation

samranahm commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 24, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov bot commented Feb 24, 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!

samranahm commented Feb 24, 2026

Uh oh!

jamesdeanexpensify commented Feb 24, 2026

Uh oh!

trjExpensify left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jamesdeanexpensify commented Feb 25, 2026

Uh oh!

trjExpensify commented Feb 25, 2026

Uh oh!

jamesdeanexpensify commented Feb 25, 2026

Uh oh!

trjExpensify commented Feb 25, 2026

Uh oh!

MelvinBot commented Mar 28, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

chatgpt-codex-connector bot Mar 28, 2026

Choose a reason for hiding this comment

Uh oh!

cristipaval Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm commented Mar 30, 2026

Uh oh!

trjExpensify commented Mar 30, 2026

Uh oh!

samranahm commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cristipaval Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samranahm Mar 31, 2026

Choose a reason for hiding this comment

Uh oh!

cristipaval Mar 31, 2026

samranahm commented Feb 24, 2026 •

edited

Loading

codecov bot commented Feb 24, 2026 •

edited by github-actions bot

Loading

trjExpensify left a comment •

edited

Loading

samranahm commented Mar 30, 2026 •

edited

Loading

cristipaval Mar 31, 2026 •

edited

Loading