From c9fbf9779bf761b9c2d8ed69454c23d9b01c0a15 Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Tue, 19 May 2026 00:24:56 +0530 Subject: [PATCH 1/5] Fix duplicate action for grouped search expenses --- src/hooks/useSearchBulkActions.ts | 48 ++++++++++++++++++--- src/hooks/useSelectedTransactionsActions.ts | 25 ++++++++--- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts index 1b44fc281277..01e7aa1da40a 100644 --- a/src/hooks/useSearchBulkActions.ts +++ b/src/hooks/useSearchBulkActions.ts @@ -120,7 +120,7 @@ function getRestrictedPolicyID( type ShouldShowBulkDuplicateParams = { selectedTransactionsKeys: string[]; - selectedTransactions: Record; + selectedTransactions: Record; allTransactions: OnyxCollection | undefined; allReports: OnyxCollection | undefined; allTransactionViolations: OnyxCollection | undefined; @@ -131,6 +131,29 @@ type ShouldShowBulkDuplicateParams = { searchData: Record | undefined; }; +function getAllTransactionsForDuplicate({ + selectedTransactionsKeys, + selectedTransactions, + allTransactions, + searchData, +}: Pick): OnyxCollection { + const allTransactionsForDuplicate = {...(allTransactions ?? {})}; + + for (const id of selectedTransactionsKeys) { + const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`; + if (allTransactionsForDuplicate[transactionKey]) { + continue; + } + + const transaction = selectedTransactions[id]?.transaction ?? (searchData?.[transactionKey] as Transaction | undefined); + if (transaction) { + allTransactionsForDuplicate[transactionKey] = transaction; + } + } + + return allTransactionsForDuplicate; +} + /** * Determines whether the bulk duplicate option should be shown for the selected transactions. * Mirrors the single-duplicate guards from MoneyReportHeader/MoneyRequestHeader. @@ -158,8 +181,10 @@ function shouldShowBulkDuplicateOption({ .filter((report): report is Report => report != null && 'reportID' in report) : []; + const allTransactionsForDuplicate = getAllTransactionsForDuplicate({selectedTransactionsKeys, selectedTransactions, allTransactions, searchData}); + return selectedTransactionsKeys.every((id) => { - const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]; + const transaction = allTransactionsForDuplicate[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]; if (!transaction || isManagedCardTransaction(transaction) || isScanning(transaction)) { return false; } @@ -882,12 +907,23 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { [currentUserPersonalDetails.accountID, defaultExpensePolicy?.id], ); + const allTransactionsForDuplicate = useMemo( + () => + getAllTransactionsForDuplicate({ + selectedTransactionsKeys, + selectedTransactions, + allTransactions, + searchData: currentSearchResults?.data, + }), + [selectedTransactionsKeys, selectedTransactions, allTransactions, currentSearchResults?.data], + ); + const isDuplicateOptionVisible = useMemo( () => shouldShowBulkDuplicateOption({ selectedTransactionsKeys, selectedTransactions, - allTransactions, + allTransactions: allTransactionsForDuplicate, allReports, allTransactionViolations, allReportNameValuePairs, @@ -899,7 +935,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { [ selectedTransactionsKeys, selectedTransactions, - allTransactions, + allTransactionsForDuplicate, allReports, allTransactionViolations, allReportNameValuePairs, @@ -1644,12 +1680,12 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { setDuplicateHandler, isDuplicateReportOptionVisible, setDuplicateReportHandler, - allTransactions, + allTransactions: allTransactionsForDuplicate, allReports, searchData: currentSearchResults?.data, }; } export default useSearchBulkActions; -export {shouldShowBulkDuplicateOption}; +export {getAllTransactionsForDuplicate, shouldShowBulkDuplicateOption}; export type {SearchHeaderOptionValue}; diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts index fefb1ed701a4..749150e4aa32 100644 --- a/src/hooks/useSelectedTransactionsActions.ts +++ b/src/hooks/useSelectedTransactionsActions.ts @@ -48,7 +48,7 @@ import useNetworkWithOfflineStatus from './useNetworkWithOfflineStatus'; import useOnyx from './useOnyx'; import usePermissions from './usePermissions'; import useReportIsArchived from './useReportIsArchived'; -import {shouldShowBulkDuplicateOption} from './useSearchBulkActions'; +import {getAllTransactionsForDuplicate, shouldShowBulkDuplicateOption} from './useSearchBulkActions'; const {HOLD, UNHOLD, MOVE, MERGE, SPLIT, DUPLICATE} = CONST.REPORT.SELECTED_TRANSACTIONS_BULK_ACTION_TYPES; @@ -157,13 +157,24 @@ function useSelectedTransactionsActions({ const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const selectedTransactionsForDuplicate = useMemo(() => { - const map: Record = {}; + const map: Record = {}; for (const id of selectedTransactionIDs) { const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]; - map[id] = {reportID: transaction?.reportID}; + map[id] = selectedTransactionsMeta[id] ?? {reportID: transaction?.reportID, transaction}; } return map; - }, [selectedTransactionIDs, allTransactions]); + }, [selectedTransactionIDs, selectedTransactionsMeta, allTransactions]); + + const allTransactionsForDuplicate = useMemo( + () => + getAllTransactionsForDuplicate({ + selectedTransactionsKeys: selectedTransactionIDs, + selectedTransactions: selectedTransactionsForDuplicate, + allTransactions, + searchData: undefined, + }), + [selectedTransactionIDs, selectedTransactionsForDuplicate, allTransactions], + ); const activePolicyExpenseChat = useMemo(() => getPolicyExpenseChat(currentUserAccountID, defaultExpensePolicy?.id), [currentUserAccountID, defaultExpensePolicy?.id]); @@ -172,7 +183,7 @@ function useSelectedTransactionsActions({ shouldShowBulkDuplicateOption({ selectedTransactionsKeys: selectedTransactionIDs, selectedTransactions: selectedTransactionsForDuplicate, - allTransactions, + allTransactions: allTransactionsForDuplicate, allReports, allTransactionViolations, allReportNameValuePairs, @@ -184,7 +195,7 @@ function useSelectedTransactionsActions({ [ selectedTransactionIDs, selectedTransactionsForDuplicate, - allTransactions, + allTransactionsForDuplicate, allReports, allTransactionViolations, allReportNameValuePairs, @@ -535,7 +546,7 @@ function useSelectedTransactionsActions({ hideDeleteModal, isDuplicateOptionVisible, setDuplicateHandler, - allTransactions, + allTransactions: allTransactionsForDuplicate, allReports, }; } From faa132f6734c1e3179dc874b0075f5041e57262a Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Tue, 19 May 2026 00:35:06 +0530 Subject: [PATCH 2/5] Fix duplicate transaction map typing --- src/hooks/useSearchBulkActions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts index 01e7aa1da40a..556077d853c7 100644 --- a/src/hooks/useSearchBulkActions.ts +++ b/src/hooks/useSearchBulkActions.ts @@ -136,7 +136,7 @@ function getAllTransactionsForDuplicate({ selectedTransactions, allTransactions, searchData, -}: Pick): OnyxCollection { +}: Pick): NonNullable> { const allTransactionsForDuplicate = {...(allTransactions ?? {})}; for (const id of selectedTransactionsKeys) { From 1184d8b2e4e02825da5d7ccca701b7def097dc8d Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 20 May 2026 01:23:19 +0530 Subject: [PATCH 3/5] Address duplicate bulk action review feedback --- src/hooks/useSearchBulkActions.ts | 10 ++++----- src/hooks/useSelectedTransactionsActions.ts | 25 ++++++--------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts index 556077d853c7..564d144ce9b3 100644 --- a/src/hooks/useSearchBulkActions.ts +++ b/src/hooks/useSearchBulkActions.ts @@ -135,8 +135,7 @@ function getAllTransactionsForDuplicate({ selectedTransactionsKeys, selectedTransactions, allTransactions, - searchData, -}: Pick): NonNullable> { +}: Pick): NonNullable> { const allTransactionsForDuplicate = {...(allTransactions ?? {})}; for (const id of selectedTransactionsKeys) { @@ -145,7 +144,7 @@ function getAllTransactionsForDuplicate({ continue; } - const transaction = selectedTransactions[id]?.transaction ?? (searchData?.[transactionKey] as Transaction | undefined); + const transaction = selectedTransactions[id]?.transaction; if (transaction) { allTransactionsForDuplicate[transactionKey] = transaction; } @@ -181,7 +180,7 @@ function shouldShowBulkDuplicateOption({ .filter((report): report is Report => report != null && 'reportID' in report) : []; - const allTransactionsForDuplicate = getAllTransactionsForDuplicate({selectedTransactionsKeys, selectedTransactions, allTransactions, searchData}); + const allTransactionsForDuplicate = getAllTransactionsForDuplicate({selectedTransactionsKeys, selectedTransactions, allTransactions}); return selectedTransactionsKeys.every((id) => { const transaction = allTransactionsForDuplicate[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]; @@ -913,9 +912,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { selectedTransactionsKeys, selectedTransactions, allTransactions, - searchData: currentSearchResults?.data, }), - [selectedTransactionsKeys, selectedTransactions, allTransactions, currentSearchResults?.data], + [selectedTransactionsKeys, selectedTransactions, allTransactions], ); const isDuplicateOptionVisible = useMemo( diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts index 749150e4aa32..fefb1ed701a4 100644 --- a/src/hooks/useSelectedTransactionsActions.ts +++ b/src/hooks/useSelectedTransactionsActions.ts @@ -48,7 +48,7 @@ import useNetworkWithOfflineStatus from './useNetworkWithOfflineStatus'; import useOnyx from './useOnyx'; import usePermissions from './usePermissions'; import useReportIsArchived from './useReportIsArchived'; -import {getAllTransactionsForDuplicate, shouldShowBulkDuplicateOption} from './useSearchBulkActions'; +import {shouldShowBulkDuplicateOption} from './useSearchBulkActions'; const {HOLD, UNHOLD, MOVE, MERGE, SPLIT, DUPLICATE} = CONST.REPORT.SELECTED_TRANSACTIONS_BULK_ACTION_TYPES; @@ -157,24 +157,13 @@ function useSelectedTransactionsActions({ const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); const selectedTransactionsForDuplicate = useMemo(() => { - const map: Record = {}; + const map: Record = {}; for (const id of selectedTransactionIDs) { const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]; - map[id] = selectedTransactionsMeta[id] ?? {reportID: transaction?.reportID, transaction}; + map[id] = {reportID: transaction?.reportID}; } return map; - }, [selectedTransactionIDs, selectedTransactionsMeta, allTransactions]); - - const allTransactionsForDuplicate = useMemo( - () => - getAllTransactionsForDuplicate({ - selectedTransactionsKeys: selectedTransactionIDs, - selectedTransactions: selectedTransactionsForDuplicate, - allTransactions, - searchData: undefined, - }), - [selectedTransactionIDs, selectedTransactionsForDuplicate, allTransactions], - ); + }, [selectedTransactionIDs, allTransactions]); const activePolicyExpenseChat = useMemo(() => getPolicyExpenseChat(currentUserAccountID, defaultExpensePolicy?.id), [currentUserAccountID, defaultExpensePolicy?.id]); @@ -183,7 +172,7 @@ function useSelectedTransactionsActions({ shouldShowBulkDuplicateOption({ selectedTransactionsKeys: selectedTransactionIDs, selectedTransactions: selectedTransactionsForDuplicate, - allTransactions: allTransactionsForDuplicate, + allTransactions, allReports, allTransactionViolations, allReportNameValuePairs, @@ -195,7 +184,7 @@ function useSelectedTransactionsActions({ [ selectedTransactionIDs, selectedTransactionsForDuplicate, - allTransactionsForDuplicate, + allTransactions, allReports, allTransactionViolations, allReportNameValuePairs, @@ -546,7 +535,7 @@ function useSelectedTransactionsActions({ hideDeleteModal, isDuplicateOptionVisible, setDuplicateHandler, - allTransactions: allTransactionsForDuplicate, + allTransactions, allReports, }; } From 8867957dd068f89733e6b3ed4ad9f11ce3385fe5 Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Wed, 20 May 2026 15:16:57 +0530 Subject: [PATCH 4/5] Add grouped duplicate regression coverage --- .../useSearchBulkActionsDuplicateTest.ts | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/tests/unit/hooks/useSearchBulkActionsDuplicateTest.ts b/tests/unit/hooks/useSearchBulkActionsDuplicateTest.ts index e6bb1d9bdd99..daec1b56a0a3 100644 --- a/tests/unit/hooks/useSearchBulkActionsDuplicateTest.ts +++ b/tests/unit/hooks/useSearchBulkActionsDuplicateTest.ts @@ -823,6 +823,46 @@ describe('useSearchBulkActions - duplicate option', () => { ); }); + it('should duplicate a grouped child transaction that only exists in selected transaction metadata', async () => { + const txnID = '1302'; + const txn = {...createRandomTransaction(1), transactionID: txnID, reportID: 'report1', managedCard: false, category: 'Grouped child', amount: 9000}; + + mockSelectedTransactions = { + [txnID]: makeSelectedTransaction({reportID: 'report1', transaction: txn}), + }; + + const {result} = renderHook(() => useSearchBulkActionsWithDuplicate({queryJSON: baseQueryJSON})); + + await waitFor(() => { + expect(result.current.headerButtonsOptions.find((o) => o.value === CONST.SEARCH.BULK_ACTION_TYPES.DUPLICATE)).toBeDefined(); + }); + + result.current.headerButtonsOptions.find((o) => o.value === CONST.SEARCH.BULK_ACTION_TYPES.DUPLICATE)?.onSelected?.(); + + expect(bulkDuplicateExpenses).toHaveBeenCalledWith( + expect.objectContaining({ + transactionIDs: [txnID], + allTransactions: expect.objectContaining({ + [`${ONYXKEYS.COLLECTION.TRANSACTION}${txnID}`]: expect.objectContaining({transactionID: txnID, category: 'Grouped child', amount: 9000}), + }), + }), + ); + }); + + it('should not show duplicate option for a grouped child managed-card transaction from selected transaction metadata', async () => { + const txnID = '1303'; + const txn = {...createRandomTransaction(1), transactionID: txnID, reportID: 'report1', managedCard: true}; + + mockSelectedTransactions = { + [txnID]: makeSelectedTransaction({reportID: 'report1', transaction: txn}), + }; + + const {result} = renderHook(() => useSearchBulkActions({queryJSON: baseQueryJSON})); + await waitFor(() => expect(result.current.headerButtonsOptions.length).toBeGreaterThan(0)); + + expect(result.current.headerButtonsOptions.find((o) => o.value === CONST.SEARCH.BULK_ACTION_TYPES.DUPLICATE)).toBeUndefined(); + }); + it('should not show duplicate option for per-diem expense on non-default workspace', async () => { const defaultPolicyID = 'DEFAULT_POLICY'; const otherPolicyID = 'OTHER_POLICY'; From 9cefc3ae60d6205bd4a325ed7021298f3f45972e Mon Sep 17 00:00:00 2001 From: KJ21-ENG Date: Mon, 25 May 2026 11:38:39 +0530 Subject: [PATCH 5/5] Avoid duplicate transaction map cloning --- src/hooks/useSearchBulkActions.ts | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts index 564d144ce9b3..2b45ddcfb42c 100644 --- a/src/hooks/useSearchBulkActions.ts +++ b/src/hooks/useSearchBulkActions.ts @@ -136,21 +136,31 @@ function getAllTransactionsForDuplicate({ selectedTransactions, allTransactions, }: Pick): NonNullable> { - const allTransactionsForDuplicate = {...(allTransactions ?? {})}; + let missingSelectedTransactions: NonNullable> | undefined; for (const id of selectedTransactionsKeys) { const transactionKey = `${ONYXKEYS.COLLECTION.TRANSACTION}${id}`; - if (allTransactionsForDuplicate[transactionKey]) { + if (allTransactions?.[transactionKey]) { continue; } const transaction = selectedTransactions[id]?.transaction; - if (transaction) { - allTransactionsForDuplicate[transactionKey] = transaction; + if (!transaction) { + continue; } + + missingSelectedTransactions = missingSelectedTransactions ?? {}; + missingSelectedTransactions[transactionKey] = transaction; + } + + if (!missingSelectedTransactions) { + return allTransactions ?? {}; } - return allTransactionsForDuplicate; + return { + ...(allTransactions ?? {}), + ...missingSelectedTransactions, + }; } /** @@ -1685,5 +1695,5 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { } export default useSearchBulkActions; -export {getAllTransactionsForDuplicate, shouldShowBulkDuplicateOption}; +export {shouldShowBulkDuplicateOption}; export type {SearchHeaderOptionValue};