Set default tax by aldo-expensify · Pull Request #42126 · Expensify/App

aldo-expensify · 2024-05-14T02:22:27Z

Details

Solution: use the policy's default tax rate if taxCode is not set. We do this in a useEffect in the same way we do it for other fields, for example here:

App/src/components/MoneyRequestConfirmationList.tsx

Lines 248 to 256 in 8668b62

    
           useEffect(() => { 
        
               if (customUnitRateID || !canUseP2PDistanceRequests) { 
        
                   return; 
        
               } 
        
               if (!customUnitRateID) { 
        
                   const rateID = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? defaultMileageRate?.customUnitRateID ?? ''; 
        
                   IOU.setCustomUnitRateID(transactionID, rateID); 
        
               } 
        
           }, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, canUseP2PDistanceRequests, transactionID]);

Fixed Issues

$ #42114
PROPOSAL:

Tests

Create workspace and enable Taxes
Set the tax rate 5% as default
In the chat with yourself, track an expense
In the whisper with actions, click "Categorize it"
Select the policyExpenseChat of the workspace you created in step 1
Select any category
Scroll down and click "Show more"
Verify that you see the Tax correctly selected: "Tax Rate 1 (5%) - Default"
Verify that the Tax amount looks correct (5% of the amount your entered)
Click "Submit"
Verify that the tax is still set

Verify that no errors appear in the JS console

Offline tests

QA Steps

Create workspace and enable Taxes
Set the tax rate 5% as default
In the chat with yourself, track an expense
In the whisper with actions, click "Categorize it"
Select the policyExpenseChat of the workspace you created in step 1
Select any category
Scroll down and click "Show more"
Verify that you see the Tax correctly selected: "Tax Rate 1 (5%) - Default"
Verify that the Tax amount looks correct (5% of the amount your entered)
Click "Submit"
Verify that the tax is still set

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.2024-05-13.at.7.30.09.PM.mov

MacOS: Desktop

aldo-expensify · 2024-05-14T02:27:36Z

Following the Test steps described above, I end up with a negative tax amount:

Is this expected? @MonilBhavsar @teneeto @getusha (Tagged you because you are in the original PR #40443 and may know if this is correct or not 🙇 )

melvin-bot · 2024-05-14T02:31:48Z

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

hungvu193 · 2024-05-14T02:36:18Z

@aldo-expensify Let me know if this needs C+ review

aldo-expensify · 2024-05-14T02:49:18Z

@aldo-expensify Let me know if this needs C+ review

Let me see if @getusha can get to this, since they reviewed the PR that introduced the regression https://github.com/Expensify/App/pull/40443/files#r1599258680

MonilBhavsar · 2024-05-14T13:04:07Z

Thanks for the PR! We already have a hook to set tax details here

App/src/components/MoneyRequestConfirmationList.tsx

Lines 373 to 382 in d646a30

    
           useEffect(() => { 
        
               const taxAmount = getTaxAmount(transaction, policy).toString(); 
        
               const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount)); 
        
               if (transaction?.taxAmount && previousTransactionAmount === transaction?.amount && previousTransactionCurrency === transaction?.currency) { 
        
                   return IOU.setMoneyRequestTaxAmount(transactionID, transaction?.taxAmount ?? 0, true); 
        
               } 
        
               IOU.setMoneyRequestTaxAmount(transactionID, amountInSmallestCurrencyUnits, true); 
        
           }, [policy, transaction, transactionID, previousTransactionAmount, previousTransactionCurrency]);

Issue will be fixed with #42151

aldo-expensify · 2024-05-14T17:05:52Z

Thanks for the PR! We already have a hook to set tax details here

That is setting taxAmount, not the taxCode. This PR is using the same pattern to set the taxCode.

getusha · 2024-05-19T12:21:03Z

@MonilBhavsar @aldo-expensify will this be fixed in #42151?

MonilBhavsar · 2024-05-20T05:17:18Z

No, we should fix it here and close #42151

MonilBhavsar · 2024-05-20T06:35:34Z

This is linked to this issue #42114. So I think we should assign Eric as a reviewer here 🤔 cc @aldo-expensify

…-tax-rate-to-transaction

aldo-expensify · 2024-05-22T07:51:44Z

Swapped reviewer to @eh2077, this should be ready for review.

aldo-expensify · 2024-05-22T07:54:08Z

The backend for now is ignoring the taxCode and taxAmount sent in AddTrackedExpenseToPolicy, so if you manually change the tax code to one that is not the default, these changes won't be persisted, but that is out of the scope of this PR and I'm working on it in the backend. This PR is only taking care of selecting the default tax code when it is missing.

eh2077 · 2024-05-22T17:18:30Z

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 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.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 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.
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: Native

N/A

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

N/A

eh2077

Frontend optimistic updating works well. Code also looks good, just a minor comment

src/components/MoneyRequestConfirmationList.tsx

melvin-bot · 2024-05-22T17:25:48Z

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

dangrous

This works for me but might be able to get around the eslint thing with @eh2077's suggestion!

src/components/MoneyRequestConfirmationList.tsx

MonilBhavsar · 2024-05-24T06:11:21Z

src/components/MoneyRequestConfirmationList.tsx

+        if (defaultTaxCode) {
+            IOU.setMoneyRequestTaxRate(transactionID, defaultTaxCode);
+        }


I think we could remove this condition - if (defaultTaxCode)?
we can fallback to empty string and always set tax rate

MonilBhavsar · 2024-05-24T06:19:59Z

Bug 1:

Set tax settings to have different workspace default and foreign default currency rates
Start request and proceed with default currency
Go back to amount step(first step) and change amount to foreign currency

Expected: Tax rate changes to have foreign default currency rate
Actual: Tax rate does not change

Bug 2:

Set tax settings to have different workspace default and foreign default currency rates
Start request and proceed with default currency
On confirmation list, update currency to foreign and then default

Expected: Tax rate changes to have foreign default currency rate and workspace default rates as per currency
Actual: Tax rate does not change

aldo-expensify · 2024-05-24T07:15:23Z

@MonilBhavsar thanks for reviewing, I'll try to get back to this asap

MonilBhavsar · 2024-05-24T12:20:08Z

Thanks! We can do similar to what we did here c671c7a#diff-29ef0426ea09b0af3420c95911645adcd54c0d3d4c0d8c4fa5aa99dfe37a3646R342-R365

On first mount, set default rate and only update the rate depending on other parameters

…-ttax-rate-to-transaction

Co-authored-by: Eric Han <117511920+eh2077@users.noreply.github.com>

…:Expensify/App into aldo_add-default-tax-rate-to-transaction

aldo-expensify · 2024-05-31T06:54:45Z

Thanks! We can do similar to what we did here c671c7a#diff-29ef0426ea09b0af3420c95911645adcd54c0d3d4c0d8c4fa5aa99dfe37a3646R342-R365

On first mount, set default rate and only update the rate depending on other parameters

I tried it, but only works if the user press the "back" to change the amount. If the user clicks the amount input and changes the currency, it doesn't work because the component doesn't get unmounted.

Screen.Recording.2024-05-30.at.11.53.32.PM.mov

aldo-expensify · 2024-05-31T07:46:43Z

@MonilBhavsar I think the bugs you found are fixed now, but I found a new one: the tax amount doesn't update automatically when the tax code changes because the currency changed. I think the code here is buggy:

App/src/components/MoneyRequestConfirmationList.tsx

Lines 384 to 396 in 3a5b0c8

    
               const taxAmount = getTaxAmount(transaction, policy).toString(); 
        
               const amountInSmallestCurrencyUnits = CurrencyUtils.convertToBackendAmount(Number.parseFloat(taxAmount)); 
        
               if (transaction?.taxAmount && previousTransactionAmount === transaction?.amount && previousTransactionCurrency === transaction?.currency) { 
        
                   return IOU.setMoneyRequestTaxAmount(transactionID, transaction?.taxAmount ?? 0, true); 
        
               } 
        
               IOU.setMoneyRequestTaxAmount(transactionID, amountInSmallestCurrencyUnits, true); 
        
           }, [policy, transaction, transactionID, previousTransactionAmount, previousTransactionCurrency]); 
        
           // If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again 
        
           if (isEditingSplitBill && didConfirm) { 
        
               setDidConfirm(false);

I wish there was some comment explaining that if statement inside the useEffect because it is pretty obscure what is doing.

Do you know in which cases are we supposed to update the tax amount automatically? is it when we change the taxCode or we change manually the amount, any other cases?

aldo-expensify · 2024-05-31T07:47:55Z

src/components/MoneyRequestConfirmationList.tsx

+            return;
+        }
+        const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transactionCurrency);
+        IOU.setMoneyRequestTaxRate(transactionID, defaultTaxCode ?? '');


Changing the function IOU.setMoneyRequestTaxRate to receive only the currency instead of the whole transaction object allow us to only watch the currency instead of the transaction object, which is what we want to react to if it changes.

MonilBhavsar · 2024-05-31T08:58:12Z

I wish there was some comment explaining that if statement inside the useEffect because it is pretty obscure what is doing.

Agree, we're getting rid of that condition in this PR #42737

Do you know in which cases are we supposed to update the tax amount automatically? is it when we change the taxCode or we change manually the amount, any other cases?

Yes, when we change the taxCode, when we change the amount and when we change the currency(if taxCode changes, taxAmount should also update)

MonilBhavsar · 2024-05-31T08:58:40Z

I think the bugs you found are fixed now, but I found a new one: the tax amount doesn't update automatically when the tax code changes because the currency changed. I think the code here is buggy:

I didn't check yet, but I believe it is related to this PR only?

aldo-expensify · 2024-06-12T02:29:10Z

I'm re-implementing this here: #43519

I tested cases of:

default tax for currency other than the workspace's currency
default tax for same currency as the workspace's currency
default tax for distances with tax enable

The amount of the tax is updated when the tax code changes

Set default tax

8668b62

aldo-expensify self-assigned this May 14, 2024

aldo-expensify marked this pull request as ready for review May 14, 2024 02:31

aldo-expensify requested a review from a team as a code owner May 14, 2024 02:31

melvin-bot bot removed the request for review from a team May 14, 2024 02:31

melvin-bot bot requested a review from hungvu193 May 14, 2024 02:31

aldo-expensify commented May 14, 2024

View reviewed changes

src/components/MoneyRequestConfirmationList.tsx Outdated Show resolved Hide resolved

Style

a12a84e

aldo-expensify mentioned this pull request May 14, 2024

[payment due 8-27][Track Tax] Support tax tracking when categorizing tracked expense #42114

Closed

6 tasks

aldo-expensify requested review from getusha and removed request for hungvu193 May 14, 2024 02:49

Merge branch 'main' of github.com:Expensify/App into aldo_add-default…

ec633bd

…-tax-rate-to-transaction

aldo-expensify requested review from eh2077 and removed request for getusha May 22, 2024 07:51

eh2077 reviewed May 22, 2024

View reviewed changes

src/components/MoneyRequestConfirmationList.tsx Outdated Show resolved Hide resolved

eh2077 approved these changes May 22, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous May 22, 2024 17:25

dangrous previously approved these changes May 22, 2024

View reviewed changes

src/components/MoneyRequestConfirmationList.tsx Outdated Show resolved Hide resolved

MonilBhavsar self-requested a review May 23, 2024 06:01

eh2077 mentioned this pull request May 23, 2024

Fix tax details are empty when categorizing tracked expense #42151

Closed

50 tasks

MonilBhavsar reviewed May 24, 2024

View reviewed changes

aldo-expensify and others added 2 commits May 30, 2024 23:12

Merge branch 'main' of github.com:Expensify/App into aldo_add-default…

6bee4c2

…-ttax-rate-to-transaction

Fix null coalesce lint

b3e99c4

Co-authored-by: Eric Han <117511920+eh2077@users.noreply.github.com>

aldo-expensify dismissed dangrous’s stale review via b3e99c4 May 31, 2024 06:22

Merge branch 'aldo_add-default-tax-rate-to-transaction' of github.com…

ca0feff

…:Expensify/App into aldo_add-default-tax-rate-to-transaction

Update tax rate when currency changes

3a5b0c8

aldo-expensify commented May 31, 2024

View reviewed changes

Pull main / resolve conflicts

4ada2a2

aldo-expensify mentioned this pull request Jun 12, 2024

Add useEffect to select default tax code #43519

Merged

50 tasks

aldo-expensify closed this Jun 12, 2024

	useEffect(() => {
	if (customUnitRateID \|\| !canUseP2PDistanceRequests) {
	return;
	}
	if (!customUnitRateID) {
	const rateID = lastSelectedDistanceRates?.[policy?.id ?? ''] ?? defaultMileageRate?.customUnitRateID ?? '';
	IOU.setCustomUnitRateID(transactionID, rateID);
	}
	}, [defaultMileageRate, customUnitRateID, lastSelectedDistanceRates, policy?.id, canUseP2PDistanceRequests, transactionID]);

Conversation

aldo-expensify commented May 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

aldo-expensify commented May 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot bot commented May 14, 2024

Uh oh!

Uh oh!

hungvu193 commented May 14, 2024

Uh oh!

aldo-expensify commented May 14, 2024

Uh oh!

MonilBhavsar commented May 14, 2024

Uh oh!

aldo-expensify commented May 14, 2024

Uh oh!

getusha commented May 19, 2024

Uh oh!

MonilBhavsar commented May 20, 2024

Uh oh!

MonilBhavsar commented May 20, 2024

Uh oh!

aldo-expensify commented May 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aldo-expensify commented May 22, 2024

Uh oh!

eh2077 commented May 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eh2077 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot bot commented May 22, 2024

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

MonilBhavsar May 24, 2024

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented May 24, 2024

Uh oh!

aldo-expensify commented May 24, 2024

Uh oh!

MonilBhavsar commented May 24, 2024

Uh oh!

aldo-expensify commented May 31, 2024

Uh oh!

aldo-expensify commented May 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aldo-expensify May 31, 2024

Choose a reason for hiding this comment

Uh oh!

MonilBhavsar commented May 31, 2024

Uh oh!

MonilBhavsar commented May 31, 2024

Uh oh!

aldo-expensify commented Jun 12, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

aldo-expensify commented May 14, 2024 •

edited

Loading

aldo-expensify commented May 14, 2024 •

edited

Loading

aldo-expensify commented May 22, 2024 •

edited

Loading

eh2077 commented May 22, 2024 •

edited

Loading

aldo-expensify commented May 31, 2024 •

edited

Loading