Skip to content

Revert "Fix tax updating for changing waypoints or currency" #73352

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.

Sign up for GitHub

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

Closed
blimpich wants to merge 1 commit into from
Closed

Revert "Fix tax updating for changing waypoints or currency" #73352

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 41 additions & 16 deletions src/components/MoneyRequestConfirmationList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,19 +332,27 @@ function MoneyRequestConfirmationList({

const shouldShowTax = isTaxTrackingEnabled(isPolicyExpenseChat, policy, isDistanceRequest, isPerDiemRequest);

const previousTransactionAmount = usePrevious(transaction?.amount);
const previousTransactionCurrency = usePrevious(transaction?.currency);
const previousTransactionModifiedCurrency = usePrevious(transaction?.modifiedCurrency);
const previousCustomUnitRateID = usePrevious(customUnitRateID);
useEffect(() => {
// Set the default tax code when conditions change
if (!shouldShowTax || !transaction || !transactionID) {
// previousTransaction is in the condition because if it is falsy, it means this is the first time the useEffect is triggered after we load it, so we should calculate the default
// tax even if the other parameters are the same against their previous values.
if (
!shouldShowTax ||
!transaction ||
!transactionID ||
(transaction.taxCode &&
previousTransactionModifiedCurrency === transaction.modifiedCurrency &&
previousTransactionCurrency === transaction.currency &&
previousCustomUnitRateID === customUnitRateID)
) {
return;
}
const defaultTaxCode = getDefaultTaxCode(policy, transaction);
const currentTaxCode = transaction.taxCode ?? '';

// Update tax code if it's different from what should be the default
if (defaultTaxCode !== currentTaxCode) {
setMoneyRequestTaxRate(transactionID, defaultTaxCode ?? '');
}
}, [customUnitRateID, policy, shouldShowTax, transaction, transactionID]);
setMoneyRequestTaxRate(transactionID, defaultTaxCode ?? '');
}, [customUnitRateID, policy, previousCustomUnitRateID, previousTransactionCurrency, previousTransactionModifiedCurrency, shouldShowTax, transaction, transactionID]);
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ PERF-6 (docs)

In useEffect, useMemo, and useCallback, specify individual object properties as dependencies instead of passing entire objects.

Replace the transaction dependency with its specific properties that are actually used:

}, [customUnitRateID, policy, previousCustomUnitRateID, previousTransactionCurrency, previousTransactionModifiedCurrency, shouldShowTax, transaction?.taxCode, transactionID]);


const isMovingTransactionFromTrackExpense = isMovingTransactionFromTrackExpenseUtil(action);

Expand Down Expand Up @@ -479,9 +487,19 @@ function MoneyRequestConfirmationList({
}
}, [shouldCalculateDistanceAmount, isReadOnly, distanceRequestAmount, transactionID, currency, isTypeSplit, isPolicyExpenseChat, selectedParticipantsProp, transaction]);

const previousTaxCode = usePrevious(transaction?.taxCode);

// Calculate and set tax amount in transaction draft
useEffect(() => {
if (!shouldShowTax || !transaction) {
if (
!shouldShowTax ||
!transaction ||
(transaction.taxAmount !== undefined &&
previousTransactionAmount === transaction.amount &&
previousTransactionCurrency === transaction.currency &&
previousCustomUnitRateID === customUnitRateID &&
previousTaxCode === transaction.taxCode)
) {
return;
}

Expand All @@ -502,13 +520,20 @@ function MoneyRequestConfirmationList({
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);
}
setMoneyRequestTaxAmount(transaction.transactionID, taxAmountInSmallestCurrencyUnits);
}
}, [policy, shouldShowTax, transaction, isDistanceRequest, customUnitRateID, distance]);
}, [
policy,
shouldShowTax,
previousTransactionAmount,
previousTransactionCurrency,
transaction,
isDistanceRequest,
customUnitRateID,
previousCustomUnitRateID,
previousTaxCode,
distance,
]);
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ PERF-6 (docs)

In useEffect, useMemo, and useCallback, specify individual object properties as dependencies instead of passing entire objects.

Replace the transaction dependency with its specific properties that are actually used in this effect:

    }, [
        policy,
        shouldShowTax,
        previousTransactionAmount,
        previousTransactionCurrency,
        transaction?.amount,
        transaction?.currency,
        transaction?.taxCode,
        transaction?.taxAmount,
        transaction?.transactionID,
        isDistanceRequest,
        customUnitRateID,
        previousCustomUnitRateID,
        previousTaxCode,
        distance,
    ]);


// If completing a split expense fails, set didConfirm to false to allow the user to edit the fields again
if (isEditingSplitBill && didConfirm) {
Expand Down
Loading