feat: Add Billable and Tax subtotals to the report view by nkdengineer · Pull Request #80079 · Expensify/App

nkdengineer · 2026-01-21T05:03:47Z

Explanation of Change

feat: Add Billable and Tax subtotals to the report view

Fixed Issues

$ #78927
PROPOSAL: #78927 (comment)

Tests

Create a new workspace
Enable taxes, tag
Enable track billable expense in Tags > More > Settings
Go to the workspace chat
Create some billable expenses, non-billable expenses, reimbursable expenses, and non-reimbursable expenses (In these expenses, select a tax rate and also have some expenses with non-default currency)
Open the expense report
Verify that the breakdown report shows Reimbursable, Non-reimbursable, Billable, and Tax total with the correct value (We can compare with the value displayed in OldDot to verify)

Verify that no errors appear in the JS console

Offline tests

Create a new workspace
Enable taxes, tag
Enable track billable expense in Tags > More > Settings
Go to the workspace chat
Go offline
Create some billable expenses, non-billable expenses, reimbursable expenses, and non-reimbursable expenses (In these expenses, select a tax rate and also have some expenses with non-default currency)
Open the expense report
Verify that the breakdown report shows Reimbursable, Non-reimbursable, Billable, and Tax total.
Verify that the breakdown text is greyed out (The value can be wrong because we need the convert amount value from the backend)

QA Steps

Same as above

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

melvin-bot · 2026-01-21T05:03:53Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

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

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

codecov · 2026-01-21T05:24:30Z

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.

Files with missing lines	Coverage Δ
src/libs/DebugUtils.ts	`68.69% <100.00%> (+0.06%)`	⬆️
src/libs/ReportUtils.ts	`74.26% <100.00%> (+0.10%)`	⬆️
...rc/components/ReportActionItem/MoneyReportView.tsx	`0.00% <0.00%> (ø)`
...stReportView/MoneyRequestReportTransactionList.tsx	`1.26% <0.00%> (-0.04%)`	⬇️
... and 6 files with indirect coverage changes

melvin-bot · 2026-01-21T14:23:55Z

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

src/components/ReportActionItem/MoneyReportView.tsx

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 84a1c92ade

ℹ️ 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-01-21T14:33:31Z

src/libs/ReportUtils.ts

+        if (taxAmount) {
+            if (currency === report?.currency) {
+                taxTotal += taxAmount;
+            } else {
+                taxTotal -= transaction?.convertedTaxAmount ?? 0;


Avoid relying on missing convertedTaxAmount

In multi‑currency expense reports, this branch uses transaction.convertedTaxAmount to compute the tax subtotal when currency !== report.currency. That field is newly added but isn’t populated anywhere in the client transaction shape/optimistic updates, so for foreign‑currency transactions it will be undefined and the tax subtotal will end up as 0 (and the “Tax” row won’t show). This will misreport tax totals for any report with FX expenses until the backend supplies a converted tax value. Consider deriving the tax subtotal from taxAmount using the same conversion logic as convertedAmount, or at least falling back when convertedTaxAmount is missing.

Useful? React with 👍 / 👎.

joekaufmanexpensify

Good from a product perspective 👍

eVoloshchak · 2026-01-25T18:35:32Z

Enable track billable expense

Could you please change this to?

Enable track billable expense in Tags > More > Settings

Create some billable expenses, non-billable expenses, reimbursable expenses, non- reimbursable expense (In these expenses, select a tax rate and also have some expenses with non-default currency)

This doesn't work as expected offline (tax amount for an expense with non-default currency is ignored and properly calculated only after you go online) 00:42

Screen.Recording.2026-01-25.at.19.30.00.mov

nkdengineer · 2026-01-27T07:29:07Z

This doesn't work as expected offline (tax amount for an expense with non-default currency is ignored and properly calculated only after you go online)

@eVoloshchak, We can't have a way to detect the correct convertedTaxAmount in offline; it's undefined there. Even if we fallback to taxAmount the total is still wrong.

trjExpensify · 2026-01-29T03:03:42Z

@eVoloshchak thoughts? Let's keep this moving.

eVoloshchak · 2026-01-29T12:28:02Z

We can't have a way to detect the correct convertedTaxAmount in offline;

Let's mark it (and any other entry) disabled if it's not up to date. Like we mark the Total disabled currently

Screen.Recording.2026-01-29.at.13.24.36.mov

trjExpensify · 2026-02-03T14:39:22Z

@nkdengineer can you address the comments and conflicts today please?

nkdengineer · 2026-02-03T14:54:33Z

Let's mark it (and any other entry) disabled if it's not up to date. Like we mark the Total disabled currently

@eVoloshchak I updated.

eVoloshchak · 2026-02-05T12:01:30Z

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

Android: mWeb Chrome

iOS: HybridApp

Simulator Screenshot - iPhone 15 Pro - 2026-02-05 at 23 01 33

iOS: mWeb Safari

Simulator Screenshot - iPhone 15 Pro - 2026-02-05 at 23 02 56

MacOS: Chrome / Safari

Screen.Recording.2026-02-05.at.22.58.34.mov

eVoloshchak · 2026-02-05T12:02:36Z

Offline tests
None

@nkdengineer, there are definitely some offline test steps we could include for the QA

eVoloshchak · 2026-02-05T12:15:22Z

Verified this is working in both cases, nice job!
Could you include unit tests for this, please? In the case of getBillableAndTaxTotal function, it's especially important

nkdengineer · 2026-02-05T14:41:38Z

@eVoloshchak Updated the offline test and unit test.

trjExpensify · 2026-02-05T20:09:02Z

@eVoloshchak we had another request for this today. Please can we get this reviewed and over the line. Thanks!

eVoloshchak

LGTM!

github-actions · 2026-02-06T09:20:10Z

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

github-actions · 2026-02-06T09:26:14Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-60f3604-402921c1b1b03674ec5b541a32fc0c063fe3ebd7/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-60f3604-da0275639e2f2378fb5e804f53426d582e960d0c/index.html

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

👀 View the workflow run that generated this build 👀

JmillsExpensify · 2026-02-06T10:53:24Z

Thanks all! Awesome to see this one merged.

OSBotify · 2026-02-10T07:22:34Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.16-0 🚀

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

OSBotify · 2026-02-11T06:27:03Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.16-9 🚀

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

nkdengineer added 3 commits January 7, 2026 14:29

feat: Add Billable and Tax subtotals to the report view

4c2dd88

resolve conflict

0c4ac1f

update convertTaxAmount

96dfcbc

melvin-bot bot assigned nkdengineer Jan 21, 2026

update translation and fix ts error

84a1c92

nkdengineer marked this pull request as ready for review January 21, 2026 14:23

nkdengineer requested review from a team as code owners January 21, 2026 14:23

melvin-bot bot requested review from a team, eVoloshchak and joekaufmanexpensify and removed request for a team January 21, 2026 14:23

melvin-bot bot requested review from heyjennahay and removed request for a team January 21, 2026 14:23

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/components/ReportActionItem/MoneyReportView.tsx Outdated Show resolved Hide resolved

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 21, 2026

View reviewed changes

joekaufmanexpensify removed the request for review from heyjennahay January 21, 2026 18:47

joekaufmanexpensify previously approved these changes Jan 21, 2026

View reviewed changes

resolve conflict

f797ce3

nkdengineer dismissed joekaufmanexpensify’s stale review via f797ce3 January 22, 2026 08:06

remove useMemo

d2d849f

Merge branch 'main' into fix/78927

609bd4d

nkdengineer added 3 commits February 3, 2026 21:44

resolve conflict

f72bf77

fix lin

af9fac2

display grey total when the transaction is pending update

6eae576

nkdengineer added 2 commits February 5, 2026 21:10

Merge branch 'main' into fix/78927

6d8d5f5

add unit test

eb0e5c4

eVoloshchak approved these changes Feb 5, 2026

View reviewed changes

melvin-bot bot requested a review from mjasikowski February 5, 2026 22:12

Merge branch 'main' into fix/78927

dc3d15b

mjasikowski approved these changes Feb 6, 2026

View reviewed changes

mjasikowski merged commit 60f3604 into Expensify:main Feb 6, 2026
30 checks passed

OSBotify mentioned this pull request Feb 10, 2026

Deploy Checklist: New Expensify 2026-02-10 #81937

Closed

mitarachim mentioned this pull request Feb 10, 2026

Reimbursable and Non-reimbursable total appear and disappear after changing reimbursable status #81939

Open

7 tasks

jponikarchuk mentioned this pull request Feb 10, 2026

Expense - Non-reimbursable total is missing #81940

Closed

7 tasks

This was referenced Feb 10, 2026

Expense - Billable and Tax total does not update when expense is deleted offline #81941

Closed

Expense - Wrong tax total when unreported expense is added offline #81943

Closed

jponikarchuk mentioned this pull request Feb 10, 2026

Expense - Tax total is still shown when Taxes are disabled #81944

Closed

7 tasks

mjasikowski mentioned this pull request Feb 10, 2026

[CP Staging] Revert "feat: Add Billable and Tax subtotals to the report view" #81956

Merged

52 tasks

Conversation

nkdengineer commented Jan 21, 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 Jan 21, 2026

Uh oh!

codecov bot commented Jan 21, 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 Jan 21, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 21, 2026

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Jan 25, 2026

Uh oh!

nkdengineer commented Jan 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Jan 29, 2026

Uh oh!

eVoloshchak commented Jan 29, 2026

Uh oh!

trjExpensify commented Feb 3, 2026

Uh oh!

nkdengineer commented Feb 3, 2026

Uh oh!

eVoloshchak commented Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak commented Feb 5, 2026

Uh oh!

eVoloshchak commented Feb 5, 2026

Uh oh!

nkdengineer commented Feb 5, 2026

Uh oh!

trjExpensify commented Feb 5, 2026

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

github-actions bot commented Feb 6, 2026

Uh oh!

JmillsExpensify commented Feb 6, 2026

Uh oh!

OSBotify commented Feb 10, 2026

Uh oh!

OSBotify commented Feb 11, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Comments

nkdengineer commented Jan 21, 2026 •

edited

Loading

codecov bot commented Jan 21, 2026 •

edited by github-actions bot

Loading

nkdengineer commented Jan 27, 2026 •

edited

Loading

eVoloshchak commented Feb 5, 2026 •

edited

Loading