Fix bulk merge post-merge navigation to open target thread report

src/components/MoneyRequestHeaderSecondaryActions.tsx

@@ -32,6 +32,7 @@ import initSplitExpense from '@libs/actions/SplitExpenses';
 import {setNameValuePair} from '@libs/actions/User';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import {getExistingTransactionID} from '@libs/IOUUtils';
+import isSearchOriginForMerge from '@libs/Navigation/helpers/isSearchOriginForMerge';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList, RightModalNavigatorParamList} from '@libs/Navigation/types';
@@ -342,7 +343,7 @@ function MoneyRequestHeaderSecondaryActions({reportID, onBackButtonPress}: Money
                 if (!transaction) {
                     return;
                 }
-                const isOnSearch = route.name.toLowerCase().startsWith('search');
+                const isOnSearch = isSearchOriginForMerge(route.name, route.params?.backTo);
                 setupMergeTransactionDataAndNavigate(transaction.transactionID, [transaction], localeCompare, getCurrencyDecimals, [], false, isOnSearch);
             },
         },

src/components/MoneyRequestReportView/SelectionToolbar.tsx

@@ -28,6 +28,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {dismissRejectUseExplanation} from '@libs/actions/IOU/RejectMoneyRequest';
 import {queueExportSearchWithTemplate} from '@libs/actions/Search';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
+import isSearchTopmostFullScreenRoute from '@libs/Navigation/helpers/isSearchTopmostFullScreenRoute';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportsSplitNavigatorParamList} from '@libs/Navigation/types';
@@ -157,6 +158,7 @@ function SelectionToolbar({reportID, transactions, reportActions}: SelectionTool
         onExportOffline: () => setOfflineModalVisible(true),
         policy,
         beginExportWithTemplate: (templateName, templateType, transactionIDList) => beginExportWithTemplate(templateName, templateType, transactionIDList),
+        isOnSearch: isSearchTopmostFullScreenRoute(),
         onDeleteSelected,
     });
 

src/hooks/useAllTransactions.ts

@@ -31,10 +31,24 @@ function useAllTransactions() {
                 {} as Record<string, OnyxEntry<Transaction>>,
             );
 
-        return {
+        const mergedTransactions = {
             ...filteredSearchTransactions,
             ...allTransactionsCollection,
         };
+
+        for (const [key, snapshotTransaction] of Object.entries(filteredSearchTransactions)) {
+            const onyxTransaction = mergedTransactions[key];
+            if (!snapshotTransaction?.transactionThreadReportID || !onyxTransaction || onyxTransaction.transactionThreadReportID) {
+                continue;
+            }
+
+            mergedTransactions[key] = {
+                ...onyxTransaction,
+                transactionThreadReportID: snapshotTransaction.transactionThreadReportID,
+            };
+        }
+
+        return mergedTransactions;
     }, [currentSearchResults?.data, allTransactionsCollection]);
 
     return allTransactions;

src/hooks/useSearchBulkActions.ts

@@ -11,7 +11,8 @@ import {useSearchActionsContext, useSearchStateContext} from '@components/Search
 import type {BulkPaySelectionData, PaymentData, SearchQueryJSON} from '@components/Search/types';
 import {unholdRequest} from '@libs/actions/IOU/Hold';
 import {setupMergeTransactionDataAndNavigate} from '@libs/actions/MergeTransaction';
-import {deleteAppReport, markAsManuallyExported, moveIOUReportToPolicy, moveIOUReportToPolicyAndInviteSubmitter} from '@libs/actions/Report';
+import type {TargetTransactionThreadReportCandidate} from '@libs/actions/MergeTransaction';
+import {createTransactionThreadReport, deleteAppReport, markAsManuallyExported, moveIOUReportToPolicy, moveIOUReportToPolicyAndInviteSubmitter} from '@libs/actions/Report';
 import {
     approveMoneyRequestOnSearch,
     bulkDeleteReports,
@@ -32,7 +33,7 @@ import {
 } from '@libs/actions/Search';
 import initSplitExpense from '@libs/actions/SplitExpenses';
 import {setNameValuePair} from '@libs/actions/User';
-import {getTransactionsAndReportsFromSearch} from '@libs/MergeTransactionUtils';
+import {getTargetTransactionThreadReportIDForSelection, getTransactionsAndReportsFromSearch} from '@libs/MergeTransactionUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
 import {getSecondaryExportReportActions, isMergeActionForSelectedTransactions} from '@libs/ReportSecondaryActionUtils';
@@ -224,10 +225,12 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
     const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS);
     const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
     const {isBetaEnabled} = usePermissions();
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
 
     const defaultExpensePolicy = useDefaultExpensePolicy();
     const undeleteTransactions = useUndeleteTransactions();
@@ -1331,7 +1334,57 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
                         text: translate('common.merge'),
                         icon: expensifyIcons.ArrowCollapse,
                         value: CONST.SEARCH.BULK_ACTION_TYPES.MERGE,
-                        onSelected: () => setupMergeTransactionDataAndNavigate(transactionID, searchedTransactions, localeCompare, getCurrencyDecimals, reports, false, true),
+                        onSelected: () => {
+                            const transactionKey: `${typeof ONYXKEYS.COLLECTION.TRANSACTION}${string}` = `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`;
+                            const searchSnapshotTransaction = currentSearchResults?.data?.[transactionKey];
+                            const selectedTransactionInfo = selectedTransactions[transactionID];
+                            const isSingleSelection = selectedTransactionsKeys.length === 1;
+                            let targetTransactionThreadReportIDOverride = isSingleSelection
+                                ? getTargetTransactionThreadReportIDForSelection(searchSnapshotTransaction ?? searchedTransactions.at(0), selectedTransactionInfo)
+                                : undefined;
+
+                            if (!targetTransactionThreadReportIDOverride && isSingleSelection) {
+                                const selectedReport = selectedTransactionInfo?.report ?? reports.at(0) ?? getReportOrDraftReport(searchSnapshotTransaction?.reportID);
+                                const selectedReportAction = selectedTransactionInfo?.reportAction;
+                                const targetTransaction = searchSnapshotTransaction ?? searchedTransactions.at(0);
+                                const shouldPassTransactionData = !selectedReportAction?.reportActionID || targetTransaction?.reportID === CONST.REPORT.UNREPORTED_REPORT_ID;
+                                const transactionViolations = targetTransaction
+                                    ? allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${targetTransaction.transactionID}`]
+                                    : undefined;
+                                const createdThreadReport = targetTransaction
+                                    ? createTransactionThreadReport(
+                                          introSelected,
+                                          currentUserPersonalDetails.login ?? '',
+                                          currentUserPersonalDetails.accountID,
+                                          betas,
+                                          selectedReport,
+                                          selectedReportAction,
+                                          shouldPassTransactionData ? targetTransaction : undefined,
+                                          shouldPassTransactionData ? transactionViolations : undefined,
+                                      )
+                                    : undefined;
+                                targetTransactionThreadReportIDOverride = createdThreadReport?.reportID;
+                            }
+
+                            const targetTransactionThreadReportCandidate: TargetTransactionThreadReportCandidate | undefined = targetTransactionThreadReportIDOverride
+                                ? {
+                                      transactionID,
+                                      threadReportID: targetTransactionThreadReportIDOverride,
+                                  }
+                                : undefined;
+
+                            setupMergeTransactionDataAndNavigate(
+                                transactionID,
+                                searchedTransactions,
+                                localeCompare,
+                                getCurrencyDecimals,
+                                reports,
+                                false,
+                                true,
+                                undefined,
+                                targetTransactionThreadReportCandidate,
+                            );
+                        },
                     });
                 }
             }
@@ -1502,6 +1555,8 @@ function useSearchBulkActions({queryJSON}: UseSearchBulkActionsParams) {
         invokeDuplicateReportHandler,
         isExpenseReportType,
         handleDeleteSelectedTransactions,
+        introSelected,
+        betas,
         undeleteTransactions,
         currentUserPersonalDetails?.email,
         theme.icon,

src/hooks/useSelectedTransactionsActions.ts

@@ -7,9 +7,11 @@ import {useSearchActionsContext, useSearchStateContext} from '@components/Search
 import {initBulkEditDraftTransaction} from '@libs/actions/IOU/BulkEdit';
 import {unholdRequest} from '@libs/actions/IOU/Hold';
 import {setupMergeTransactionDataAndNavigate} from '@libs/actions/MergeTransaction';
-import {exportReportToCSV} from '@libs/actions/Report';
+import type {TargetTransactionThreadReportCandidate} from '@libs/actions/MergeTransaction';
+import {createTransactionThreadReport, exportReportToCSV} from '@libs/actions/Report';
 import {getExportTemplates, handlePreventSearchAPI} from '@libs/actions/Search';
 import initSplitExpense from '@libs/actions/SplitExpenses';
+import {getTargetTransactionThreadReportIDForSelection} from '@libs/MergeTransactionUtils';
 import Navigation, {navigationRef} from '@libs/Navigation/Navigation';
 import {getIOUActionForTransactionID, getReportAction, isDeletedAction} from '@libs/ReportActionsUtils';
 import {isMergeActionForSelectedTransactions, isSplitAction} from '@libs/ReportSecondaryActionUtils';
@@ -89,6 +91,8 @@ function useSelectedTransactionsActions({
     const [integrationsExportTemplates] = useOnyx(ONYXKEYS.NVP_INTEGRATION_SERVER_EXPORT_TEMPLATES);
     const [csvExportLayouts] = useOnyx(ONYXKEYS.NVP_CSV_EXPORT_LAYOUTS);
     const [allTransactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
+    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [allReportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS);
     const {getCurrencyDecimals} = useCurrencyListActions();
 
@@ -419,13 +423,45 @@ function useSelectedTransactionsActions({
 
         const canMergeTransaction = selectedTransactionsList.length < 3 && report && policy && isMergeActionForSelectedTransactions(selectedTransactionsList, [report], [policy]);
         if (canMergeTransaction) {
-            const transactionID = selectedTransactionsList.at(0)?.transactionID;
-            if (transactionID) {
+            const selectedTransaction = selectedTransactionsList.at(0);
+            const transactionID = selectedTransaction?.transactionID;
+            if (transactionID && selectedTransaction) {
                 options.push({
                     text: translate('common.merge'),
                     icon: expensifyIcons.ArrowCollapse,
                     value: MERGE,
-                    onSelected: () =>
+                    onSelected: () => {
+                        const isSingleSelection = selectedTransactionsList.length === 1;
+                        let targetTransactionThreadReportIDOverride: string | undefined;
+                        const iouReportAction = isSingleSelection ? getIOUActionForTransactionID(reportActions, transactionID) : undefined;
+
+                        if (isSingleSelection) {
+                            const selectedTransactionMeta = selectedTransactionsMeta?.[transactionID];
+                            targetTransactionThreadReportIDOverride = getTargetTransactionThreadReportIDForSelection(selectedTransaction, selectedTransactionMeta, iouReportAction);
+
+                            if (!targetTransactionThreadReportIDOverride) {
+                                const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`];
+                                const createdThreadReport = createTransactionThreadReport(
+                                    introSelected,
+                                    login ?? '',
+                                    currentUserAccountID,
+                                    betas,
+                                    report,
+                                    iouReportAction,
+                                    selectedTransaction,
+                                    transactionViolations,
+                                );
+                                targetTransactionThreadReportIDOverride = createdThreadReport?.reportID;
+                            }
+                        }
+
+                        const targetTransactionThreadReportCandidate: TargetTransactionThreadReportCandidate | undefined = targetTransactionThreadReportIDOverride
+                            ? {
+                                  transactionID,
+                                  threadReportID: targetTransactionThreadReportIDOverride,
+                              }
+                            : undefined;
+
                         setupMergeTransactionDataAndNavigate(
                             transactionID,
                             selectedTransactionsList,
@@ -435,7 +471,9 @@ function useSelectedTransactionsActions({
                             false,
                             isOnSearch,
                             selectedTransactionsList.length > 1 ? [policy, policy] : undefined,
-                        ),
+                            targetTransactionThreadReportCandidate,
+                        );
+                    },
                 });
             }
         }

src/libs/MergeTransactionUtils.ts

@@ -6,7 +6,7 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {MergeTransaction, Policy, Report, SearchResults, Transaction} from '@src/types/onyx';
+import type {MergeTransaction, Policy, Report, ReportAction, SearchResults, Transaction} from '@src/types/onyx';
 import type {Attendee} from '@src/types/onyx/IOU';
 import SafeString from '@src/utils/SafeString';
 import {convertToBackendAmount, convertToDisplayString} from './CurrencyUtils';
@@ -58,6 +58,11 @@ type MergeFieldData = {
 
 /** Type for merge transaction values that can be null to clear existing values in Onyx */
 type MergeTransactionUpdateValues = Partial<Record<keyof MergeTransaction, MergeTransaction[keyof MergeTransaction] | null>>;
+type TargetTransactionThreadReportIDSource = {
+    transaction?: OnyxEntry<Transaction>;
+    reportAction?: OnyxEntry<ReportAction>;
+    [key: string]: unknown;
+};
 
 const MERGE_FIELD_TRANSLATION_KEYS = {
     amount: 'iou.amount',
@@ -352,6 +357,43 @@ function getTransactionThreadReportID(transaction: OnyxEntry<Transaction>) {
     return iouActionOfTargetTransaction?.childReportID;
 }
 
+function isValidTargetTransactionThreadReportID(reportID: string | undefined) {
+    return !!reportID && reportID !== CONST.FAKE_REPORT_ID;
+}
+
+function getTargetTransactionThreadReportIDForSelection(
+    transaction: OnyxEntry<Transaction>,
+    selectedTransaction?: TargetTransactionThreadReportIDSource,
+    fallbackReportAction?: OnyxEntry<ReportAction>,
+) {
+    const selectedChildReportID = selectedTransaction?.reportAction?.childReportID;
+    if (isValidTargetTransactionThreadReportID(selectedChildReportID)) {
+        return selectedChildReportID;
+    }
+
+    const selectedTransactionThreadReportID = selectedTransaction?.transaction?.transactionThreadReportID;
+    if (isValidTargetTransactionThreadReportID(selectedTransactionThreadReportID)) {
+        return selectedTransactionThreadReportID;
+    }
+
+    const transactionThreadReportID = transaction?.transactionThreadReportID;
+    if (isValidTargetTransactionThreadReportID(transactionThreadReportID)) {
+        return transactionThreadReportID;
+    }
+
+    const fallbackChildReportID = fallbackReportAction?.childReportID;
+    if (isValidTargetTransactionThreadReportID(fallbackChildReportID)) {
+        return fallbackChildReportID;
+    }
+
+    const computedThreadReportID = getTransactionThreadReportID(transaction);
+    return isValidTargetTransactionThreadReportID(computedThreadReportID) ? computedThreadReportID : undefined;
+}
+
+function getTargetTransactionThreadReportIDForSearchSelection(transaction: OnyxEntry<Transaction>, selectedTransaction?: TargetTransactionThreadReportIDSource) {
+    return getTargetTransactionThreadReportIDForSelection(transaction, selectedTransaction);
+}
+
 /**
  * Build the merged transaction data for display by combining target transaction with merge transaction updates
  * @param targetTransaction - The target transaction to merge into
@@ -694,6 +736,8 @@ export {
     areTransactionsEligibleForMerge,
     DERIVED_MERGE_FIELDS,
     getRateFromMerchant,
+    getTargetTransactionThreadReportIDForSelection,
+    getTargetTransactionThreadReportIDForSearchSelection,
     getTransactionsAndReportsFromSearch,
 };
 

src/libs/Navigation/helpers/isSearchOriginForMerge.ts

@@ -0,0 +1,34 @@
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import isSearchTopmostFullScreenRoute from './isSearchTopmostFullScreenRoute';
+
+function normalizeRoute(route?: string): string | undefined {
+    if (!route) {
+        return undefined;
+    }
+
+    const decodedRoute = (() => {
+        try {
+            return decodeURIComponent(route);
+        } catch {
+            return route;
+        }
+    })();
+
+    return decodedRoute.startsWith('/') ? decodedRoute.substring(1) : decodedRoute;
+}
+
+function isSearchOriginForMerge(routeName: string, backTo?: string): boolean {
+    if (routeName !== SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
+        return false;
+    }
+
+    const normalizedBackTo = normalizeRoute(backTo);
+    if (normalizedBackTo) {
+        return normalizedBackTo.startsWith(ROUTES.SEARCH_ROOT.route);
+    }
+
+    return isSearchTopmostFullScreenRoute();
+}
+
+export default isSearchOriginForMerge;