Fix incorrect tax rate selected with distance rate #43052

MonilBhavsar · 2024-06-04T18:28:23Z

Details

For distance request, gets the taxCode from the distance rate
Refactors and cleans up code

Fixed Issues

$ #42802
PROPOSAL:

Tests

Same as QA

Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

On oldDot, configure some distance rates with tax percentages

On newDot, go to policy expense chat > + and create distance request
Ensure the selected tax percentage is the one corresponding to the distance rate selected
Ensure the tax amount is also calculated correctly considering the distance rate, and tax rate(Use oldDot for correct reference)
Submit the expense and ensure the distance request is created with selected tax rate and amount

For regression, test manual request

On newDot, go to policy expense chat > + and create manual request
Ensure the selected tax percentage is the workspace default or foreign default depending on currency
Change currency and ensure tax rate changes
Ensure the tax amount is also calculated correctly considering the distance rate, and tax rate(Use oldDot for correct reference)
Submit the expense and ensure the manual request is created with selected tax rate and amount

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

Distance request:

https://drive.google.com/file/d/17fyJ2A2NdtgIxJuDU45TEFrAAXv6MiAL/view?usp=sharing

Manual request:

Screen.Recording.2024-06-05.at.8.24.37.PM.mov

MacOS: Desktop

See MacOS: Chrome / Safari

melvin-bot · 2024-06-05T14:25:23Z

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

MonilBhavsar · 2024-06-05T14:33:55Z

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

@@ -78,10 +76,12 @@ function IOURequestStepDistanceRate({
    const initiallyFocusedOption = sections.find((item) => item.isSelected)?.keyForList;

    function selectDistanceRate(customUnitRateID: string) {
-        if (policy?.customUnits && customUnitID && shouldShowTax) {


For distance policy?.customUnits && customUnitID are always set, so I found it redundant and hence removed and cleaned up the code

hungvu193 · 2024-06-05T14:38:53Z

Since this issue linked to a DB, let me know if we need C+ here 😁

MonilBhavsar · 2024-06-05T14:45:18Z

Yes, we need a C+ here. This is actually not a bug from the PR. We just missed implementing this logic

hungvu193 · 2024-06-05T14:49:01Z

Cool. I'll start my review in minutes

MonilBhavsar · 2024-06-05T14:51:15Z

Thanks a lot @hungvu193 !

hungvu193 · 2024-06-05T15:41:52Z

Hey @MonilBhavsar How can I enable Track Tax on my old dot?

MonilBhavsar · 2024-06-05T15:48:49Z

Like this-

Screen.Recording.2024-06-05.at.9.17.02.PM.mov

hungvu193 · 2024-06-05T15:50:28Z

Thank you. I figured it out. I needed to enable tax under Xero config

hungvu193 · 2024-06-05T16:46:17Z

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

Android: mWeb Chrome

iOS: Native

Screen.Recording.2024-06-05.at.23.33.55.mov

iOS: mWeb Safari

Screen.Recording.2024-06-05.at.23.45.39.mov

MacOS: Chrome / Safari

Chrome.distance.mov

Chrome.manual.mov

MacOS: Desktop

Screen.Recording.2024-06-05.at.23.51.06.mov

hungvu193

Tests well 🎉

melvin-bot · 2024-06-05T16:53:24Z

@grgia 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-06-06T05:27:41Z

There are conflicts, looking...

MonilBhavsar · 2024-06-06T05:36:53Z

I have resolved conflicts. @hungvu193 could you please take a look again

hungvu193 · 2024-06-06T06:05:17Z

Sure

hungvu193 · 2024-06-06T07:18:00Z

Confirmed, it worked as expected

Screen.Recording.2024-06-06.at.13.58.36.mov

Screen.Recording.2024-06-06.at.14.14.47.mov

OSBotify · 2024-06-06T13:07:30Z

🚀 Deployed to staging by https://github.com/grgia in version: 1.4.80-1 🚀

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

OSBotify · 2024-06-11T23:34:46Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

MonilBhavsar added 5 commits June 4, 2024 23:48

Get taxname for distance request

d70e9d6

Pass taxCode associated with distance rate

c74e185

Fix lint

fa44cf5

Refactor code and prevent cyclic dependency lint error

d49857f

Merge branch 'main' into monil-fixDistanceTaxRateBug

fad70bf

MonilBhavsar marked this pull request as ready for review June 5, 2024 14:25

MonilBhavsar requested a review from a team as a code owner June 5, 2024 14:25

melvin-bot bot requested review from hungvu193 and removed request for a team June 5, 2024 14:25

Fix style

7f1f408

MonilBhavsar commented Jun 5, 2024

View reviewed changes

Revert a change and edit docs

941dd37

MonilBhavsar force-pushed the monil-fixDistanceTaxRateBug branch from a24822e to 941dd37 Compare June 5, 2024 14:43

hungvu193 approved these changes Jun 5, 2024

View reviewed changes

melvin-bot bot requested a review from grgia June 5, 2024 16:53

Merge branch 'main' into monil-fixDistanceTaxRateBug

f2f10aa

Fix lint

3744ffb

grgia approved these changes Jun 6, 2024

View reviewed changes

grgia merged commit 4be277c into main Jun 6, 2024
15 checks passed

grgia deleted the monil-fixDistanceTaxRateBug branch June 6, 2024 12:25

github-actions bot mentioned this pull request Jun 6, 2024

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

melvin-bot bot mentioned this pull request Jun 11, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [Track Tax] Distance tax - Tax amount is zero when distance rate with non-zero tax rate is selected #42802

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix incorrect tax rate selected with distance rate #43052

Fix incorrect tax rate selected with distance rate #43052

MonilBhavsar commented Jun 4, 2024 •

edited

Loading

melvin-bot bot commented Jun 5, 2024

MonilBhavsar Jun 5, 2024

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

hungvu193 commented Jun 5, 2024 •

edited

Loading

hungvu193 left a comment

melvin-bot bot commented Jun 5, 2024

MonilBhavsar commented Jun 6, 2024

MonilBhavsar commented Jun 6, 2024

hungvu193 commented Jun 6, 2024

hungvu193 commented Jun 6, 2024

OSBotify commented Jun 6, 2024

OSBotify commented Jun 11, 2024

Fix incorrect tax rate selected with distance rate #43052

Fix incorrect tax rate selected with distance rate #43052

Conversation

MonilBhavsar commented Jun 4, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 5, 2024

MonilBhavsar Jun 5, 2024

Choose a reason for hiding this comment

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

MonilBhavsar commented Jun 5, 2024

hungvu193 commented Jun 5, 2024

hungvu193 commented Jun 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

hungvu193 left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Jun 5, 2024

MonilBhavsar commented Jun 6, 2024

MonilBhavsar commented Jun 6, 2024

hungvu193 commented Jun 6, 2024

hungvu193 commented Jun 6, 2024

OSBotify commented Jun 6, 2024

OSBotify commented Jun 11, 2024

MonilBhavsar commented Jun 4, 2024 •

edited

Loading

hungvu193 commented Jun 5, 2024 •

edited

Loading