fix: clear pre-mount promotion marker after successful submit

Author: JakubKorytko

src/libs/actions/Report/index.ts

@@ -3089,6 +3089,15 @@ async function clearPromotedDraftReportForPreMount(reportID: string) {
     return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_PRE_MOUNT_PROMOTION}${reportID}`, null);
 }
 
+/**
+ * Clears only the promotion marker left by `promoteDraftReportForPreMount`, once the caller has handed off to the
+ * real submission for this reportID. The REPORT row is left alone - it is no longer speculative, and the real
+ * submission's own optimistic/success data owns it from here.
+ */
+function clearPromotedDraftReportPreMountMarker(reportID: string) {
+    return Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_PRE_MOUNT_PROMOTION}${reportID}`, null);
+}
+
 /**
  * Saves the comment left by the user as they are typing. By saving this data the user can switch between chats, close
  * tab, refresh etc without worrying about loosing what they typed out.
@@ -8564,6 +8573,7 @@ export {
     saveReportDraft,
     promoteDraftReportForPreMount,
     clearPromotedDraftReportForPreMount,
+    clearPromotedDraftReportPreMountMarker,
     moveIOUReportToPolicy,
     moveIOUReportToPolicyAndInviteSubmitter,
     convertIOUReportToExpenseReport,

src/pages/iou/request/step/IOURequestStepConfirmation.tsx

@@ -36,7 +36,7 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import {setMoneyRequestBillable, setMoneyRequestReimbursable} from '@libs/actions/IOU/MoneyRequest';
-import {clearPromotedDraftReportForPreMount, promoteDraftReportForPreMount} from '@libs/actions/Report';
+import {clearPromotedDraftReportForPreMount, clearPromotedDraftReportPreMountMarker, promoteDraftReportForPreMount} from '@libs/actions/Report';
 import {setTransactionReport} from '@libs/actions/Transaction';
 import {isMobileSafari} from '@libs/Browser';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
@@ -681,13 +681,21 @@ function IOURequestStepConfirmation({
             const promotedReportID = promotedDraftReportIDRef.current;
             // Read the latest submission state at cleanup time because submission can start or finish after this effect runs.
             const hasSubmitIntent = !!getPendingSubmitFollowUpAction();
+            if (!promotedReportID || promotedReportID !== preMountDestinationReportID || Navigation.getIsFullscreenPreInsertedUnderRHP()) {
+                return;
+            }
+
+            promotedDraftReportIDRef.current = undefined;
+
             // eslint-disable-next-line react-hooks/exhaustive-deps
-            if (!promotedReportID || promotedReportID !== preMountDestinationReportID || hasSubmitIntent || formHasBeenSubmitted.current || Navigation.getIsFullscreenPreInsertedUnderRHP()) {
+            if (hasSubmitIntent || formHasBeenSubmitted.current) {
+                // Submission owns the REPORT row from here - only drop the now-irrelevant promotion marker so
+                // startup cleanup does not mistake this now-real report for an interrupted speculative one.
+                clearPromotedDraftReportPreMountMarker(promotedReportID);
                 return;
             }
 
             clearPromotedDraftReportForPreMount(promotedReportID);
-            promotedDraftReportIDRef.current = undefined;
         };
     }, [preMountDestinationReportID, formHasBeenSubmitted]);