[CP Staging] Fix tax rate being updated when currency is updated in offline mode #42128

MonilBhavsar · 2024-05-14T05:49:02Z

Details

Fixed Issues

$ #42049
PROPOSAL:

Tests

Precondition:

Workspace has enabled tax rate.
Workspace currency default and Foreign currency default are different.

Go to staging.new.expensify.com
Go to workspace chat.
Go offline.
Submit an expense in local currency.
Go to transaction thread.
Click Amount and change it to a foreign currency.
Ensure tax rate and tax amount is updated accordingly
Ensure system message only displays amount and currency change

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Precondition:

Workspace has enabled tax rate.
Workspace currency default and Foreign currency default are different.

Go to staging.new.expensify.com
Go to workspace chat.
Go offline.
Submit an expense in local currency.
Go to transaction thread.
Click Amount and change it to a foreign currency.
Ensure tax rate and tax amount is updated accordingly
Ensure system message only displays amount and currency change

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

See MacOS: Chrome / Safari

Android: mWeb Chrome

See MacOS: Chrome / Safari

iOS: Native

See MacOS: Chrome / Safari

iOS: mWeb Safari

See MacOS: Chrome / Safari

MacOS: Chrome / Safari

Screen.Recording.2024-05-14.at.11.25.08.AM.mov

MacOS: Desktop

See MacOS: Chrome / Safari

melvin-bot · 2024-05-14T05:49:07Z

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

MonilBhavsar · 2024-05-14T05:54:28Z

@rojiphil are you available to review this PR?

rojiphil · 2024-05-14T05:56:37Z

are you available to review this PR?

@MonilBhavsar Yes. reviewing.

MonilBhavsar · 2024-05-14T05:58:06Z

Thank you!

MonilBhavsar · 2024-05-14T08:21:19Z

How's it going here

rojiphil · 2024-05-14T08:29:35Z

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

    if (!transaction?.amount) {
        return;
    }
    const transactionTaxCode = transaction?.taxCode ?? '';
-    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction, currency) ?? '';
    const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, transactionTaxCode ?? defaultTaxCode) ?? '';


Just one issue I notice here. Otherwise this works fine.
Currently, the tax code and tax amount does not correlate correctly as displayed below. I think this is because we are giving preference to transactionTaxCode over defaultTaxCode here.
When a currency changes, is it intentional to reset the tax code to the default one (i.e. Foreign or workspace) even when the transaction tax code is set to a non-default one?

42128-web-chrome.mp4

When a currency changes, is it intentional to reset the tax code to the default one (i.e. Foreign or workspace) even when the transaction tax code is set to a non-default one?

Yes!

Ok. Got it. Thanks. Now I know what is expected here.

Thanks for clarifying!

When a currency changes, is it intentional to reset the tax code to the default one (i.e. Foreign or workspace) even when the transaction tax code is set to a non-default one?

Also, this is behavior server side. When online if currency is changed, then server will update taxRate and hence taxAmount

Just digged in a little deeper. Would the following solve this issue?

const transactionCurrency = TransactionUtils.getCurrency(transaction); const taxCode = ((transactionCurrency !== currency) ? defaultTaxCode : transactionTaxCode) ?? defaultTaxCode; const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';

It would, but we have this similar logic to get taxCode in getDefaultTaxCode() that is used by other functions too, so let's use it

I think the logic within getDefaultTaxCode() and here are not similar. The reasoning being that getDefaultTaxCode() returns one of the default tax codes whereas we want to choose to return either transaction’s tax code or default tax code here. But I may be missing your point. Once the code changes are done, I will take a look.

Okay, i think I am getting the issue now

rojiphil · 2024-05-14T08:40:04Z

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

MacOS: Chrome / Safari

42128-web-safari-01.mp4

Android: Native

42128-android-native-01.mp4

Android: mWeb Chrome

42128-mweb-chrome-01.mp4

iOS: Native

42128-ios-native-01.mp4

iOS: mWeb Safari

42128-mweb-safari-01.mp4

MacOS: Desktop

42128-desktop-01.mp4

rojiphil · 2024-05-14T08:45:34Z

@MonilBhavsar Oh! We have conflicts to address too.
Other than the issue mentioned here, the code looks good.
I can generate the test videos and complete the checklist when we are ready.

Beamanator · 2024-05-14T12:14:42Z

Bump @rojiphil - any updates here? This fixes a deploy blocker so please make it high priority 🙏

MonilBhavsar · 2024-05-14T12:20:14Z

Latest is here #42128 (comment)
I need to take a look at this comment

I'm tackling another one in parallel. Should be back here once I submit another one for review

rojiphil · 2024-05-14T12:21:06Z

any updates here? This fixes a deploy blocker so please make it high priority

@Beamanator Sure. This is taken with high priority. The latest update here is that we have an issue that is being worked upon here

Beamanator · 2024-05-14T12:32:41Z

Ahaa, thanks gents!! 🙏

MonilBhavsar · 2024-05-14T14:49:55Z

This is ready for review/test. Thank you @rojiphil for detailed testing and drawing my attention!

rojiphil

Code looks super good. But I have just one additional comment. Please do have a look.
Post your feedback I would go ahead and complete the checklist. Thanks.

rojiphil · 2024-05-14T15:29:27Z

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

-        const taxAmount = getTaxAmount(transaction, policy, newAmount);
+        // If currency has changed, then we get the default tax rate based on currency, otherwise we use the current tax rate selected in transaction, if we have it.
+        const transactionTaxCode = transaction?.taxCode ?? '';
+        const taxCode = currency !== transactionCurrency ? TransactionUtils.getDefaultTaxCode(policy, transaction, currency) ?? '' : transactionTaxCode;


Since transactionTaxCode may return empty, can we fallback to defaultTaxCode as getDefaultTaxCode() is always guaranteed to return a valid value?
Something like this:

const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction, currency); const taxCode = (currency !== transactionCurrency ? defaultTaxCode : transactionTaxCode) ?? defaultTaxCode;

This way, we can avoid taxCode being empty. This also aligns with the existing implementation i.e. transactionTaxCode ?? defaultTaxCode where we fallback to the default one if transactionTaxCode is empty. This will also help us keep any possible regressions at bay.

Good point. Updated!

rojiphil

LGTM and tests well too.
Checklist completed.

melvin-bot · 2024-05-14T18:07:03Z

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

Beamanator

LGTM!

…pdate [CP Staging] Fix tax rate being updated when currency is updated in offline mode (cherry picked from commit 0d424d2)

Beamanator · 2024-05-15T06:42:25Z

This successfully got deployed to Desktop and Web in https://github.com/Expensify/App/actions/runs/9084540534

And it should have been deployed to android & iOS in a following CP (there were 2 more last night)

Beamanator · 2024-05-15T06:42:39Z

@rojiphil @MonilBhavsar are either of you around to test this in staging?

rojiphil · 2024-05-15T06:52:37Z

are either of you around to test this in staging?

Works well on staging for me

20240515_122012.mp4

OSBotify · 2024-05-15T09:52:28Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.73-7 🚀

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

MonilBhavsar added 3 commits May 14, 2024 11:12

Pass taxCode when currency changes

1e57b99

Pass policy argument to fix system messages

fa95dbb

Fix system messages to only cover direct update

34b27f7

MonilBhavsar self-assigned this May 14, 2024

MonilBhavsar requested a review from a team as a code owner May 14, 2024 05:49

melvin-bot bot requested review from rojiphil and removed request for a team May 14, 2024 05:49

rojiphil reviewed May 14, 2024

View reviewed changes

Merge branch 'main' into monil-fixOfflineCurrencyTaxUpdate

1823d04

Update the taxCode if currency is updated and refactor code

f34a2ac

rojiphil reviewed May 14, 2024

View reviewed changes

Fallback to default tax rate

d2c656c

rojiphil approved these changes May 14, 2024

View reviewed changes

melvin-bot bot requested a review from cristipaval May 14, 2024 18:07

Beamanator approved these changes May 14, 2024

View reviewed changes

Beamanator merged commit 0d424d2 into main May 14, 2024
16 of 17 checks passed

Beamanator deleted the monil-fixOfflineCurrencyTaxUpdate branch May 14, 2024 18:35

OSBotify pushed a commit that referenced this pull request May 14, 2024

Merge pull request #42128 from Expensify/monil-fixOfflineCurrencyTaxU…

e955a76

…pdate [CP Staging] Fix tax rate being updated when currency is updated in offline mode (cherry picked from commit 0d424d2)

github-actions bot mentioned this pull request May 14, 2024

Deploy Checklist: New Expensify 2024-05-13 #42040

Closed

74 tasks

melvin-bot bot mentioned this pull request May 15, 2024

[PAID] Tax - Tax rate and tax amount does not update when switching currency offline #42049

Closed

6 tasks

linhvovan29546 mentioned this pull request Dec 25, 2024

Expense - Report action shows "changed tax rate to x(previously x)" when there is no rate change #54560

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Fix tax rate being updated when currency is updated in offline mode #42128

[CP Staging] Fix tax rate being updated when currency is updated in offline mode #42128

MonilBhavsar commented May 14, 2024 •

edited

Loading

melvin-bot bot commented May 14, 2024

MonilBhavsar commented May 14, 2024

rojiphil commented May 14, 2024

MonilBhavsar commented May 14, 2024

MonilBhavsar commented May 14, 2024

rojiphil May 14, 2024

MonilBhavsar May 14, 2024

rojiphil May 14, 2024

MonilBhavsar May 14, 2024

rojiphil May 14, 2024

MonilBhavsar May 14, 2024

rojiphil May 14, 2024

MonilBhavsar May 14, 2024

rojiphil commented May 14, 2024 •

edited

Loading

rojiphil commented May 14, 2024

Beamanator commented May 14, 2024

MonilBhavsar commented May 14, 2024 •

edited

Loading

rojiphil commented May 14, 2024

Beamanator commented May 14, 2024

MonilBhavsar commented May 14, 2024

rojiphil left a comment

rojiphil May 14, 2024

MonilBhavsar May 14, 2024

rojiphil left a comment

melvin-bot bot commented May 14, 2024

Beamanator left a comment

Beamanator commented May 15, 2024

Beamanator commented May 15, 2024

rojiphil commented May 15, 2024

OSBotify commented May 15, 2024

[CP Staging] Fix tax rate being updated when currency is updated in offline mode #42128

[CP Staging] Fix tax rate being updated when currency is updated in offline mode #42128

Conversation

MonilBhavsar commented May 14, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented May 14, 2024

MonilBhavsar commented May 14, 2024

rojiphil commented May 14, 2024

MonilBhavsar commented May 14, 2024

MonilBhavsar commented May 14, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rojiphil commented May 14, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

rojiphil commented May 14, 2024

Beamanator commented May 14, 2024

MonilBhavsar commented May 14, 2024 • edited Loading

rojiphil commented May 14, 2024

Beamanator commented May 14, 2024

MonilBhavsar commented May 14, 2024

rojiphil left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rojiphil left a comment

Choose a reason for hiding this comment

melvin-bot bot commented May 14, 2024

Beamanator left a comment

Choose a reason for hiding this comment

Beamanator commented May 15, 2024

Beamanator commented May 15, 2024

rojiphil commented May 15, 2024

OSBotify commented May 15, 2024

MonilBhavsar commented May 14, 2024 •

edited

Loading

rojiphil commented May 14, 2024 •

edited

Loading

MonilBhavsar commented May 14, 2024 •

edited

Loading