diff --git a/src/hooks/useExportActions.ts b/src/hooks/useExportActions.ts index a0e0a2dc0e6f..e93cc8de31ff 100644 --- a/src/hooks/useExportActions.ts +++ b/src/hooks/useExportActions.ts @@ -133,7 +133,7 @@ function useExportActions({reportID, policy, onPDFModalOpen}: UseExportActionsPa jsonQuery: '{}', reportIDList: [moneyRequestReport.reportID], transactionIDList, - policyID, + policyID: policyID ?? moneyRequestReport.policyID, }); }; diff --git a/src/hooks/useSearchBulkActions.ts b/src/hooks/useSearchBulkActions.ts index 0d9979a4d76c..94087e10aea4 100644 --- a/src/hooks/useSearchBulkActions.ts +++ b/src/hooks/useSearchBulkActions.ts @@ -478,6 +478,10 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { return; } + const selectedPolicyID = selectedPolicyIDs.length === 1 ? selectedPolicyIDs.at(0) : undefined; + const queryPolicyID = queryJSON?.policyID?.length === 1 ? queryJSON.policyID.at(0) : undefined; + const exportPolicyID = policyID ?? (areAllMatchingItemsSelected ? queryPolicyID : selectedPolicyID); + if (areAllMatchingItemsSelected) { queueExportSearchWithTemplate({ templateName, @@ -485,7 +489,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { jsonQuery: queryJSON ? serializeQueryJSONForBackend(queryJSON) : JSON.stringify(queryJSON), reportIDList: [], transactionIDList: [], - policyID, + policyID: exportPolicyID, }); } else { queueExportSearchWithTemplate({ @@ -494,7 +498,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { jsonQuery: '{}', reportIDList: selectedTransactionReportIDs, transactionIDList: selectedTransactionsKeys, - policyID, + policyID: exportPolicyID, }); } @@ -520,6 +524,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) { queryJSON, selectedTransactionReportIDs, selectedTransactionsKeys, + selectedPolicyIDs, ], );