feat: add new input fields for tax tracking #32550

teneeto · 2023-12-06T09:13:08Z

Details

create simple input fields that can allow inserting, editing and viewing tax details.

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

src/components/MoneyRequestConfirmationList.js

src/pages/iou/steps/IOURequestStepTaxRatePage.js

…-input-fields-for-tax-tracking

teneeto · 2023-12-30T15:12:29Z

@alitoshmatov @MonilBhavsar fixed bug relating to error message. Please let's check.

MonilBhavsar · 2024-01-01T05:48:00Z

Thank you! A typescript check is failing

…-input-fields-for-tax-tracking

teneeto · 2024-01-01T19:44:32Z

Thank you! A typescript check is failing

O yes, it's unrelated, a pull fixed it.

MonilBhavsar · 2024-01-02T07:39:14Z

Thanks! Merging main should fix the failing jest tests.
@alitoshmatov could you please take a look and confirm the bug you noted is fixed, thanks!

…-input-fields-for-tax-tracking

teneeto · 2024-01-02T09:31:06Z

Thanks, test fixed with a pull/merge.

alitoshmatov · 2024-01-03T09:49: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

https://github.com/Expensify/App/assets/59907218/3e06eaa0-2f2a-4eb6-8724-2e27cc2f4be4

Android: mWeb Chrome

tax2-mweb.mov

iOS: Native

tax2-ios.mp4

iOS: mWeb Safari

tax2-safari.mp4

MacOS: Chrome / Safari

tax2-web.mov

MacOS: Desktop

tax2-desktop.mov

alitoshmatov · 2024-01-03T09:50:18Z

Everything looks good, @teneeto Can you resolve conflicts and notify me. I will recheck everything quickly

…-input-fields-for-tax-tracking

teneeto · 2024-01-03T10:14:10Z

Hi @alitoshmatov, resolved conflict. can you check again? cc: @MonilBhavsar

alitoshmatov · 2024-01-03T10:17:38Z

Everything looks great!

MonilBhavsar · 2024-01-03T10:42:49Z

Thank you! Taking a final look

MonilBhavsar

Looks great! Let's ship it

MonilBhavsar · 2024-01-03T10:56:18Z

src/components/MoneyRequestConfirmationList.js

@@ -777,12 +825,15 @@ export default compose(
            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
            selector: DistanceRequestUtils.getDefaultMileageRate,
        },
-        draftTransaction: {
+        splitTransactionDraft: {


NAB, this seems unused and can be removed in a follow up PR as it is unrelated to this change

O will see to it.

OSBotify · 2024-01-03T11:02:07Z

✋ 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-01-04T19:03:00Z

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

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

OSBotify · 2024-01-04T20:10:37Z

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

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

OSBotify · 2024-01-09T05:19:17Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.22-6 🚀

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

aimane-chnaif · 2024-07-24T18:36:47Z

Coming from #44632:

    const formattedTaxAmount = CurrencyUtils.convertToDisplayString(props.transaction.taxAmount, props.iouCurrencyCode);

There's case when transaction.taxAmount becomes negative. So we had to convert it to positive first using TransactionUtils.getTaxAmount

teneeto added 2 commits December 6, 2023 10:07

initial input screens

3d85737

fix lint

20efbfc

MonilBhavsar reviewed Dec 6, 2023

View reviewed changes

teneeto added 27 commits December 7, 2023 23:46

check policy expense chat: a flag for showing tax rate

71b49b9

add policy tax rates in tax rate page

50e1a81

add tax rates list threshold

c683500

add tax rates sections in options utils

c14bbe3

add tax propTypes

88d352d

add tax pickerPropTypes

8b26228

add tax picker

e4be96d

use TaxPicker in tax rates page

11a4691

fix lint

df81cf5

remove whitespace

c34095e

add default amount to avoid Nan

2f78afd

add default title for tax rate and format amount

8098ae1

set tax rate and tax amount to onyx

11ab530

add defaulttax title

bebace8

update tax rate section

0675e22

update tax Amount based on tax rate

2abfc7c

should show search input if threshold is more than 8

ce50e7c

should show error if current amount is greater than iou amount

9e12ece

update comment

e5f6e17

set taxAmount in Onyx

d9fa49d

add tax translation strings

98db78b

format tax amount and use translation for invalid tax amount

e28ae1b

translate titles

781952a

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

6fe318c

…-input-fields-for-tax-tracking

update merge conflict

7f80963

translate tax amount and rate

62e98c1

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

5b11998

…-input-fields-for-tax-tracking

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

21d6849

…-input-fields-for-tax-tracking

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

f1644e9

…-input-fields-for-tax-tracking

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

844fdd4

…-input-fields-for-tax-tracking

Merge branch 'main' of github.com:teneeto/App into feat/31672/add-new…

70f3b99

…-input-fields-for-tax-tracking

MonilBhavsar approved these changes Jan 3, 2024

View reviewed changes

MonilBhavsar merged commit 27a51a4 into Expensify:main Jan 3, 2024
16 checks passed

github-actions bot mentioned this pull request Jan 4, 2024

Deploy Checklist: New Expensify 2024-01-04 #33973

Closed

74 tasks

This was referenced Jan 5, 2024

IOU - Tax settings for Foreign Currency Default are not applied #34055

Closed

Tax - Selecting tax after refreshing tax rate redirects user to request page #34058

Closed

Pujan92 mentioned this pull request Jan 5, 2024

[$500] [HOLD for payment 2024-01-17] Expense - App crashes when attempting to request money from a deleted workspace #34063

Closed

6 tasks

alitoshmatov mentioned this pull request Jan 9, 2024

Payment issue for E/App PR#34094 #34097

Closed

rayane-djouah mentioned this pull request Feb 17, 2024

[TS migration] Migrate '[Components Group 1]' component to TypeScript #36764

Merged

50 tasks

MonilBhavsar mentioned this pull request May 1, 2024

[Needs payment][Track Tax] Add new input fields for tax tracking in Money requests #31672

Closed

Krishna2323 mentioned this pull request May 11, 2024

[HOLD for payment 2024-05-09] [$250] Taxes - Tax exceeding limit is saved instead of showing error in tax input editor #41075

Closed

6 tasks

aimane-chnaif mentioned this pull request Jul 24, 2024

[HOLD for payment 2024-07-24] [$250] Split tax - Tax amount is negative when manually entering tax amount when splitting expense #44632

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add new input fields for tax tracking #32550

feat: add new input fields for tax tracking #32550

teneeto commented Dec 6, 2023 •

edited

Loading

teneeto commented Dec 30, 2023

MonilBhavsar commented Jan 1, 2024

teneeto commented Jan 1, 2024

MonilBhavsar commented Jan 2, 2024

teneeto commented Jan 2, 2024

alitoshmatov commented Jan 3, 2024

alitoshmatov commented Jan 3, 2024

teneeto commented Jan 3, 2024

alitoshmatov commented Jan 3, 2024

MonilBhavsar commented Jan 3, 2024

MonilBhavsar left a comment

MonilBhavsar Jan 3, 2024 •

edited

Loading

teneeto Jan 3, 2024

OSBotify commented Jan 3, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 9, 2024

aimane-chnaif commented Jul 24, 2024

feat: add new input fields for tax tracking #32550

feat: add new input fields for tax tracking #32550

Conversation

teneeto commented Dec 6, 2023 • edited Loading

Details

Fixed Issues

Tests

Note:

Offline tests

QA Steps

Note:

PR Author Checklist

Screenshots/Videos

teneeto commented Dec 30, 2023

MonilBhavsar commented Jan 1, 2024

teneeto commented Jan 1, 2024

MonilBhavsar commented Jan 2, 2024

teneeto commented Jan 2, 2024

alitoshmatov commented Jan 3, 2024

Reviewer Checklist

Screenshots/Videos

alitoshmatov commented Jan 3, 2024

teneeto commented Jan 3, 2024

alitoshmatov commented Jan 3, 2024

MonilBhavsar commented Jan 3, 2024

MonilBhavsar left a comment

Choose a reason for hiding this comment

MonilBhavsar Jan 3, 2024 • edited Loading

Choose a reason for hiding this comment

teneeto Jan 3, 2024

Choose a reason for hiding this comment

OSBotify commented Jan 3, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 9, 2024

aimane-chnaif commented Jul 24, 2024

teneeto commented Dec 6, 2023 •

edited

Loading

MonilBhavsar Jan 3, 2024 •

edited

Loading