support for offline tax tracking #40443
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import Onyx from 'react-native-onyx'; | |
| import type {ValueOf} from 'type-fest'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import type {Policy, RecentWaypoint, Report, TaxRate, TaxRates, Transaction, TransactionViolation} from '@src/types/onyx'; | ||
| import type {Comment, Receipt, TransactionChanges, TransactionPendingFieldsKey, Waypoint, WaypointCollection} from '@src/types/onyx/Transaction'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
| import type {IOURequestType} from './actions/IOU'; | ||
|
|
@@ -96,6 +96,8 @@ function buildOptimisticTransaction( | |
| existingTransactionID: string | null = null, | ||
| category = '', | ||
| tag = '', | ||
| taxCode = '', | ||
| taxAmount = 0, | ||
| billable = false, | ||
| pendingFields: Partial<{[K in TransactionPendingFieldsKey]: ValueOf<typeof CONST.RED_BRICK_ROAD_PENDING_ACTION>}> | undefined = undefined, | ||
| reimbursable = true, | ||
|
|
@@ -126,6 +128,8 @@ function buildOptimisticTransaction( | |
| filename, | ||
| category, | ||
| tag, | ||
| taxCode, | ||
| taxAmount, | ||
|
Comment on lines
+131
to
+132
There was a problem hiding this comment. This is causing the deploy blocker: #42114 (comment) |
||
| billable, | ||
| reimbursable, | ||
| }; | ||
|
|
@@ -651,29 +655,69 @@ function getRateID(transaction: OnyxEntry<Transaction>): string | undefined { | |
| } | ||
|
|
||
| /** | ||
| * Gets the tax code based on selected currency. | ||
| * Returns policy default tax rate if transaction is in policy default currency, otherwise returns foreign default tax rate | ||
| */ | ||
| function getDefaultTaxCode(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) { | ||
| const defaultExternalID = policy?.taxRates?.defaultExternalID; | ||
| const foreignTaxDefault = policy?.taxRates?.foreignTaxDefault; | ||
| return policy?.outputCurrency === getCurrency(transaction) ? defaultExternalID : foreignTaxDefault; | ||
| } | ||
|
|
||
| /** | ||
| * Transforms tax rates to a new object format - to add codes and new name with concatenated name and value. | ||
| * | ||
| * @param policy - The policy which the user has access to and which the report is tied to. | ||
| * @returns The transformed tax rates object.g | ||
| */ | ||
| function transformedTaxRates(policy: OnyxEntry<Policy> | undefined, transaction?: OnyxEntry<Transaction>): Record<string, TaxRate> { | ||
| const taxRates = policy?.taxRates; | ||
| const defaultExternalID = taxRates?.defaultExternalID; | ||
|
|
||
| const defaultTaxCode = () => { | ||
| if (!transaction) { | ||
| return defaultExternalID; | ||
| } | ||
|
|
||
| return policy && getDefaultTaxCode(policy, transaction); | ||
| }; | ||
|
Comment on lines
+677
to
+683
There was a problem hiding this comment. @teneeto Why did we wrap this code in a function? Why didn't we just do something like: Are you expecting that |
||
|
|
||
| const getModifiedName = (data: TaxRate, code: string) => | ||
| `${data.name} (${data.value})${defaultTaxCode() === code ? ` ${CONST.DOT_SEPARATOR} ${Localize.translateLocal('common.default')}` : ''}`; | ||
| const taxes = Object.fromEntries(Object.entries(taxRates?.taxes ?? {}).map(([code, data]) => [code, {...data, code, modifiedName: getModifiedName(data, code), name: data.name}])); | ||
| return taxes; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the tax value of a selected tax | ||
| */ | ||
| function getTaxValue(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>, taxCode: string) { | ||
| return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === taxCode)?.value; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the tax name for Workspace Taxes Settings | ||
| */ | ||
| function getWorkspaceTaxesSettingsName(policy: OnyxEntry<Policy>, taxCode: string) { | ||
| return Object.values(transformedTaxRates(policy)).find((taxRate) => taxRate.code === taxCode)?.modifiedName; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the tax name | ||
| */ | ||
| function getTaxName(policy: OnyxEntry<Policy>, transaction: OnyxEntry<Transaction>) { | ||
| const defaultTaxCode = getDefaultTaxCode(policy, transaction); | ||
| return Object.values(transformedTaxRates(policy, transaction)).find((taxRate) => taxRate.code === (transaction?.taxCode ?? defaultTaxCode))?.modifiedName; | ||
| } | ||
|
|
||
| export { | ||
| buildOptimisticTransaction, | ||
| calculateTaxAmount, | ||
| getWorkspaceTaxesSettingsName, | ||
| getDefaultTaxCode, | ||
| transformedTaxRates, | ||
| getTaxValue, | ||
| getTaxName, | ||
| getEnabledTaxRateCount, | ||
| getUpdatedTransaction, | ||
| getDescription, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the
currencydiffers from the currenttransaction currency, thetaxCodeshould 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.