fix: revert revert taxes field by koko57 · Pull Request #78358 · Expensify/App

koko57 · 2025-12-23T11:38:00Z

Reapplying changes from #74441 reverted in #76502 and then in #77741

Explanation of Change

Fixed Issues

$ #72238
$ #77621
PROPOSAL:

Tests

Prerequisites: SelfDM, create several tracked expenses

Tracked Expenses

User with no workspace / User with several non-default workspaces

Go to selfDM
Go to an expense
Verify that the Tax and Tax Amount fields are NOT displayed

User with a default workspace / only one non-default workspace

Taxes not enabled

Go to selfDM
Go to an expense
Verify that the Tax and Tax Amount fields are NOT displayed

Taxes enabled

Be invited to a workspace with Taxes enabled
OR
Go to the default/only workspace More features settings
Enable Taxes
Go to selfDM
Go to an expense
Verify that the Tax and Tax Amount fields are displayed
Click on the Tax field, verify that the Tax selector opens
Verify that you can choose a tax rate, the selector closes, and the chosen tax rate is displayed in the Tax field
Click on the Tax Amount field
Verify that Tax Amount screen appears (in RHP)
Verify that you can change the value to a smaller amount and submit the change
Go back to the selfDM
Click "Submit to someone" under the expense you've just visited
Choose a workspace (the default one)
Verify that the Tax and Tax Amount fields values are set to the values chosen in step 10 and 13

Submitting the expense to the default workspace

Go back to self DM or in the expense with tax rate set open the expense details
Click Submit to someone
Choose the default workspace
Verify that on the confirmation page the tax rate and tax amount values are preserved from the self DM expense
Submit the expense, verify that no error appears

Prerequisites: another workspace with taxes enabled
Submitting the expense to a different workspace with taxes enabled

Add a new tax rate to the default workspace
Create a new tracked expense
Set the tax rate to the newly created one
Go back to self DM or in the expense with tax rate set open the expense details
Click Submit to someone
Choose a different workspace with tax enabled
Verify that on the confirmation page the tax rate and tax amount values are preserved from the self DM expense
Fill in the merchant
Click "Create X expense"
Verify that you see the error for the tax rate
Change the tax rate
Verify that after changing the tax rate no error appears and you can submit the expense

Creating a tracked expense

User with no workspace / User with several non-default workspaces

Go to selfDM
Click Composer + -> Create expense
On the Confirmation step, verify that the Tax and Tax Amount fields are NOT displayed

User with a default workspace / only one non-default workspace

Taxes not enabled

Go to selfDM
Click Composer + -> Create expense
On the Confirmation step, verify that the Tax and Tax Amount fields are NOT displayed

Taxes enabled

Go to selfDM
Click Composer + -> Create expense
On the Confirmation step, verify that the Tax and Tax Amount fields are displayed
Click on the Tax field, verify that the Tax selector opens
Verify that you can choose a tax rate, the selector closes, and the chosen tax rate is displayed in the Tax field
Click on the Tax Amount field
Verify that Tax Amount screen appears (in RHP)
Verify that you can change the value to a smaller amount and submit the change
Submit the expense
Go to the newly created expense
Verify that the Tax and Tax Amount fields are set to the values you selected during the creation of the expense

Changing default workspace

Prerequisites: Workspace A (default) and Workspace B both with two tax rates (the ones that are created by default) the Tax Rate 1 in Workspace B has the value changed to a different amount (i.e. 6%)

Go to selfDM
Click Composer + -> Create expense
In the Confirmation step choose the tax rate to Tax Rate 1
Create the expense
Verify that in the expense view the tax rate and the tax amount are displayed properly - the tax rate name should be Tax Rate 1
Go to workspaces
Set the Workspace B as a default workspace
Go back to the expense you created in step 4
Verify that the tax rate name is no longer Tax Rate 1, but the value is displayed

Fixed frontend issue: #76495

Prerequisites: default tax rate for a foreign currency

Go to self DM
Create an expense in workspace's default currency
Open the expense report
Go offline
Click Amount, change the currency, save it
Verify that the tax rate is updated to the foreign currency default tax rate

fix for #77621

Prerequisites: Account has self DM, the Workspace has enabled Tax rates feature.
Configure tax settings below in Taxes page:

Workspace currency default tax rate - 5%.
Workspace foreign default tax rate - 10%.

Go to self DM
Create an expense in default currency
Click Submit it to someone
Select the workspace with tax rates
On confirm page, click Amount
Change the currency and save it
Verify that the tax rate is updated to the foreign default tax rate and the value is recalculated

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

Screen.Recording.2025-11-06.at.16.12.58.mp4

Screen.Recording.2025-11-06.at.16.12.42.mp4

Screen.Recording.2025-12-23.at.21.27.57.mp4

codecov · 2025-12-23T11:47:32Z

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 Δ
...es/iou/request/step/IOURequestStepConfirmation.tsx	`56.32% <100.00%> (ø)`
.../components/MoneyRequestConfirmationListFooter.tsx	`84.30% <87.50%> (-0.03%)`	⬇️
src/libs/TransactionUtils/index.ts	`73.27% <85.71%> (+0.03%)`	⬆️
src/libs/actions/IOU/index.ts	`68.04% <66.66%> (-0.02%)`	⬇️
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.24% <0.00%> (ø)`
src/libs/PolicyUtils.ts	`54.45% <50.00%> (-0.29%)`	⬇️
...es/iou/request/step/IOURequestStepParticipants.tsx	`0.00% <0.00%> (ø)`
...ges/iou/request/step/IOURequestStepTaxRatePage.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyRequestConfirmationList.tsx	`56.85% <72.72%> (-0.07%)`	⬇️
...s/iou/request/step/IOURequestStepTaxAmountPage.tsx	`0.00% <0.00%> (ø)`
... and 2 more
... and 7 files with indirect coverage changes

github-actions · 2025-12-23T12:25:24Z

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

github-actions · 2025-12-23T12:30:21Z

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

Android 🤖	iOS 🍎
⏩ SKIPPED ⏩	⏩ SKIPPED ⏩
The build for Android was skipped	The build for iOS was skipped

Desktop 💻	Web 🕸️
⏩ SKIPPED ⏩	https://78358.pr-testing.expensify.com
The build for Desktop was skipped

👀 View the workflow run that generated this build 👀

melvin-bot · 2025-12-23T20:29:19Z

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

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

@parasharrajat this has been awaiting a review for 2 weeks. Can you do that today, please? A customer was asking about this today.

parasharrajat · 2026-01-06T07:38:04Z

@trjExpensify This is not ready.

trjExpensify · 2026-01-06T20:00:30Z

Can you elaborate on why maybe? It was marked as ready for review 2 weeks ago and nothing new has happened on it since.

parasharrajat · 2026-01-07T08:29:05Z

Based on the slack comment, I thought you were not confident about the solution before going on leave so I was waiting for you to come back.

koko57 · 2026-01-07T08:29:59Z

@parasharrajat I think this one can be reviewed, as the other issue #77631 is a bit more complicated but happens only in one case when the user has workspaces with the same rate names. So I thought it could be handled separately, not to block this PR

parasharrajat · 2026-01-07T08:30:47Z

Sounds good. Can you please update the PR title and resolve conflicts? I will get on it.

parasharrajat · 2026-01-07T08:31:58Z

Also, can you please tell me what has changed over the last PR? As most of it is just revert so it will save me some time.

koko57 · 2026-01-07T08:54:23Z

@parasharrajat just revert + fix for #77621

koko57 · 2026-01-07T14:26:37Z

@parasharrajat FYI I've found an issue with the solution for #77621 - it causes another problem when changing the tax rate. I must come upwith another idea. I'll ping you when it's ready

koko57 · 2026-01-08T10:10:15Z

@parasharrajat after fixing the issue I've found in my PR yesterday I tried to reproduce #77631 on this branch but I no longer can. Could it be because we no longer can change the participant from the confirmation page? Or my last change fixed that 🤔

Could you please also check the repro steps for #77631?

parasharrajat · 2026-01-08T12:11:33Z

src/libs/actions/IOU/index.ts

                          tag,
                          taxCode,
-                          taxAmount,
+                          taxAmount: Math.abs(taxAmount),


Why are we doing this?

because in some cases the amount was negative. We need to send only positive value

https://expensify.slack.com/archives/C09CD19HXFA/p1765279004474739

parasharrajat · 2026-01-08T12:42:38Z

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

                if (existingCategory) {
                    const isExistingCategoryEnabled = policyCategories?.[existingCategory]?.enabled;
                    if (isExistingCategoryEnabled) {
                        setMoneyRequestCategory(item.transactionID, existingCategory, policy);


Earlier we were passing isMovingTransactionFromTrackExpense here as well.

but I straight reverted the revert. Where do you remember having it passed? Why do you suggest passing it here

My bad, I was checking the wrong old commit probably.

…bject

parasharrajat · 2026-01-21T11:06:45Z

BUG: Updating tax rate offline does not work on existing tracked expenses.
BUG: Tax rate is not saved on the tracked expense once it is created.
BUG: Tax rate is not valid error does not hide when we select the correct rate.
[Due for payment 2025-12-11] Expense - Tax rate is blank after changing expense currency offline #76495

parasharrajat · 2026-01-21T11:12:30Z

BUG: When submitting to someone to a non default workspace, the tax rate is not preserved.

21.01.2026_16.41.29_REC.mp4

parasharrajat · 2026-01-21T13:31:32Z

BUG: I can see violations are showing up in tracked expenses as well.

happening on staging as well....

21.01.2026_19.01.12_REC.mp4

parasharrajat · 2026-01-21T13:32:49Z

BUG: Changing default workspace, shows the wrong pre-selected tax rate on existing tracked expenses.

While offline....

21.01.2026_19.01.56_REC.mp4

parasharrajat · 2026-01-21T13:46:04Z

parasharrajat · 2026-01-21T13:56:23Z

BUG: Staging: The incorrect Tax amount is calculated on FE.

Steps:

Create a transaction in workpace for 1 Rupee.
Be, offline Set the tax rate to 13%.
Tax amount is showing 0.12.
Be online, amount changes to 0.11.

parasharrajat · 2026-01-21T14:38:52Z

BUG: On old tracked expenses, when we switch to a workspace with taxes, the tax rate does not align with currency...

21.01.2026_20.07.08_REC.mp4

parasharrajat · 2026-01-21T14:41:17Z

BUG: https://expensify.slack.com/archives/C09CD19HXFA/p1769006224617509?thread_ts=1769002865.651009&cid=C09CD19HXFA

koko57 · 2026-01-21T15:09:41Z

@parasharrajat so now we have 3, right?
#78358 (comment)
#78358 (comment)
#78358 (comment)

the one with tax amount change - I guess BE does rounding a bit different than FE, but it looks like an old issue 😃

parasharrajat · 2026-01-21T15:11:17Z

BUG: Staging: The incorrect Tax amount is calculated on FE.

This one is present on staging... Not ours.

cristipaval · 2026-01-21T16:13:52Z

@parasharrajat so now we have 3, right? #78358 (comment) #78358 (comment) #78358 (comment)

the one with tax amount change - I guess BE does rounding a bit different than FE, but it looks like an old issue 😃

Let's not block on these. One of them is already in staging, and the others are NABs that occur in very rare use cases. GIven that we got a lot of conflicts coming in the meantime, I'd suggest we merge this as it is and fixe these NABs in a follow-up

parasharrajat · 2026-01-21T17:15:45Z

Screenshots

🔲 iOS / native

21.01.2026_23.17.02_REC.mp4

🔲 iOS / Safari

21.01.2026_23.26.14_REC.mp4

🔲 MacOS / Chrome

21.01.2026_23.12.55_REC.mp4

🔲 Android / Chrome

🔲 Android / native

21.01.2026_23.33.31_REC.mp4

parasharrajat

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.
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.

🎀 👀 🎀 C+ reviewed

OSBotify · 2026-01-21T20:11:34Z

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

OSBotify · 2026-01-21T23:36:50Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.6-0 🚀

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

jponikarchuk · 2026-01-22T07:43:40Z

This PR failing because of an issue
This issue is reproducible in: All platforms

OSBotify · 2026-01-22T22:24:06Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.6-4 🚀

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

fix: revert revert tsxes field

0370977

melvin-bot bot assigned koko57 Dec 23, 2025

fix: recalculate the taxAmount when currency changes

358c956

koko57 marked this pull request as ready for review December 23, 2025 20:29

koko57 requested review from a team as code owners December 23, 2025 20:29

melvin-bot bot requested a review from parasharrajat December 23, 2025 20:29

melvin-bot bot removed the request for review from a team December 23, 2025 20:29

fix: resolve conflicts

be5ec78

koko57 added 5 commits January 7, 2026 17:02

fix: remove the fix for the currency

4c331ea

fix: resolve conflicts

b2fe60e

fix: recalculate tax amount

e05ff24

fix: resolve conflicts

a949f54

fix: resolve conflicts

b565775

parasharrajat reviewed Jan 8, 2026

View reviewed changes

koko57 added 2 commits January 21, 2026 10:24

fix: only check if tax rate matches when taxCode on the transaction o…

0778490

…bject

fix: resolve conflicts

9ac724f

cristipaval mentioned this pull request Jan 21, 2026

Tax - Tax amount is not reset after changing workspace and can exceed tax rate limit #77631

Closed

7 tasks

parasharrajat approved these changes Jan 21, 2026

View reviewed changes

melvin-bot bot requested a review from cristipaval January 21, 2026 17:57

cristipaval approved these changes Jan 21, 2026

View reviewed changes

cristipaval merged commit 5b76720 into Expensify:main Jan 21, 2026
29 checks passed

OSBotify mentioned this pull request Jan 21, 2026

Deploy Checklist: New Expensify 2026-01-21 #80164

Closed

78 tasks

jponikarchuk mentioned this pull request Jan 22, 2026

[$250] Expenses - Unable to create an expense after selecting a valid tax rate #80192

Closed

7 tasks

luacmartins mentioned this pull request Feb 2, 2026

Remove policyID from TrackExpense CREATE flow #81190

Merged

53 tasks

lanitochka17 mentioned this pull request Feb 10, 2026

[$250] Expense - Tax rate changes to default rate 0% after adding unreported expense to expense report #82051

Closed

7 tasks

Conversation

koko57 commented Dec 23, 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 Dec 23, 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!

github-actions bot commented Dec 23, 2025

Uh oh!

github-actions bot commented Dec 23, 2025

Uh oh!

melvin-bot bot commented Dec 23, 2025

Uh oh!

trjExpensify commented Jan 5, 2026

Uh oh!

parasharrajat commented Jan 6, 2026

Uh oh!

trjExpensify commented Jan 6, 2026

Uh oh!

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

Uh oh!

Uh oh!

koko57 commented Jan 7, 2026

Uh oh!

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

Uh oh!

Uh oh!

parasharrajat commented Jan 7, 2026

Uh oh!

koko57 commented Jan 7, 2026

Uh oh!

koko57 commented Jan 7, 2026

Uh oh!

koko57 commented Jan 8, 2026

Uh oh!

parasharrajat Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

koko57 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

koko57 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

koko57 Jan 8, 2026

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jan 12, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

parasharrajat commented Jan 21, 2026

Uh oh!

parasharrajat commented Jan 21, 2026

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

parasharrajat commented Jan 21, 2026

Uh oh!

parasharrajat commented Jan 21, 2026

Uh oh!

parasharrajat commented Jan 21, 2026

Uh oh!

koko57 commented Dec 23, 2025 •

edited

Loading

codecov bot commented Dec 23, 2025 •

edited by github-actions bot

Loading

parasharrajat commented Jan 7, 2026 •

edited

Loading

parasharrajat commented Jan 7, 2026 •

edited

Loading

parasharrajat commented Jan 21, 2026 •

edited

Loading

parasharrajat commented Jan 21, 2026 •

edited

Loading

parasharrajat commented Jan 21, 2026 •

edited

Loading

koko57 commented Jan 21, 2026 •

edited

Loading

parasharrajat commented Jan 21, 2026 •

edited

Loading