Enable Tax and Tax Amount fields in selfDM by koko57 · Pull Request #74441 · Expensify/App

koko57 · 2025-11-06T08:26:47Z

Explanation of Change

Fixed Issues

$ #72238
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

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]."

Same as tests

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

MacOS: Desktop

codecov · 2025-11-06T08:38:12Z

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/PolicyUtils.ts	`54.22% <100.00%> (-0.59%)`	⬇️
.../components/MoneyRequestConfirmationListFooter.tsx	`82.89% <87.50%> (+<0.01%)`	⬆️
...c/components/ReportActionItem/MoneyRequestView.tsx	`0.27% <0.00%> (ø)`
src/libs/actions/IOU.ts	`64.38% <66.66%> (-0.29%)`	⬇️
...es/iou/request/step/IOURequestStepConfirmation.tsx	`47.93% <50.00%> (ø)`
...ges/iou/request/step/IOURequestStepTaxRatePage.tsx	`0.00% <0.00%> (ø)`
...es/iou/request/step/IOURequestStepParticipants.tsx	`0.00% <0.00%> (ø)`
src/components/MoneyRequestConfirmationList.tsx	`58.17% <75.00%> (-0.08%)`	⬇️
...s/iou/request/step/IOURequestStepTaxAmountPage.tsx	`0.00% <0.00%> (ø)`
src/hooks/usePolicyForTransaction.ts	`0.00% <0.00%> (ø)`
... and 183 files with indirect coverage changes

melvin-bot · 2025-11-07T14:09:07Z

@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 · 2025-11-10T13:56:29Z

@parasharrajat have you started the review?

parasharrajat · 2025-11-10T14:01:58Z

Yes

heyjennahay

No concern with product change

parasharrajat · 2025-11-12T08:26:25Z

src/components/MoneyRequestConfirmationList.tsx

+    const taxPercentage =
+        getTaxValue(policy, transaction, transaction?.taxCode ?? defaultTaxCode) ??
+        (isMovingTransactionFromTrackExpense ? getTaxValue(policyForMovingExpenses, transaction, transaction?.taxCode ?? defaultTaxCode) : '');


Suggested change

const taxPercentage =

getTaxValue(policy, transaction, transaction?.taxCode ?? defaultTaxCode) ??

(isMovingTransactionFromTrackExpense ? getTaxValue(policyForMovingExpenses, transaction, transaction?.taxCode ?? defaultTaxCode) : '');

const taxPercentage =

getTaxValue(isMovingTransactionFromTrackExpense ? policyForMovingExpenses: policy, transaction, transaction?.taxCode ?? defaultTaxCode)

@parasharrajat no, the condition is ok - first we want to check if we get the taxValue for the chosen policy, otherwise we would always get the taxValue for policyForMovingExpenses. If there's no tax value we fallback to this another condition

I've added a comment to make it clear

parasharrajat · 2025-11-12T11:48:31Z

I am not sure if this is a bug or not.

BUG: For old tracked expenses, the tax amount does not match the tax rate as I think the default on tax amount is 0.

12.11.2025_17.16.59_REC.mp4

parasharrajat · 2025-11-12T11:51:49Z

BUG: the tax amount is not set correctly on the confirm page while submitting to someone.

12.11.2025_17.20.56_REC.mp4

parasharrajat · 2025-11-12T11:59:54Z

BUG: Tax field does not show values correctly for non-default workspaces.

Here wrong value is shown as the default.
And a custom created tax rate does not show up on the field.

Steps:

Create a custom tax rate on the non-default workpace.
Create a expenese from FAB.
on Default workpsace as to, select a tax rate.
Change to the workspace from step 1, and then change the tax rate to the custom tax rate.

12.11.2025_17.28.43_REC.mp4

koko57 · 2025-11-12T12:15:00Z

I am not sure if this is a bug or not.

BUG: For old tracked expenses, the tax amount does not match the tax rate as I think the default on tax amount is 0.

12.11.2025_17.16.59_REC.mp4

@parasharrajat what do you mean by old tracked expense

parasharrajat · 2025-11-12T12:18:16Z

old tracked expense

Any tracked expense that you created in the past.

koko57 · 2025-11-12T14:20:00Z

BUG: Tax field does not show values correctly for non-default workspaces.

Here wrong value is shown as the default.

And a custom created tax rate does not show up on the field.

12.11.2025_17.28.43_REC.mp4

@parasharrajat it's when creating new expense or submitting to someone?

parasharrajat · 2025-11-29T08:26:22Z

Screenshots

🔲 iOS / native

29.11.2025_14.05.33_REC.mp4

🔲 iOS / Safari

29.11.2025_14.08.51_REC.mp4

🔲 MacOS / Chrome

29.11.2025_13.16.12_REC.mp4

🔲 Android / Chrome

29.11.2025_14.11.17_REC.mp4

🔲 Android / native

29.11.2025_13.51.32_REC.mp4

29.11.2025_13.53.30_REC.mp4

parasharrajat · 2025-11-29T08:44:27Z

Overall, it looks good. There are 2 notes #74441 (comment)

koko57 · 2025-11-29T09:03:23Z

@parasharrajat

NOTE: When the selected tax rate is not present in the target workspace, it is not listed in the tax rate selector page while submitting to someone.

Should it be visible? I think it's even better that we filter out a value that is not existing on this workspace

28.11.2025_19.25.42_REC.mp4
Note: I noticed that when we submit to someone, if the category field loads with a delay, the tax rate immediately changes according to the category default. Here user didn't change the category at all so the expected was the same value from tracked expense to be preserved on load.

Check the last few seconds.

29.11.2025_13.51.32_REC.mp4

This is because we're managing setting a lot of values in useEffects in either IOURequestStepConfirmation or in the Confirmation List. I don't think it's good and I'm thinking of a solution to fix it. But it means a whole lot of refactor - IMHO all the values should be set when choosing participant and it shouldn't happen in the useEffects like now as it's prone to errors because the race conditions.

Happy to work on a POC for that, but it's completely out of the scope for this PR

parasharrajat · 2025-11-29T09:12:54Z

Should it be visible? I think it's even better that we filter out a value that is not existing on this workspace

If we reference other fields, such as categories, we show the pre-selected non-existing values in the list. But I am not considering it an issue for now. @cristipaval What do you say?

parasharrajat · 2025-11-29T09:13:18Z

Happy to work on a POC for that, but it's completely out of the scope for this PR

Sounds good to me. That's why I left it as a note instead of bug.

parasharrajat · 2025-11-29T09:26:34Z

Can you please resolve conflicts @koko57?

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

koko57 · 2025-12-01T09:20:03Z

@cristipaval @parasharrajat conflicts resolved

melvin-bot · 2025-12-01T15:52:30Z

@cristipaval looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

cristipaval · 2025-12-01T15:52:56Z

@cristipaval looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

test (job 8) is now fixed in main

OSBotify · 2025-12-01T16:17:43Z

✋ 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 · 2025-12-01T23:42:35Z

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

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

OSBotify · 2025-12-03T13:55:14Z

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

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

OSBotify · 2025-12-03T14:50:41Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.70-0 🚀

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

koko57 added 2 commits November 5, 2025 11:26

feat: enable tax field

aea224f

Merge branch 'main' into feat/72238-taxes-field

428465e

melvin-bot bot assigned koko57 Nov 6, 2025

koko57 changed the title ~~Feat/72238 taxes field~~ Enable Tax and Tax Amount fields in selfDM Nov 6, 2025

koko57 added 3 commits November 6, 2025 10:42

fix: create a hook to avoid code duplication

179f6ba

fix: preserve the value, show an error message

5a88e20

fix: resolve conflicts

d852a72

koko57 marked this pull request as ready for review November 7, 2025 14:09

koko57 requested review from a team as code owners November 7, 2025 14:09

melvin-bot bot requested review from parasharrajat and removed request for a team November 7, 2025 14:09

melvin-bot bot requested review from heyjennahay and removed request for a team November 7, 2025 14:09

fix: eslint, prettier

ebf57af

heyjennahay previously approved these changes Nov 10, 2025

View reviewed changes

parasharrajat reviewed Nov 12, 2025

View reviewed changes

fix: resolve conflicts

f2e829d

koko57 dismissed heyjennahay’s stale review via f2e829d November 12, 2025 08:38

fix: prettier, add a comment

bb80896

parasharrajat approved these changes Nov 29, 2025

View reviewed changes

melvin-bot bot requested a review from cristipaval November 29, 2025 15:02

fix: resolve conflicts

1379bbf

cristipaval approved these changes Dec 1, 2025

View reviewed changes

cristipaval merged commit 9573a2a into Expensify:main Dec 1, 2025
36 of 39 checks passed

melvin-bot bot added the Emergency label Dec 1, 2025

cristipaval removed the Emergency label Dec 1, 2025

OSBotify mentioned this pull request Dec 1, 2025

Deploy Checklist: New Expensify 2025-12-01 #76460

Closed

jponikarchuk mentioned this pull request Dec 2, 2025

[Due for payment 2025-12-11] Expense - Tax rate is blank after changing expense currency offline #76495

Closed

8 tasks

Beamanator mentioned this pull request Dec 2, 2025

[NoQA] Revert 72238-taxes-field #76502

Merged

53 tasks

inimaga mentioned this pull request Dec 2, 2025

Expense - System message changes to "set the tax rate to y%" when changing tax rate #76464

Closed

8 tasks

koko57 mentioned this pull request Dec 3, 2025

Tax field on unreported expense #76636

Merged

53 tasks

koko57 mentioned this pull request Dec 23, 2025

fix: revert revert taxes field #78358

Merged

53 tasks

Conversation

koko57 commented Nov 6, 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 Nov 6, 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 Nov 7, 2025

Uh oh!

trjExpensify commented Nov 10, 2025

Uh oh!

parasharrajat commented Nov 10, 2025

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

parasharrajat Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

koko57 Nov 12, 2025

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Nov 12, 2025

Uh oh!

parasharrajat commented Nov 12, 2025

Uh oh!

parasharrajat commented Nov 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

koko57 commented Nov 12, 2025

Uh oh!

parasharrajat commented Nov 12, 2025

Uh oh!

koko57 commented Nov 12, 2025

Uh oh!

parasharrajat commented Nov 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

Uh oh!

parasharrajat commented Nov 29, 2025

Uh oh!

koko57 commented Nov 29, 2025

Uh oh!

parasharrajat commented Nov 29, 2025

Uh oh!

parasharrajat commented Nov 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

parasharrajat commented Nov 29, 2025

Uh oh!

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

Uh oh!

koko57 commented Dec 1, 2025

Uh oh!

Uh oh!

melvin-bot bot commented Dec 1, 2025

Uh oh!

cristipaval commented Dec 1, 2025

Uh oh!

koko57 commented Nov 6, 2025 •

edited

Loading

codecov bot commented Nov 6, 2025 •

edited by github-actions bot

Loading

parasharrajat commented Nov 12, 2025 •

edited

Loading

parasharrajat commented Nov 29, 2025 •

edited

Loading

parasharrajat commented Nov 29, 2025 •

edited

Loading