Use suitable decimals while calculating tax #43948

ShridharGoel · 2024-06-18T19:09:02Z

Details

Use suitable decimals while calculating tax.

Fixed Issues

$ #42601
PROPOSAL: #42601 (comment)

Tests

Select "submit expense" in any workspace.
Enter amount đ20000 (currency: VND).
Select tax rate: 12%.
Tax amount should be set to đ2143.
Click on the tax amount to open the edit page and check the amount shown.
Test by editing amount to 2144 (it should show as invalid).

QA Steps

Select "submit expense" in any workspace.
Enter amount đ20000 (currency: VND).
Select tax rate: 12%.
Tax amount should be set to đ2143.
Click on the tax amount to open the edit page and check the amount shown.
Test by editing amount to 2144 (it should show as invalid).

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-07-06.at.3.14.02.PM.mov

Android: mWeb Chrome

Screenrecording_20240626_011750.mp4

iOS: Native

Screen.Recording.2024-06-26.at.12.25.44.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-06-26.at.12.33.02.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-25.at.7.05.18.PM.mov

MacOS: Desktop

Screen.Recording.2024-06-26.at.12.20.33.AM.mov

melvin-bot · 2024-06-18T19:09:07Z

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

ShridharGoel · 2024-06-25T19:51:11Z

Pending: Android video because of build issue.

…into max-tax

DylanDylann · 2024-07-02T09:09:19Z

@ShridharGoel Please merge the latest main and re-test on Android

DylanDylann · 2024-07-02T09:16:32Z

src/libs/TransactionUtils.ts

@@ -714,9 +715,11 @@ function hasWarningTypeViolation(transactionID: string, transactionViolations: O
 /**
 * Calculates tax amount from the given expense amount and tax percentage
 */
-function calculateTaxAmount(percentage: string, amount: number) {
+function calculateTaxAmount(percentage: string, amount: number, currency: string | undefined = undefined) {


Should we update to

currency?: string

One more thing, why don't we pass currency in all cases?

DylanDylann · 2024-07-02T09:21:03Z

src/libs/CurrencyUtils.ts

    if (amountAsInt === null || amountAsInt === undefined) {
        return '';
    }
-    return convertToFrontendAmountAsInteger(amountAsInt).toFixed(2);
+    const decimals = getCurrencyDecimals(currency);
+    return convertToFrontendAmountAsInteger(amountAsInt, currency).toFixed(decimals);


Why we need to use toFixed(decimals) here? we just used toFixed(decimals) in convertToFrontendAmountAsInteger

@ShridharGoel How about this?

This is needed to convert it to a String (we can also use just the toString() method).

I think we should use toString method

This seems to be needed because in 2 decimals, Number changes 25.00 to 25. We again need to change it back to 25.00 when calling convertToFrontendAmountAsString.

yeah, make sense

DylanDylann · 2024-07-02T09:23:14Z

tests/unit/CurrencyUtilsTest.ts

+        });
+    });
+
+    describe('convertToFrontendAmountAsInteger VND', () => {


Please write a clear description to describe that we need to fix in this PR

DylanDylann · 2024-07-02T09:23:21Z

tests/unit/CurrencyUtilsTest.ts

+        });
+    });
+
+    describe('convertToFrontendAmountAsString VND', () => {


DylanDylann · 2024-07-04T09:12:29Z

@ShridharGoel Could you process this PR soon? Because It relates to another PR that we need to prioritise

ShridharGoel · 2024-07-04T09:19:14Z

Sure, checking.

ShridharGoel · 2024-07-04T13:03:45Z

Will update this within a few hours.

…into max-tax

DylanDylann · 2024-07-05T08:19:59Z

@ShridharGoel Is this PR ready for the next reviewing round? I see that you still post proposals while this PR is still pending from you. Please follow the guideline

App/contributingGuides/CONTRIBUTING.md

Line 98 in 36e9217

    
           5. Contributors should **not** submit proposals on issues when they have assigned issues or PRs that are awaiting an action from them. If so, they will be in violation of Rule #1 (Get Shit Done) in our [Code of Conduct](https://github.com/Expensify/App/blob/main/CODE_OF_CONDUCT.md) and will receive a warning. Multiple warnings can lead to removal from the program.

ShridharGoel · 2024-07-05T08:28:56Z

Yes, this is ready.

…

On Friday 5 July 2024, DylanDylann ***@***.***> wrote: @ShridharGoel <https://github.com/ShridharGoel> Is this PR ready for the next reviewing round? I see that you still post proposals while this PR is still pending from you. Please follow the guideline https://github.com/Expensify/App/blob/36e92179c5e1c9f70d4352dba07395 243732de0d/contributingGuides/CONTRIBUTING.md?plain=1#L98 — Reply to this email directly, view it on GitHub <#43948 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIPLJHBNXZ56DC5YPMYRDGTZKZJMLAVCNFSM6AAAAABJQUCGH6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMJQGQZDCNZQGI> . You are receiving this because you were mentioned.Message ID: ***@***.***>

ShridharGoel · 2024-07-05T08:29:50Z

@DylanDylann I had already updated the PR yesterday.

…

On Friday 5 July 2024, Shridhar Goel ***@***.***> wrote: Yes, this is ready. On Friday 5 July 2024, DylanDylann ***@***.***> wrote: > @ShridharGoel <https://github.com/ShridharGoel> Is this PR ready for the > next reviewing round? I see that you still post proposals while this PR is > still pending from you. Please follow the guideline > > https://github.com/Expensify/App/blob/36e92179c5e1c9f70d4352 > dba07395243732de0d/contributingGuides/CONTRIBUTING.md?plain=1#L98 > > — > Reply to this email directly, view it on GitHub > <#43948 (comment)>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/AIPLJHBNXZ56DC5YPMYRDGTZKZJMLAVCNFSM6AAAAABJQUCGH6VHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDEMJQGQZDCNZQGI> > . > You are receiving this because you were mentioned.Message ID: > ***@***.***> >

DylanDylann · 2024-07-05T08:31:02Z

@ShridharGoel Typescript check failure

DylanDylann · 2024-07-05T08:34:41Z

@ShridharGoel One more thing, in the next time please ping me or leave a message when you finish the update

ShridharGoel · 2024-07-05T09:04:37Z

@DylanDylann Updated.

DylanDylann · 2024-07-05T09:12:14Z

tests/unit/CurrencyUtilsTest.ts

+     * VND uses 0 decimals, so this test is needed.
+     * https://github.com/Expensify/App/pull/43948
+     */
+    describe('convertToFrontendAmountAsInteger VND', () => {


App/tests/unit/CurrencyUtilsTest.ts

Lines 134 to 144 in 8d6b1b3

describe('convertToDisplayString', () => {

test.each([

[CONST.CURRENCY.USD, 25, '$0.25'],

[CONST.CURRENCY.USD, 2500, '$25.00'],

[CONST.CURRENCY.USD, 150, '$1.50'],

[CONST.CURRENCY.USD, 250000, '$2,500.00'],

['JPY', 2500, '¥25'],

['JPY', 250000, '¥2,500'],

['JPY', 2500.5, '¥25'],

['RSD', 100, 'RSD\xa01.00'],

['RSD', 145, 'RSD\xa01.45'],

I think we should do like above reference instead of creating new test

DylanDylann · 2024-07-05T09:12:54Z

@ShridharGoel Also please check this comment

DylanDylann · 2024-07-05T10:53:53Z

tests/unit/CurrencyUtilsTest.ts

+            [null, '', 'USD'],
+            [undefined, '', 'USD'],
+            [0, '0.00', 'USD'],
+            // VND uses 0 decimals.


Suggested change

// VND uses 0 decimals.

DylanDylann · 2024-07-05T10:54:00Z

tests/unit/CurrencyUtilsTest.ts

+            [undefined, '', 'USD'],
+            [0, '0.00', 'USD'],
+            // VND uses 0 decimals.
+            // https://github.com/Expensify/App/pull/43948


Suggested change

// https://github.com/Expensify/App/pull/43948

DylanDylann · 2024-07-05T10:54:09Z

tests/unit/CurrencyUtilsTest.ts

+            [25, 0.25, 'USD'],
+            [2500, 25, 'USD'],
+            [2500.5, 25, 'USD'], // The backend should never send a decimal .5 value
+            // VND uses 0 decimals.


Suggested change

// VND uses 0 decimals.

DylanDylann · 2024-07-05T10:54:16Z

tests/unit/CurrencyUtilsTest.ts

+            [2500, 25, 'USD'],
+            [2500.5, 25, 'USD'], // The backend should never send a decimal .5 value
+            // VND uses 0 decimals.
+            // https://github.com/Expensify/App/pull/43948


Suggested change

// https://github.com/Expensify/App/pull/43948

DylanDylann · 2024-07-05T10:54:44Z

@ShridharGoel Minor things, everything else looks good

DylanDylann · 2024-07-05T10:54:56Z

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

Screen.Recording.2024-07-08.at.14.46.36.mov

Android: mWeb Chrome

Screen.Recording.2024-07-08.at.14.44.14.mov

iOS: Native

Screen.Recording.2024-07-08.at.14.48.11.mov

iOS: mWeb Safari

Screen.Recording.2024-07-08.at.14.45.15.mov

MacOS: Chrome / Safari

Screen.Recording.2024-07-08.at.12.37.13.mov

MacOS: Desktop

Screen.Recording.2024-07-08.at.14.42.47.mov

OSBotify · 2024-07-08T19:51:18Z

✋ 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-07-10T11:19:23Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.0.6-0 🚀

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

OSBotify · 2024-07-10T11:36:37Z

🚀 Deployed to staging by https://github.com/francoisl in version: 9.0.6-0 🚀

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

OSBotify · 2024-07-11T10:16:52Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.0.6-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-11T10:36:28Z

🚀 Cherry-picked to staging by https://github.com/Julesssss in version: 9.0.6-1 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-15T20:19:14Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

OSBotify · 2024-07-17T00:18:16Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.7-8 🚀

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

aldo-expensify · 2024-07-23T19:19:32Z

src/components/MoneyRequestConfirmationList.tsx

@@ -329,10 +329,10 @@ function MoneyRequestConfirmationList({
            taxCode = transaction?.taxCode ?? TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
        }
        const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, taxCode) ?? '';
-        const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount);
+        const taxAmount = TransactionUtils.calculateTaxAmount(taxPercentage, taxableAmount, currency);


@ShridharGoel

Why did we use currency and not transcation.currency? currency seems to be the currency associated to the mileage rate or the policy: (mileageRate as MileageRate)?.currency ?? policyCurrency;. What if the transaction is not a distance transaction and it has a different currency from the policy default?

@aldo-expensify This makes sense, we can update it to use transaction.currency instead. Should I open a PR for this?

No worries, I'll update it here: #43519

Use suitable decimals while calculating tax

4d5b18b

ShridharGoel requested a review from a team as a code owner June 18, 2024 19:09

melvin-bot bot requested review from DylanDylann and removed request for a team June 18, 2024 19:09

ShridharGoel marked this pull request as draft June 18, 2024 19:09

ShridharGoel added 3 commits June 26, 2024 01:03

Update

d03daf4

Add and update tests

f1b4060

Merge branch 'main' of https://github.com/Expensify/App into max-tax

69e2c0c

ShridharGoel marked this pull request as ready for review June 25, 2024 19:48

Update IOURequestStepDistanceRate.tsx

c362173

ShridharGoel added 4 commits June 26, 2024 13:00

Update

e89431e

Merge branch 'max-tax' of https://github.com/ShridharGoel/ExpensifyApp …

9443aaa

…into max-tax

Update

f6d8de6

Update

2a7588d

DylanDylann reviewed Jul 2, 2024

View reviewed changes

Merge branch 'main' of https://github.com/Expensify/App into max-tax

9569e75

ShridharGoel added 5 commits July 4, 2024 20:20

Update

ead5591

Update IOURequestStepTaxRatePage.tsx

21530f8

Add some default values

2fb7b26

Merge branch 'max-tax' of https://github.com/ShridharGoel/ExpensifyApp …

6d4d7aa

…into max-tax

Lint fix

6747545

tienifr mentioned this pull request Jul 5, 2024

mWeb - Tax - With Workspace currency IQD, creating expense unable to erase digits in tax amount #44854

Closed

6 tasks

Typecheck fix

f05fff3

ShridharGoel requested a review from DylanDylann July 5, 2024 09:04

DylanDylann reviewed Jul 5, 2024

View reviewed changes

Update

6ea6286

DylanDylann reviewed Jul 5, 2024

View reviewed changes

Update

db546d9

ShridharGoel requested a review from DylanDylann July 6, 2024 09:23

DylanDylann approved these changes Jul 8, 2024

View reviewed changes

melvin-bot bot requested a review from francoisl July 8, 2024 07:49

francoisl approved these changes Jul 8, 2024

View reviewed changes

francoisl merged commit 608cd99 into Expensify:main Jul 8, 2024
16 checks passed

github-actions bot mentioned this pull request Jul 10, 2024

Deploy Checklist: New Expensify 2024-07-10 #45144

Closed

aldo-expensify reviewed Jul 23, 2024

View reviewed changes

	describe('convertToDisplayString', () => {
	test.each([
	[CONST.CURRENCY.USD, 25, '$0.25'],
	[CONST.CURRENCY.USD, 2500, '$25.00'],
	[CONST.CURRENCY.USD, 150, '$1.50'],
	[CONST.CURRENCY.USD, 250000, '$2,500.00'],
	['JPY', 2500, '¥25'],
	['JPY', 250000, '¥2,500'],
	['JPY', 2500.5, '¥25'],
	['RSD', 100, 'RSD\xa01.00'],
	['RSD', 145, 'RSD\xa01.45'],

Use suitable decimals while calculating tax #43948

Use suitable decimals while calculating tax #43948

Conversation

ShridharGoel commented Jun 18, 2024 • edited Loading

Details

Fixed Issues

Tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 18, 2024

ShridharGoel commented Jun 25, 2024

DylanDylann commented Jul 2, 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann commented Jul 4, 2024

ShridharGoel commented Jul 4, 2024 • edited Loading

ShridharGoel commented Jul 4, 2024

DylanDylann commented Jul 5, 2024

ShridharGoel commented Jul 5, 2024 via email

ShridharGoel commented Jul 5, 2024 via email

DylanDylann commented Jul 5, 2024

DylanDylann commented Jul 5, 2024

ShridharGoel commented Jul 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

DylanDylann commented Jul 5, 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

DylanDylann commented Jul 5, 2024

DylanDylann commented Jul 5, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

OSBotify commented Jul 8, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 11, 2024

OSBotify commented Jul 15, 2024

OSBotify commented Jul 17, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ShridharGoel commented Jun 18, 2024 •

edited

Loading

ShridharGoel commented Jul 4, 2024 •

edited

Loading

DylanDylann commented Jul 5, 2024 •

edited

Loading