chore: move policy tax rates to policy key #36784

teneeto · 2024-02-19T06:30:37Z

Details

Remove policyTaxRates_ key and use taxRates from policy key.

Fixed Issues

Tests

Make sure Tax is enabled in Old Dot.
Add some tax policies in Old Dot.
Add a member to your workspace.
select a user from your workspace with enabled policies.
Click on request money as either manual or scan.
enter amount.
click on Show More and select tax rate.

Note:

from step 8, Ensure;
9. Default tax rate and tax amount are selected
10. Tax details are not displayed if tax tracking is disabled

Also, try to edit the tax amount then make sure;
11. that there should be an error when you try to enter a tax amount that is greater than the maximum tax amount.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Make sure Tax is enabled in Old Dot.
Add some tax policies in Old Dot.
Add a member to your workspace.
select a user from your workspace with enabled policies.
Click on request money as either manual or scan.
enter amount.
click on Show More and select tax rate.

Note:

from step 8, Ensure;
9. Default tax rate and tax amount are selected
10. Tax details are not displayed if tax tracking is disabled

Also, try to edit the tax amount then make sure;
11. that there should be an error when you try to enter a tax amount that is greater than the maximum tax amount.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-12-17.at.02.38.46.mov

Mobile Web - Chrome

Screen.Recording.2023-12-17.at.03.32.29.mov

Mobile Web - Safari

Screen.Recording.2023-12-17.at.02.45.42.mov

Desktop

Screen.Recording.2023-12-17.at.02.41.46.mov

iOS

Screen.Recording.2023-12-17.at.02.26.37.mov

Android

Screen.Recording.2023-12-17.at.03.28.54.mov

…pAmount

…move-policy-tax-rates-to-policy-key

MonilBhavsar

In codebase, there are some occurrences of policyTaxRatesOptions. Can we please rename them to taxRatesOptions

MonilBhavsar

This changes looks good and works fine. Thanks!

…move-policy-tax-rates-to-policy-key

src/components/MoneyRequestConfirmationList.js

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

MonilBhavsar · 2024-02-23T13:39:25Z

src/components/TaxPicker/index.js

@@ -36,28 +36,9 @@ function TaxPicker({selectedTaxRate, policyTaxRates, insets, onSubmit}) {
    }, [selectedTaxRate]);

    const sections = useMemo(() => {
-        const {policyTaxRatesOptions} = OptionsListUtils.getFilteredOptions(


NAB, this was better readable 😄

src/components/TaxPicker/taxPickerPropTypes.js

src/pages/iou/request/step/IOURequestStepTaxAmountPage.js

src/pages/iou/request/step/IOURequestStepTaxRatePage.js

src/types/onyx/Policy.ts

melvin-bot · 2024-02-23T13:47:00Z

@rlinoz 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-02-23T13:47:12Z

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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

MonilBhavsar · 2024-02-23T13:47:34Z

Rodrigo, sorry for the ping

…move-policy-tax-rates-to-policy-key

MonilBhavsar

Thanks!

OSBotify · 2024-02-26T11:08:59Z

✋ 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 · 2024-02-26T21:08:41Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 1.4.44-0 🚀

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

OSBotify · 2024-02-28T23:57:17Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

kosmydel · 2024-02-29T12:45:28Z

src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

+    const defaultTaxKey = taxRates.defaultExternalID;
+    const defaultTaxName = (defaultTaxKey && `${taxRates.taxes[defaultTaxKey].name} (${taxRates.taxes[defaultTaxKey].value}) • ${translate('common.default')}`) || '';


Why do we ignore here the foreignTaxDefault value?

teneeto added 22 commits February 19, 2024 05:30

add taxRates propTypes to policy key

ecda0af

use policy propTypes temp_confirmation list

b5e8ed9

use policy propTypes on money request confirmation list

9c57826

use taxRates from policy key

b74b585

remove policyTaxRates props and ONYX key

bf33e31

use taxRates from policy key

3ca147b

remove policyTaxRates props and ONYX key

8e10b1f

get taxRates with lodashGet

77347eb

remove unused import

081ca79

use taxRates from policy key for IOURequestStepAmount

3c26cf6

remove policyTaxRates props and ONYX key for IOURequestStepAmount

1e88b6f

add taxRates propTypes to policy for IOURequestStepAmount

079bac4

get policy from ONYX for IOURequestStepAmount

2a248c3

remove policyTaxRates props and ONYX key for IOURequestStepTaxAmountPage

614502a

add taxRates propTypes to policy for IOURequestStepTaxAmountPage

108fd3e

add comments for taxRates field on policy proptypes

697bc85

add comments for taxRates field on policy proptypes for IOURequestSte…

b051dc4

…pAmount

use taxRates from policy key for IOURequestStepTaxRatePage

80ce551

remove policyTaxRates props and ONYX key for IOURequestStepTaxRatePage

f4deedf

add taxRates propTypes to policy for IOURequestStepTaxRatePage

52e15ef

update policy onyx request key for IOURequestStepTaxRatePage

401cdec

update policy onyx request key for IOURequestStepTaxAmountPage

c8434b2

teneeto mentioned this pull request Feb 19, 2024

[Onyx] Move policyTaxRates_ key back into the policy_ key #36171

Closed

teneeto added 2 commits February 21, 2024 14:02

remove tax rates types and keys

59f6200

Merge branch 'main' of github.com:teneeto/Expensify into chore/36171/…

a90b409

…move-policy-tax-rates-to-policy-key

MonilBhavsar reviewed Feb 21, 2024

View reviewed changes

teneeto added 3 commits February 22, 2024 09:45

update tax Picker Prop Types

5b30df8

use taxRates from policy

7c38ea8

add missing import

c93638a

Merge branch 'main' of github.com:teneeto/Expensify into chore/36171/…

6a8239a

…move-policy-tax-rates-to-policy-key

MonilBhavsar reviewed Feb 23, 2024

View reviewed changes

MonilBhavsar marked this pull request as ready for review February 23, 2024 13:46

MonilBhavsar requested a review from a team as a code owner February 23, 2024 13:46

MonilBhavsar removed the request for review from a team February 23, 2024 13:46

melvin-bot bot requested a review from rlinoz February 23, 2024 13:46

MonilBhavsar removed the request for review from rlinoz February 23, 2024 13:47

teneeto added 8 commits February 23, 2024 16:13

add policy defaults

7823561

add policy defaults

7332ede

add comments to ONYX Props

d6f8cb7

add comments to ONYX Props

ebd910a

update comments

71be744

update comments

71fd0cd

update comments

1283b12

Merge branch 'main' of github.com:teneeto/Expensify into chore/36171/…

697f7e1

…move-policy-tax-rates-to-policy-key

MonilBhavsar approved these changes Feb 26, 2024

View reviewed changes

MonilBhavsar merged commit 7120be2 into Expensify:main Feb 26, 2024
15 checks passed

github-actions bot mentioned this pull request Feb 26, 2024

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

kosmydel reviewed Feb 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: move policy tax rates to policy key #36784

chore: move policy tax rates to policy key #36784

teneeto commented Feb 19, 2024

MonilBhavsar left a comment

MonilBhavsar left a comment

MonilBhavsar Feb 23, 2024

melvin-bot bot commented Feb 23, 2024

MonilBhavsar commented Feb 23, 2024 •

edited

Loading

MonilBhavsar commented Feb 23, 2024

MonilBhavsar left a comment

OSBotify commented Feb 26, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024

kosmydel Feb 29, 2024

		const defaultTaxKey = taxRates.defaultExternalID;
		const defaultTaxName = (defaultTaxKey && `${taxRates.taxes[defaultTaxKey].name} (${taxRates.taxes[defaultTaxKey].value}) • ${translate('common.default')}`) \|\| '';

chore: move policy tax rates to policy key #36784

chore: move policy tax rates to policy key #36784

Conversation

teneeto commented Feb 19, 2024

Details

Fixed Issues

Tests

Note:

Offline tests

QA Steps

Note:

PR Author Checklist

Screenshots/Videos

MonilBhavsar left a comment

Choose a reason for hiding this comment

MonilBhavsar left a comment

Choose a reason for hiding this comment

MonilBhavsar Feb 23, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Feb 23, 2024

MonilBhavsar commented Feb 23, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

MonilBhavsar commented Feb 23, 2024

MonilBhavsar left a comment

Choose a reason for hiding this comment

OSBotify commented Feb 26, 2024

OSBotify commented Feb 26, 2024

OSBotify commented Feb 28, 2024

kosmydel Feb 29, 2024

Choose a reason for hiding this comment

MonilBhavsar commented Feb 23, 2024 •

edited

Loading