Allow submitters to select "Received reimbursement" option v2#90202
Allow submitters to select "Received reimbursement" option v2#90202nabi-ebrahimi wants to merge 4 commits into
Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
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 --helpTypically, you'd want to translate only what you changed by running |
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.
|
|
This PR fixes the two regressions related to issues 90031 and 90070. Screenshots/VideosAndroid: NativeIssue: 90031 az_recorder_20260511_134458.mp4Issue: 90070 az_recorder_20260511_140653.mp4Android: mWeb ChromeIssue: 90070 az_recorder_20260511_142500.mp4Issue: 90031 Screen.Recording.2026-05-11.at.10.23.23.AM.moviOS: NativeIssue: 90070 Screen.Recording.2026-05-11.at.9.55.02.AM.movIssue: 90031 Screen.Recording.2026-05-11.at.9.59.56.AM.mp4iOS: mWeb SafariIssue: 90070 Screen.Recording.2026-05-11.at.10.52.44.AM.movIssue: 90031 Screen.Recording.2026-05-11.at.10.48.01.AM.movMacOS: Chrome / SafariIssue: 90070 Screen.Recording.2026-05-11.at.9.12.57.AM.mp4Issue: 90031 Screen.Recording.2026-05-11.at.9.04.10.AM.mov |
There was a problem hiding this comment.
💡 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".
| value: { | ||
| ...chatReport, | ||
| iouReportID: null, | ||
| hasOutstandingChildRequest: false, |
There was a problem hiding this comment.
Preserve outstanding child requests on chat report merge
When markReportPaymentReceived() applies optimistic chat-report updates, it unconditionally sets hasOutstandingChildRequest to false. In a workspace chat that still has other unpaid child reports, this clears the outstanding indicator incorrectly and can leave the UI in the wrong state until a later server sync. The existing payMoneyRequest() flow computes this field dynamically for this exact reason, so this new path should do the same.
Useful? React with 👍 / 👎.
| return getOriginalMessage(action)?.paymentType !== CONST.IOU.PAYMENT_TYPE.ELSEWHERE; | ||
| }); | ||
|
|
||
| return !hasBankPaymentAction; |
There was a problem hiding this comment.
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 👍 / 👎.
Explanation of Change
NewDot now includes a
Received paymentoption in the reportMoremenu 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
Received paymentoption.Offline tests
Same as Tests.
QA Steps
Same as Tests.
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.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