[CP Staging] Fix pay report on Spend by luacmartins · Pull Request #93308 · Expensify/App

luacmartins · 2026-06-11T16:48:29Z

Explanation of Change

Passes chatReport to the PayActionCell to avoid an incorrect early return preventing reports from being paid.

Fixed Issues

$ #93230

Tests

Pre-condition: workspace account with an approved expense report ready to pay.

Create an expense, then submit and approve it.
Go to Spend > Reports.
On a wide/desktop layout, click Pay on the report row.
Click Mark as paid.
Verify the report is paid and the row updates accordingly.
Repeat with bulk pay: select multiple payable reports, pay them, and verify all succeed.
Verify that no errors appear in the JS console.

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2026-06-11.at.10.53.21.AM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

codecov · 2026-06-11T17:00:17Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ts/Search/SearchList/ListItem/ActionCell/index.tsx	`62.50% <ø> (ø)`
...ReportListItemRow/ExpenseReportListItemRowWide.tsx	`0.00% <ø> (ø)`
...chList/ListItem/ExpenseReportListItemRow/index.tsx	`0.00% <ø> (ø)`
...earch/SearchList/ListItem/ReportListItemHeader.tsx	`90.47% <100.00%> (+0.64%)`	⬆️
...h/SearchList/ListItem/ActionCell/PayActionCell.tsx	`0.00% <0.00%> (ø)`
...arch/SearchList/ListItem/ExpenseReportListItem.tsx	`0.00% <0.00%> (ø)`
... and 41 files with indirect coverage changes

melvin-bot · 2026-06-11T17:01:37Z

@suneox 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: ad699c5f2f

ℹ️ 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-06-11T17:04:39Z

        return searchData?.[`${ONYXKEYS.COLLECTION.REPORT}${reportItem.parentReportID}`];
    }, [searchData, reportItem.parentReportID]);

+    const chatReport = parentChatReport ?? snapshotChatReport;


Resolve chat reports from chatReportID in report rows

When an expense report row has the chat room only on chatReportID (the field PayActionCell previously subscribed to via iouReport?.chatReportID) and does not have parentReportID, this new value stays undefined because both lookups above use only reportItem.parentReportID. Since PayActionCell no longer falls back to iouReport.chatReportID, the Pay button path either computes canIOUBePaid without a chat report or returns early in confirmPayment; use the same snapshotReport?.chatReportID ?? reportItem.parentReportID resolution used in ReportListItemHeader/bulk pay before passing it down.

Useful? React with 👍 / 👎.

@luacmartins Agree, i think this is a valid point. The snapshotChatReport in ExpenseReportListItem only uses reportItem.parentReportID, while ReportListItemHeader uses snapshotReport?.chatReportID ?? reportItem.parentReportID. We should align both to be consistent.

daledah · 2026-06-11T17:22:01Z

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 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.ts 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.
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-06-12.at.00.39.29.mov

JmillsExpensify

LGTM

daledah

Just a minor comment above for consistency. The code changes LGTM

melvin-bot · 2026-06-11T17:48:47Z

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

OSBotify · 2026-06-11T18:58:47Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

[CP Staging] Fix pay report on Spend (cherry picked from commit 98d11b8) (cherry-picked to staging by Julesssss)

github-actions · 2026-06-11T19:13:56Z

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

OSBotify · 2026-06-11T19:34:04Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.5-2 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-11T19:41:15Z

Help site review — no changes required

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

Conclusion: No help site documentation updates are required.

Why:

This is an internal bug fix. It passes chatReport down through the component tree (ExpenseReportListItem → ExpenseReportListItemRow → PayActionCell) to avoid an incorrect early return that was preventing reports from being paid on Spend > Reports.
There are no user-facing changes: no new or renamed features, no copy/label changes, no new settings, and no change to a documented workflow. The "Pay" / "Mark as paid" flow already works as described in the help site — this PR simply restores it to function correctly.
Help articles document product features and behaviors, not internal prop-passing/data-flow fixes. The documented behavior (paying reports) is unchanged.

Because no documentation changes are needed, I did not create a draft help site PR.

@luacmartins, if you believe a behavior here is documented in a way that no longer matches reality, let me know which article and I'll draft the update.

github-actions · 2026-06-11T19:48:22Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-98d11b8fc6c-2c3e1fb-9ffb51cdc2b7fdb69869478e27e5de906870c5d8/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-98d11b8-2c3e1fb-8f2000536427560f6ebf8b66c69abd33b1d629c0/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-11T23:43:58Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.5-6 🚀

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

OSBotify · 2026-06-11T23:58:46Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.4.6-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-06-12T21:46:15Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.6-4 🚀

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

Pujan92 · 2026-08-11T03:26:49Z

We forgot to pass chatReport for transaction row, which caused the issue #95422

fix bug

b00b277

luacmartins self-assigned this Jun 11, 2026

fix prettier

ad699c5

luacmartins changed the title ~~Fix pay report on Spend~~ [CP Staging] Fix pay report on Spend Jun 11, 2026

luacmartins marked this pull request as ready for review June 11, 2026 17:01

luacmartins requested review from a team as code owners June 11, 2026 17:01

melvin-bot Bot requested review from JmillsExpensify and suneox and removed request for a team June 11, 2026 17:01

melvin-bot Bot removed the request for review from a team June 11, 2026 17:01

chatgpt-codex-connector Bot reviewed Jun 11, 2026

View reviewed changes

JmillsExpensify previously approved these changes Jun 11, 2026

View reviewed changes

daledah approved these changes Jun 11, 2026

View reviewed changes

melvin-bot Bot requested a review from Gonals June 11, 2026 17:48

add fallback report

cd33034

luacmartins dismissed JmillsExpensify’s stale review via cd33034 June 11, 2026 17:58

amyevans approved these changes Jun 11, 2026

View reviewed changes

Julesssss approved these changes Jun 11, 2026

View reviewed changes

Julesssss merged commit 98d11b8 into main Jun 11, 2026
39 of 40 checks passed

Julesssss deleted the cmartins-fixPayAction branch June 11, 2026 18:51

OSBotify pushed a commit that referenced this pull request Jun 11, 2026

Merge pull request #93308 from Expensify/cmartins-fixPayAction

632ce63

[CP Staging] Fix pay report on Spend (cherry picked from commit 98d11b8) (cherry-picked to staging by Julesssss)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 11, 2026

OSBotify mentioned this pull request Jun 11, 2026

Deploy Checklist: New Expensify 2026-06-10 #93219

Closed

72 tasks

melvin-bot Bot mentioned this pull request Jun 11, 2026

[Due for payment 2026-06-19] [Due for payment 2026-06-18] Spend - Unable to pay report on Spend #93230

Closed

7 tasks

daledah mentioned this pull request Jun 17, 2026

[Due for payment 2026-06-18] Payment issue for E/App PR#92297 #93347

Closed

This was referenced Jul 12, 2026

Fix invoice Pay from Search transaction rows (resolve chatReport in PayActionCell) #95873

Merged

[Due for payment 2026-08-07] [$250] Invoice - Unable to pay invoice via Pay dropdown buton #95422

Closed

KJ21-ENG mentioned this pull request Jul 17, 2026

[$250] Reports list Pay button (Web Chrome, ACH) unresponsive on first clicks; works only after page refresh #96068

Closed

1 task

Conversation

luacmartins commented Jun 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!

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

melvin-bot Bot commented Jun 11, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

daledah Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

luacmartins Jun 11, 2026

Choose a reason for hiding this comment

Uh oh!

daledah commented Jun 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

daledah 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!

melvin-bot Bot commented Jun 11, 2026

Uh oh!

Uh oh!

OSBotify commented Jun 11, 2026

Uh oh!

github-actions Bot commented Jun 11, 2026

Uh oh!

OSBotify commented Jun 11, 2026

Uh oh!

MelvinBot commented Jun 11, 2026

Help site review — no changes required

Uh oh!

github-actions Bot commented Jun 11, 2026

Uh oh!

OSBotify commented Jun 11, 2026

Uh oh!

OSBotify commented Jun 11, 2026

Uh oh!

OSBotify commented Jun 12, 2026

Uh oh!

Pujan92 commented Aug 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

luacmartins commented Jun 11, 2026 •

edited

Loading

codecov Bot commented Jun 11, 2026 •

edited by github-actions Bot

Loading

daledah commented Jun 11, 2026 •

edited

Loading

daledah left a comment •

edited

Loading