[CP Staging] fixed no-imbursable row deploy blockers by mukhrr · Pull Request #91073 · Expensify/App

mukhrr · 2026-05-19T12:01:55Z

Explanation of Change

Fixed Issues

$ #91057
#91058
PROPOSAL:

Tests

#91058:

Go to workspace chat.
Create two non-reimbursable expenses.
Open expense report.
Open both expenses.
Delete one of the expenses.

Verify “Amount · Non-reimbursable” will appear on the remaining expense immediately.

#91057:
Precondition:

Enable Rules in workspace settings.
Set Billable default to Billable in Rules settings.

Go to workspace chat.
Create a non-reimbursable, billable expense.
Open the report.

Verify Billable row will be present in the expense report.
Verify that no errors appear in the JS console

Offline tests

QA Steps

// 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mp4

melvin-bot · 2026-05-19T12:02:03Z

@hoangzinh 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: 61a979bfd9

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

hoangzinh · 2026-05-19T13:01:26Z

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

Screen.Recording.2026-05-19.at.20.33.17.mov

Android: mWeb Chrome

Screen.Recording.2026-05-19.at.20.30.53.mov

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-05-19.at.20.26.42.mov

rlinoz

Thanks for fixing it.

rlinoz · 2026-05-19T14:19:03Z

    const isP2PDistanceRequest = isCustomUnitRateIDForP2P(transaction);
    const moneyRequestReport = parentReport;
    const parentReportTransactions = useReportTransactions(moneyRequestReport?.reportID);
+    // Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,


Suggested change

// Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,

// Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,

rlinoz · 2026-05-19T14:19:13Z

    const moneyRequestReport = parentReport;
    const parentReportTransactions = useReportTransactions(moneyRequestReport?.reportID);
+    // Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,
+    // instead of waiting for the optimistic delete to be removed from Onyx (https://github.com/Expensify/App/issues/91058).


Suggested change

// instead of waiting for the optimistic delete to be removed from Onyx (https://github.com/Expensify/App/issues/91058).

// instead of waiting for the optimistic delete to be removed from Onyx.

github-actions · 2026-05-19T14:28:39Z

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

github-actions · 2026-05-19T14:34:16Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3c963f8-d67ad90-17a90a8f2b780d74e698d7cf41df4c9badc6e656/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-3c963f8-d67ad90-db02880e9b3b80afd1a66b1d653371cd81177201/index.html

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

👀 View the workflow run that generated this build 👀

[CP Staging] fixed no-imbursable row deploy blockers (cherry picked from commit 3c963f8) (cherry-picked to staging by mountiny)

OSBotify · 2026-05-19T16:00:45Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.3.77-1 🚀

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

Bundle Size Analysis (Sentry):

Android

MelvinBot · 2026-05-19T16:03:54Z

No help site changes are required for this PR.

The changes fix UI timing/display bugs for non-reimbursable expense rows (pending-delete filtering and breakdown row visibility logic). No new features, workflows, terminology, or user-facing concepts were introduced or modified — these are internal rendering fixes only.

OSBotify · 2026-05-19T22:03:21Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.77-3 🚀

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

OSBotify · 2026-05-19T22:08:46Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-19T22:13:47Z

No help site changes are required for this PR.

This PR fixes internal UI display bugs in MoneyReportView and MoneyRequestView — specifically how the expense report view handles optimistic deletions (pending-delete transactions) and correctly shows/hides reimbursability breakdown rows vs. billable/tax rows. These are rendering-logic fixes that don't introduce or modify any user-facing features, workflows, or terminology documented on the help site.

fixed billable and tax rows with non-imbursable row

61a979b

mukhrr requested review from a team as code owners May 19, 2026 12:01

melvin-bot Bot assigned mukhrr May 19, 2026

melvin-bot Bot requested review from heyjennahay and hoangzinh and removed request for a team May 19, 2026 12:02

chatgpt-codex-connector Bot reviewed May 19, 2026

View reviewed changes

Comment thread src/components/ReportActionItem/MoneyReportView.tsx Outdated

Comment thread src/components/ReportActionItem/MoneyRequestView.tsx Outdated

fixed offline regressions

0a78c91

mukhrr mentioned this pull request May 19, 2026

[Due for payment 2026-05-26] Expense - Missing Billable row when expense is non-reimbursable #91057

Closed

7 tasks

hoangzinh reviewed May 19, 2026

View reviewed changes

Comment thread src/components/ReportActionItem/MoneyReportView.tsx

hoangzinh reviewed May 19, 2026

View reviewed changes

Comment thread src/components/ReportActionItem/MoneyRequestView.tsx

hoangzinh mentioned this pull request May 19, 2026

Expense - “Amount · Non-reimbursable” does not appear immediately after deleting expense #91058

Closed

7 tasks

removed redundant issue link in codebase

9ba7886

hoangzinh approved these changes May 19, 2026

View reviewed changes

melvin-bot Bot requested a review from rlinoz May 19, 2026 13:54

rlinoz approved these changes May 19, 2026

View reviewed changes

rlinoz changed the title ~~fixed no-imbursable row deploy blockers~~ [CP Staging] fixed no-imbursable row deploy blockers May 19, 2026

rlinoz merged commit 3c963f8 into Expensify:main May 19, 2026
44 of 45 checks passed

OSBotify pushed a commit that referenced this pull request May 19, 2026

Merge pull request #91073 from mukhrr/fix/89548-blockers

d479c80

[CP Staging] fixed no-imbursable row deploy blockers (cherry picked from commit 3c963f8) (cherry-picked to staging by mountiny)

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

OSBotify mentioned this pull request May 19, 2026

Deploy Checklist: New Expensify 2026-05-19 #91039

Closed

75 tasks

	// Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,

	// Exclude transactions pending deletion so the report is recognized as single-expense immediately after deleting one of its expenses,

	// instead of waiting for the optimistic delete to be removed from Onyx (https://github.com/Expensify/App/issues/91058).
	// instead of waiting for the optimistic delete to be removed from Onyx.

Conversation

mukhrr commented May 19, 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 19, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

rlinoz left a comment

Choose a reason for hiding this comment

Uh oh!

rlinoz May 19, 2026

Choose a reason for hiding this comment

Uh oh!

rlinoz May 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented May 19, 2026

Uh oh!

github-actions Bot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

OSBotify commented May 19, 2026

Uh oh!

MelvinBot commented May 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

mukhrr commented May 19, 2026 •

edited

Loading

hoangzinh commented May 19, 2026 •

edited

Loading