Fix Reimbursable row appearing when tax or billable triggers breakdown by MelvinBot · Pull Request #85117 · Expensify/App

MelvinBot · 2026-03-12T17:29:03Z

Explanation of Change

PR #84792 changed the "Reimbursable" (outOfPocket) row visibility condition from checking for the presence of non-reimbursable expenses to simply checking !!reimbursableSpend. Since reimbursableSpend is always > 0 for any normal reimbursable expense, the Reimbursable row now appears anytime the breakdown section is visible — including when the breakdown is only triggered by tax or billable amounts. This causes a redundant "Reimbursable" row showing the same value as "Total".

This PR reverts the outOfPocket row condition in both components to match Classic (OD) behavior, as directed by JmillsExpensify in this comment:

MoneyReportView.tsx: show: !!reimbursableSpend → show: !!nonReimbursableSpend
MoneyRequestReportTransactionList.tsx: shouldShow: !!reimbursableSpend → shouldShow: shouldShowExpenseReportBreakDown

The Reimbursable row now only appears when there are non-reimbursable expenses (a genuine split), while the companySpend fix from PR #84792 is preserved.

Fixed Issues

$ #84968
PROPOSAL: #84968 (comment)

Tests

Go to a workspace chat where taxes are enabled
Create a single reimbursable expense with a non-zero tax rate (e.g., 5%)
Open the expense report
Verify the "Reimbursable" row does not appear in the breakdown (only Tax should appear)
Create a second expense and toggle it to non-reimbursable
Verify both "Reimbursable" and "Non-reimbursable" rows now appear in the breakdown
Toggle the second expense back to reimbursable
Verify only the Tax row remains 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

Same as tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web: Tested via automated browser testing

Scenario 1 — Single reimbursable expense with 5% tax: breakdown shows only Tax row, no redundant "Reimbursable" row.

Scenario 2 — Mixed reimbursable + non-reimbursable expenses: both "Reimbursable" and "Non-reimbursable" rows correctly appear alongside Tax row.

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

MelvinBot · 2026-03-12T17:29:21Z

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

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

MelvinBot · 2026-03-12T17:40:19Z

The failing check (test (job 7)) is unrelated to this PR's changes.

Failing test: tests/ui/components/IOURequestStepConfirmationPageTest.tsx — "should route unreported distance expense to requestMoney and skip createDistanceRequest"

Error: TypeError: Cannot read properties of undefined (reading 'GRANTED') at __mocks__/react-native-permissions.ts:11

Analysis: The mock file imports RESULTS from react-native-permissions/dist/commonjs/permissions, but that module only exports PERMISSIONS. RESULTS is actually exported from react-native-permissions/dist/commonjs/results. This causes RESULTS to be undefined, which then fails when accessing RESULTS.GRANTED.

Evidence this is unrelated:

This PR only changes visibility conditions in src/components/ReportActionItem/MoneyReportView.tsx and src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx
git diff main shows zero changes to __mocks__/react-native-permissions.ts or tests/ui/components/IOURequestStepConfirmationPageTest.tsx
The failure is in a completely different feature area (IOU request step confirmation / location permissions)

This appears to be a pre-existing flaky test issue with the react-native-permissions mock that is not consistently triggered.

rojiphil · 2026-03-12T17:53:38Z

@MelvinBot Changes LGTM. Mark pr as ready for review

MelvinBot · 2026-03-12T17:55:19Z

PR has been marked as ready for review as requested. ✅

melvin-bot · 2026-03-12T17:55:21Z

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

github-actions · 2026-03-12T17:58:28Z

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

                        <View style={[styles.dFlex, styles.alignItemsEnd, styles.gap2, styles.mb2, styles.flex1]}>
                            {[
-                                {text: 'cardTransactions.outOfPocket', value: formattedOutOfPocketAmount, shouldShow: !!reimbursableSpend},
+                                {text: 'cardTransactions.outOfPocket', value: formattedOutOfPocketAmount, shouldShow: shouldShowExpenseReportBreakDown},


❌ CONSISTENCY-3 (docs)

The two files that render the expense breakdown section (MoneyReportView.tsx and MoneyRequestReportTransactionList.tsx) use different conditions for the same outOfPocket row visibility:

MoneyReportView.tsx (line 253): show: !!nonReimbursableSpend

MoneyRequestReportTransactionList.tsx (line 733): shouldShow: shouldShowExpenseReportBreakDown

While both aim to express "show the Reimbursable row when there are non-reimbursable expenses," they use different mechanisms. shouldShowExpenseReportBreakDown checks if any transaction is non-reimbursable (transaction-level check), while !!nonReimbursableSpend checks the aggregated monetary amount (amount-level check). These could diverge in edge cases (e.g., non-reimbursable expenses that net to zero). Since nonReimbursableSpend is already available in this file (line 180) and would be consistent with how the adjacent companySpend row works in both files, consider using !!nonReimbursableSpend here as well:

{text: 'cardTransactions.outOfPocket', value: formattedOutOfPocketAmount, shouldShow: !!nonReimbursableSpend},

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

I think we can make this consistent with others
@MelvinBot Let us use !!nonReimbursableSpend as suggested. What do you think?

Good call — using !!nonReimbursableSpend here makes both files consistent with each other and with the adjacent companySpend row. Updated in 6b37a8c.

rojiphil · 2026-03-12T18:15:37Z

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

Ran into build issues with android hybrid but I think it is fine to skip this as the changes here are not platform specific.

Android: mWeb Chrome

85117-mweb-chrome-001.mp4

iOS: HybridApp

85117-ios-hybrid-001.mp4

iOS: mWeb Safari

85117-mweb-safari-001.mp4

MacOS: Chrome / Safari

85117-web-chrome-001.mp4

MelvinBot · 2026-03-12T18:30:24Z

The failing check test (job 7) is unrelated to this PR.

Failing test: tests/ui/components/IOURequestStepConfirmationPageTest.tsx — TypeError: Cannot read properties of undefined (reading 'GRANTED')

Analysis: The error originates in __mocks__/react-native-permissions.ts:11 which imports RESULTS from react-native-permissions/dist/commonjs/permissions. However, that module only exports PERMISSIONS — RESULTS is actually defined in react-native-permissions/dist/commonjs/results. This is a pre-existing bug in the mock file (last modified Nov 2025) that causes intermittent failures depending on Jest worker module cache state.

Evidence this is unrelated:

This PR only changes MoneyRequestReportTransactionList.tsx and MoneyReportView.tsx (2 lines total)
The failing test is about IOURequestStepConfirmation — a completely different component
The mock file is identical on main and this branch
The 5 most recent test runs on main all passed — confirming this is intermittent

The other failing check (checklist) is the PR Author/Reviewer Checklist which is not a code issue.

A re-run of the test job should resolve this. The underlying mock bug should be tracked separately.

rojiphil · 2026-03-12T18:55:21Z

@MelvinBot Please address the comment here

Update the outOfPocket row shouldShow condition in MoneyRequestReportTransactionList.tsx to use !!nonReimbursableSpend, matching MoneyReportView.tsx and the adjacent companySpend row. Co-authored-by: Roji Philip <rojiphil@users.noreply.github.com>

melvin-bot · 2026-03-12T18:55:59Z

@parasharrajat @deetergp One of you needs to 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-12T18:57:48Z

@jjcoffee @parasharrajat please ignore the review request here. Thanks.

rojiphil

@deetergp Changes LGTM and works well too.
Over to you. Thanks.

85117-web-chrome-002.mp4

MelvinBot · 2026-03-12T19:15:08Z

The failing check is unrelated to this PR's changes.

Failing test: tests/ui/components/IOURequestStepConfirmationPageTest.tsx — "should route unreported distance expense to requestMoney and skip createDistanceRequest"

Error: TypeError: Cannot read properties of undefined (reading 'GRANTED') at __mocks__/react-native-permissions.ts:11

Root cause: The mock file imports {PERMISSIONS, RESULTS} from react-native-permissions/dist/commonjs/permissions, but that module only exports PERMISSIONS. The RESULTS constant is in a separate file (react-native-permissions/dist/commonjs/results), so RESULTS is undefined and RESULTS.GRANTED throws. This is a pre-existing issue in the mock.

Why this is unrelated:

This PR only changes two files: MoneyReportView.tsx and MoneyRequestReportTransactionList.tsx (one line each)
The failing test does not import or test any code from those files
The mock file and test file are identical between this branch and main
The same mock bug exists on main — this appears to be a flaky/intermittent failure depending on test execution environment

github-actions · 2026-03-12T20:15:40Z

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

github-actions · 2026-03-12T20:20:58Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-75c590e-fda79d3-c5a61c9e34c7159e233bbaf3fdc066fd347507e3/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-75c590e-fda79d3-183a6d3a16b3ac0bcb4c000e6d76ad130e1d3544/index.html

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

👀 View the workflow run that generated this build 👀

…ibility Fix Reimbursable row appearing when tax or billable triggers breakdown (cherry picked from commit 75c590e) (cherry-picked to staging by luacmartins)

OSBotify · 2026-03-12T21:53:46Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 9.3.36-10 🚀

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

OSBotify · 2026-03-12T22:53:02Z

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

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

OSBotify · 2026-03-12T23:20:26Z

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

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

MelvinBot assigned rojiphil Mar 12, 2026

MelvinBot requested a review from a team March 12, 2026 17:29

MelvinBot mentioned this pull request Mar 12, 2026

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

Closed

7 tasks

MelvinBot marked this pull request as ready for review March 12, 2026 17:55

MelvinBot requested a review from a team as a code owner March 12, 2026 17:55

melvin-bot bot requested review from jjcoffee and removed request for a team March 12, 2026 17:55

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 12, 2026 17:55

github-actions bot reviewed Mar 12, 2026

View reviewed changes

MelvinBot requested a review from a team as a code owner March 12, 2026 18:55

melvin-bot bot requested review from deetergp and parasharrajat and removed request for a team March 12, 2026 18:55

rojiphil approved these changes Mar 12, 2026

View reviewed changes

luacmartins approved these changes Mar 12, 2026

View reviewed changes

deetergp approved these changes Mar 12, 2026

View reviewed changes

deetergp merged commit 75c590e into main Mar 12, 2026
42 of 43 checks passed

deetergp deleted the claude-fixReimbursableRowVisibility branch March 12, 2026 20:14

github-actions bot mentioned this pull request Mar 12, 2026

Investigate workflow job failing on main: test / test (job 7) #85136

Closed

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

OSBotify mentioned this pull request Mar 12, 2026

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

Closed

Conversation

MelvinBot commented Mar 12, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

melvin-bot bot commented Mar 12, 2026

Uh oh!

github-actions bot Mar 12, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-3 (docs)

Uh oh!

This comment was marked as outdated.

Uh oh!

rojiphil Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

melvin-bot bot commented Mar 12, 2026

Uh oh!

rojiphil commented Mar 12, 2026

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rojiphil commented Mar 12, 2026 •

edited

Loading