[Payment due @hoangzinh] Remove tax, total and billable above amount in single expense report by mukhrr · Pull Request #92042 · Expensify/App

mukhrr · 2026-05-29T05:14:37Z

Explanation of Change

Fixed Issues

$ #92951
PROPOSAL:

Tests

Go to WS settings
Enable Tax and Rules
Go to Rules -> Billable-default
Set to Billable
Go to WS chat
Create a non-imbursable expense with non-default currency (make sure it's billable as well)

Verify there is nothing above Amount row in expense
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-29T05:15:09Z

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

mukhrr · 2026-05-29T05:17:50Z

cc @hoangzinh @shawnborton

shawnborton · 2026-05-29T07:13:15Z

At this point I don't think there is ever any case where we want the divider, right? So why not just delete it and all of the logic for it?

mukhrr · 2026-05-29T07:32:29Z

I think we still need it since we may show Tax, Total and Billable rows above

shawnborton · 2026-05-29T07:38:57Z

Can you show me what those cases look like? I would think all of those rows are below

mukhrr · 2026-05-29T10:14:53Z

Can you show me what those cases look like? I would think all of those rows are below

shawnborton · 2026-05-29T10:20:21Z

Can you show the full screenshot? Isn't tax a row in the list below?

mukhrr · 2026-05-29T10:22:28Z

Can you show the full screenshot? Isn't tax a row in the list below?

mukhrr · 2026-05-29T10:30:00Z

@shawnborton this one should be more informative

shawnborton · 2026-05-29T10:32:58Z

Got it, @Expensify/product what do you think about that? I feel like if we just added "Converted" to the Tax line, we could get rid of the big header value as well. Like this:

heyjennahay

Product review not required

trjExpensify · 2026-06-01T23:01:38Z

@heyjennahay I think there is a product component to this. In a one-expense report, are we good with removing the tax total at the "report level" and showing it in a Converted: $x.xx dot separator on the Tax amount field?

heyjennahay · 2026-06-02T08:57:21Z

Yep I think it's fine

mukhrr · 2026-06-02T09:17:01Z

@shawnborton @heyjennahay @trjExpensify Does this looks good?

mukhrr · 2026-06-02T09:20:38Z

And are we okay to show when it's 0 ?

shawnborton · 2026-06-02T09:37:56Z

This shouldn't be there though, right?

mukhrr · 2026-06-02T09:42:12Z

@shawnborton Just removed tax total based on this #92042 (comment). Want me to eliminate this total too?

In that case, we have only billable above the line

# Conflicts: # Mobile-Expensify # android/app/build.gradle # android/app/src/main/java/com/expensify/chat/MainApplication.kt # index.js # ios/NewExpensify/Info.plist # ios/NotificationServiceExtension/Info.plist # ios/Podfile.lock # ios/ShareViewController/Info.plist # jest/setup.ts # modules/ExpensifyNitroUtils/nitrogen/generated/android/ExpensifyNitroUtilsOnLoad.cpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/c++/JContact.hpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/c++/JContactFields.hpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/c++/JHybridAppStartTimeModuleSpec.hpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/c++/JHybridContactsModuleSpec.hpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/c++/JStringHolder.hpp # modules/ExpensifyNitroUtils/nitrogen/generated/android/kotlin/com/margelo/nitro/utils/Contact.kt # modules/ExpensifyNitroUtils/nitrogen/generated/android/kotlin/com/margelo/nitro/utils/StringHolder.kt # modules/ExpensifyNitroUtils/nitrogen/generated/ios/ExpensifyNitroUtils+autolinking.rb # package-lock.json # package.json # src/CONST/index.ts # src/components/Search/SearchList/ListItem/ChatListItem.tsx # src/components/Search/SearchSingleSelectionPicker.tsx # src/components/SpendRules/SpendRulesSection.tsx # src/components/Table/TableBody.tsx # src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableHeaderButtons.tsx # src/components/Tables/WorkspaceCompanyCardsTable/WorkspaceCompanyCardsTableRow.tsx # src/components/Tables/WorkspaceCompanyCardsTable/index.tsx # src/hooks/useExpenseActions.ts # src/languages/de.ts # src/languages/en.ts # src/languages/es.ts # src/languages/fr.ts # src/languages/it.ts # src/languages/ja.ts # src/languages/nl.ts # src/languages/pl.ts # src/languages/pt-BR.ts # src/languages/zh-hans.ts # src/libs/API/types.ts # src/libs/HttpUtils.ts # src/libs/Network/enhanceParameters.ts # src/libs/PolicyUtils.ts # src/libs/Reauthentication.ts # src/libs/Request.ts # src/libs/TransactionUtils/index.ts # src/libs/actions/Session/index.ts # src/libs/telemetry/trackAuthenticationError.ts # src/pages/iou/request/step/confirmation/SubmitExpenseOrchestrator.tsx # src/pages/iou/request/step/confirmation/useExpenseSubmission.ts # src/pages/settings/Wallet/ExpensifyCardPage/index.tsx # src/pages/workspace/AccessOrNotFoundWrapper.tsx # src/pages/workspace/WorkspaceInitialPage.tsx # src/pages/workspace/WorkspaceMembersPage.tsx # src/pages/workspace/WorkspaceMoreFeaturesPage/index.tsx # src/pages/workspace/WorkspaceOverviewPage.tsx # src/pages/workspace/WorkspacePageWithSections.tsx # src/pages/workspace/accounting/PolicyAccountingPage.tsx # src/pages/workspace/categories/WorkspaceCategoriesPage.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardDetailsPage.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardPageEmptyState.tsx # src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx # src/pages/workspace/distanceRates/PolicyDistanceRatesPage.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardBankAccounts.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardFeedSelectorPage.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardListPage.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPage.tsx # src/pages/workspace/expensifyCard/WorkspaceExpensifyCardPageEmptyState.tsx # src/pages/workspace/hr/HRProviderCard.tsx # src/pages/workspace/hr/WorkspaceHRPage.tsx # src/pages/workspace/invoices/WorkspaceInvoiceVBASection.tsx # src/pages/workspace/invoices/WorkspaceInvoicesPage.tsx # src/pages/workspace/invoices/WorkspaceInvoicingDetailsSection.tsx # src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx # src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx # src/pages/workspace/reports/WorkspaceReportsPage.tsx # src/pages/workspace/rules/ExpenseReportRulesSection.tsx # src/pages/workspace/rules/IndividualExpenseRulesSection.tsx # src/pages/workspace/rules/MerchantRulesSection.tsx # src/pages/workspace/rules/PolicyRulesPage.tsx # src/pages/workspace/tags/WorkspaceTagsPage.tsx # src/pages/workspace/tags/WorkspaceViewTagsPage.tsx # src/pages/workspace/taxes/WorkspaceTaxesPage.tsx # src/pages/workspace/timeTracking/WorkspaceTimeTrackingDefaultRateSection.tsx # src/pages/workspace/timeTracking/WorkspaceTimeTrackingPage.tsx # src/pages/workspace/travel/BookOrManageYourTrip.tsx # src/pages/workspace/travel/GetStartedTravel.tsx # src/pages/workspace/travel/PolicyTravelPage.tsx # src/pages/workspace/travel/WorkspaceTravelInvoicingSection.tsx # src/pages/workspace/workflows/WorkspaceWorkflowsPage.tsx # src/types/onyx/Session.ts # tests/ui/WorkspaceMoreFeaturesPageTest.tsx # tests/unit/APITest.ts # tests/unit/NetworkTest.tsx # tests/unit/PolicyUtilsTest.ts

hoangzinh · 2026-06-03T13:09:19Z

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

Screen.Recording.2026-06-11.at.23.58.18.mov

iOS: HybridApp

Screen.Recording.2026-06-12.at.01.01.17.mov

iOS: mWeb Safari

Screen.Recording.2026-06-12.at.00.28.30.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-11.at.23.53.30.mov

hoangzinh · 2026-06-11T17:00:36Z

@mukhrr can you resolve conflict please?

mukhrr · 2026-06-11T17:14:31Z

@mukhrr can you resolve conflict please?

done @hoangzinh

hoangzinh

🚢

hoangzinh · 2026-06-11T18:07:58Z

@mukhrr can you check ESLint fails if it's caused by this PR?

melvin-bot · 2026-06-11T18:32:43Z

🎯 @hoangzinh, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - no internal issue.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

hoangzinh · 2026-06-12T08:41:22Z

@mukhrr can you link to the correct issue in the PR description please "Fixed Issues"

hoangzinh · 2026-06-15T08:40:25Z

Hmm, Melvin didn't assign internal engineer

hoangzinh

🙏

hoangzinh · 2026-06-15T08:47:28Z

@rlinoz Melvin didn’t auto-assign an internal engineer. Could you please help us review this PR?

mjasikowski · 2026-06-15T08:57:50Z

@hoangzinh lol I'm here

github-actions · 2026-06-15T09:00:07Z

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

OSBotify · 2026-06-15T09:03:55Z

✋ 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-06-15T09:05:51Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-84dceedc319-928684c-586603cf1b9cf1fd0027a7800c6b1c75dd986ec7/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-84dceed-928684c-6c04ca4befb00cb6678fface1e18220ce971ceee/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-15T18:12:16Z

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

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

Bundle Size Analysis (Sentry):

iOS

MelvinBot · 2026-06-15T18:14:23Z

🤖 No help site changes required.

I reviewed this PR against the help articles under App/docs/articles.

What this PR changes: It's a display-only cleanup of the expense report view. For a single-expense report it hides the report-level rows (Total / Billable / Tax) that simply repeated the single expense's own amount, and instead surfaces the converted tax value directly on that expense's Tax amount field. It also gates the report-field block behind areReportFieldsEnabled. No feature behavior, setting, workflow, or label changes — purely which redundant rows render.

Why no docs update: The help site documents features, settings, and workflows (e.g., what billable/tax/report fields are and how to enable them), not the row-level layout of a report's summary view. Nothing in App/docs/articles describes these breakdown rows or their placement, so there's nothing to bring into sync with this change. The underlying billable/tax/report-field features themselves are unchanged.

No draft PR was created since no help-site content needs updating.

@mukhrr, please confirm you agree no help site changes are required here. If you believe a specific article should be updated, point me to it and I'll create the draft PR.

OSBotify · 2026-06-15T19:03:22Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-06-16T19:44:26Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

Fix stray thread divider above single non-reimbursable expense

03298a0

mukhrr requested review from a team as code owners May 29, 2026 05:14

melvin-bot Bot assigned mukhrr May 29, 2026

melvin-bot Bot requested review from heyjennahay and mjasikowski and removed request for a team May 29, 2026 05:14

removed unnecessary comments

39da57d

github-actions Bot reviewed May 29, 2026

View reviewed changes

Comment thread tests/ui/MoneyReportViewTest.tsx Outdated

mukhrr mentioned this pull request May 29, 2026

Hide redundant Reimbursable rows; show "· Non-reimbursable" on Amount #90411

Merged

53 tasks

added unnecessary comments to eslint

737665f

heyjennahay reviewed Jun 1, 2026

View reviewed changes

moved tax total from top to related row

f7bdd0f

mukhrr requested a review from hoangzinh June 3, 2026 04:09

dilshodmackbook-sketch mentioned this pull request Jun 8, 2026

[Due for payment 2026-06-23] [$125] Remove tax, total and billable above amount in single expense report #92951

Open

mukhrr added 3 commits June 11, 2026 22:11

Merge remote-tracking branch 'upstream/main' into fix/89548-blockers-v2

eebdee8

Merge remote-tracking branch 'origin/main' into fix/89548-blockers-v2

e586cd0

Merge remote-tracking branch 'origin/main' into fix/89548-blockers-v2

feb26d1

hoangzinh approved these changes Jun 11, 2026

View reviewed changes

fixed eslint

a557c66

melvin-bot Bot changed the title ~~Remove tax, total and billable above amount in single expense report~~ [Payment due @hoangzinh] Remove tax, total and billable above amount in single expense report Jun 11, 2026

hoangzinh approved these changes Jun 15, 2026

View reviewed changes

mjasikowski approved these changes Jun 15, 2026

View reviewed changes

mjasikowski merged commit 84dceed into Expensify:main Jun 15, 2026
36 checks passed

OSBotify mentioned this pull request Jun 15, 2026

Deploy Checklist: New Expensify 2026-06-15 #93604

Closed

62 tasks

Conversation

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

Uh oh!

mukhrr commented May 29, 2026

Uh oh!

Uh oh!

shawnborton commented May 29, 2026

Uh oh!

mukhrr commented May 29, 2026

Uh oh!

shawnborton commented May 29, 2026

Uh oh!

mukhrr commented May 29, 2026

Uh oh!

shawnborton commented May 29, 2026

Uh oh!

mukhrr commented May 29, 2026

Uh oh!

mukhrr commented May 29, 2026

Uh oh!

shawnborton commented May 29, 2026

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Jun 1, 2026

Uh oh!

heyjennahay commented Jun 2, 2026

Uh oh!

mukhrr commented Jun 2, 2026

Uh oh!

mukhrr commented Jun 2, 2026

Uh oh!

shawnborton commented Jun 2, 2026

Uh oh!

mukhrr commented Jun 2, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh commented Jun 11, 2026

Uh oh!

mukhrr commented Jun 11, 2026

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

melvin-bot Bot commented Jun 11, 2026

Uh oh!

hoangzinh commented Jun 12, 2026

Uh oh!

hoangzinh commented Jun 15, 2026

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Jun 15, 2026

Uh oh!

mjasikowski commented Jun 15, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

OSBotify commented Jun 15, 2026

Uh oh!

mukhrr commented May 29, 2026 •

edited

Loading

hoangzinh commented Jun 3, 2026 •

edited

Loading

hoangzinh commented Jun 11, 2026 •

edited

Loading