Allow submitters to select "Received reimbursement" option v2 by nabi-ebrahimi · Pull Request #90202 · Expensify/App

nabi-ebrahimi · 2026-05-11T13:47:53Z

Explanation of Change

NewDot now includes a Received payment option in the report More menu for eligible submitters. When selected, it shows a confirmation modal and then uses the existing pay-elsewhere flow to mark the report as paid, while staying hidden for true bank-payment scenarios.

Fixed Issues

$ #83035
PROPOSAL: #83035 (comment)

Tests

Sign in as UserA.
Create an expense and submit it to the workspace.
Sign in as UserB.
Approve the report.
Switch back to UserA.
Open the report and inspect the More menu.
Verify that there is a Received payment option.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// 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

Screen.Recording.2026-03-24.at.11.18.15.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-03-24.at.11.23.11.AM.mov

iOS: Native

Screen.Recording.2026-03-24.at.11.32.54.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-03-24.at.11.37.58.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-24.at.9.43.57.AM.mov

melvin-bot · 2026-05-11T13:48:00Z

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

codecov · 2026-05-11T13:58:47Z

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/CONST/index.ts	`93.89% <ø> (ø)`
src/libs/API/types.ts	`100.00% <ø> (ø)`
src/libs/ReportSecondaryActionUtils.ts	`94.21% <93.75%> (+0.19%)`	⬆️
src/libs/actions/IOU/PayMoneyRequest.ts	`81.34% <95.83%> (+2.05%)`	⬆️
...eaderActions/MoneyReportHeaderSecondaryActions.tsx	`0.00% <0.00%> (ø)`
...aderActions/MoneyReportHeaderSelectionDropdown.tsx	`0.61% <0.00%> (-0.01%)`	⬇️
src/hooks/useLifecycleActions.tsx	`0.00% <0.00%> (ø)`
... and 33 files with indirect coverage changes

nabi-ebrahimi · 2026-05-11T19:53:31Z

This PR fixes the two regressions related to issues 90031 and 90070.

Screenshots/Videos

Android: Native

Issue: 90031

az_recorder_20260511_134458.mp4

Issue: 90070

az_recorder_20260511_140653.mp4

Android: mWeb Chrome

Issue: 90070

az_recorder_20260511_142500.mp4

Issue: 90031

Screen.Recording.2026-05-11.at.10.23.23.AM.mov

iOS: Native

Issue: 90070

Screen.Recording.2026-05-11.at.9.55.02.AM.mov

Issue: 90031

Screen.Recording.2026-05-11.at.9.59.56.AM.mp4

iOS: mWeb Safari

Issue: 90070

Screen.Recording.2026-05-11.at.10.52.44.AM.mov

Issue: 90031

Screen.Recording.2026-05-11.at.10.48.01.AM.mov

MacOS: Chrome / Safari

Issue: 90070

Screen.Recording.2026-05-11.at.9.12.57.AM.mp4

Issue: 90031

Screen.Recording.2026-05-11.at.9.04.10.AM.mov

melvin-bot · 2026-05-11T19:54:04Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b0ce6f246f

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

chatgpt-codex-connector · 2026-05-11T20:01:30Z

+        return getOriginalMessage(action)?.paymentType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE;
+    });
+
+    return !hasBankPaymentAction;


Block repeated "Received payment" on already paid-elsewhere reports

This predicate still returns true after a pay-elsewhere reimbursement because it only treats non-elsewhere pay actions as a blocker. As a result, once a submitter marks a report as received, the same menu action remains available and can be triggered again, creating duplicate PAY actions/API writes on an already reimbursed report.

Useful? React with 👍 / 👎.

Keeping this intentional for now to match the issue’s agreed Classic parity behavior. The issue discussion explicitly decided that the option should remain visible even after the submitter marks the report as paid elsewhere, rather than hiding it after first use: #83035 (comment)

nabi-ebrahimi · 2026-05-12T12:45:14Z

@Pujan92 could you please take a look at the PR. Thanks

trjExpensify · 2026-05-13T01:32:53Z

Swapping @joekaufmanexpensify in for the review as he created this.

github-actions · 2026-05-14T21:37:38Z

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

Pujan92 · 2026-05-15T12:11:24Z

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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-05-23.at.19.34.43.mov

iOS: HybridApp

Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-05-23.at.19.31.09.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-04.at.23.09.18.mov

#90070 - Fixed

Screen.Recording.2026-05-23.at.19.16.35.mov

joekaufmanexpensify · 2026-05-15T13:57:53Z

@nabi-ebrahimi @Pujan92 #90031 is not a bug. It is intentional that we show this option, even when payments are disabled on the workspace. I commented on the deploy blocker to clarify. Can we please revert this behavior?

Description from OP of the issue:

joekaufmanexpensify · 2026-05-15T14:03:55Z

For #90035, it's expected that you can use received payment button multiple times on the same report. However, it's not expected that we throw an error after the first attempt. Do we think this is a backend issue? The API is returning an error. Here are logs if we get someone internal to investigate.

nabi-ebrahimi · 2026-05-16T11:34:17Z

Do we think this is a backend issue? The API is returning an error.

Yes, this needs backend change and the related pr is already in review - thanks

joekaufmanexpensify · 2026-05-18T12:40:53Z

Nice, thanks! I'll retest the first now and then the second once the backend PR is merged 👍

github-actions · 2026-05-18T12:42:07Z

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

joekaufmanexpensify · 2026-05-18T15:08:02Z

@joekaufmanexpensify Thanks for the clarification — I missed that earlier.
I’ve reverted this so the Received payment action is shown again even when payments are disabled on the workspace.

Retested and confirmed this is working now 👍

joekaufmanexpensify · 2026-05-18T15:08:17Z

I'll follow along on the backend PR to retest the other issue

joekaufmanexpensify · 2026-05-21T12:21:45Z

Backend is deployed! Going to retest today

joekaufmanexpensify · 2026-05-21T14:37:43Z

For #90035, it's expected that you can use received payment button multiple times on the same report. However, it's not expected that we throw an error after the first attempt. Do we think this is a backend issue? The API is returning an error.

Retested and this is working now! I'm able to mark the same report as payment received multiple times 👍

joekaufmanexpensify

Working well from my perspective 👍

Pujan92 · 2026-05-22T12:27:29Z

@nabi-ebrahimi some checks are failing

Pujan92 · 2026-05-22T12:30:24Z

+    const currentUserAccountID = getUserAccountID();
+    const currentUserEmail = getCurrentUserEmail();


need to use useCurrentUserPersonalDetails now

…il parameters

nabi-ebrahimi · 2026-05-23T11:27:18Z

@Pujan92 All checks are passed now

Pujan92

LGTM!

luacmartins

LGTM

github-actions · 2026-05-23T20:33:27Z

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

github-actions · 2026-05-23T20:40:06Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-a9c3c31d0b7-a545ffa-883b7537546a6b0491c43fb663692295eae8627c/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-a9c3c31-a545ffa-320e8c3451b43c1a89d58d03568774bfe4d981f1/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-23T20:41:49Z

✋ 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-05-25T11:22:44Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.81-0 🚀

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

MelvinBot · 2026-05-25T11:25:46Z

I reviewed the changes in this PR against the help site articles under App/docs/articles.

No help site changes are required. The "Received payment" feature is already documented:

Expense-and-Report-Actions.md — line 149 in the "Additional report actions available from the More menu" table already includes Received payment with the correct description: "On approved, closed, or reimbursed expense reports where no bank payment has been initiated | Submitter | Confirms that payment was received outside of Expensify and marks the report as paid"
Understanding-Report-Statuses-and-Actions.md — line 36 already lists Received payment in the More menu options

Both articles accurately reflect the behavior introduced by this PR.

jponikarchuk · 2026-05-25T17:20:29Z

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

OSBotify · 2026-05-25T22:35:46Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.81-2 🚀

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

nabi-ebrahimi added 4 commits May 11, 2026 18:10

Allow submitters to select "Received reimbursement" option

eee1a09

fix held test

8922826

fix: hide received payment for held expense reports

d6ecb08

fix: hide received payment when payments are disabled

b0ce6f2

melvin-bot Bot assigned nabi-ebrahimi May 11, 2026

nabi-ebrahimi marked this pull request as ready for review May 11, 2026 19:53

nabi-ebrahimi requested review from a team as code owners May 11, 2026 19:53

melvin-bot Bot requested a review from Pujan92 May 11, 2026 19:54

melvin-bot Bot requested review from trjExpensify and removed request for a team May 11, 2026 19:54

chatgpt-codex-connector Bot reviewed May 11, 2026

View reviewed changes

nabi-ebrahimi added 2 commits May 12, 2026 15:42

Merge branch 'main' into fix-reimbursement-regression

d6f6726

fix: preserve outstanding child requests in received payment flow

ab59f8e

trjExpensify requested review from joekaufmanexpensify and removed request for trjExpensify May 13, 2026 01:32

This comment has been minimized.

Sign in to view

joekaufmanexpensify mentioned this pull request May 15, 2026

[Due for payment 2026-05-20] [Due for payment 2026-05-18] Expense - Received payment option is shown when Payments are disabled in workflows settings #90031

Closed

7 tasks

Merge branch 'main' into fix-reimbursement-regression

b983732

This comment has been minimized.

Sign in to view

joekaufmanexpensify previously approved these changes May 21, 2026

View reviewed changes

Merge branch 'main' into fix-reimbursement-regression

de9b463

Pujan92 reviewed May 22, 2026

View reviewed changes

nabi-ebrahimi added 2 commits May 23, 2026 13:45

Merge branch 'main' into fix-reimbursement-regression

f39904b

Update markReportPaymentReceived function to accept accountID and ema…

9ef5a3d

…il parameters

nabi-ebrahimi dismissed joekaufmanexpensify’s stale review via 9ef5a3d May 23, 2026 09:50

Pujan92 approved these changes May 23, 2026

View reviewed changes

melvin-bot Bot requested a review from luacmartins May 23, 2026 14:05

luacmartins approved these changes May 23, 2026

View reviewed changes

luacmartins merged commit a9c3c31 into Expensify:main May 23, 2026
43 checks passed

OSBotify mentioned this pull request May 25, 2026

Deploy Checklist: New Expensify 2026-05-25 #91591

Closed

36 tasks

applause-bot Bot mentioned this pull request May 25, 2026

Expense - CONFIRMED label does not show on OD after confirming payment on ND #91637

Open

7 tasks

jponikarchuk mentioned this pull request May 25, 2026

[Due for payment 2026-06-25] [$250] New feature: Allow "Received reimbursement" option for submitters #83035

Open

		const currentUserAccountID = getUserAccountID();
		const currentUserEmail = getCurrentUserEmail();

Conversation

nabi-ebrahimi commented May 11, 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 May 11, 2026

Uh oh!

codecov Bot commented May 11, 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!

nabi-ebrahimi commented May 11, 2026

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 11, 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 May 11, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi May 12, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi commented May 12, 2026

Uh oh!

trjExpensify commented May 13, 2026

Uh oh!

github-actions Bot commented May 14, 2026

Uh oh!

This comment has been minimized.

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

joekaufmanexpensify commented May 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joekaufmanexpensify commented May 15, 2026

Uh oh!

nabi-ebrahimi commented May 16, 2026

Uh oh!

joekaufmanexpensify commented May 18, 2026

Uh oh!

github-actions Bot commented May 18, 2026

Uh oh!

This comment has been minimized.

joekaufmanexpensify commented May 18, 2026

Uh oh!

joekaufmanexpensify commented May 18, 2026

Uh oh!

joekaufmanexpensify commented May 21, 2026

Uh oh!

joekaufmanexpensify commented May 21, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Pujan92 commented May 22, 2026

Uh oh!

Pujan92 May 22, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi commented May 23, 2026

Uh oh!

Pujan92 left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

nabi-ebrahimi commented May 11, 2026 •

edited

Loading

codecov Bot commented May 11, 2026 •

edited by github-actions Bot

Loading

Pujan92 commented May 15, 2026 •

edited

Loading

joekaufmanexpensify commented May 15, 2026 •

edited

Loading