diff --git a/config/eslint/eslint.seatbelt.tsv b/config/eslint/eslint.seatbelt.tsv index bbf0c7e8c27a..38bbe9892d6e 100644 --- a/config/eslint/eslint.seatbelt.tsv +++ b/config/eslint/eslint.seatbelt.tsv @@ -362,8 +362,6 @@ "../../src/pages/Search/SearchAdvancedFiltersPage/SearchFiltersCardPage.tsx" "react-hooks/set-state-in-effect" 1 "../../src/pages/Search/SearchPage.tsx" "react-hooks/refs" 31 "../../src/pages/Search/SearchPage.tsx" "react-hooks/set-state-in-effect" 1 -"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/immutability" 2 -"../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/preserve-manual-memoization" 1 "../../src/pages/TransactionDuplicate/Confirmation.tsx" "react-hooks/refs" 12 "../../src/pages/TransactionDuplicate/Review.tsx" "react-hooks/preserve-manual-memoization" 1 "../../src/pages/TransactionMerge/MergeFieldReview.tsx" "no-restricted-syntax" 1 diff --git a/src/libs/API/parameters/MergeDuplicatesParams.ts b/src/libs/API/parameters/MergeDuplicatesParams.ts index e1cdfd0903c6..8edbfa0e8cac 100644 --- a/src/libs/API/parameters/MergeDuplicatesParams.ts +++ b/src/libs/API/parameters/MergeDuplicatesParams.ts @@ -10,6 +10,7 @@ type MergeDuplicatesParams = { billable: boolean; reimbursable: boolean; tag: string; + taxCode?: string; receiptID: number; reportID: string | undefined; reportActionID?: string | undefined; diff --git a/src/libs/API/parameters/ResolveDuplicatesParams.ts b/src/libs/API/parameters/ResolveDuplicatesParams.ts index 66d013af8891..d5558acff0e7 100644 --- a/src/libs/API/parameters/ResolveDuplicatesParams.ts +++ b/src/libs/API/parameters/ResolveDuplicatesParams.ts @@ -13,6 +13,7 @@ type ResolveDuplicatesParams = { billable: boolean; reimbursable: boolean; tag: string; + taxCode?: string; /** The reportActionID of the dismissed violation action in the kept transaction thread report */ dismissedViolationReportActionID: string; diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 21ce1e56c537..e470f822cd2c 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -2551,7 +2551,8 @@ function getTransactionID(report?: OnyxEntry): string | undefined { } function buildNewTransactionAfterReviewingDuplicates(reviewDuplicateTransaction: OnyxEntry, duplicatedTransaction: OnyxEntry): Partial { - const {duplicates, ...restReviewDuplicateTransaction} = reviewDuplicateTransaction ?? {}; + const {duplicates, taxAmount, ...restReviewDuplicateTransaction} = reviewDuplicateTransaction ?? {}; + const hasUpdatedTaxCode = reviewDuplicateTransaction?.taxCode !== undefined && reviewDuplicateTransaction?.taxCode !== duplicatedTransaction?.taxCode; return { ...duplicatedTransaction, @@ -2559,6 +2560,8 @@ function buildNewTransactionAfterReviewingDuplicates(reviewDuplicateTransaction: modifiedMerchant: reviewDuplicateTransaction?.merchant, merchant: reviewDuplicateTransaction?.merchant, comment: {...reviewDuplicateTransaction?.comment, comment: reviewDuplicateTransaction?.description}, + // If the taxCode changes, apply the reviewed tax amount and clear stale taxName/taxValue so MoneyRequestView derives them fresh from the policy. + ...(hasUpdatedTaxCode && {taxAmount, taxName: undefined, taxValue: undefined}), }; } diff --git a/src/libs/actions/IOU/Duplicate.ts b/src/libs/actions/IOU/Duplicate.ts index 5cb6e14439c5..b6906c42da44 100644 --- a/src/libs/actions/IOU/Duplicate.ts +++ b/src/libs/actions/IOU/Duplicate.ts @@ -71,40 +71,105 @@ function getIOUActionForTransactions(transactionIDList: Array; + billable: boolean; + comment: string; + category: string; + created: string; + currency: string; + merchant: string; + reimbursable: boolean; + tag: string; + taxCode?: string; + taxAmount?: number; + taxValue?: string; +}; - const optimisticTransactionData: OnyxUpdate = { +function buildOptimisticTransactionData({ + transactionID, + originalSelectedTransaction, + billable, + comment, + category, + created, + currency, + merchant, + reimbursable, + tag, + taxCode, + taxAmount, + taxValue, +}: DuplicateTransactionParams): OnyxUpdate { + return { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`, + key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, value: { ...originalSelectedTransaction, - billable: params.billable, + billable, comment: { - comment: params.comment, + comment, }, - category: params.category, - created: params.created, - currency: params.currency, - modifiedMerchant: params.merchant, - reimbursable: params.reimbursable, - tag: params.tag, + category, + created, + currency, + modifiedMerchant: merchant, + reimbursable, + tag, + taxCode: taxCode ?? originalSelectedTransaction?.taxCode, + taxAmount: taxAmount ?? originalSelectedTransaction?.taxAmount, + taxValue: taxValue ?? originalSelectedTransaction?.taxValue, + // Clear `taxName` to stay consistent with the server response, + // and avoid retaining an outdated value that doesn't match the new `taxCode`. + taxName: taxCode ? null : originalSelectedTransaction?.taxName, }, }; +} - const failureTransactionData: OnyxUpdate = { +function buildFailureTransactionData(transactionID: string | undefined, originalSelectedTransaction: OnyxEntry): OnyxUpdate { + return { onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`, + key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style value: originalSelectedTransaction as OnyxTypes.Transaction, }; +} + +type MergeDuplicatesFuncParams = MergeDuplicatesParams & {currentUserLogin: string; currentUserAccountID: number; taxAmount?: number; taxValue?: string}; + +/** Merge several transactions into one by updating the fields of the one we want to keep and deleting the rest */ +function mergeDuplicates({ + transactionThreadReportID: optimisticTransactionThreadReportID, + currentUserLogin, + currentUserAccountID, + taxAmount, + taxValue, + ...params +}: MergeDuplicatesFuncParams) { + const allParams: MergeDuplicatesParams = {...params}; + const allTransactions = getAllTransactions(); + const allTransactionViolations = getAllTransactionViolations(); + const allReports = getAllReports(); + const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`]; + + const optimisticTransactionData = buildOptimisticTransactionData({ + transactionID: params.transactionID, + originalSelectedTransaction, + billable: params.billable, + comment: params.comment, + category: params.category, + created: params.created, + currency: params.currency, + merchant: params.merchant, + reimbursable: params.reimbursable, + tag: params.tag, + taxCode: params.taxCode, + taxAmount, + taxValue, + }); + + const failureTransactionData = buildFailureTransactionData(params.transactionID, originalSelectedTransaction); const optimisticTransactionDuplicatesData: Array> = params.transactionIDList.map((id) => ({ onyxMethod: Onyx.METHOD.SET, @@ -344,7 +409,7 @@ function mergeDuplicates({transactionThreadReportID: optimisticTransactionThread } /** Instead of merging the duplicates, it updates the transaction we want to keep and puts the others on hold without deleting them */ -function resolveDuplicates(params: MergeDuplicatesParams) { +function resolveDuplicates({taxAmount, taxValue, ...params}: MergeDuplicatesParams & {taxAmount?: number; taxValue?: string}) { if (!params.transactionID) { return; } @@ -354,30 +419,23 @@ function resolveDuplicates(params: MergeDuplicatesParams) { const originalSelectedTransaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`]; - const optimisticTransactionData: OnyxUpdate = { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`, - value: { - ...originalSelectedTransaction, - billable: params.billable, - comment: { - comment: params.comment, - }, - category: params.category, - created: params.created, - currency: params.currency, - modifiedMerchant: params.merchant, - reimbursable: params.reimbursable, - tag: params.tag, - }, - }; + const optimisticTransactionData = buildOptimisticTransactionData({ + transactionID: params.transactionID, + originalSelectedTransaction, + billable: params.billable, + comment: params.comment, + category: params.category, + created: params.created, + currency: params.currency, + merchant: params.merchant, + reimbursable: params.reimbursable, + tag: params.tag, + taxCode: params.taxCode, + taxAmount, + taxValue, + }); - const failureTransactionData: OnyxUpdate = { - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.TRANSACTION}${params.transactionID}`, - // eslint-disable-next-line @typescript-eslint/non-nullable-type-assertion-style - value: originalSelectedTransaction as OnyxTypes.Transaction, - }; + const failureTransactionData = buildFailureTransactionData(params.transactionID, originalSelectedTransaction); const optimisticTransactionViolations: Array> = [...params.transactionIDList, params.transactionID].map((id) => { const violations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? []; diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index bb0392b36c45..f0675c4ea25d 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -57,6 +57,7 @@ function Confirmation() { const [reviewDuplicatesReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reviewDuplicates?.reportID}`); const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(reviewDuplicatesReport?.policyID)}`); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`); + const [duplicatedTransactionPolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${getNonEmptyStringOnyxID(reviewDuplicatesReport?.policyID)}`); const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${getNonEmptyStringOnyxID(reviewDuplicatesReport?.policyID)}`); const compareResult = TransactionUtils.compareDuplicateTransactionFields(policyTags ?? {}, transaction, allDuplicates, reviewDuplicatesReport, undefined, policy, policyCategories); const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', route.params.threadReportID, route.params.backTo); @@ -73,25 +74,44 @@ function Confirmation() { () => TransactionUtils.buildMergeDuplicatesParams(reviewDuplicates, duplicates ?? [], newTransaction), [duplicates, reviewDuplicates, newTransaction], ); + const reviewDuplicatesTaxCode = reviewDuplicates?.taxCode; + const reviewDuplicatesTaxAmount = reviewDuplicates?.taxAmount; + const duplicatedTransactionTaxCode = duplicatedTransaction?.taxCode; + const taxRates = duplicatedTransactionPolicy?.taxRates?.taxes; + const taxData = useMemo(() => { + const taxCode = reviewDuplicatesTaxCode ?? ''; + const taxRate = taxCode ? taxRates?.[taxCode] : undefined; + // Preserve taxAmount and taxValue if taxCode is deleted or remains unchanged compared to duplicatedTransaction?.taxCode. + if (!taxRate || (taxCode && duplicatedTransactionTaxCode === taxCode) || reviewDuplicatesTaxAmount === undefined) { + return; + } + + return { + taxAmount: -reviewDuplicatesTaxAmount, + taxValue: taxRate?.value, + taxCode, + }; + }, [reviewDuplicatesTaxCode, reviewDuplicatesTaxAmount, taxRates, duplicatedTransactionTaxCode]); const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID; + const currentUserAccountID = currentUserPersonalDetails.accountID; + const currentUserLogin = currentUserPersonalDetails?.login; + const childReportID = reportAction?.childReportID; const handleMergeDuplicates = useCallback(() => { - const transactionThreadReportID = reportAction?.childReportID ?? generateReportID(); - if (!reportAction?.childReportID) { - transactionsMergeParams.transactionThreadReportID = transactionThreadReportID; - } - mergeDuplicates({...transactionsMergeParams, currentUserAccountID: currentUserPersonalDetails.accountID, currentUserLogin: currentUserPersonalDetails?.login ?? ''}); + const transactionThreadReportID = childReportID ?? generateReportID(); + const mergeParams = !childReportID ? {...transactionsMergeParams, transactionThreadReportID} : transactionsMergeParams; + mergeDuplicates({...mergeParams, ...taxData, currentUserAccountID, currentUserLogin: currentUserLogin ?? ''}); if (isSuperWideRHPDisplayed) { Navigation.dismissToSuperWideRHP(); return; } Navigation.dismissModal(); - }, [reportAction?.childReportID, transactionsMergeParams, currentUserPersonalDetails.accountID, currentUserPersonalDetails?.login, isSuperWideRHPDisplayed]); + }, [childReportID, transactionsMergeParams, taxData, currentUserAccountID, currentUserLogin, isSuperWideRHPDisplayed]); const handleResolveDuplicates = useCallback(() => { - resolveDuplicates(transactionsMergeParams); + resolveDuplicates({...transactionsMergeParams, ...taxData}); Navigation.dismissToSuperWideRHP(); - }, [transactionsMergeParams]); + }, [transactionsMergeParams, taxData]); const contextMenuStateValue = useMemo( () => ({ diff --git a/src/pages/TransactionDuplicate/ReviewTaxCode.tsx b/src/pages/TransactionDuplicate/ReviewTaxCode.tsx index 84590df4d91d..96dd7a8405e3 100644 --- a/src/pages/TransactionDuplicate/ReviewTaxCode.tsx +++ b/src/pages/TransactionDuplicate/ReviewTaxCode.tsx @@ -26,9 +26,10 @@ function ReviewTaxRate() { const {translate} = useLocalize(); const {getCurrencyDecimals} = useCurrencyListActions(); const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES); - const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reviewDuplicates?.reportID ?? route.params.threadReportID}`); + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reviewDuplicates?.reportID}`); const policy = usePolicy(report?.policyID); - const transactionID = getTransactionID(report); + const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`); + const transactionID = getTransactionID(transactionThreadReport); const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`); const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`); const allDuplicateIDs = useMemo( diff --git a/tests/actions/IOUTest/DuplicateTest.ts b/tests/actions/IOUTest/DuplicateTest.ts index fd2442e35312..5a260be7c57c 100644 --- a/tests/actions/IOUTest/DuplicateTest.ts +++ b/tests/actions/IOUTest/DuplicateTest.ts @@ -199,6 +199,7 @@ describe('actions/Duplicate', () => { billable: true, reimbursable: false, tag: 'UpdatedProject', + taxCode: '', receiptID: 123, reportID, }; @@ -533,6 +534,7 @@ describe('actions/Duplicate', () => { billable: true, reimbursable: false, tag: 'UpdatedProject', + taxCode: '', receiptID: 123, reportID, }; diff --git a/tests/unit/TransactionUtilsTest.ts b/tests/unit/TransactionUtilsTest.ts index f8258e473781..999ee70f3bd0 100644 --- a/tests/unit/TransactionUtilsTest.ts +++ b/tests/unit/TransactionUtilsTest.ts @@ -2822,6 +2822,39 @@ describe('TransactionUtils', () => { }); }); + describe('buildNewTransactionAfterReviewingDuplicates', () => { + it('preserves the kept transaction tax amount when the selected tax code matches the existing tax code', () => { + const duplicatedTransaction = generateTransaction({ + transactionID: 'transaction1', + reportID: 'report1', + taxCode: 'id_TAX_RATE_1', + taxAmount: -500, + taxValue: '5%', + }); + + const reviewDuplicates = { + duplicates: [], + transactionID: 'transaction1', + reportID: 'report1', + merchant: 'Updated Merchant', + category: 'Travel', + tag: 'Project', + taxCode: 'id_TAX_RATE_1', + taxAmount: 900, + description: 'Updated comment', + comment: duplicatedTransaction.comment ?? {}, + reimbursable: false, + billable: true, + }; + + const updatedTransaction = TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates, duplicatedTransaction); + + expect(updatedTransaction.taxCode).toBe('id_TAX_RATE_1'); + expect(updatedTransaction.taxAmount).toBe(-500); + expect(updatedTransaction.taxValue).toBe('5%'); + }); + }); + describe('getTagArrayFromName', () => { it('splits simple tag by colon', () => { expect(TransactionUtils.getTagArrayFromName('tag1:tag2:tag3')).toEqual(['tag1', 'tag2', 'tag3']);