Merge pull request #93091 from Expensify/revert-92131-fix/issue-89388

Revert "fix: pass workspace policyID when exporting with account-level custom templates"

(cherry picked from commit 5f4c382)

(cherry-picked to staging by Julesssss)

Author: Julesssss

src/hooks/useExportActions.ts

@@ -133,7 +133,7 @@ function useExportActions({reportID, policy, onPDFModalOpen}: UseExportActionsPa
             jsonQuery: '{}',
             reportIDList: [moneyRequestReport.reportID],
             transactionIDList,
-            policyID: policyID ?? moneyRequestReport.policyID,
+            policyID,
         });
     };
 

src/hooks/useSearchBulkActions.ts

@@ -551,22 +551,14 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             }
             const serializedQuery = queryJSON ? serializeQueryJSONForBackend(queryJSON) : JSON.stringify(queryJSON);
 
-            // Only fall back to the selection's policyID when every selected transaction belongs to the same real workspace.
-            // selectedPolicyIDs filters out falsy policyIDs, so a mix of one workspace expense and policy-less (personal/unreported)
-            // expenses would otherwise collapse to a single ID and incorrectly resolve GL codes against that workspace.
-            const allSelectedHavePolicy = Object.values(selectedTransactions).every((transaction) => !!transaction.policyID);
-            const selectedPolicyID = allSelectedHavePolicy && 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,
                     templateType,
                     jsonQuery: serializedQuery,
                     reportIDList: [],
                     transactionIDList: [],
-                    policyID: exportPolicyID,
+                    policyID,
                 });
             } else {
                 const isGroupExport = !!queryJSON?.groupBy && selectedTransactionsKeys.some((key) => key.startsWith(CONST.SEARCH.GROUP_PREFIX));
@@ -576,7 +568,7 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                     jsonQuery: isGroupExport ? serializeQueryJSONForBackend(addSelectedGroupsFilter(queryJSON, selectedTransactions, currentSearchResults?.data)) : '{}',
                     reportIDList: isGroupExport ? [] : selectedTransactionReportIDs,
                     transactionIDList: isGroupExport ? [] : selectedTransactionsKeys,
-                    policyID: exportPolicyID,
+                    policyID,
                 });
             }
 
@@ -603,7 +595,6 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
             queryJSON,
             selectedTransactionReportIDs,
             selectedTransactionsKeys,
-            selectedPolicyIDs,
         ],
     );