From d6c70d9827a65465fc15a99e794c7c10ecfe38db Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Sat, 25 Apr 2026 03:31:10 +0000 Subject: [PATCH 1/6] Pass taxCode through duplicate merge/resolve flow and fix ReviewTaxCode report lookup The Review Duplicates tax code page was showing empty because ReviewTaxCode was using the wrong report to derive the transactionID. Additionally, the taxCode, taxAmount, and taxValue fields were not being passed through the merge/resolve duplicate transaction flow, so even when a user selected a different tax rate, the optimistic update would not reflect the change. Co-authored-by: dmkt9 --- .../API/parameters/MergeDuplicatesParams.ts | 1 + .../API/parameters/ResolveDuplicatesParams.ts | 1 + src/libs/TransactionUtils/index.ts | 5 ++- src/libs/actions/IOU/Duplicate.ts | 25 ++++++++++++-- .../TransactionDuplicate/Confirmation.tsx | 23 ++++++++++--- .../TransactionDuplicate/ReviewTaxCode.tsx | 5 +-- tests/actions/IOUTest/DuplicateTest.ts | 2 ++ tests/unit/TransactionUtilsTest.ts | 33 +++++++++++++++++++ 8 files changed, 85 insertions(+), 10 deletions(-) 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 a7d4a9d084ba..72b7e67bb421 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -2537,7 +2537,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, @@ -2545,6 +2546,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 4dca866c25a7..36f4f18a8e11 100644 --- a/src/libs/actions/IOU/Duplicate.ts +++ b/src/libs/actions/IOU/Duplicate.ts @@ -76,10 +76,17 @@ function getIOUActionForTransactions(transactionIDList: Array TransactionUtils.buildMergeDuplicatesParams(reviewDuplicates, duplicates ?? [], newTransaction), [duplicates, reviewDuplicates, newTransaction], ); + const taxData = useMemo(() => { + const taxCode = reviewDuplicates?.taxCode ?? ''; + const taxRate = taxCode ? duplicatedTransactionPolicy?.taxRates?.taxes?.[taxCode] : undefined; + // Preserve taxAmount and taxValue if taxCode is deleted or remains unchanged compared to duplicatedTransaction?.taxCode. + if (!taxRate || (taxCode && duplicatedTransaction?.taxCode === taxCode) || reviewDuplicates?.taxAmount === undefined) { + return; + } + + return { + taxAmount: -reviewDuplicates.taxAmount, + taxValue: taxRate?.value, + taxCode, + }; + }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID; const handleMergeDuplicates = useCallback(() => { @@ -80,18 +95,18 @@ function Confirmation() { if (!reportAction?.childReportID) { transactionsMergeParams.transactionThreadReportID = transactionThreadReportID; } - mergeDuplicates({...transactionsMergeParams, currentUserAccountID: currentUserPersonalDetails.accountID, currentUserLogin: currentUserPersonalDetails?.login ?? ''}); + mergeDuplicates({...transactionsMergeParams, ...taxData, currentUserAccountID: currentUserPersonalDetails.accountID, currentUserLogin: currentUserPersonalDetails?.login ?? ''}); if (isSuperWideRHPDisplayed) { Navigation.dismissToSuperWideRHP(); return; } Navigation.dismissModal(); - }, [reportAction?.childReportID, transactionsMergeParams, currentUserPersonalDetails.accountID, currentUserPersonalDetails?.login, isSuperWideRHPDisplayed]); + }, [reportAction?.childReportID, transactionsMergeParams, taxData, currentUserPersonalDetails.accountID, currentUserPersonalDetails?.login, 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 9bfef52b9b02..2d749a246c71 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, }; @@ -532,6 +533,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 79925928b333..e8ed94452453 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']); From 8602bdeac4c98e62952f6e583d4dbc6f92c62289 Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Wed, 29 Apr 2026 13:49:02 +0000 Subject: [PATCH 2/6] Fix ESLint preserve-manual-memoization error in taxData useMemo Use reviewDuplicates as dependency instead of specific sub-properties to satisfy React Compiler's inferred dependency analysis. Co-authored-by: dmkt9 --- src/pages/TransactionDuplicate/Confirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index 907b903cd957..c70fb62e7cfe 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -87,7 +87,7 @@ function Confirmation() { taxValue: taxRate?.value, taxCode, }; - }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); + }, [reviewDuplicates, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID; const handleMergeDuplicates = useCallback(() => { From 75b7bfb0d737e240c030e323ea3ec09adf9cf0ed Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Wed, 29 Apr 2026 13:59:49 +0000 Subject: [PATCH 3/6] Fix: use narrow hook dependencies for reviewDuplicates in Confirmation.tsx Co-authored-by: dmkt9 --- src/pages/TransactionDuplicate/Confirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index c70fb62e7cfe..ea242435b8b5 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -87,7 +87,7 @@ function Confirmation() { taxValue: taxRate?.value, taxCode, }; - }, [reviewDuplicates, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); + }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, reviewDuplicates.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID; const handleMergeDuplicates = useCallback(() => { From b9031d2c716879a2f84657064e9f894b1cd02a42 Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Wed, 29 Apr 2026 14:06:03 +0000 Subject: [PATCH 4/6] Fix typecheck: remove duplicate non-optional-chained dep in useMemo Co-authored-by: dmkt9 --- src/pages/TransactionDuplicate/Confirmation.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index ea242435b8b5..907b903cd957 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -87,7 +87,7 @@ function Confirmation() { taxValue: taxRate?.value, taxCode, }; - }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, reviewDuplicates.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); + }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.taxCode]); const isReportOwner = iouReport?.ownerAccountID === currentUserPersonalDetails?.accountID; const handleMergeDuplicates = useCallback(() => { From 7d8ad1a2db1b1e414baf7a23347ac913aca3456a Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Wed, 29 Apr 2026 15:20:49 +0000 Subject: [PATCH 5/6] Fix React Compiler memoization errors in Confirmation.tsx Extract nested optional-chained properties into variables before useMemo/useCallback so React Compiler can track dependencies. Avoid mutating memoized transactionsMergeParams by spreading instead. Update seatbelt counts to reflect resolved errors. Co-authored-by: dmkt9 --- config/eslint/eslint.seatbelt.tsv | 2 -- .../TransactionDuplicate/Confirmation.tsx | 27 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) 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/pages/TransactionDuplicate/Confirmation.tsx b/src/pages/TransactionDuplicate/Confirmation.tsx index 907b903cd957..f0675c4ea25d 100644 --- a/src/pages/TransactionDuplicate/Confirmation.tsx +++ b/src/pages/TransactionDuplicate/Confirmation.tsx @@ -74,34 +74,39 @@ 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 = reviewDuplicates?.taxCode ?? ''; - const taxRate = taxCode ? duplicatedTransactionPolicy?.taxRates?.taxes?.[taxCode] : undefined; + 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 && duplicatedTransaction?.taxCode === taxCode) || reviewDuplicates?.taxAmount === undefined) { + if (!taxRate || (taxCode && duplicatedTransactionTaxCode === taxCode) || reviewDuplicatesTaxAmount === undefined) { return; } return { - taxAmount: -reviewDuplicates.taxAmount, + taxAmount: -reviewDuplicatesTaxAmount, taxValue: taxRate?.value, taxCode, }; - }, [reviewDuplicates?.taxCode, reviewDuplicates?.taxAmount, duplicatedTransactionPolicy?.taxRates?.taxes, duplicatedTransaction?.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, ...taxData, 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, taxData, currentUserPersonalDetails.accountID, currentUserPersonalDetails?.login, isSuperWideRHPDisplayed]); + }, [childReportID, transactionsMergeParams, taxData, currentUserAccountID, currentUserLogin, isSuperWideRHPDisplayed]); const handleResolveDuplicates = useCallback(() => { resolveDuplicates({...transactionsMergeParams, ...taxData}); From d26382ab2c2bd7b5eafa73d8f1665277a29c3aba Mon Sep 17 00:00:00 2001 From: "dmkt9 (via MelvinBot)" Date: Wed, 29 Apr 2026 16:15:11 +0000 Subject: [PATCH 6/6] Refactor: Extract shared optimistic/failure transaction data helpers in Duplicate.ts Extract buildOptimisticTransactionData and buildFailureTransactionData helpers to eliminate duplication between mergeDuplicates and resolveDuplicates. Co-authored-by: dmkt9 --- src/libs/actions/IOU/Duplicate.ts | 153 +++++++++++++++++++----------- 1 file changed, 96 insertions(+), 57 deletions(-) diff --git a/src/libs/actions/IOU/Duplicate.ts b/src/libs/actions/IOU/Duplicate.ts index 64b5d75d9172..b6906c42da44 100644 --- a/src/libs/actions/IOU/Duplicate.ts +++ b/src/libs/actions/IOU/Duplicate.ts @@ -71,53 +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; +}; -/** 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, +function buildOptimisticTransactionData({ + transactionID, + originalSelectedTransaction, + billable, + comment, + category, + created, + currency, + merchant, + reimbursable, + tag, + taxCode, 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: OnyxUpdate = { +}: 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, - taxCode: params.taxCode ?? originalSelectedTransaction?.taxCode, + 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: params.taxCode ? null : originalSelectedTransaction?.taxName, + 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, @@ -367,36 +419,23 @@ function resolveDuplicates({taxAmount, taxValue, ...params}: MergeDuplicatesPara 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, - taxCode: params.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: params.taxCode ? null : originalSelectedTransaction?.taxName, - }, - }; + 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}`] ?? [];