[Merge] Merging tax rates #71244

dominictb · 2025-09-24T22:10:01Z

Explanation of Change

Enable users to select tax rate when merging expenses, auto-calculate tax amount.

Fixed Issues

$ #70058
PROPOSAL:

Tests

Test case 1: Merge in the same workspace with tax enabled

Create a workspace with tax enabled and create a few different tax rates
Create 2 expenses with the same tax rate to the same workspace
Go to any of these expenses > More > Merge with the other expense
In confirmation step, Verify the tax rate from step 1 is automatically selected
Verify the tax amount is automatically calculated based on selected amount and selected tax rate
Create 2 other expenses with different tax rates
Go to any of these expenses > More > Merge with the other expense
In review details step, Verify the tax rates of theses expenses are selectable
In confirmation step, Verify the tax amount is automatically calculated based on selected amount and selected tax rate

Test case 2: Merge in different workspaces with tax enabled in both workspaces

Repeat steps 1 - 10 with 2 expenses from different workspaces with tax enabled in both workspaces
This can lead to tax rate violation if the selected tax rate does not exist in the destination workspace

Test case 3: Merge in different workspaces with tax enabled and tax disabled

Verify:

In review details step, Tax field does not show (it's auto selected depending on destination report).
After merging:
- If the destination report supports tax, the initial expense tax value is kept and tax amount is calculated based on that tax value and merged amount.
- Otherwise, there's no tax.
Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-11-06.at.15.17.04.mov

Android: mWeb Chrome

Screen.Recording.2025-11-06.at.15.20.35.mov

iOS: Native

Screen.Recording.2025-11-06.at.15.09.13-compressed.mov

iOS: mWeb Safari

Screen.Recording.2025-11-06.at.15.12.26-compressed.mov

MacOS: Chrome / Safari

Test case 1 & 2:

Screen.Recording.2025-10-09.at.17.37.15-compressed.mov

Test case 3:

Screen.Recording.2025-10-17.at.02.49.32.mov

Screen.Recording.2025-10-17.at.02.48.35.mov

MacOS: Desktop

Screen.Recording.2025-11-06.at.15.25.52-compressed.mov

codecov · 2025-09-24T22:20:12Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/hooks/useSelectedTransactionsActions.ts	`82.35% <100.00%> (+0.10%)`	⬆️
src/libs/DebugUtils.ts	`68.63% <100.00%> (+0.06%)`	⬆️
src/libs/TransactionUtils/index.ts	`72.89% <100.00%> (+0.18%)`	⬆️
src/pages/Search/SearchPage.tsx	`23.50% <ø> (+0.52%)`	⬆️
src/pages/TransactionMerge/ReceiptReviewPage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/MergeTransaction.ts	`48.09% <80.00%> (+0.39%)`	⬆️
.../TransactionMerge/MergeTransactionsListContent.tsx	`0.00% <0.00%> (ø)`
src/pages/TransactionMerge/ConfirmationPage.tsx	`0.00% <0.00%> (ø)`
src/hooks/useMergeTransactions.ts	`0.00% <0.00%> (ø)`
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.24% <0.00%> (ø)`
... and 2 more
... and 31 files with indirect coverage changes

…eat/70058

melvin-bot · 2025-09-29T19:46:22Z

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

hoangzinh · 2025-09-30T01:55:28Z

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
- MacOS: Desktop
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

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

hoangzinh · 2025-09-30T11:28:52Z

src/libs/MergeTransactionUtils.ts

+    const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
+    return taxAmountInSmallestCurrencyUnits;


Why do we need to convert taxAmount to a string, then parse it to a float? Besides that, I guess we can put this function into TransactionUtils to reuse later.

I just copied from here:

App/src/components/MoneyRequestConfirmationList.tsx

Lines 540 to 541 in b5f7c02

const taxAmount = calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);

const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString()));

But I think it's not needed. It was initially added because calculateTaxAmount previously did not handle floating-point precision.

App/src/components/MoneyRequestConfirmationList.tsx

Lines 540 to 541 in b5f7c02

const taxAmount = calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);

const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString()));

Just removed that conversion

hoangzinh · 2025-09-30T15:13:26Z

@dominictb can you upload recordings for platform?

…eat/70058

dominictb · 2025-10-01T18:20:43Z

I'll add recordings later after implementing the changes that I'm asking Garett in #70058 (comment)

trjExpensify · 2025-10-06T20:00:18Z

@dominictb, did you get that added? Can you add recordings, and @hoangzinh can you start review?

hoangzinh · 2025-10-07T07:50:23Z

@trjExpensify I finished code review. Whenever @dominictb uploads his recordings, I will complete review checklist

dominictb · 2025-10-07T17:45:32Z

Clarifying some points in the issue thread #70058

…eat/70058

dominictb · 2025-10-09T11:02:58Z

BUG: Tax is not saved if I initiate the merge from the expense that does not support tax

Have 2 expenses from 2 workspaces, one with non-zero tax rate and the other without tax rate
Go to the expense that does not have tax enabled
Trigger the merge flow from here
In review details step, select the report with tax enabled as the destination report. Since the destination report supports tax, we'll automatically select the non-zero tax rate
After merging, notice that the tax field is set to 0% - tax exempt

This only happens if I initiate the merge flow from the expense that does not have tax enabled. Other cases work fine.

Screen.Recording.2025-10-09.at.16.57.44.mov

In the Transaction_Merge payload, I did pass the correct taxAmount, taxCode and taxValue params.

@youssef-lr I think this is a BE bug. Can you take a look?

…eat/70058

dominictb · 2026-01-05T12:49:04Z

Checking that

…eat/70058

dominictb · 2026-01-05T17:51:12Z

Fixed [Merge] Merging tax rates #71244 (comment) in 7d56278

I was wrong to assume that other fields had the same bug. Indeed only fields that are dependent on report and policy (report name, workspace, tax,...) are affected. Root cause is we don't update transaction.reportID to the selected reportID. Thus it uses the target transaction reportID to get policy here. That's why if we had 2 expenses having the same taxCode (but different tax percentages), we would always end up seeing the target transaction tax name.

Also here we should retain the source report if it is the selected report to find the corresponding policyID.

trjExpensify · 2026-01-05T21:31:32Z

Is this ready for another review @dominictb?

dominictb · 2026-01-06T02:06:57Z

Yes cc @hoangzinh

hoangzinh

All goods. I have a few feedback. Going to test PR today

src/components/ReportActionItem/MoneyRequestView.tsx

hoangzinh · 2026-01-06T23:02:13Z

src/hooks/useMergeTransactions.ts

        targetTransactionReport = targetTransactionReport ?? currentSearchResults?.data[`${ONYXKEYS.COLLECTION.REPORT}${targetTransaction?.reportID}`];
        sourceTransactionReport = sourceTransactionReport ?? currentSearchResults?.data[`${ONYXKEYS.COLLECTION.REPORT}${sourceTransaction?.reportID}`];
+        // If we're on search, search snapshot policies are more up to date
+        targetTransactionPolicy = currentSearchResults?.data[`${ONYXKEYS.COLLECTION.POLICY}${targetTransactionReport?.policyID}`];


Suggested change

targetTransactionPolicy = currentSearchResults?.data[`${ONYXKEYS.COLLECTION.POLICY}${targetTransactionReport?.policyID}`];

targetTransactionPolicy = targetTransactionPolicy ?? currentSearchResults?.data[`${ONYXKEYS.COLLECTION.POLICY}${targetTransactionReport?.policyID}`];

I thought onyx data is more up-to-date than snapshot, isn't it?

Since we're on search page, the snapshot data is more up to date. See #71244 (comment)

hoangzinh · 2026-01-06T23:04:44Z

src/libs/MergeTransactionUtils.ts

 ) {
    const conflictFields: string[] = [];
-    const mergeableData: Record<string, unknown> = {};
+    const mergeableData: Record<string, unknown> = {selectedTransactionByField: {}};


can you elaborate on this change? @dominictb. I'm worried it will reset selected options when this function is triggered.

Thanks, that makes sense. 6518595

src/pages/TransactionMerge/ConfirmationPage.tsx

hoangzinh · 2026-01-07T11:32:24Z

Bug: Unable to merge transactions

Policy A with tax enabled
Policy B with tax disabled
Submit expense X to workspace chat of policy A
Submit expense Y to workspace chat of policy B
Go to Reports -> Expenses
Select expense X and Y to merge (select X first)
Select report of expense Y to keep
Continue with merging steps

Screen.Recording.2026-01-07.at.18.25.11.mov

trjExpensify · 2026-01-08T00:13:44Z

@dominictb can you address the feedback today please? Let's get this over the line!

dominictb · 2026-01-08T00:17:53Z

Sure. I'm closely monitoring this. @hoangzinh Do you have any other concerns or bugs you found? I'm addressing the current ones but appreciate it if we can batch and fix them all.

hoangzinh · 2026-01-08T00:28:18Z

So far, so good from me. I tried to test various cases yesterday, but it's only bug I found so far.

trjExpensify · 2026-01-08T01:23:51Z

Nice one! But dammit, we've picked up a conflict. 😮‍💨

…eat/70058

dominictb · 2026-01-08T13:48:35Z

@youssef-lr I think this #71244 (comment) is a BE bug. When the target workspace has tax enabled but source workspace does not -> Transaction_Merge returns 402 Policy has tax tracking set to false error. This used to work previously. Can you check?

This reverts commit d14c2b4.

MonilBhavsar · 2026-01-13T19:39:53Z

The error seems to be coming from here in BE https://github.com/Expensify/Auth/blob/92178dc621df6b83c81536b8cff5ff599a769a2b/auth/lib/Transaction.cpp#L7664
What is expected behavior in this case? The transaction does not have tax data, right?

…eat/70058

dominictb · 2026-01-14T16:57:04Z

I think we can ignore the taxCode param if the destination report/workspace does not support tax instead of throwing exception.

Same thing happens when you moving an expense with tax to a workspace/report without tax, taxCode, taxValue and taxAmount are persistent in the transaction but they just don't show up.

trjExpensify · 2026-01-14T23:30:36Z

Gotcha, are we unblocked to continue reviewing this one?

…eat/70058

dominictb · 2026-01-15T17:49:41Z

I think we can ignore the taxCode param if the destination report/workspace does not support tax instead of throwing exception.

Oh what I meant in #71244 (comment) is that we need to update backend to do this.

Also I resolved @hoangzinh latest feedbacks in f12a935. He can continue reviewing those changes while waiting for the backend update.

…eat/70058

hoangzinh · 2026-01-16T10:34:05Z

Also I resolved @hoangzinh latest feedbacks in f12a935. He can continue reviewing those changes while waiting for the backend update.

I will manage to review the PR over the weekend, in the meantime

hoangzinh · 2026-01-16T10:35:43Z

I think we can ignore the taxCode param if the destination report/workspace does not support tax instead of throwing exception.

Oh what I meant in #71244 (comment) is that we need to update backend to do this.

ah, @youssef-lr @MonilBhavsar do you agree with @dominictb's suggestion above?

display tax rate in merge details page

8677040

melvin-bot bot assigned dominictb Sep 24, 2025

dominictb added 6 commits September 29, 2025 23:52

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

dc95254

…eat/70058

auto calculate tax amount when selecting tax rate or amount

bd346d2

auto calculate tax amount when selecting tax value

cee6050

centralize merge tax logic

20274b3

fix typescript check

33185a3

fix unit test

93172bf

dominictb marked this pull request as ready for review September 29, 2025 19:46

dominictb requested a review from a team as a code owner September 29, 2025 19:46

melvin-bot bot requested review from hoangzinh and removed request for a team September 29, 2025 19:46

hoangzinh reviewed Sep 30, 2025

View reviewed changes

dominictb added 2 commits October 2, 2025 00:53

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

8d646ca

…eat/70058

remove redundant conversion

7b3c393

dominictb mentioned this pull request Oct 1, 2025

[Merge] Enable users to select tax rate when merging expenses, auto-calculate tax amount. #70058

Open

dominictb added 2 commits October 8, 2025 22:08

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

62289d9

…eat/70058

only show policy specific fields for supported reports

2175bce

dominictb added 3 commits October 9, 2025 18:03

update merge transaction in Onyx after calculating tax

0294213

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

9fc1c60

…eat/70058

fix typecheck

d0c7366

dominictb added 2 commits January 5, 2026 22:36

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

7e86943

…eat/70058

update transaction report ID based on selection

7d56278

hoangzinh reviewed Jan 6, 2026

View reviewed changes

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

2a4cbb5

…eat/70058

dominictb added 2 commits January 8, 2026 23:06

Revert "fallback tax rate"

6328a3b

This reverts commit d14c2b4.

fix: do not reset selectedTransactionByField

6518595

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

ca76e87

…eat/70058

fix lint

b909921

dominictb added 2 commits January 16, 2026 00:47

compute taxName on selection

f12a935

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

97bec70

…eat/70058

dominictb added 4 commits January 16, 2026 00:51

Merge branch 'main' of github.com-dominictb:dominictb/epsf-app into f…

8d88494

…eat/70058

fix lint

02fbb14

fix lint

10ed005

remove lint silent

0e348f1

		const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString()));
		return taxAmountInSmallestCurrencyUnits;

	const taxAmount = calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency);
	const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString()));

	targetTransactionPolicy = currentSearchResults?.data[`${ONYXKEYS.COLLECTION.POLICY}${targetTransactionReport?.policyID}`];
	targetTransactionPolicy = targetTransactionPolicy ?? currentSearchResults?.data[`${ONYXKEYS.COLLECTION.POLICY}${targetTransactionReport?.policyID}`];

[Merge] Merging tax rates #71244

Are you sure you want to change the base?

[Merge] Merging tax rates #71244

Conversation

dominictb commented Sep 24, 2025 • 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!

codecov bot commented Sep 24, 2025 • 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 Sep 29, 2025

Uh oh!

hoangzinh commented Sep 30, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

dominictb Oct 1, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Sep 30, 2025

Uh oh!

dominictb commented Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify commented Oct 6, 2025

Uh oh!

hoangzinh commented Oct 7, 2025

Uh oh!

dominictb commented Oct 7, 2025

Uh oh!

dominictb commented Oct 9, 2025

Uh oh!

dominictb commented Jan 5, 2026

Uh oh!

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

Uh oh!

Uh oh!

trjExpensify commented Jan 5, 2026

Uh oh!

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

Uh oh!

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hoangzinh Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh Jan 6, 2026

Choose a reason for hiding this comment

Uh oh!

dominictb Jan 8, 2026 • 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!

Uh oh!

hoangzinh commented Jan 7, 2026

Uh oh!

trjExpensify commented Jan 8, 2026

Uh oh!

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

Uh oh!

Uh oh!

hoangzinh commented Jan 8, 2026

Uh oh!

dominictb commented Sep 24, 2025 •

edited

Loading

codecov bot commented Sep 24, 2025 •

edited by github-actions bot

Loading

dominictb commented Oct 1, 2025 •

edited

Loading

dominictb commented Jan 5, 2026 •

edited

Loading

dominictb commented Jan 6, 2026 •

edited

Loading

dominictb Jan 8, 2026 •

edited

Loading

dominictb commented Jan 8, 2026 •

edited

Loading