[CP Stg] Fix tax amount manual adjustment by roryabraham · Pull Request #73391 · Expensify/App

roryabraham · 2025-10-24T04:33:48Z

Explanation of Change

I fixed this bug by following the guidelines from https://react.dev/learn/you-might-not-need-an-effect. We don't need to (and shouldn't) use effects to compute values that are derived from state and props. Instead, we can compute them in render. useEffect is appropriate to sync React with an external system: in this case, Onyx. So we do keep the effect to save the tax amount to the draft transaction in Onyx.

It's not necessary to memoize these calculations, because React Compiler is doing it for us. Initially my changes broke the React Compiler for this file (for reasons I don't fully understand), but adding a missing dependency on an effect fixed it.

Fixed Issues

$ #73309

Tests

Prerequisites

Create a workspace
Enable tax and distance rates
Set up two tax rates:
1. A default for the workspace currency default (USD)
2. A different default for foreign currencies
Go to workspace settings -> distance rates -> settings -> enable tax tracking
Go to workspace settings -> distance rates -> choose a distance rate -> add a tax rate

Test changing tax rate manually

Click on the global create expense button
Enter a $20USD expense
Verify that the workspace default tax rate is applied on the confirmation page
Change the tax rate to something else
Verify that you are able to change the tax rate

Test changing tax amount manually

Click on the global create expense button
Enter a $20USD expense
Verify that the workspace default tax rate is applied on the confirmation page, resulting in some tax amount.
Change the tax amount (to something lower than the initially computed tax rate)
Verify that you are able to change the tax amount.

Test changing waypoints

Click on the global create button -> track distance
Enter two waypoints
Click next
Observe the tax amount
Click back
Change one of the waypoints
Click next
Verify the tax amount updated in accordance with the new waypoints

Test changing currency

Click on the global create expense button
Enter a $20USD expense
Verify that the workspace default tax rate is applied
Click back
Change the currency to a different currency
Verify that the foreign currency tax rate is applied

Verify that no errors appear in the JS console

Offline tests

None.

QA Steps

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

web.mov

MacOS: Desktop

roryabraham · 2025-10-24T04:36:21Z

src/components/MoneyRequestConfirmationList.tsx

            routeError,
            isDelegateAccessRestricted,
            showDelegateNoAccessModal,
+            setDidConfirmSplit,


I mentioned this in the PR description, but I had to add this to make React Compiler happy

melvin-bot · 2025-10-24T04:38:08Z

@truph01 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

src/components/MoneyRequestConfirmationList.tsx

truph01 · 2025-10-24T04:43:08Z

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

Screen.Recording.2025-10-24.at.13.45.26.mov

Android: mWeb Chrome

Screen.Recording.2025-10-24.at.13.52.51.mov

iOS: HybridApp

iOS: mWeb Safari

Screen.Recording.2025-10-24.at.13.51.15.mov

MacOS: Chrome / Safari

output.mp4

MacOS: Desktop

Screen.Recording.2025-10-24.at.13.42.09.mov

truph01 · 2025-10-24T05:02:13Z

@roryabraham @lakchote Do we need the C+ for this one?

I asked because I see that @lakchote has already approved this PR

lakchote · 2025-10-24T05:09:18Z

@roryabraham @lakchote Do we need the C+ for this one?

I asked because I see that @lakchote has already approved this PR

yes please continue your review @truph01

lakchote · 2025-10-24T05:32:54Z

@roryabraham @lakchote Do we need the C+ for this one?
I asked because I see that @lakchote has already approved this PR

yes please continue your review @truph01

Any ETA for the review @truph01? It's the last blocker to fix before we can proceed with the deploy (after testing it on staging too). If you're not sure you can finish it in the next hour, please let me know and I'll proceed with the merge.

truph01 · 2025-10-24T05:38:54Z

@lakchote I am on it and can finish the review in the next hour

truph01 · 2025-10-24T05:55:43Z

@roryabraham The tax amount is always 0 when tracking distance, could you help check it:

output.mp4

roryabraham · 2025-10-24T06:15:57Z

@truph01 is it working on main for you?

truph01 · 2025-10-24T06:21:35Z

@roryabraham

@truph01 did you do step 4 from the prerequisites?

Yes, I did it 4. Go to workspace settings -> distance rates -> settings -> enable tax tracking

@truph01 is it working on main for you?

In staging, it doesn't work as well

output.mp4

I checked the logic and saw that, the taxClaimablePercentage:

App/src/libs/DistanceRequestUtils.ts

Line 338 in bd83ec9

    
           const taxClaimablePercentage = customUnitRate.attributes?.taxClaimablePercentage ?? CONST.DEFAULT_NUMBER_ID;

in my policy is undefined.

roryabraham · 2025-10-24T06:25:10Z

Try setting a taxClaimablePercentage for your specific distance rate?

truph01 · 2025-10-24T06:28:14Z

@roryabraham Yes, if I try to set the taxClaimablePercentage, now the tax is shown in the confirmation page as expected.

roryabraham · 2025-10-24T06:53:08Z

This seems like a problem specific to the policy you're testing then.

lakchote · 2025-10-24T06:53:25Z

@truph01 it's been more than an hour now, when do you expect to finish the review please? 🙏

melvin-bot · 2025-10-24T06:54:34Z

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

lakchote · 2025-10-24T06:54:47Z

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

truph01 · 2025-10-24T06:55:26Z

It's been more than an hour now, when do you expect to finish the review please? 🙏

@lakchote I'm currently blocked on recording video on the iOS platform; everything else looks good across other platforms.

lakchote · 2025-10-24T06:56:15Z

@lakchote I'm currently blocked on recording video on the iOS platform; everything else looks good across other platforms.

It's fine as there shouldn't be any edge case related to iOS given the code changes, I'll proceed with the merge

[CP Stg] Fix tax amount manual adjustment (cherry picked from commit 0f48666) (cherry-picked to staging by lakchote)

truph01 · 2025-10-24T07:01:05Z

@roryabraham Could you add this note to the test steps:

Try setting a taxClaimablePercentage for your specific distance rate?

OSBotify · 2025-10-24T07:35:20Z

✋ 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-10-24T07:37:27Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.37-8 🚀

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

IuliiaHerets · 2025-10-24T10:12:40Z

CP is passed for Web, mWeb and Native apps. Still pending validation for Desktop

1761295878331.2025-10-24_11_48_26.mp4

1761295857135.2025-10-24_11_47_10.mp4

1761295843856.2025-10-24_11_38_16.mp4

1761295823266.2025-10-24_11_37_36.mp4

…ustment" This reverts commit 0f48666, reversing changes made to bd83ec9.

OSBotify · 2025-10-24T17:54:37Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.2.37-8 🚀

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

OSBotify · 2025-10-24T18:19:35Z

🚀 Cherry-picked to staging by https://github.com/lakchote in version: 9.2.38-0 🚀

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

OSBotify · 2025-10-27T20:08:59Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.2.38-5 🚀

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

roryabraham added 2 commits October 23, 2025 21:18

Fix bug preventing manual adjustment of tax amount

05ceffb

Add missing dependency to fix React Compiler

907272c

roryabraham requested review from blimpich and luacmartins October 24, 2025 04:33

roryabraham self-assigned this Oct 24, 2025

roryabraham commented Oct 24, 2025

View reviewed changes

roryabraham marked this pull request as ready for review October 24, 2025 04:38

roryabraham requested a review from a team as a code owner October 24, 2025 04:38

melvin-bot bot requested review from truph01 and removed request for a team October 24, 2025 04:38

github-actions bot reviewed Oct 24, 2025

View reviewed changes

src/components/MoneyRequestConfirmationList.tsx Show resolved Hide resolved

Remove unused import

25cf57f

lakchote approved these changes Oct 24, 2025

View reviewed changes

truph01 approved these changes Oct 24, 2025

View reviewed changes

melvin-bot bot requested a review from mollfpr October 24, 2025 06:54

lakchote removed request for blimpich, luacmartins and mollfpr October 24, 2025 06:55

lakchote approved these changes Oct 24, 2025

View reviewed changes

lakchote merged commit 0f48666 into main Oct 24, 2025
29 of 30 checks passed

lakchote deleted the Rory-FixTaxAmountAdjustment branch October 24, 2025 06:56

OSBotify pushed a commit that referenced this pull request Oct 24, 2025

Merge pull request #73391 from Expensify/Rory-FixTaxAmountAdjustment

ba3ac51

[CP Stg] Fix tax amount manual adjustment (cherry picked from commit 0f48666) (cherry-picked to staging by lakchote)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 24, 2025

OSBotify mentioned this pull request Oct 24, 2025

Deploy Checklist: New Expensify 2025-10-23 #73307

Closed

88 tasks

This was referenced Oct 24, 2025

Investigate workflow job failing on main: test / test (job 1) #73400

Closed

Investigate workflow job failing on main: test / test (job 1) #73402

Closed

roryabraham added a commit that referenced this pull request Oct 24, 2025

Apply changes from PR #73391

1ce1511

mitarachim mentioned this pull request Oct 24, 2025

[Due for payment 2025-11-26] Tax - Tax amount changes to zero after changing currency when tax rate is non-zero #73411

Closed

8 tasks

nlemma mentioned this pull request Oct 24, 2025

[Awaiting Checklist Completion] [$500] Distance - Tax rate & tax amount field are different when selected for the first and second time #73413

Closed

8 tasks

blimpich added a commit that referenced this pull request Oct 24, 2025

Revert "Merge pull request #73391 from Expensify/Rory-FixTaxAmountAdj…

9dded9b

…ustment" This reverts commit 0f48666, reversing changes made to bd83ec9.

blimpich mentioned this pull request Oct 24, 2025

Revert 3 tax related PRs #73443

Closed

54 tasks

melvin-bot bot mentioned this pull request Oct 27, 2025

[Due for payment 2025-11-03] Expense - Unable to change tax rate and tax amount on confirm page #73309

Closed

8 tasks

bernhardoj mentioned this pull request Oct 30, 2025

[$250] Error displayed and manual IOU expense fails to submit after split scan flow #73739

Closed

8 tasks

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Prerequisites

Test changing tax rate manually

Test changing tax amount manually

Test changing waypoints

Test changing currency

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

roryabraham Oct 24, 2025

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Oct 24, 2025

Uh oh!

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

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

Uh oh!

Uh oh!

lakchote commented Oct 24, 2025

Uh oh!

lakchote commented Oct 24, 2025

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

roryabraham commented Oct 24, 2025

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

roryabraham commented Oct 24, 2025

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

roryabraham commented Oct 24, 2025

Uh oh!

lakchote commented Oct 24, 2025

Uh oh!

melvin-bot bot commented Oct 24, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

lakchote commented Oct 24, 2025

Uh oh!

Uh oh!

truph01 commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

IuliiaHerets commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 24, 2025

Uh oh!

OSBotify commented Oct 27, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

roryabraham commented Oct 24, 2025 •

edited

Loading

truph01 commented Oct 24, 2025 •

edited

Loading

truph01 commented Oct 24, 2025 •

edited

Loading

lakchote commented Oct 24, 2025 •

edited

Loading