Fix breakdown rows toggling together when changing reimbursable status by MelvinBot · Pull Request #84792 · Expensify/App

MelvinBot · 2026-03-10T19:43:16Z

Explanation of Change

Both the "Reimbursable" (outOfPocket) and "Non-reimbursable" (companySpend) rows in the expense report total breakdown used the same visibility condition, causing them to appear and disappear together when toggling an expense's reimbursable status.

This PR makes each row independently control its own visibility based on whether its respective spend value is non-zero:

Reimbursable row (outOfPocket): now shows only when reimbursableSpend > 0
Non-reimbursable row (companySpend): shows only when nonReimbursableSpend > 0 (was already correct in MoneyReportView.tsx, now also fixed in MoneyRequestReportTransactionList.tsx)

The fix is applied in both components that render the breakdown:

MoneyReportView.tsx — the legacy report view
MoneyRequestReportTransactionList.tsx — the newer transaction list view

Fixed Issues

$ #81939
PROPOSAL: #81939 (comment)

Tests

Go to a workspace chat
Create an expense in a foreign currency
Open the expense report
Disable the Reimbursable toggle on the expense
Verify only the "Non-reimbursable" row appears in the Total section (the "Reimbursable" row should not appear since reimbursable spend is $0)
Enable the Reimbursable toggle
Verify only the "Reimbursable" row appears (or the breakdown disappears entirely since showing just "Reimbursable" alongside "Total" with the same amount is redundant)
Create a second expense, make one reimbursable and one non-reimbursable
Verify both rows appear independently in the breakdown

Verify that no errors appear in the JS console

Offline tests

No offline-specific behavior changes — this is a purely visual/conditional rendering fix that depends on local report data already available in Onyx.

QA Steps

Go to a workspace chat
Create an expense in a foreign currency
Open the expense report
Toggle the Reimbursable status on/off
Verify the Reimbursable and Non-reimbursable rows in the Total section appear/disappear independently based on whether their respective spend values are non-zero
Verify they no longer appear and disappear together

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

Both the "Reimbursable" and "Non-reimbursable" rows in the expense report breakdown used the same visibility condition, causing them to appear and disappear together. Each row now independently controls its own visibility based on whether its respective spend value is non-zero. Co-authored-by: Roji Philip <rojiphil@users.noreply.github.com>

MelvinBot · 2026-03-10T19:43:29Z

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-fixBreakdownRowVisibility
git checkout -b claude-fixBreakdownRowVisibility upstream/claude-fixBreakdownRowVisibility
git push -u origin claude-fixBreakdownRowVisibility

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

rojiphil · 2026-03-11T06:37:21Z

Looks good. @MelvinBot Mark the pr as ready for review

MelvinBot · 2026-03-11T06:38:42Z

PR has been marked as ready for review ✅

melvin-bot · 2026-03-11T06:38:45Z

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

rojiphil · 2026-03-11T06:43:21Z

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 there are no new alerts related to the canBeMissing param for useOnyx
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

84792-android-hybrid-001.mp4

Android: mWeb Chrome

84792-mweb-chrome-001.mp4

iOS: HybridApp

84792-ios-hybrid-001.mp4

iOS: mWeb Safari

84792-mweb-safari-001.mp4

MacOS: Chrome / Safari

84792-web-chrome-002.mp4

rojiphil

@deetergp @JmillsExpensify Changes LGTM and works well too.
All yours. Thanks.

JmillsExpensify

Great product fix. Thanks!

OSBotify · 2026-03-11T16:28:24Z

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

github-actions · 2026-03-11T16:41:33Z

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

github-actions · 2026-03-11T16:47:34Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2f328fd-ba88656-2d6e1dba90e12c98b2242be6554e96454cc00244/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2f328fd-ba88656-4ce67aad99cbbbe7b3f252186ee4456a0557656b/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-11T20:06:45Z

🚀 Deployed to staging by https://github.com/deetergp in version: 9.3.36-0 🚀

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

jponikarchuk · 2026-03-11T21:17:42Z

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

rojiphil · 2026-03-12T05:55:07Z

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

As mentioned in OP, this PR simplified the implementation as follows:

This PR makes each row independently control its own visibility based on whether its respective spend value is non-zero:

But I agree that this would make ND and OD go out of sync in the following areas:

ND would not display Reimbursable at all when it is 0. On the other hand, OD would display Reimbursable even when it is 0 in cases when there is at least one non-zero Non-reimbursable expense.
Whenever report breakdown gets displayed due to other relevant attributes being changed(e.g. tax rate becoming non-zero, enabled billable flag), ND would display Reimbursable when it is non-zero. On the other hand, OD would display Reimbursable amount only if there are non-reimbursable expenses. Otherwise, it will not display Reimbursable amount.

@JmillsExpensify Not sure if the simplified logic implemented in this PR is fine or if we need to align with OD. Please advise.

jponikarchuk · 2026-03-12T07:50:25Z

@rojiphil @deetergp Could you please clarify what is expected offline behavior for this PR? When we disable Reimbursable, both options remain visible. This happens in all environments. Is this the expected?

WhatsApp.Video.2026-03-11.at.8.26.21.PM.mp4

rojiphil · 2026-03-12T08:22:03Z

Could you please clarify what is expected offline behavior for this PR? When we disable Reimbursable, both options remain visible. This happens in all environments. Is this the expected?

@jponikarchuk This looks like a separate issue and is unrelated to this PR. Most likely, this is due to currency conversion. Do you get this problem if you create an expense in CLP itself?

jponikarchuk · 2026-03-12T09:02:23Z

@rojiphil We have no issue with the local currency

ScreenRecording_03-12-2026.05-56-09_1.MP4

rojiphil · 2026-03-12T09:11:14Z

We have no issue with the local currency

Thanks. So, that's a separate unrelated issue to this PR.

rojiphil · 2026-03-12T09:15:49Z

Now, we just have this pending comment to be addressed.
To me, the changes in this PR looks fine but I would leave @JmillsExpensify to take a final call on this.

JmillsExpensify · 2026-03-12T17:01:34Z

I think we need to make it work exactly like Classic, I just missed that. So if we need time to make that work, or if it's not going to be possible, then I think we should revert for now.

…ers breakdown Reverts the outOfPocket row visibility condition from PR #84792 to match Classic (OD) behavior: the Reimbursable row only shows when there are non-reimbursable expenses, not whenever reimbursableSpend > 0. Co-authored-by: Roji Philip <rojiphil@users.noreply.github.com>

OSBotify · 2026-03-12T22:51:26Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.3.36-10 🚀

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

MelvinBot assigned rojiphil Mar 10, 2026

MelvinBot requested a review from a team March 10, 2026 19:43

MelvinBot mentioned this pull request Mar 10, 2026

[Due for payment 2026-03-19] [$250] Reimbursable and Non-reimbursable total appear and disappear after changing reimbursable status #81939

Closed

7 tasks

MelvinBot marked this pull request as ready for review March 11, 2026 06:38

MelvinBot requested a review from a team as a code owner March 11, 2026 06:38

melvin-bot bot requested review from JmillsExpensify and rojiphil and removed request for a team and rojiphil March 11, 2026 06:38

rojiphil approved these changes Mar 11, 2026

View reviewed changes

melvin-bot bot requested a review from deetergp March 11, 2026 06:49

JmillsExpensify approved these changes Mar 11, 2026

View reviewed changes

deetergp approved these changes Mar 11, 2026

View reviewed changes

deetergp merged commit 2f328fd into main Mar 11, 2026
38 checks passed

deetergp deleted the claude-fixBreakdownRowVisibility branch March 11, 2026 16:20

OSBotify mentioned this pull request Mar 11, 2026

Deploy Checklist: New Expensify 2026-03-11 #84953

Closed

jponikarchuk mentioned this pull request Mar 11, 2026

[Due for payment 2026-03-19] Expense - Reimbursable row appears when expense tax rate is non-zero #84968

Closed

7 tasks

MelvinBot mentioned this pull request Mar 12, 2026

[Due for payment 2026-03-19] Report - Cancel payment doesn't work and leads to blank page #85019

Closed

7 tasks

MelvinBot mentioned this pull request Mar 12, 2026

Fix Reimbursable row appearing when tax or billable triggers breakdown #85117

Merged

52 tasks

Conversation

MelvinBot commented Mar 10, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 10, 2026

Uh oh!

rojiphil commented Mar 11, 2026

Uh oh!

MelvinBot commented Mar 11, 2026

Uh oh!

melvin-bot bot commented Mar 11, 2026

Uh oh!

rojiphil commented Mar 11, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

github-actions bot commented Mar 11, 2026

Uh oh!

OSBotify commented Mar 11, 2026

Uh oh!

jponikarchuk commented Mar 11, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

jponikarchuk commented Mar 12, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

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

Uh oh!

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

JmillsExpensify commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rojiphil left a comment •

edited

Loading

jponikarchuk commented Mar 12, 2026 •

edited

Loading