-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[CP Stg] Fix tax amount manual adjustment #73391
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -35,7 +35,7 @@ import Log from '@libs/Log'; | |
| import {validateAmount} from '@libs/MoneyRequestUtils'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import {getIOUConfirmationOptionsFromPayeePersonalDetail, hasEnabledOptions} from '@libs/OptionsListUtils'; | ||
| import {getDistanceRateCustomUnitRate, getTagLists, isTaxTrackingEnabled} from '@libs/PolicyUtils'; | ||
| import {getTagLists, isTaxTrackingEnabled} from '@libs/PolicyUtils'; | ||
| import {isSelectedManagerMcTest} from '@libs/ReportUtils'; | ||
| import type {OptionData} from '@libs/ReportUtils'; | ||
| import { | ||
|
|
@@ -475,35 +475,16 @@ function MoneyRequestConfirmationList({ | |
| }, [shouldCalculateDistanceAmount, isReadOnly, distanceRequestAmount, transactionID, currency, isTypeSplit, isPolicyExpenseChat, selectedParticipantsProp, transaction]); | ||
|
|
||
| // Calculate and set tax amount in transaction draft | ||
| const taxableAmount = isDistanceRequest ? DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, distance) : (transaction?.amount ?? 0); | ||
| const taxPercentage = getTaxValue(policy, transaction, transaction?.taxCode ?? defaultTaxCode) ?? ''; | ||
| const taxAmount = calculateTaxAmount(taxPercentage, taxableAmount, transaction?.currency ?? CONST.CURRENCY.USD); | ||
| const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString())); | ||
| useEffect(() => { | ||
| if (!shouldShowTax || !transaction) { | ||
| if (!transactionID) { | ||
| return; | ||
| } | ||
|
|
||
| let taxableAmount: number | undefined; | ||
| let taxCode: string | undefined; | ||
| if (isDistanceRequest) { | ||
| if (customUnitRateID) { | ||
| const customUnitRate = getDistanceRateCustomUnitRate(policy, customUnitRateID); | ||
| taxCode = customUnitRate?.attributes?.taxRateExternalID; | ||
| taxableAmount = DistanceRequestUtils.getTaxableAmount(policy, customUnitRateID, distance); | ||
| } | ||
| } else { | ||
| taxableAmount = transaction.amount ?? 0; | ||
| taxCode = transaction.taxCode ?? getDefaultTaxCode(policy, transaction) ?? ''; | ||
| } | ||
|
|
||
| if (taxCode && taxableAmount) { | ||
| const taxPercentage = getTaxValue(policy, transaction, taxCode) ?? ''; | ||
| const taxAmount = calculateTaxAmount(taxPercentage, taxableAmount, transaction.currency); | ||
| const taxAmountInSmallestCurrencyUnits = convertToBackendAmount(Number.parseFloat(taxAmount.toString())); | ||
|
|
||
| // Only update if the calculated tax amount is different from the current one | ||
| if (transaction.taxAmount !== taxAmountInSmallestCurrencyUnits) { | ||
| setMoneyRequestTaxAmount(transaction.transactionID, taxAmountInSmallestCurrencyUnits); | ||
| } | ||
| } | ||
| }, [policy, shouldShowTax, transaction, isDistanceRequest, customUnitRateID, distance]); | ||
| setMoneyRequestTaxAmount(transactionID, taxAmountInSmallestCurrencyUnits); | ||
| }, [transactionID, taxAmountInSmallestCurrencyUnits]); | ||
|
|
||
| // If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again | ||
| if (isEditingSplitBill && didConfirm) { | ||
|
|
@@ -964,6 +945,7 @@ function MoneyRequestConfirmationList({ | |
| routeError, | ||
| isDelegateAccessRestricted, | ||
| showDelegateNoAccessModal, | ||
| setDidConfirmSplit, | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I mentioned this in the PR description, but I had to add this to make React Compiler happy |
||
| ], | ||
| ); | ||
|
|
||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.