From f776c3b4a08e27e91de355ada98d07796e5cd0ec Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 20 Apr 2026 01:48:23 +0100 Subject: [PATCH 1/9] fix: filter one-sided duplicate violations at display time Add shouldShowDuplicateViolation predicate that requires bidirectional confirmation before displaying a duplicatedTransaction violation. A duplicate is only shown if at least one referenced partner also has a matching violation pointing back. This prevents stale violations when OpenReport and UpdateMoneyRequestAmountAndCurrency resolve in different order causing one-sided data. Wire the check into all display paths: useTransactionViolations, getTransactionViolations, hasViolation, isDuplicate, hasVisibleViolationsForUser, and all callers that pass the violations collection. Made-with: Cursor --- .../ReviewDuplicatesPrimaryAction.tsx | 1 + src/components/MoneyRequestHeader.tsx | 3 +- src/hooks/useTransactionViolations.ts | 18 ++++++-- src/libs/ReportPrimaryActionUtils.ts | 2 +- src/libs/ReportSecondaryActionUtils.ts | 2 +- src/libs/TransactionUtils/index.ts | 41 +++++++++++++++++-- src/libs/Violations/ViolationsUtils.ts | 5 ++- src/libs/actions/IOU/ReportWorkflow.ts | 4 +- 8 files changed, 63 insertions(+), 13 deletions(-) diff --git a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx index 371db14f6426..8ba2d76022ef 100644 --- a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx +++ b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx @@ -43,6 +43,7 @@ function ReviewDuplicatesPrimaryAction({reportID, chatReportID}: SimpleActionPro moneyRequestReport, policy, allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + reportTransaction.transactionID], + allTransactionViolations, ), ); if (duplicateTransaction) { diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 251612157921..712f88add10f 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -82,7 +82,8 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe const {wideRHPRouteKeys} = useWideRHPState(); const isOnHold = isOnHoldTransactionUtils(transaction); - const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, transactionViolations); + const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); + const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, transactionViolations, allTransactionViolations); const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); diff --git a/src/hooks/useTransactionViolations.ts b/src/hooks/useTransactionViolations.ts index 957259a3f694..6ff2a92a3c35 100644 --- a/src/hooks/useTransactionViolations.ts +++ b/src/hooks/useTransactionViolations.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {isViolationDismissed, mergeProhibitedViolations, shouldShowViolation} from '@libs/TransactionUtils'; +import {shouldShowDuplicateViolation, isViolationDismissed, mergeProhibitedViolations, shouldShowViolation} from '@libs/TransactionUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import type {TransactionViolation, TransactionViolations} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; @@ -10,6 +10,7 @@ import useOnyx from './useOnyx'; function useTransactionViolations(transactionID?: string, shouldShowRterForSettledReport = true): TransactionViolations { const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`); const [transactionViolations = getEmptyArray()] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`); + const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.reportID)}`); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`); const currentUserDetails = useCurrentUserPersonalDetails(); @@ -20,10 +21,21 @@ function useTransactionViolations(transactionID?: string, shouldShowRterForSettl transactionViolations.filter( (violation: TransactionViolation) => !isViolationDismissed(transaction, violation, currentUserDetails.email ?? '', currentUserDetails.accountID, iouReport, policy) && - shouldShowViolation(iouReport, policy, violation.name, currentUserDetails.email ?? '', shouldShowRterForSettledReport, transaction), + shouldShowViolation(iouReport, policy, violation.name, currentUserDetails.email ?? '', shouldShowRterForSettledReport, transaction) && + shouldShowDuplicateViolation(transactionID ?? '', violation, allTransactionViolations), ), ), - [transaction, transactionViolations, iouReport, policy, shouldShowRterForSettledReport, currentUserDetails.email, currentUserDetails.accountID], + [ + transaction, + transactionViolations, + allTransactionViolations, + transactionID, + iouReport, + policy, + shouldShowRterForSettledReport, + currentUserDetails.email, + currentUserDetails.accountID, + ], ); } diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts index e0e9e7beac5c..8f879dbdc3f7 100644 --- a/src/libs/ReportPrimaryActionUtils.ts +++ b/src/libs/ReportPrimaryActionUtils.ts @@ -329,7 +329,7 @@ function isReviewDuplicatesAction( violations: OnyxCollection, ) { const hasDuplicates = reportTransactions.some((transaction) => - isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]), + isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], violations), ); if (!hasDuplicates) { diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 803b54ebb34b..4a6b06ee2f80 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -320,7 +320,7 @@ function isApproveAction( } const isExpenseReport = isExpenseReportUtils(report); const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => - isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]), + isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], violations), ); if (isExpenseReport && isProcessingReport && reportHasDuplicatedTransactions) { diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 575d7db9cbee..e8073a1ec7f9 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -1516,7 +1516,9 @@ function getTransactionViolations( const violations = transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]?.filter( - (violation) => !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy), + (violation) => + !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy) && + shouldShowDuplicateViolation(transaction.transactionID, violation, transactionViolations), ) ?? []; return violations; @@ -1860,6 +1862,27 @@ function getRecentTransactions(transactions: Record, size = 2): .slice(0, size); } +/** + * A duplicatedTransaction violation is only valid for display if the link is bidirectional: + * transaction A must reference B AND B must reference A back. This prevents showing stale + * one-sided duplicate violations when the backend only re-evaluated one side of the pair. + */ +function shouldShowDuplicateViolation(transactionID: string, violation: TransactionViolation, allTransactionViolations: OnyxCollection): boolean { + if (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION) { + return true; + } + + const duplicateTransactionIDs = violation.data?.duplicates; + if (!duplicateTransactionIDs?.length) { + return false; + } + + return duplicateTransactionIDs.some((partnerID) => { + const bidirectionalViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${partnerID}`]; + return bidirectionalViolations?.some((duplicateViolation) => duplicateViolation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && duplicateViolation.data?.duplicates?.includes(transactionID)); + }); +} + /** * Check if transaction has duplicatedTransaction violation. * @param transactionID - the transaction to check @@ -1871,6 +1894,7 @@ function isDuplicate( iouReport: OnyxEntry, policy: OnyxEntry, transactionViolation: OnyxEntry, + allTransactionViolations?: OnyxCollection, ): boolean { if (!transaction) { return false; @@ -1878,8 +1902,12 @@ function isDuplicate( const duplicatedTransactionViolation = transactionViolation?.find((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION); const hasDuplicatedTransactionViolation = !!duplicatedTransactionViolation; const isDuplicatedTransactionViolationDismissed = isViolationDismissed(transaction, duplicatedTransactionViolation, currentUserEmail, currentUserAccountID, iouReport, policy); + const shouldDisplayDuplicate = + !duplicatedTransactionViolation || + !allTransactionViolations || + shouldShowDuplicateViolation(transaction.transactionID, duplicatedTransactionViolation, allTransactionViolations); - return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed; + return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed && shouldDisplayDuplicate; } /** @@ -1968,13 +1996,16 @@ function hasViolation( if (!doesTransactionSupportViolations(transaction)) { return false; } - const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]; + const isCollection = !Array.isArray(transactionViolations); + const violations = isCollection ? transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID] : transactionViolations; + const allViolations = isCollection ? transactionViolations : undefined; return !!violations?.some( (violation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION && (showInReview === undefined || showInReview === (violation.showInReview ?? false)) && - !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy), + !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy) && + (!allViolations || shouldShowDuplicateViolation(transaction.transactionID, violation, allViolations)), ); } @@ -1998,6 +2029,7 @@ function hasDuplicateTransactions( iouReport, policy, allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], + allTransactionViolations, ), ) ); @@ -2923,6 +2955,7 @@ export { getCategoryTaxCodeAndAmount, isPerDiemRequest, isViolationDismissed, + shouldShowDuplicateViolation, isBrokenConnectionViolation, isPartialTransaction, isPendingCardOrScanningTransaction, diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts index 4003f22e0227..6890c1395912 100644 --- a/src/libs/Violations/ViolationsUtils.ts +++ b/src/libs/Violations/ViolationsUtils.ts @@ -23,7 +23,7 @@ import { } from '@libs/PolicyUtils'; import {isCurrentUserSubmitter} from '@libs/ReportUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; -import {hasValidModifiedAmount, isViolationDismissed, shouldShowViolation} from '@libs/TransactionUtils'; +import {hasValidModifiedAmount, shouldShowDuplicateViolation, isViolationDismissed, shouldShowViolation} from '@libs/TransactionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Card, CardList, Policy, PolicyCategories, PolicyTagLists, PolicyTags, Report, ReportAction, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx'; @@ -909,7 +909,8 @@ const ViolationsUtils = { return transactionViolations.some((violation: TransactionViolation) => { return ( !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, report, policy) && - shouldShowViolation(report, policy, violation.name, currentUserEmail, true, transaction) + shouldShowViolation(report, policy, violation.name, currentUserEmail, true, transaction) && + shouldShowDuplicateViolation(transaction.transactionID, violation, violations) ); }); }); diff --git a/src/libs/actions/IOU/ReportWorkflow.ts b/src/libs/actions/IOU/ReportWorkflow.ts index 5bdfd0adf1e7..c27d6f896763 100644 --- a/src/libs/actions/IOU/ReportWorkflow.ts +++ b/src/libs/actions/IOU/ReportWorkflow.ts @@ -642,6 +642,7 @@ function approveMoneyRequest(params: ApproveMoneyRequestFunctionParams) { // Remove duplicates violations if we approve the report if (hasDuplicates) { + const allViolations = getAllTransactionViolations(); let transactions = getReportTransactions(expenseReport.reportID).filter((transaction) => isDuplicate( transaction, @@ -649,7 +650,8 @@ function approveMoneyRequest(params: ApproveMoneyRequestFunctionParams) { currentUserAccountIDParam, expenseReport, policy, - getAllTransactionViolations()?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], + allViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], + allViolations, ), ); if (!full) { From 02231e36e6bbb8368fc865f22d84710fd625ab42 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 20 Apr 2026 01:48:45 +0100 Subject: [PATCH 2/9] test: add unit tests for shouldShowDuplicateViolation Cover bidirectional matching, one-sided stale references, missing partners, multi-duplicate lists, and the stale backend response scenario. Made-with: Cursor --- tests/unit/TransactionTest.ts | 89 +++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 71952a667a7e..668c0083176f 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -1600,3 +1600,92 @@ describe('Transaction', () => { }); }); }); + +describe('shouldShowDuplicateViolation', () => { + const TXN_A = 'txnA'; + const TXN_B = 'txnB'; + const TXN_C = 'txnC'; + + function makeDuplicateViolation(duplicates: string[]): TransactionViolation { + return { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + type: CONST.VIOLATION_TYPES.VIOLATION, + data: {duplicates}, + }; + } + + function makeCategoryViolation(): TransactionViolation { + return { + name: CONST.VIOLATIONS.MISSING_CATEGORY, + type: CONST.VIOLATION_TYPES.VIOLATION, + }; + } + + it('should return true for non-duplicate violations (pass-through)', () => { + const violation = makeCategoryViolation(); + const allViolations = {}; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violation, allViolations)).toBe(true); + }); + + it('should return true when both sides reference each other', () => { + const violationA = makeDuplicateViolation([TXN_B]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A])], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(true); + }); + + it('should return false when partner does not reference back', () => { + const violationA = makeDuplicateViolation([TXN_B]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); + }); + + it('should return false when partner has no violations at all', () => { + const violationA = makeDuplicateViolation([TXN_B]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); + }); + + it('should return false when partner references a different transaction', () => { + const violationA = makeDuplicateViolation([TXN_B]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_C])], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); + }); + + it('should return true if at least one partner in a multi-duplicate list references back', () => { + const violationA = makeDuplicateViolation([TXN_B, TXN_C]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B, TXN_C])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_C}`]: [makeDuplicateViolation([TXN_A])], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(true); + }); + + it('should return false when data.duplicates is empty', () => { + const violationA = makeDuplicateViolation([]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [violationA], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); + }); + + it('should handle the stale backend response scenario — A cleared, B still has one-sided reference', () => { + const violationB = makeDuplicateViolation([TXN_A]); + const allViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [violationB], + }; + expect(TransactionUtils.shouldShowDuplicateViolation(TXN_B, violationB, allViolations)).toBe(false); + }); +}); From 3cea558d60636645a1302394e4fd6761482c5ae7 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 20 Apr 2026 01:53:51 +0100 Subject: [PATCH 3/9] refactor: simplify isDuplicate to derive violations from collection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the redundant transactionViolation parameter — isDuplicate now looks up the single transaction's violations from the collection internally, eliminating the repeated slice-then-pass pattern at every call site. Made-with: Cursor --- .../ReviewDuplicatesPrimaryAction.tsx | 10 +------- src/components/MoneyRequestHeader.tsx | 2 +- src/libs/ReportPrimaryActionUtils.ts | 4 +-- src/libs/ReportSecondaryActionUtils.ts | 4 +-- src/libs/TransactionUtils/index.ts | 25 ++++++------------- src/libs/actions/IOU/ReportWorkflow.ts | 11 +------- 6 files changed, 12 insertions(+), 44 deletions(-) diff --git a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx index 8ba2d76022ef..2213d19da4b8 100644 --- a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx +++ b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx @@ -36,15 +36,7 @@ function ReviewDuplicatesPrimaryAction({reportID, chatReportID}: SimpleActionPro let threadID: string | undefined | null = transactionThreadReportID; if (!threadID) { const duplicateTransaction = transactions.find((reportTransaction) => - isDuplicate( - reportTransaction, - email ?? '', - accountID, - moneyRequestReport, - policy, - allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + reportTransaction.transactionID], - allTransactionViolations, - ), + isDuplicate(reportTransaction, email ?? '', accountID, moneyRequestReport, policy, allTransactionViolations), ); if (duplicateTransaction) { const existingThreadID = getThreadReportIDsForTransactions(reportActions, [duplicateTransaction]).at(0); diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 712f88add10f..5a2504e75371 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -83,7 +83,7 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe const isOnHold = isOnHoldTransactionUtils(transaction); const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); - const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, transactionViolations, allTransactionViolations); + const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, allTransactionViolations); const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts index 8f879dbdc3f7..fe6d68dea56c 100644 --- a/src/libs/ReportPrimaryActionUtils.ts +++ b/src/libs/ReportPrimaryActionUtils.ts @@ -328,9 +328,7 @@ function isReviewDuplicatesAction( policy: Policy | undefined, violations: OnyxCollection, ) { - const hasDuplicates = reportTransactions.some((transaction) => - isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], violations), - ); + const hasDuplicates = reportTransactions.some((transaction) => isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations)); if (!hasDuplicates) { return false; diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 4a6b06ee2f80..97eb8c8ce6c9 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -319,9 +319,7 @@ function isApproveAction( return false; } const isExpenseReport = isExpenseReportUtils(report); - const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => - isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], violations), - ); + const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations)); if (isExpenseReport && isProcessingReport && reportHasDuplicatedTransactions) { return true; diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index e8073a1ec7f9..b56f181112ac 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -1879,7 +1879,9 @@ function shouldShowDuplicateViolation(transactionID: string, violation: Transact return duplicateTransactionIDs.some((partnerID) => { const bidirectionalViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${partnerID}`]; - return bidirectionalViolations?.some((duplicateViolation) => duplicateViolation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && duplicateViolation.data?.duplicates?.includes(transactionID)); + return bidirectionalViolations?.some( + (duplicateViolation) => duplicateViolation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && duplicateViolation.data?.duplicates?.includes(transactionID), + ); }); } @@ -1893,19 +1895,16 @@ function isDuplicate( currentUserAccountID: number, iouReport: OnyxEntry, policy: OnyxEntry, - transactionViolation: OnyxEntry, - allTransactionViolations?: OnyxCollection, + allTransactionViolations: OnyxCollection, ): boolean { if (!transaction) { return false; } + const transactionViolation = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; const duplicatedTransactionViolation = transactionViolation?.find((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION); const hasDuplicatedTransactionViolation = !!duplicatedTransactionViolation; const isDuplicatedTransactionViolationDismissed = isViolationDismissed(transaction, duplicatedTransactionViolation, currentUserEmail, currentUserAccountID, iouReport, policy); - const shouldDisplayDuplicate = - !duplicatedTransactionViolation || - !allTransactionViolations || - shouldShowDuplicateViolation(transaction.transactionID, duplicatedTransactionViolation, allTransactionViolations); + const shouldDisplayDuplicate = !duplicatedTransactionViolation || shouldShowDuplicateViolation(transaction.transactionID, duplicatedTransactionViolation, allTransactionViolations); return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed && shouldDisplayDuplicate; } @@ -2021,17 +2020,7 @@ function hasDuplicateTransactions( return ( reportTransactions.length > 0 && - reportTransactions.some((transaction) => - isDuplicate( - transaction, - currentUserEmail, - currentUserAccountID, - iouReport, - policy, - allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], - allTransactionViolations, - ), - ) + reportTransactions.some((transaction) => isDuplicate(transaction, currentUserEmail, currentUserAccountID, iouReport, policy, allTransactionViolations)) ); } diff --git a/src/libs/actions/IOU/ReportWorkflow.ts b/src/libs/actions/IOU/ReportWorkflow.ts index c27d6f896763..44a82dfbf8c1 100644 --- a/src/libs/actions/IOU/ReportWorkflow.ts +++ b/src/libs/actions/IOU/ReportWorkflow.ts @@ -642,17 +642,8 @@ function approveMoneyRequest(params: ApproveMoneyRequestFunctionParams) { // Remove duplicates violations if we approve the report if (hasDuplicates) { - const allViolations = getAllTransactionViolations(); let transactions = getReportTransactions(expenseReport.reportID).filter((transaction) => - isDuplicate( - transaction, - currentUserEmailParam, - currentUserAccountIDParam, - expenseReport, - policy, - allViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], - allViolations, - ), + isDuplicate(transaction, currentUserEmailParam, currentUserAccountIDParam, expenseReport, policy, getAllTransactionViolations()), ); if (!full) { transactions = transactions.filter((transaction) => !isOnHold(transaction)); From fc3e0b46f373c4386a1535f43b4a58a42bed441c Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 20 Apr 2026 02:09:45 +0100 Subject: [PATCH 4/9] fix: avoid defaulting string ID to empty value in useTransactionViolations Made-with: Cursor --- src/hooks/useTransactionViolations.ts | 4 ++-- src/libs/Violations/ViolationsUtils.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hooks/useTransactionViolations.ts b/src/hooks/useTransactionViolations.ts index 6ff2a92a3c35..7793f783fe3d 100644 --- a/src/hooks/useTransactionViolations.ts +++ b/src/hooks/useTransactionViolations.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {shouldShowDuplicateViolation, isViolationDismissed, mergeProhibitedViolations, shouldShowViolation} from '@libs/TransactionUtils'; +import {isViolationDismissed, mergeProhibitedViolations, shouldShowDuplicateViolation, shouldShowViolation} from '@libs/TransactionUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import type {TransactionViolation, TransactionViolations} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; @@ -22,7 +22,7 @@ function useTransactionViolations(transactionID?: string, shouldShowRterForSettl (violation: TransactionViolation) => !isViolationDismissed(transaction, violation, currentUserDetails.email ?? '', currentUserDetails.accountID, iouReport, policy) && shouldShowViolation(iouReport, policy, violation.name, currentUserDetails.email ?? '', shouldShowRterForSettledReport, transaction) && - shouldShowDuplicateViolation(transactionID ?? '', violation, allTransactionViolations), + (!transactionID || shouldShowDuplicateViolation(transactionID, violation, allTransactionViolations)), ), ), [ diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts index 6890c1395912..70ad4a7886c7 100644 --- a/src/libs/Violations/ViolationsUtils.ts +++ b/src/libs/Violations/ViolationsUtils.ts @@ -23,7 +23,7 @@ import { } from '@libs/PolicyUtils'; import {isCurrentUserSubmitter} from '@libs/ReportUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; -import {hasValidModifiedAmount, shouldShowDuplicateViolation, isViolationDismissed, shouldShowViolation} from '@libs/TransactionUtils'; +import {hasValidModifiedAmount, isViolationDismissed, shouldShowDuplicateViolation, shouldShowViolation} from '@libs/TransactionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Card, CardList, Policy, PolicyCategories, PolicyTagLists, PolicyTags, Report, ReportAction, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx'; From f6bb7e71e5ec02adf49e0af31c3d79ccd761b035 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Mon, 20 Apr 2026 03:00:16 +0100 Subject: [PATCH 5/9] fix: add bidirectional violation data to tests and document collection subscription Made-with: Cursor --- src/hooks/useTransactionViolations.ts | 3 +++ tests/unit/ReportPrimaryActionUtilsTest.ts | 10 ++++++++ tests/unit/ReportSecondaryActionUtilsTest.ts | 24 ++++++++++++++++++-- tests/unit/ViolationUtilsTest.ts | 17 ++++++++++++++ tests/unit/useTransactionViolationsTest.ts | 1 + 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/hooks/useTransactionViolations.ts b/src/hooks/useTransactionViolations.ts index 7793f783fe3d..cea6a91cb234 100644 --- a/src/hooks/useTransactionViolations.ts +++ b/src/hooks/useTransactionViolations.ts @@ -10,6 +10,9 @@ import useOnyx from './useOnyx'; function useTransactionViolations(transactionID?: string, shouldShowRterForSettledReport = true): TransactionViolations { const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`); const [transactionViolations = getEmptyArray()] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`); + // Full collection subscription is intentional: shouldShowDuplicateViolation needs to + // look up duplicate transactions' violations to verify bidirectional links, and a selector + // approach introduces a loading-state ambiguity that causes stale violations to flash. const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.reportID)}`); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`); diff --git a/tests/unit/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts index df5210453b83..4313e52d80c3 100644 --- a/tests/unit/ReportPrimaryActionUtilsTest.ts +++ b/tests/unit/ReportPrimaryActionUtilsTest.ts @@ -1100,6 +1100,7 @@ describe('isReviewDuplicatesAction', () => { } as unknown as Report; await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); const TRANSACTION_ID = 'TRANSACTION_ID'; + const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, } as unknown as Transaction; @@ -1109,6 +1110,13 @@ describe('isReviewDuplicatesAction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, + } as TransactionViolation, + ], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [TRANSACTION_ID]}, } as TransactionViolation, ], }; @@ -1220,6 +1228,7 @@ describe('getTransactionThreadPrimaryAction', () => { const policy = {}; const REPORT_ACTION_ID = 'REPORT_ACTION_ID'; const TRANSACTION_ID = 'TRANSACTION_ID'; + const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, comment: { @@ -1230,6 +1239,7 @@ describe('getTransactionThreadPrimaryAction', () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction); const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as unknown as TransactionViolation; expect(getTransactionThreadPrimaryAction(CURRENT_USER_EMAIL, CURRENT_USER_ACCOUNT_ID, {} as Report, report, transaction, [violation], policy as Policy, false)).toBe( diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts index e099db856bf3..9833cae50505 100644 --- a/tests/unit/ReportSecondaryActionUtilsTest.ts +++ b/tests/unit/ReportSecondaryActionUtilsTest.ts @@ -524,6 +524,7 @@ describe('getSecondaryAction', () => { approver: EMPLOYEE_EMAIL, } as unknown as Policy; const TRANSACTION_ID = 'TRANSACTION_ID'; + const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, } as unknown as Transaction; @@ -532,6 +533,7 @@ describe('getSecondaryAction', () => { const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as TransactionViolation; await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); @@ -543,7 +545,15 @@ describe('getSecondaryAction', () => { chatReport, reportTransactions: [transaction], originalTransaction: {} as Transaction, - violations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, + violations: { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [TRANSACTION_ID]}, + } as TransactionViolation, + ], + }, bankAccountList: {}, policy, }); @@ -591,6 +601,7 @@ describe('getSecondaryAction', () => { it('includes APPROVE option for DEW policy report without pending approval', async () => { // Given a submitted expense report on a DEW policy without any pending approval action const TRANSACTION_ID = 'TRANSACTION_ID_DEW'; + const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID_DEW'; const report = { reportID: REPORT_ID, type: CONST.REPORT.TYPE.EXPENSE, @@ -608,12 +619,21 @@ describe('getSecondaryAction', () => { } as unknown as Transaction; const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as TransactionViolation; await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); - const violations = {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}; + const violations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + data: {duplicates: [TRANSACTION_ID]}, + } as TransactionViolation, + ], + }; // When getting secondary report actions const result = getSecondaryReportActions({ diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts index 12cdc011c1cc..7e669cd0480f 100644 --- a/tests/unit/ViolationUtilsTest.ts +++ b/tests/unit/ViolationUtilsTest.ts @@ -105,9 +105,12 @@ const smartScanFailedViolation = { type: CONST.VIOLATION_TYPES.WARNING, }; +const DUPLICATE_PARTNER_TRANSACTION_ID = 'duplicate-partner-txn'; + const duplicatedTransactionViolation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, type: CONST.VIOLATION_TYPES.WARNING, + data: {duplicates: [DUPLICATE_PARTNER_TRANSACTION_ID]}, }; describe('getViolationsOnyxData', () => { @@ -1373,6 +1376,13 @@ describe('getViolations', () => { const transactionViolationsCollection = { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [duplicatedTransactionViolation, smartScanFailedViolation, tagOutOfPolicyViolation], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_PARTNER_TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + type: CONST.VIOLATION_TYPES.WARNING, + data: {duplicates: [transaction.transactionID]}, + }, + ], }; await Onyx.multiSet({...transactionCollectionDataSet}); @@ -1414,6 +1424,13 @@ describe('getViolations', () => { const transactionViolationsCollection = { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [duplicatedTransactionViolation, smartScanFailedViolation, tagOutOfPolicyViolation], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_PARTNER_TRANSACTION_ID}`]: [ + { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + type: CONST.VIOLATION_TYPES.WARNING, + data: {duplicates: [transaction.transactionID]}, + }, + ], }; await Onyx.multiSet({...transactionCollectionDataSet}); diff --git a/tests/unit/useTransactionViolationsTest.ts b/tests/unit/useTransactionViolationsTest.ts index 42e457646d87..7c5e75c539cf 100644 --- a/tests/unit/useTransactionViolationsTest.ts +++ b/tests/unit/useTransactionViolationsTest.ts @@ -14,6 +14,7 @@ jest.mock('@libs/TransactionUtils', () => { return { isViolationDismissed: jest.fn(), shouldShowViolation: jest.fn(), + shouldShowDuplicateViolation: jest.fn(() => true), mergeProhibitedViolations: (transactionViolations: Array<{name: string; type: string; data?: {prohibitedExpenseRule?: string | string[]}}>) => { const prohibitedViolations = transactionViolations.filter((violation) => violation.name === CONST_MOCK.VIOLATIONS.PROHIBITED_EXPENSE); From e7f7849343ec005cc0a767f0a51ff64c3ee064c7 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Tue, 21 Apr 2026 15:23:39 +0100 Subject: [PATCH 6/9] revert: remove display-time bidirectional filter approach Revert all changes from the display-time shouldShowDuplicateViolation wiring (isDuplicate signature change, useTransactionViolations full collection subscription, getTransactionViolations/hasViolation filters, and all dependent call-site updates). The successData approach will be used instead. Made-with: Cursor --- .../ReviewDuplicatesPrimaryAction.tsx | 9 +- src/components/MoneyRequestHeader.tsx | 3 +- src/hooks/useTransactionViolations.ts | 21 +---- src/libs/ReportPrimaryActionUtils.ts | 4 +- src/libs/ReportSecondaryActionUtils.ts | 4 +- src/libs/TransactionUtils/index.ts | 52 ++++------- src/libs/Violations/ViolationsUtils.ts | 5 +- src/libs/actions/IOU/ReportWorkflow.ts | 9 +- tests/unit/ReportPrimaryActionUtilsTest.ts | 10 --- tests/unit/ReportSecondaryActionUtilsTest.ts | 24 +---- tests/unit/TransactionTest.ts | 89 ------------------- tests/unit/ViolationUtilsTest.ts | 17 ---- tests/unit/useTransactionViolationsTest.ts | 1 - 13 files changed, 45 insertions(+), 203 deletions(-) diff --git a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx index 2213d19da4b8..371db14f6426 100644 --- a/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx +++ b/src/components/MoneyReportHeaderPrimaryAction/ReviewDuplicatesPrimaryAction.tsx @@ -36,7 +36,14 @@ function ReviewDuplicatesPrimaryAction({reportID, chatReportID}: SimpleActionPro let threadID: string | undefined | null = transactionThreadReportID; if (!threadID) { const duplicateTransaction = transactions.find((reportTransaction) => - isDuplicate(reportTransaction, email ?? '', accountID, moneyRequestReport, policy, allTransactionViolations), + isDuplicate( + reportTransaction, + email ?? '', + accountID, + moneyRequestReport, + policy, + allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + reportTransaction.transactionID], + ), ); if (duplicateTransaction) { const existingThreadID = getThreadReportIDsForTransactions(reportActions, [duplicateTransaction]).at(0); diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx index 5a2504e75371..251612157921 100644 --- a/src/components/MoneyRequestHeader.tsx +++ b/src/components/MoneyRequestHeader.tsx @@ -82,8 +82,7 @@ function MoneyRequestHeader({reportID: reportIDProp, onBackButtonPress}: MoneyRe const {wideRHPRouteKeys} = useWideRHPState(); const isOnHold = isOnHoldTransactionUtils(transaction); - const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); - const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, allTransactionViolations); + const isDuplicate = isDuplicateTransactionUtils(transaction, email ?? '', accountID, report, policy, transactionViolations); const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations); const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations); diff --git a/src/hooks/useTransactionViolations.ts b/src/hooks/useTransactionViolations.ts index cea6a91cb234..957259a3f694 100644 --- a/src/hooks/useTransactionViolations.ts +++ b/src/hooks/useTransactionViolations.ts @@ -1,6 +1,6 @@ import {useMemo} from 'react'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; -import {isViolationDismissed, mergeProhibitedViolations, shouldShowDuplicateViolation, shouldShowViolation} from '@libs/TransactionUtils'; +import {isViolationDismissed, mergeProhibitedViolations, shouldShowViolation} from '@libs/TransactionUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import type {TransactionViolation, TransactionViolations} from '@src/types/onyx'; import getEmptyArray from '@src/types/utils/getEmptyArray'; @@ -10,10 +10,6 @@ import useOnyx from './useOnyx'; function useTransactionViolations(transactionID?: string, shouldShowRterForSettledReport = true): TransactionViolations { const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`); const [transactionViolations = getEmptyArray()] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`); - // Full collection subscription is intentional: shouldShowDuplicateViolation needs to - // look up duplicate transactions' violations to verify bidirectional links, and a selector - // approach introduces a loading-state ambiguity that causes stale violations to flash. - const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS); const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(transaction?.reportID)}`); const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${iouReport?.policyID}`); const currentUserDetails = useCurrentUserPersonalDetails(); @@ -24,21 +20,10 @@ function useTransactionViolations(transactionID?: string, shouldShowRterForSettl transactionViolations.filter( (violation: TransactionViolation) => !isViolationDismissed(transaction, violation, currentUserDetails.email ?? '', currentUserDetails.accountID, iouReport, policy) && - shouldShowViolation(iouReport, policy, violation.name, currentUserDetails.email ?? '', shouldShowRterForSettledReport, transaction) && - (!transactionID || shouldShowDuplicateViolation(transactionID, violation, allTransactionViolations)), + shouldShowViolation(iouReport, policy, violation.name, currentUserDetails.email ?? '', shouldShowRterForSettledReport, transaction), ), ), - [ - transaction, - transactionViolations, - allTransactionViolations, - transactionID, - iouReport, - policy, - shouldShowRterForSettledReport, - currentUserDetails.email, - currentUserDetails.accountID, - ], + [transaction, transactionViolations, iouReport, policy, shouldShowRterForSettledReport, currentUserDetails.email, currentUserDetails.accountID], ); } diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts index fe6d68dea56c..e0e9e7beac5c 100644 --- a/src/libs/ReportPrimaryActionUtils.ts +++ b/src/libs/ReportPrimaryActionUtils.ts @@ -328,7 +328,9 @@ function isReviewDuplicatesAction( policy: Policy | undefined, violations: OnyxCollection, ) { - const hasDuplicates = reportTransactions.some((transaction) => isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations)); + const hasDuplicates = reportTransactions.some((transaction) => + isDuplicate(transaction, currentUserEmail, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]), + ); if (!hasDuplicates) { return false; diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts index 97eb8c8ce6c9..803b54ebb34b 100644 --- a/src/libs/ReportSecondaryActionUtils.ts +++ b/src/libs/ReportSecondaryActionUtils.ts @@ -319,7 +319,9 @@ function isApproveAction( return false; } const isExpenseReport = isExpenseReportUtils(report); - const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations)); + const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => + isDuplicate(transaction, currentUserLogin, currentUserAccountID, report, policy, violations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]), + ); if (isExpenseReport && isProcessingReport && reportHasDuplicatedTransactions) { return true; diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index b56f181112ac..575d7db9cbee 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -1516,9 +1516,7 @@ function getTransactionViolations( const violations = transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]?.filter( - (violation) => - !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy) && - shouldShowDuplicateViolation(transaction.transactionID, violation, transactionViolations), + (violation) => !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy), ) ?? []; return violations; @@ -1862,29 +1860,6 @@ function getRecentTransactions(transactions: Record, size = 2): .slice(0, size); } -/** - * A duplicatedTransaction violation is only valid for display if the link is bidirectional: - * transaction A must reference B AND B must reference A back. This prevents showing stale - * one-sided duplicate violations when the backend only re-evaluated one side of the pair. - */ -function shouldShowDuplicateViolation(transactionID: string, violation: TransactionViolation, allTransactionViolations: OnyxCollection): boolean { - if (violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION) { - return true; - } - - const duplicateTransactionIDs = violation.data?.duplicates; - if (!duplicateTransactionIDs?.length) { - return false; - } - - return duplicateTransactionIDs.some((partnerID) => { - const bidirectionalViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${partnerID}`]; - return bidirectionalViolations?.some( - (duplicateViolation) => duplicateViolation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION && duplicateViolation.data?.duplicates?.includes(transactionID), - ); - }); -} - /** * Check if transaction has duplicatedTransaction violation. * @param transactionID - the transaction to check @@ -1895,18 +1870,16 @@ function isDuplicate( currentUserAccountID: number, iouReport: OnyxEntry, policy: OnyxEntry, - allTransactionViolations: OnyxCollection, + transactionViolation: OnyxEntry, ): boolean { if (!transaction) { return false; } - const transactionViolation = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]; const duplicatedTransactionViolation = transactionViolation?.find((violation: TransactionViolation) => violation.name === CONST.VIOLATIONS.DUPLICATED_TRANSACTION); const hasDuplicatedTransactionViolation = !!duplicatedTransactionViolation; const isDuplicatedTransactionViolationDismissed = isViolationDismissed(transaction, duplicatedTransactionViolation, currentUserEmail, currentUserAccountID, iouReport, policy); - const shouldDisplayDuplicate = !duplicatedTransactionViolation || shouldShowDuplicateViolation(transaction.transactionID, duplicatedTransactionViolation, allTransactionViolations); - return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed && shouldDisplayDuplicate; + return hasDuplicatedTransactionViolation && !isDuplicatedTransactionViolationDismissed; } /** @@ -1995,16 +1968,13 @@ function hasViolation( if (!doesTransactionSupportViolations(transaction)) { return false; } - const isCollection = !Array.isArray(transactionViolations); - const violations = isCollection ? transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID] : transactionViolations; - const allViolations = isCollection ? transactionViolations : undefined; + const violations = Array.isArray(transactionViolations) ? transactionViolations : transactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID]; return !!violations?.some( (violation) => violation.type === CONST.VIOLATION_TYPES.VIOLATION && (showInReview === undefined || showInReview === (violation.showInReview ?? false)) && - !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy) && - (!allViolations || shouldShowDuplicateViolation(transaction.transactionID, violation, allViolations)), + !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, iouReport, policy), ); } @@ -2020,7 +1990,16 @@ function hasDuplicateTransactions( return ( reportTransactions.length > 0 && - reportTransactions.some((transaction) => isDuplicate(transaction, currentUserEmail, currentUserAccountID, iouReport, policy, allTransactionViolations)) + reportTransactions.some((transaction) => + isDuplicate( + transaction, + currentUserEmail, + currentUserAccountID, + iouReport, + policy, + allTransactionViolations?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], + ), + ) ); } @@ -2944,7 +2923,6 @@ export { getCategoryTaxCodeAndAmount, isPerDiemRequest, isViolationDismissed, - shouldShowDuplicateViolation, isBrokenConnectionViolation, isPartialTransaction, isPendingCardOrScanningTransaction, diff --git a/src/libs/Violations/ViolationsUtils.ts b/src/libs/Violations/ViolationsUtils.ts index 70ad4a7886c7..4003f22e0227 100644 --- a/src/libs/Violations/ViolationsUtils.ts +++ b/src/libs/Violations/ViolationsUtils.ts @@ -23,7 +23,7 @@ import { } from '@libs/PolicyUtils'; import {isCurrentUserSubmitter} from '@libs/ReportUtils'; import * as TransactionUtils from '@libs/TransactionUtils'; -import {hasValidModifiedAmount, isViolationDismissed, shouldShowDuplicateViolation, shouldShowViolation} from '@libs/TransactionUtils'; +import {hasValidModifiedAmount, isViolationDismissed, shouldShowViolation} from '@libs/TransactionUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import type {Card, CardList, Policy, PolicyCategories, PolicyTagLists, PolicyTags, Report, ReportAction, Transaction, TransactionViolation, ViolationName} from '@src/types/onyx'; @@ -909,8 +909,7 @@ const ViolationsUtils = { return transactionViolations.some((violation: TransactionViolation) => { return ( !isViolationDismissed(transaction, violation, currentUserEmail, currentUserAccountID, report, policy) && - shouldShowViolation(report, policy, violation.name, currentUserEmail, true, transaction) && - shouldShowDuplicateViolation(transaction.transactionID, violation, violations) + shouldShowViolation(report, policy, violation.name, currentUserEmail, true, transaction) ); }); }); diff --git a/src/libs/actions/IOU/ReportWorkflow.ts b/src/libs/actions/IOU/ReportWorkflow.ts index 44a82dfbf8c1..5bdfd0adf1e7 100644 --- a/src/libs/actions/IOU/ReportWorkflow.ts +++ b/src/libs/actions/IOU/ReportWorkflow.ts @@ -643,7 +643,14 @@ function approveMoneyRequest(params: ApproveMoneyRequestFunctionParams) { // Remove duplicates violations if we approve the report if (hasDuplicates) { let transactions = getReportTransactions(expenseReport.reportID).filter((transaction) => - isDuplicate(transaction, currentUserEmailParam, currentUserAccountIDParam, expenseReport, policy, getAllTransactionViolations()), + isDuplicate( + transaction, + currentUserEmailParam, + currentUserAccountIDParam, + expenseReport, + policy, + getAllTransactionViolations()?.[ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + transaction.transactionID], + ), ); if (!full) { transactions = transactions.filter((transaction) => !isOnHold(transaction)); diff --git a/tests/unit/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts index 4313e52d80c3..df5210453b83 100644 --- a/tests/unit/ReportPrimaryActionUtilsTest.ts +++ b/tests/unit/ReportPrimaryActionUtilsTest.ts @@ -1100,7 +1100,6 @@ describe('isReviewDuplicatesAction', () => { } as unknown as Report; await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); const TRANSACTION_ID = 'TRANSACTION_ID'; - const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, } as unknown as Transaction; @@ -1110,13 +1109,6 @@ describe('isReviewDuplicatesAction', () => { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [ { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, - } as TransactionViolation, - ], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ - { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [TRANSACTION_ID]}, } as TransactionViolation, ], }; @@ -1228,7 +1220,6 @@ describe('getTransactionThreadPrimaryAction', () => { const policy = {}; const REPORT_ACTION_ID = 'REPORT_ACTION_ID'; const TRANSACTION_ID = 'TRANSACTION_ID'; - const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, comment: { @@ -1239,7 +1230,6 @@ describe('getTransactionThreadPrimaryAction', () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction); const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as unknown as TransactionViolation; expect(getTransactionThreadPrimaryAction(CURRENT_USER_EMAIL, CURRENT_USER_ACCOUNT_ID, {} as Report, report, transaction, [violation], policy as Policy, false)).toBe( diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts index 9833cae50505..e099db856bf3 100644 --- a/tests/unit/ReportSecondaryActionUtilsTest.ts +++ b/tests/unit/ReportSecondaryActionUtilsTest.ts @@ -524,7 +524,6 @@ describe('getSecondaryAction', () => { approver: EMPLOYEE_EMAIL, } as unknown as Policy; const TRANSACTION_ID = 'TRANSACTION_ID'; - const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID'; const transaction = { transactionID: TRANSACTION_ID, } as unknown as Transaction; @@ -533,7 +532,6 @@ describe('getSecondaryAction', () => { const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as TransactionViolation; await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); @@ -545,15 +543,7 @@ describe('getSecondaryAction', () => { chatReport, reportTransactions: [transaction], originalTransaction: {} as Transaction, - violations: { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ - { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [TRANSACTION_ID]}, - } as TransactionViolation, - ], - }, + violations: {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, bankAccountList: {}, policy, }); @@ -601,7 +591,6 @@ describe('getSecondaryAction', () => { it('includes APPROVE option for DEW policy report without pending approval', async () => { // Given a submitted expense report on a DEW policy without any pending approval action const TRANSACTION_ID = 'TRANSACTION_ID_DEW'; - const DUPLICATE_TRANSACTION_ID = 'DUPLICATE_TRANSACTION_ID_DEW'; const report = { reportID: REPORT_ID, type: CONST.REPORT.TYPE.EXPENSE, @@ -619,21 +608,12 @@ describe('getSecondaryAction', () => { } as unknown as Transaction; const violation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [DUPLICATE_TRANSACTION_ID]}, } as TransactionViolation; await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction); await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report); - const violations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_TRANSACTION_ID}`]: [ - { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - data: {duplicates: [TRANSACTION_ID]}, - } as TransactionViolation, - ], - }; + const violations = {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}; // When getting secondary report actions const result = getSecondaryReportActions({ diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 668c0083176f..71952a667a7e 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -1600,92 +1600,3 @@ describe('Transaction', () => { }); }); }); - -describe('shouldShowDuplicateViolation', () => { - const TXN_A = 'txnA'; - const TXN_B = 'txnB'; - const TXN_C = 'txnC'; - - function makeDuplicateViolation(duplicates: string[]): TransactionViolation { - return { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - type: CONST.VIOLATION_TYPES.VIOLATION, - data: {duplicates}, - }; - } - - function makeCategoryViolation(): TransactionViolation { - return { - name: CONST.VIOLATIONS.MISSING_CATEGORY, - type: CONST.VIOLATION_TYPES.VIOLATION, - }; - } - - it('should return true for non-duplicate violations (pass-through)', () => { - const violation = makeCategoryViolation(); - const allViolations = {}; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violation, allViolations)).toBe(true); - }); - - it('should return true when both sides reference each other', () => { - const violationA = makeDuplicateViolation([TXN_B]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A])], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(true); - }); - - it('should return false when partner does not reference back', () => { - const violationA = makeDuplicateViolation([TXN_B]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); - }); - - it('should return false when partner has no violations at all', () => { - const violationA = makeDuplicateViolation([TXN_B]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); - }); - - it('should return false when partner references a different transaction', () => { - const violationA = makeDuplicateViolation([TXN_B]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_C])], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); - }); - - it('should return true if at least one partner in a multi-duplicate list references back', () => { - const violationA = makeDuplicateViolation([TXN_B, TXN_C]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B, TXN_C])], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_C}`]: [makeDuplicateViolation([TXN_A])], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(true); - }); - - it('should return false when data.duplicates is empty', () => { - const violationA = makeDuplicateViolation([]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [violationA], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_A, violationA, allViolations)).toBe(false); - }); - - it('should handle the stale backend response scenario — A cleared, B still has one-sided reference', () => { - const violationB = makeDuplicateViolation([TXN_A]); - const allViolations = { - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [violationB], - }; - expect(TransactionUtils.shouldShowDuplicateViolation(TXN_B, violationB, allViolations)).toBe(false); - }); -}); diff --git a/tests/unit/ViolationUtilsTest.ts b/tests/unit/ViolationUtilsTest.ts index 7e669cd0480f..12cdc011c1cc 100644 --- a/tests/unit/ViolationUtilsTest.ts +++ b/tests/unit/ViolationUtilsTest.ts @@ -105,12 +105,9 @@ const smartScanFailedViolation = { type: CONST.VIOLATION_TYPES.WARNING, }; -const DUPLICATE_PARTNER_TRANSACTION_ID = 'duplicate-partner-txn'; - const duplicatedTransactionViolation = { name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, type: CONST.VIOLATION_TYPES.WARNING, - data: {duplicates: [DUPLICATE_PARTNER_TRANSACTION_ID]}, }; describe('getViolationsOnyxData', () => { @@ -1376,13 +1373,6 @@ describe('getViolations', () => { const transactionViolationsCollection = { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [duplicatedTransactionViolation, smartScanFailedViolation, tagOutOfPolicyViolation], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_PARTNER_TRANSACTION_ID}`]: [ - { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - type: CONST.VIOLATION_TYPES.WARNING, - data: {duplicates: [transaction.transactionID]}, - }, - ], }; await Onyx.multiSet({...transactionCollectionDataSet}); @@ -1424,13 +1414,6 @@ describe('getViolations', () => { const transactionViolationsCollection = { [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`]: [duplicatedTransactionViolation, smartScanFailedViolation, tagOutOfPolicyViolation], - [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${DUPLICATE_PARTNER_TRANSACTION_ID}`]: [ - { - name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, - type: CONST.VIOLATION_TYPES.WARNING, - data: {duplicates: [transaction.transactionID]}, - }, - ], }; await Onyx.multiSet({...transactionCollectionDataSet}); diff --git a/tests/unit/useTransactionViolationsTest.ts b/tests/unit/useTransactionViolationsTest.ts index 7c5e75c539cf..42e457646d87 100644 --- a/tests/unit/useTransactionViolationsTest.ts +++ b/tests/unit/useTransactionViolationsTest.ts @@ -14,7 +14,6 @@ jest.mock('@libs/TransactionUtils', () => { return { isViolationDismissed: jest.fn(), shouldShowViolation: jest.fn(), - shouldShowDuplicateViolation: jest.fn(() => true), mergeProhibitedViolations: (transactionViolations: Array<{name: string; type: string; data?: {prohibitedExpenseRule?: string | string[]}}>) => { const prohibitedViolations = transactionViolations.filter((violation) => violation.name === CONST_MOCK.VIOLATIONS.PROHIBITED_EXPENSE); From 2ca772d53a6b83d61bb71d382e70a7119fc16138 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Tue, 21 Apr 2026 15:49:52 +0100 Subject: [PATCH 7/9] fix: re-apply cleaned partner violations via successData to prevent stale duplicates When UpdateMoneyRequestAmountAndCurrency resolves, a queued OpenReport command can overwrite the optimistic cleanup with stale one-sided duplicate violations. Pushing the same cleaned value into successData ensures it is re-applied after the server response, preventing the stale data from persisting. Made-with: Cursor --- src/libs/TransactionUtils/index.ts | 13 ++++++++++++- src/libs/actions/IOU/UpdateMoneyRequest.ts | 8 +++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 575d7db9cbee..0357f1b8ed89 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -2359,10 +2359,21 @@ function removeTransactionFromDuplicateTransactionViolation( }); } + const cleanedValue = optimisticViolations.length > 0 ? optimisticViolations : null; + onyxData.optimisticData?.push({ onyxMethod: Onyx.METHOD.SET, key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`, - value: optimisticViolations.length > 0 ? optimisticViolations : null, + value: cleanedValue, + }); + + // Re-apply the cleaned violations on success so that stale data from a + // queued command (e.g. OpenReport resolving between optimistic apply and + // the server response) doesn't re-introduce one-sided duplicate violations. + onyxData.successData?.push({ + onyxMethod: Onyx.METHOD.SET, + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${duplicateID}`, + value: cleanedValue, }); onyxData.failureData?.push({ diff --git a/src/libs/actions/IOU/UpdateMoneyRequest.ts b/src/libs/actions/IOU/UpdateMoneyRequest.ts index 5ebc61c00b8a..724b5e2570ec 100644 --- a/src/libs/actions/IOU/UpdateMoneyRequest.ts +++ b/src/libs/actions/IOU/UpdateMoneyRequest.ts @@ -919,7 +919,13 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U > > = []; const successData: Array< - OnyxUpdate + OnyxUpdate< + | typeof ONYXKEYS.COLLECTION.TRANSACTION_DRAFT + | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS + | typeof ONYXKEYS.COLLECTION.REPORT + | typeof ONYXKEYS.COLLECTION.TRANSACTION + | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + > > = []; const failureData: Array< OnyxUpdate< From 10c2c412875eb44745f2b2281b90d9c6789d56df Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Tue, 21 Apr 2026 15:50:39 +0100 Subject: [PATCH 8/9] test: add unit tests for successData in removeTransactionFromDuplicateTransactionViolation Made-with: Cursor --- tests/unit/TransactionTest.ts | 119 ++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index 71952a667a7e..e627787d0af0 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -14,6 +14,8 @@ import ONYXKEYS from '@src/ONYXKEYS'; import type {TransactionViolation} from '@src/types/onyx'; import type {Attendee} from '@src/types/onyx/IOU'; import type {ReportCollectionDataSet} from '@src/types/onyx/Report'; +import type {OnyxData} from '@src/types/onyx/Request'; +import type {UpdateMoneyRequestDataKeys} from '../../src/libs/actions/IOU/UpdateMoneyRequest'; import * as TransactionUtils from '../../src/libs/TransactionUtils'; import type {PersonalDetails, RecentWaypoint, Report, ReportAction, ReportActions, Transaction} from '../../src/types/onyx'; import createRandomPolicy from '../utils/collections/policies'; @@ -1600,3 +1602,120 @@ describe('Transaction', () => { }); }); }); + +describe('removeTransactionFromDuplicateTransactionViolation', () => { + const TXN_A = 'txn_a'; + const TXN_B = 'txn_b'; + + function makeDuplicateViolation(duplicates: string[]): TransactionViolation { + return { + name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + type: CONST.VIOLATION_TYPES.VIOLATION, + data: {duplicates}, + }; + } + + function makeCategoryViolation(): TransactionViolation { + return { + name: CONST.VIOLATIONS.MISSING_CATEGORY, + type: CONST.VIOLATION_TYPES.VIOLATION, + }; + } + + function makeTransactionCollection(...ids: string[]) { + const collection: Record = {}; + for (const id of ids) { + collection[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`] = {transactionID: id} as Transaction; + } + return collection; + } + + it('should push successData that re-applies cleaned partner violations', () => { + const onyxData: OnyxData = {optimisticData: [], successData: [], failureData: []}; + + const TXN_C = 'txn_c'; + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A, TXN_C])], + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B, TXN_C), transactionViolations); + + expect(onyxData.successData?.length).toBe(1); + const successEntry = onyxData.successData?.at(0); + expect(successEntry?.key).toBe(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`); + expect(successEntry?.value).toEqual([ + { + ...makeDuplicateViolation([TXN_A, TXN_C]), + data: {duplicates: [TXN_C]}, + }, + ]); + }); + + it('should have matching optimistic and success data values', () => { + const onyxData: OnyxData = {optimisticData: [], successData: [], failureData: []}; + + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A])], + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B), transactionViolations); + + expect(onyxData.optimisticData?.length).toBe(1); + expect(onyxData.successData?.length).toBe(1); + + const optimisticEntry = onyxData.optimisticData?.at(0); + const successEntry = onyxData.successData?.at(0); + expect(optimisticEntry?.key).toBe(successEntry?.key); + expect(optimisticEntry?.value).toEqual(successEntry?.value); + }); + + it('should set successData value to null when removing the last duplicate reference', () => { + const onyxData: OnyxData = {optimisticData: [], successData: [], failureData: []}; + + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A])], + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B), transactionViolations); + + const successEntry = onyxData.successData?.at(0); + expect(successEntry?.value).toBeNull(); + }); + + it('should preserve failureData for rollback with original violations', () => { + const onyxData: OnyxData = {optimisticData: [], successData: [], failureData: []}; + + const originalBViolations = [makeDuplicateViolation([TXN_A]), makeCategoryViolation()]; + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: originalBViolations, + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B), transactionViolations); + + expect(onyxData.failureData?.length).toBe(1); + const failureEntry = onyxData.failureData?.at(0); + expect(failureEntry?.key).toBe(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`); + expect(failureEntry?.value).toEqual(originalBViolations); + }); + + it('should not push any data when successData array is undefined', () => { + const onyxData: OnyxData = { + optimisticData: [], + failureData: [], + }; + + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A])], + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B), transactionViolations); + + expect(onyxData.optimisticData?.length).toBe(1); + expect(onyxData.successData).toBeUndefined(); + }); +}); From fa419ebdcf0b469ed4cb6541d38d3f7616fabf18 Mon Sep 17 00:00:00 2001 From: Fedi Rajhi Date: Thu, 23 Apr 2026 22:25:39 +0100 Subject: [PATCH 9/9] fix: preserve non-duplicate violations when cleaning partner successData Made-with: Cursor --- src/libs/TransactionUtils/index.ts | 2 +- tests/unit/TransactionTest.ts | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts index 0357f1b8ed89..efca27c0e502 100644 --- a/src/libs/TransactionUtils/index.ts +++ b/src/libs/TransactionUtils/index.ts @@ -2347,7 +2347,7 @@ function removeTransactionFromDuplicateTransactionViolation( continue; } - const optimisticViolations = duplicateTransactionViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION); + const optimisticViolations = duplicateViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION); if (duplicateTransactionIDs.length > 0) { optimisticViolations.push({ diff --git a/tests/unit/TransactionTest.ts b/tests/unit/TransactionTest.ts index e627787d0af0..4251ec7aecd5 100644 --- a/tests/unit/TransactionTest.ts +++ b/tests/unit/TransactionTest.ts @@ -1702,6 +1702,23 @@ describe('removeTransactionFromDuplicateTransactionViolation', () => { expect(failureEntry?.value).toEqual(originalBViolations); }); + it('should preserve non-duplicate violations on partner when cleaning duplicate reference', () => { + const onyxData: OnyxData = {optimisticData: [], successData: [], failureData: []}; + + const transactionViolations = { + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_A}`]: [makeDuplicateViolation([TXN_B])], + [`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TXN_B}`]: [makeDuplicateViolation([TXN_A]), makeCategoryViolation()], + }; + + TransactionUtils.removeTransactionFromDuplicateTransactionViolation(onyxData, TXN_A, makeTransactionCollection(TXN_A, TXN_B), transactionViolations); + + const successEntry = onyxData.successData?.at(0); + expect(successEntry?.value).toEqual([makeCategoryViolation()]); + + const optimisticEntry = onyxData.optimisticData?.at(0); + expect(optimisticEntry?.value).toEqual([makeCategoryViolation()]); + }); + it('should not push any data when successData array is undefined', () => { const onyxData: OnyxData = { optimisticData: [],