support for offline tax tracking by teneeto · Pull Request #40443 · Expensify/App

teneeto · 2024-04-18T13:51:59Z

Details

This PR adds Support for tax tracking when offline.

Fixed Issues

$: 39616
PROPOSAL: 39616

Tests

Submit Expense

Go to workspace chat.
Start a Submit expense (money request) flow.
In confirmation page, click Show more > Tax amount > Change Currency.
Submit Expense
Expectation: when currency is changed from Policy default currency to another currency then let's make sure we use tax rate as foreign default else it should remain as workspace default .

Edit Expense

Go to transaction thread.
Click and update expense amount or tax rate.
Expectation: when changing request amount and tax rate offline, the tax amount will change accordingly and immediately.

Verify that no errors appear in the JS console

Offline tests

Submit Expense

Go to workspace chat.
Start a Submit expense (money request) flow.
In confirmation page, click Show more > Tax amount > Change Currency.
Submit Expense
Expectation: when currency is changed from Policy default currency to another currency then let's make sure we use tax rate as foreign default else it should remain as workspace default .

Edit Expense

Go to transaction thread.
Click and update expense amount or tax rate.
Expectation: when changing request amount and tax rate offline, the tax amount will change accordingly and immediately.

QA Steps

Submit Expense

Go to workspace chat.
Start a Submit expense (money request) flow.
In confirmation page, click Show more > Tax amount > Change Currency.
Submit Expense
Expectation: when currency is changed from Policy default currency to another currency then let's make sure we use tax rate as foreign default else it should remain as workspace default .

Edit Expense

Go to transaction thread.
Click and update expense amount or tax rate.
Expectation: when changing request amount and tax rate offline, the tax amount will change accordingly and immediately.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Screen.Recording.2024-04-18.at.15.18.16.mov

iOS: Native

Android: Native

Android: mWeb Chrome

iOS: mWeb Safari

MacOS: Desktop

…6/support-for-offline-tax-tracking

…currency

getusha · 2024-05-09T08:48:02Z

@teneeto could you just put the issue link like #39616 in the PR description?

…6/support-for-offline-tax-tracking

MonilBhavsar · 2024-05-10T11:25:21Z

I noticed a bug -

Click on 'Submit expense'
Change currency to other than default currency
Ensure tax rate changes
but tax amount is updated to zero (And then changing tax rate also does not update tax amount. Tax amount stays zero)

cc @teneeto @getusha

Looks like we're updating it correctly in draft transaction in Onyx, but not displaying it

See taxAmount in Onyx is 45 and in UI it is 0

MonilBhavsar · 2024-05-13T07:12:48Z

See taxAmount in Onyx is 45 and in UI it is 0

This is bug with certain currencies where amount in small decimals is not supported. Not related to this PR

MonilBhavsar

Looks good. Let's ship it! 🚀

OSBotify · 2024-05-13T07:22: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-05-13T08:42:03Z

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

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

Julesssss · 2024-05-13T11:16:00Z

Hey @teneeto @MonilBhavsar. I believe this deploy blocker was introduced by this large PR. Would you mind taking a look? As this is a huge PR reverting isn't going to be ideal so ideally we can get a quick fix submitted.

aldo-expensify · 2024-05-14T01:11:18Z

src/libs/TransactionUtils.ts

+        taxCode,
+        taxAmount,


This is causing the deploy blocker: #42114 (comment)

OSBotify · 2024-05-15T09:50:13Z

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

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

rushatgabhane · 2024-05-20T17:03:55Z

hey, this PR caused a blocker - #42045

DylanDylann · 2024-05-22T03:36:57Z

src/libs/actions/IOU.ts

+function updateMoneyRequestTaxRate({transactionID, optimisticReportActionID, taxCode, taxAmount, policy, policyTagList, policyCategories}: UpdateMoneyRequestTaxRateParams) {
    const transactionChanges = {
        taxCode,
+        ...(taxAmount && {taxAmount}),


It caused this bug, when taxAmount is zero, the value will be ignored

rojiphil · 2024-05-23T18:12:54Z

src/components/MoneyRequestConfirmationList.tsx

+const getTaxAmount = (transaction: OnyxEntry<OnyxTypes.Transaction>, policy: OnyxEntry<OnyxTypes.Policy>) => {
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
+
+    const taxPercentage = TransactionUtils.getTaxValue(policy, transaction, transaction?.taxCode ?? defaultTaxCode) ?? '';


When the currency differs from the current transaction currency, the taxCode should have also changed to the default (i.e. local or foreign based on the newly updated currency) tax rate. And, the tax amount should also have been recomputed. Missing these changes here resulted in issue #42049.

aldo-expensify · 2024-05-31T07:14:03Z

src/components/MoneyRequestConfirmationList.tsx

+        if (transaction?.taxAmount && previousTransactionAmount === transaction?.amount && previousTransactionCurrency === transaction?.currency) {
            return IOU.setMoneyRequestTaxAmount(transaction?.transactionID, transaction?.taxAmount, true);
        }


What is this block doing here? is it here in case the currency didn't change?

if transaction?.taxAmount && previousTransactionAmount, what is the purpose of calling IOU.setMoneyRequestTaxAmount? is the draft in a different state?

aldo-expensify · 2024-05-31T07:19:34Z

src/libs/TransactionUtils.ts

+    const defaultTaxCode = () => {
+        if (!transaction) {
+            return defaultExternalID;
+        }
+
+        return policy && getDefaultTaxCode(policy, transaction);
+    };


@teneeto Why did we wrap this code in a function? Why didn't we just do something like:

const defaultTaxCode = !transaction ? defaultExternalID : policy && getDefaultTaxCode(policy, transaction);

Are you expecting that policy or transaction can mutate?

aldo-expensify · 2024-05-31T07:29:50Z

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

-    const moneyRequestTaxPercentage = (transaction?.taxRate ? transaction?.taxRate?.data?.value : defaultTaxValue) ?? '';
-    const editingTaxPercentage = (transactionTaxCode ? taxRates?.taxes[transactionTaxCode]?.value : moneyRequestTaxPercentage) ?? '';
+    const defaultTaxCode = TransactionUtils.getDefaultTaxCode(policy, transaction) ?? '';
+    const getTaxValue = (taxCode: string) => TransactionUtils.getTaxValue(policy, transaction, taxCode);


Why did we create this getTaxValue function, it is only used inside here, right? is it just to type getTaxValue(xxx) instead of TransactionUtils.getTaxValue(policy, transaction, taxCode)?

aldo-expensify · 2024-05-31T07:34:36Z

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

-    if (percentage) {
-        return TransactionUtils.calculateTaxAmount(percentage, amount);
+function getTaxAmount(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, selectedTaxCode: string, amount: number): number | undefined {
+    const getTaxValue = (taxCode: string) => TransactionUtils.getTaxValue(policy, transaction, taxCode);


Why did we define a function here? this makes the code more confusing

teneeto added 6 commits April 18, 2024 13:19

add taxAmount param to updateMoneyRequestAmountAndCurrency

7574fc9

should optimistically update tax amount when updating expense amount

1ed12df

add UpdateMoneyRequestTaxRateParams types to updateMoneyRequestTaxRate

1c16b1a

add taxAmount to UpdateMoneyRequestTaxRateParams types

8dce58a

should optimistically update tax amount when updating tax rate

228c477

fix lint

a0ac9ba

teneeto changed the title ~~Feature/39616/support for offline tax tracking~~ support for offline tax tracking Apr 18, 2024

teneeto added 4 commits April 19, 2024 09:45

Merge branch 'main' of github.com:teneeto/Expensify into feature/3961…

7b79f15

…6/support-for-offline-tax-tracking

fix lint

3ba09e8

Merge branch 'main' of github.com:teneeto/Expensify into feature/3961…

59a57b0

…6/support-for-offline-tax-tracking

Merge branch 'main' of github.com:teneeto/Expensify into feature/3961…

1e8a4a4

…6/support-for-offline-tax-tracking

teneeto mentioned this pull request Apr 23, 2024

[Awaiting Payment 22nd May] [$250] [Track Tax] - Support for tax tracking when offline #39616

Closed

6 tasks

teneeto added 18 commits April 24, 2024 12:58

update policy getTaxRatesSection

3cd43a4

update TaxPicker

31d6d0d

update IOURequestStepTaxRatePage

b2829fc

Merge branch 'main' of github.com:teneeto/Expensify into feature/3961…

d87b8cc

…6/support-for-offline-tax-tracking

set taxCode and use foreignTaxDefault and defaultExternalId based on …

e9a2ebd

…currency

set taxcode and not taxRate

26e108f

modify default TaxName props

7855c95

update defaultTaxKey

36e731f

use modified getDefaultTaxName

f66df7b

set default tax code

7c29f96

update defaultTaxKey to defaultTaxCode

6330d7d

update defaultTaxKey to defaultTaxCode

cdeb5bd

add getDefaultTaxCode function

8e08bb9

use getDefaultTaxCode function

dd6f0a6

use getDefaultTaxCode function

042bf2e

remove unused var

45fd4f5

use getDefaultTaxCode function

5365262

use getDefaultTaxCode function

57425e4

teneeto added 2 commits May 9, 2024 12:25

revert: add backTo

52e8cc7

Merge branch 'main' of github.com:teneeto/Expensify into feature/3961…

bade846

…6/support-for-offline-tax-tracking

use navigateBack

ea26dc9

MonilBhavsar approved these changes May 13, 2024

View reviewed changes

MonilBhavsar merged commit 2e6e8ca into Expensify:main May 13, 2024

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

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

Closed

74 tasks

MonilBhavsar mentioned this pull request May 13, 2024

[CP Staging] Fix tax amount being displayed as negative #42039

Merged

50 tasks

Julesssss mentioned this pull request May 13, 2024

[HOLD for payment 2024-05-22] Tax - Missing tax amount change in system message and incorrect new tax amount in the message #42045

Closed

6 tasks

m-natarajan mentioned this pull request May 13, 2024

[HOLD for payment 2024-05-22] Tax - Tax amount does not update to 0.00 immediately when changing tax rate to 0% offline #42052

Closed

6 tasks

ShridharGoel mentioned this pull request May 13, 2024

[HOLD for payment 2024-05-22] Tax - Unable to save valid tax rate amount when changing currency for the first time #42047

Closed

6 tasks

MonilBhavsar mentioned this pull request May 13, 2024

[CP Staging] Fix bug when updating tax rate to zero #42065

Merged

50 tasks

ShridharGoel mentioned this pull request May 13, 2024

[CP Staging] Use selected currency when utilising tax rate #42064

Merged

48 tasks

aldo-expensify reviewed May 14, 2024

View reviewed changes

aldo-expensify mentioned this pull request May 14, 2024

Set default tax #42126

Closed

50 tasks

DylanDylann reviewed May 22, 2024

View reviewed changes

rojiphil reviewed May 23, 2024

View reviewed changes

rojiphil mentioned this pull request May 23, 2024

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

Closed

6 tasks

aldo-expensify reviewed May 31, 2024

View reviewed changes

bernhardoj mentioned this pull request Nov 28, 2024

[$250] Search-Invoice with +2 expense submitted in OD is displayed with a negative total amount in ND #53045

Closed

8 tasks

Conversation

teneeto commented Apr 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

getusha commented May 9, 2024

Uh oh!

MonilBhavsar commented May 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MonilBhavsar commented May 13, 2024

Uh oh!

MonilBhavsar left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 13, 2024

Uh oh!

OSBotify commented May 13, 2024

Uh oh!

Julesssss commented May 13, 2024

Uh oh!

aldo-expensify May 14, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented May 15, 2024

Uh oh!

rushatgabhane commented May 20, 2024

Uh oh!

DylanDylann May 22, 2024

Choose a reason for hiding this comment

Uh oh!

rojiphil May 23, 2024

Choose a reason for hiding this comment

Uh oh!

aldo-expensify May 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aldo-expensify May 31, 2024

Choose a reason for hiding this comment

Uh oh!

aldo-expensify May 31, 2024

Choose a reason for hiding this comment

Uh oh!

aldo-expensify May 31, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

teneeto commented Apr 18, 2024 •

edited

Loading

MonilBhavsar commented May 10, 2024 •

edited

Loading

aldo-expensify May 31, 2024 •

edited

Loading