Share extension: pre-mount destination report and create expense before reveal transition

src/libs/Navigation/helpers/cleanupAndNavigateAfterExpenseCreate.ts

@@ -1,4 +1,6 @@
+import Log from '@libs/Log';
 import {getReportOrDraftReport, isMoneyRequestReport} from '@libs/ReportUtils';
+import {isTracking} from '@libs/telemetry/submitFollowUpAction';
 
 import CONST from '@src/CONST';
 import type {Report, ReportAction} from '@src/types/onyx';
@@ -19,6 +21,18 @@ type CleanupAndNavigateAfterExpenseCreateParams = {
     isInvoice?: boolean;
     linkedTrackedExpenseReportAction?: OnyxEntry<ReportAction>;
     action: DeepValueOf<typeof CONST.IOU.ACTION>;
+    /** When false, runs cleanup only — use when dismiss/reveal already handled navigation.
+     * IMPORTANT: Caller must own telemetry span lifecycle. SubmitExpenseOrchestrator starts
+     * SPAN_SUBMIT_EXPENSE before calling createTransaction; when shouldNavigate=false, caller
+     * is responsible for ending the span (see useExpenseSubmission createTransaction).
+     * Skips shouldWaitForUpcomingTransition, so transition never arrives (no 1s timeout).
+     */
+    shouldNavigate?: boolean;
+    /** Pre-computed navigation report ID. When provided, used instead of recomputing
+     * from report/backToReport/optimisticChatReportID to ensure UI and state register
+     * against the same destination.
+     */
+    navigationReportID?: string;
 };
 
 function cleanupAndNavigateAfterExpenseCreate({
@@ -31,14 +45,20 @@ function cleanupAndNavigateAfterExpenseCreate({
     isInvoice,
     linkedTrackedExpenseReportAction,
     action,
+    shouldNavigate = true,
+    navigationReportID,
 }: CleanupAndNavigateAfterExpenseCreateParams) {
+    if (__DEV__ && isTracking() && !shouldNavigate) {
+        Log.warn('[cleanupAndNavigateAfterExpenseCreate] shouldNavigate=false but span is active. Caller must own span lifecycle — miss this and span hangs 60s until dropped.');
+    }
+
     cleanupAfterExpenseCreate({
         draftTransactionIDs,
         linkedTrackedExpenseReportAction,
-        shouldWaitForUpcomingTransition: true,
+        shouldWaitForUpcomingTransition: shouldNavigate,
     });
 
-    const finalActiveReportID = backToReport ?? report?.reportID ?? optimisticChatReportID;
+    const finalActiveReportID = navigationReportID ?? backToReport ?? report?.reportID ?? optimisticChatReportID;
     const hasMultipleTransactions = isInvoice ? false : isMoneyRequestReport(finalActiveReportID === report?.reportID ? report : getReportOrDraftReport(finalActiveReportID));
     const shouldAddPendingNewTransactionIDs =
         action === CONST.IOU.ACTION.CATEGORIZE || action === CONST.IOU.ACTION.SHARE ? true : !isInvoice && !!finalActiveReportID && !hasMultipleTransactions;
@@ -50,6 +70,7 @@ function cleanupAndNavigateAfterExpenseCreate({
         isInvoice,
         hasMultipleTransactions,
         shouldAddPendingNewTransactionIDs,
+        shouldNavigate,
     });
 }