From 80d204911dada1e33db59b6a60da870b613b75d6 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 30 Apr 2026 14:53:37 +0200
Subject: [PATCH 01/33] feat: add shared scan utilities

---
 .../components/GpsPermissionGate.tsx          | 42 ++++++++++++++
 .../hooks/useScanCapture.ts                   | 19 ++++++
 .../utils/buildReceiptFiles.ts                | 58 +++++++++++++++++++
 .../IOURequestStepScan/utils/getFileSource.ts | 11 ++++
 .../utils/startScanProcessSpan.ts             | 16 +++++
 .../utils/useScanFileReadabilityCheck.ts      | 50 ++++++++++++++++
 6 files changed, 196 insertions(+)
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate.tsx
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan.ts
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate.tsx
new file mode 100644
index 000000000000..05c81ff06e0f
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate.tsx
@@ -0,0 +1,42 @@
+import React from 'react';
+import LocationPermissionModal from '@components/LocationPermissionModal';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import {updateLastLocationPermissionPrompt} from '@userActions/IOU';
+
+type GpsPermissionGateProps = {
+    /** Whether the GPS permission flow is active */
+    startLocationPermissionFlow: boolean;
+
+    /** Receipt files awaiting confirmation */
+    receiptFiles: ReceiptFile[];
+
+    /** Resets the permission flow state */
+    resetPermissionFlow: () => void;
+
+    /** Called when GPS permission is granted or denied, with the receipt files and grant status */
+    onComplete: (files: ReceiptFile[], locationPermissionGranted: boolean) => void;
+};
+
+/**
+ * Pure gate component that renders a LocationPermissionModal when GPS permission
+ * is needed for distance-based receipt processing.
+ */
+function GpsPermissionGate({startLocationPermissionFlow, receiptFiles, resetPermissionFlow, onComplete}: GpsPermissionGateProps) {
+    if (!startLocationPermissionFlow || !receiptFiles.length) {
+        return null;
+    }
+
+    return (
+        <LocationPermissionModal
+            startPermissionFlow={startLocationPermissionFlow}
+            resetPermissionFlow={resetPermissionFlow}
+            onGrant={() => onComplete(receiptFiles, true)}
+            onDeny={() => {
+                updateLastLocationPermissionPrompt();
+                onComplete(receiptFiles, false);
+            }}
+        />
+    );
+}
+
+export default GpsPermissionGate;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts b/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts
new file mode 100644
index 000000000000..7048e37b2cc6
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts
@@ -0,0 +1,19 @@
+import useFilesValidation from '@hooks/useFilesValidation';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+/**
+ * Wraps useFilesValidation for scan-specific file capture.
+ * Validates files (type, size, HEIC conversion, PDF thumbnails) and calls
+ * the provided callback with the validated files.
+ */
+function useScanCapture(onFilesValidated: (files: FileObject[], dataTransferItems: DataTransferItem[]) => void) {
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation(onFilesValidated);
+
+    return {
+        validateFiles,
+        PDFValidationComponent,
+        ErrorModal,
+    };
+}
+
+export default useScanCapture;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
new file mode 100644
index 000000000000..b42368946ded
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
@@ -0,0 +1,58 @@
+import type {OnyxEntry} from 'react-native-onyx';
+import {shouldReuseInitialTransaction} from '@libs/TransactionUtils';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
+import {buildOptimisticTransactionAndCreateDraft} from '@userActions/TransactionEdit';
+import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
+import type Transaction from '@src/types/onyx/Transaction';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+type BuildReceiptFilesParams = {
+    files: FileObject[];
+    getFileSource: (file: FileObject) => string;
+    initialTransaction: OnyxEntry<Transaction>;
+    initialTransactionID: string;
+    currentUserPersonalDetails: CurrentUserPersonalDetails;
+    reportID: string;
+    shouldAcceptMultipleFiles: boolean;
+    isMultiScanEnabled: boolean;
+    transactions: Transaction[];
+};
+
+/**
+ * Builds ReceiptFile[] from captured/picked files, creating optimistic transaction drafts as needed
+ * and storing receipts in Onyx via setMoneyRequestReceipt.
+ */
+function buildReceiptFiles({
+    files,
+    getFileSource,
+    initialTransaction,
+    initialTransactionID,
+    currentUserPersonalDetails,
+    reportID,
+    shouldAcceptMultipleFiles,
+    isMultiScanEnabled,
+    transactions,
+}: BuildReceiptFilesParams): ReceiptFile[] {
+    const receiptFiles: ReceiptFile[] = [];
+
+    for (const [index, file] of files.entries()) {
+        const source = getFileSource(file);
+        const transaction = shouldReuseInitialTransaction(initialTransaction, shouldAcceptMultipleFiles, index, isMultiScanEnabled, transactions)
+            ? initialTransaction
+            : buildOptimisticTransactionAndCreateDraft({
+                  initialTransaction: initialTransaction as Partial<Transaction>,
+                  currentUserPersonalDetails,
+                  reportID,
+              });
+
+        const transactionID = transaction?.transactionID ?? initialTransactionID;
+        receiptFiles.push({file, source, transactionID});
+        setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
+    }
+
+    return receiptFiles;
+}
+
+export default buildReceiptFiles;
+export type {BuildReceiptFilesParams};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts
new file mode 100644
index 000000000000..3fd9ee4ae6ca
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/getFileSource.ts
@@ -0,0 +1,11 @@
+import type {FileObject} from '@src/types/utils/Attachment';
+
+/**
+ * Returns a source URI for the given file.
+ * On native, files have a `uri` property; on web, we create a blob URL.
+ */
+function getFileSource(file: FileObject): string {
+    return file.uri ?? URL.createObjectURL(file as Blob);
+}
+
+export default getFileSource;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan.ts
new file mode 100644
index 000000000000..8ac2b83499f1
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan.ts
@@ -0,0 +1,16 @@
+import {getSpan, startSpan} from '@libs/telemetry/activeSpans';
+import CONST from '@src/CONST';
+
+/**
+ * Starts the scan-process-and-navigate telemetry span as a child of the shutter-to-confirmation span.
+ */
+function startScanProcessSpan(isMultiScanEnabled: boolean) {
+    startSpan(CONST.TELEMETRY.SPAN_SCAN_PROCESS_AND_NAVIGATE, {
+        name: CONST.TELEMETRY.SPAN_SCAN_PROCESS_AND_NAVIGATE,
+        op: CONST.TELEMETRY.SPAN_SCAN_PROCESS_AND_NAVIGATE,
+        parentSpan: getSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION),
+        attributes: {[CONST.TELEMETRY.ATTRIBUTE_IS_MULTI_SCAN]: isMultiScanEnabled},
+    });
+}
+
+export default startScanProcessSpan;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts
new file mode 100644
index 000000000000..a50b4eeb6a93
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts
@@ -0,0 +1,50 @@
+import {useEffect, useRef} from 'react';
+import {isLocalFile} from '@libs/fileDownload/FileUtils';
+import {checkIfLocalFileIsAccessible} from '@userActions/IOU/Receipt';
+import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
+import CONST from '@src/CONST';
+import type Transaction from '@src/types/onyx/Transaction';
+
+/**
+ * On mount, verifies that all local receipt files (blob:// URLs) are still readable.
+ * If the browser was refreshed, blob URLs cease to exist — this resets the scan flow
+ * so the user can start over rather than seeing broken images.
+ */
+function useScanFileReadabilityCheck(transactions: Array<Partial<Transaction>>, draftTransactionIDs: string[], setIsMultiScanEnabled: (value: boolean) => void) {
+    const hasValidated = useRef(false);
+
+    useEffect(() => {
+        if (hasValidated.current) {
+            return;
+        }
+        hasValidated.current = true;
+
+        let isAllScanFilesCanBeRead = true;
+
+        Promise.all(
+            transactions.map((item) => {
+                const itemReceiptPath = item.receipt?.source;
+                const isLocal = isLocalFile(itemReceiptPath);
+
+                if (!isLocal) {
+                    return Promise.resolve();
+                }
+
+                const onFailure = () => {
+                    isAllScanFilesCanBeRead = false;
+                };
+
+                return checkIfLocalFileIsAccessible(item.receipt?.filename, itemReceiptPath, item.receipt?.type, () => {}, onFailure);
+            }),
+        ).then(() => {
+            if (isAllScanFilesCanBeRead) {
+                return;
+            }
+            setIsMultiScanEnabled(false);
+            removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
+            removeDraftTransactionsByIDs(draftTransactionIDs, true);
+        });
+    }, [setIsMultiScanEnabled, transactions, draftTransactionIDs]);
+}
+
+export default useScanFileReadabilityCheck;

From 44124b2536b7ed3a0ec52ae8187b6fc7e3148e3b Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 30 Apr 2026 16:56:13 +0200
Subject: [PATCH 02/33] feat: add separate variants

---
 .../step/IOURequestStepScan/ScanRouter.tsx    | 103 +++
 .../components/DesktopWebUploadView.tsx       | 134 ----
 .../components/MobileWebCameraView.tsx        | 410 ------------
 .../components/ScanEditReceipt.tsx            |  72 ++
 .../components/ScanFromReport.tsx             |  93 +++
 .../components/ScanGlobalCreate.tsx           | 133 ++++
 .../components/ScanSkipConfirmation.tsx       | 251 +++++++
 .../step/IOURequestStepScan/index.native.tsx  | 616 ------------------
 .../request/step/IOURequestStepScan/index.tsx | 209 +-----
 9 files changed, 670 insertions(+), 1351 deletions(-)
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
 delete mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
 delete mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/MobileWebCameraView.tsx
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
 delete mode 100644 src/pages/iou/request/step/IOURequestStepScan/index.native.tsx

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
new file mode 100644
index 000000000000..b50ed7f0087c
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -0,0 +1,103 @@
+import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import useOnyx from '@hooks/useOnyx';
+import usePolicy from '@hooks/usePolicy';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import {isPolicyExpenseChat} from '@libs/ReportUtils';
+import ScanEditReceipt from '@pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt';
+import ScanFromReport from '@pages/iou/request/step/IOURequestStepScan/components/ScanFromReport';
+import ScanGlobalCreate from '@pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate';
+import ScanSkipConfirmation from '@pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation';
+import CONST from '@src/CONST';
+import type {IOUAction, IOUType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import type {Report} from '@src/types/onyx';
+import type Transaction from '@src/types/onyx/Transaction';
+
+type ScanRouterProps = {
+    report: OnyxEntry<Report>;
+    action: IOUAction;
+    iouType: IOUType;
+    reportID: string;
+    transactionID: string;
+    transaction: OnyxEntry<Transaction>;
+    backTo: Route | undefined;
+    backToReport: string | undefined;
+};
+
+/**
+ * ScanRouter — thin routing layer that selects the appropriate scan variant
+ * based on route params and transaction state.
+ *
+ * Variant selection:
+ *   Edit       — replacing an existing receipt (backTo or isEditing)
+ *   SkipConfirm — quick action with skipConfirmation flag (direct submit)
+ *   FromReport — initiated from report (+) button (sets participants, shows confirmation)
+ *   GlobalCreate — FAB (+) global create (auto-selects workspace or shows participant picker)
+ */
+function ScanRouter({report, action, iouType, reportID, transactionID, transaction, backTo, backToReport}: ScanRouterProps) {
+    const policy = usePolicy(report?.policyID);
+    const isArchived = useReportIsArchived(report?.reportID);
+    const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`);
+
+    const isEditing = action === CONST.IOU.ACTION.EDIT;
+
+    // Edit/replace receipt flow
+    if (backTo || isEditing) {
+        return (
+            <ScanEditReceipt
+                report={report}
+                transactionID={transactionID}
+                backTo={backTo}
+            />
+        );
+    }
+
+    const isFromGlobalCreate = !!transaction?.isFromGlobalCreate;
+    const shouldSkipConfirmation =
+        !!skipConfirmation && !!report?.reportID && !isArchived && !(isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
+
+    // From-report flows (not global create, not archived)
+    if (!isFromGlobalCreate && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
+        if (shouldSkipConfirmation) {
+            return (
+                <ScanSkipConfirmation
+                    report={report}
+                    iouType={iouType}
+                    reportID={reportID}
+                    transactionID={transactionID}
+                    transaction={transaction}
+                    backToReport={backToReport}
+                />
+            );
+        }
+
+        return (
+            <ScanFromReport
+                report={report}
+                iouType={iouType}
+                reportID={reportID}
+                transactionID={transactionID}
+                transaction={transaction}
+                backToReport={backToReport}
+            />
+        );
+    }
+
+    // Global create flow (FAB or archived report)
+    return (
+        <ScanGlobalCreate
+            report={report}
+            iouType={iouType}
+            reportID={reportID}
+            transactionID={transactionID}
+            transaction={transaction}
+            backToReport={backToReport}
+        />
+    );
+}
+
+ScanRouter.displayName = 'ScanRouter';
+
+export default ScanRouter;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
deleted file mode 100644
index 0ffdd14ca9e3..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
+++ /dev/null
@@ -1,134 +0,0 @@
-import React, {useRef, useState} from 'react';
-import {PanResponder, View} from 'react-native';
-import AttachmentPicker from '@components/AttachmentPicker';
-import Button from '@components/Button';
-import DragAndDropConsumer from '@components/DragAndDrop/Consumer';
-import {useDragAndDropState} from '@components/DragAndDrop/Provider';
-import DropZoneUI from '@components/DropZone/DropZoneUI';
-import Icon from '@components/Icon';
-import ReceiptAlternativeMethods from '@components/ReceiptAlternativeMethods';
-import Text from '@components/Text';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
-import CONST from '@src/CONST';
-import type {FileObject} from '@src/types/utils/Attachment';
-
-type DesktopWebUploadViewProps = {
-    PDFValidationComponent: React.ReactNode;
-    shouldAcceptMultipleFiles: boolean;
-    isReplacingReceipt: boolean;
-    validateFiles: (files: FileObject[], items?: DataTransferItem[]) => void;
-    onBackButtonPress: () => void;
-    shouldShowWrapper: boolean;
-};
-
-function DesktopWebUploadView({PDFValidationComponent, shouldAcceptMultipleFiles, isReplacingReceipt, validateFiles, onBackButtonPress, shouldShowWrapper}: DesktopWebUploadViewProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const lazyIllustrations = useMemoizedLazyIllustrations(['ReceiptStack']);
-    const lazyIcons = useMemoizedLazyExpensifyIcons(['ReplaceReceipt', 'SmartScan']);
-    const panResponder = useRef(
-        PanResponder.create({
-            onPanResponderTerminationRequest: () => false,
-        }),
-    ).current;
-
-    const {isDraggingOver} = useDragAndDropState();
-    const [containerHeight, setContainerHeight] = useState(0);
-    const [desktopUploadViewHeight, setDesktopUploadViewHeight] = useState(0);
-    const [alternativeMethodsHeight, setAlternativeMethodsHeight] = useState(0);
-    const chooseFilesPaddingVertical = Number(styles.chooseFilesView(false).paddingVertical);
-    const shouldHideAlternativeMethods = alternativeMethodsHeight + desktopUploadViewHeight + chooseFilesPaddingVertical * 2 > containerHeight;
-
-    const handleDropReceipt = (e: DragEvent) => {
-        const files = Array.from(e?.dataTransfer?.files ?? []);
-        if (files.length === 0) {
-            return;
-        }
-        for (const file of files) {
-            file.uri = URL.createObjectURL(file);
-        }
-
-        validateFiles(files, Array.from(e.dataTransfer?.items ?? []));
-    };
-
-    return (
-        <StepScreenDragAndDropWrapper
-            headerTitle={translate('common.receipt')}
-            onBackButtonPress={onBackButtonPress}
-            shouldShowWrapper={shouldShowWrapper}
-            testID="IOURequestStepScan"
-        >
-            {(isDraggingOverWrapper) => (
-                <View
-                    onLayout={(event) => {
-                        setContainerHeight(event.nativeEvent.layout.height);
-                    }}
-                    style={[styles.flex1, styles.chooseFilesView(false)]}
-                >
-                    <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                        {!(isDraggingOver ?? isDraggingOverWrapper) && (
-                            <View
-                                style={[styles.alignItemsCenter, styles.justifyContentCenter]}
-                                onLayout={(e) => {
-                                    setDesktopUploadViewHeight(e.nativeEvent.layout.height);
-                                }}
-                            >
-                                {PDFValidationComponent}
-                                <Icon
-                                    src={lazyIllustrations.ReceiptStack}
-                                    width={CONST.RECEIPT.ICON_SIZE}
-                                    height={CONST.RECEIPT.ICON_SIZE}
-                                />
-                                <View
-                                    style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
-                                    {...panResponder.panHandlers}
-                                >
-                                    <Text style={[styles.textFileUpload, styles.mb2]}>{translate(shouldAcceptMultipleFiles ? 'receipt.uploadMultiple' : 'receipt.upload')}</Text>
-                                    <Text style={[styles.textLabelSupporting, styles.textAlignCenter, styles.lineHeightLarge]}>
-                                        {translate(shouldAcceptMultipleFiles ? 'receipt.desktopSubtitleMultiple' : 'receipt.desktopSubtitleSingle')}
-                                    </Text>
-                                </View>
-
-                                <AttachmentPicker allowMultiple={shouldAcceptMultipleFiles}>
-                                    {({openPicker}) => (
-                                        <Button
-                                            success
-                                            text={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
-                                            accessibilityLabel={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
-                                            style={[styles.p5]}
-                                            onPress={() => {
-                                                openPicker({
-                                                    onPicked: (data) => validateFiles(data),
-                                                });
-                                            }}
-                                            sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
-                                        />
-                                    )}
-                                </AttachmentPicker>
-                            </View>
-                        )}
-                    </View>
-                    <DragAndDropConsumer onDrop={handleDropReceipt}>
-                        <DropZoneUI
-                            icon={isReplacingReceipt ? lazyIcons.ReplaceReceipt : lazyIcons.SmartScan}
-                            dropStyles={styles.receiptDropOverlay(true)}
-                            dropTitle={isReplacingReceipt ? translate('dropzone.replaceReceipt') : translate(shouldAcceptMultipleFiles ? 'dropzone.scanReceipts' : 'quickAction.scanReceipt')}
-                            dropTextStyles={styles.receiptDropText}
-                            dashedBorderStyles={[styles.dropzoneArea, styles.easeInOpacityTransition, styles.activeDropzoneDashedBorder(theme.receiptDropBorderColorActive, true)]}
-                        />
-                    </DragAndDropConsumer>
-                    {!shouldHideAlternativeMethods && <ReceiptAlternativeMethods onLayout={(e) => setAlternativeMethodsHeight(e.nativeEvent.layout.height)} />}
-                </View>
-            )}
-        </StepScreenDragAndDropWrapper>
-    );
-}
-
-export default DesktopWebUploadView;
-export type {DesktopWebUploadViewProps};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/MobileWebCameraView.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/MobileWebCameraView.tsx
deleted file mode 100644
index 5a00a1d479ce..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/components/MobileWebCameraView.tsx
+++ /dev/null
@@ -1,410 +0,0 @@
-import React, {useCallback} from 'react';
-import {StyleSheet, View} from 'react-native';
-import type {OnyxEntry} from 'react-native-onyx';
-import Animated from 'react-native-reanimated';
-import ActivityIndicator from '@components/ActivityIndicator';
-import AttachmentPicker from '@components/AttachmentPicker';
-import Button from '@components/Button';
-import FeatureTrainingModal from '@components/FeatureTrainingModal';
-import Icon from '@components/Icon';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import RenderHTML from '@components/RenderHTML';
-import Text from '@components/Text';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
-import useLocalize from '@hooks/useLocalize';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWebCamera from '@hooks/useWebCamera';
-import {base64ToFile} from '@libs/fileDownload/FileUtils';
-import {cancelSpan, endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
-import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan';
-import {cropImageToAspectRatio} from '@pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio';
-import type {ImageObject} from '@pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio';
-import useMobileReceiptScan from '@pages/iou/request/step/IOURequestStepScan/hooks/useMobileReceiptScan';
-import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
-import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper';
-import variables from '@styles/variables';
-import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
-import {buildOptimisticTransactionAndCreateDraft} from '@userActions/TransactionEdit';
-import CONST from '@src/CONST';
-import type {IOUType} from '@src/CONST';
-import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
-import type Transaction from '@src/types/onyx/Transaction';
-import type {FileObject} from '@src/types/utils/Attachment';
-import {isEmptyObject} from '@src/types/utils/EmptyObject';
-import NavigationAwareCamera from './NavigationAwareCamera/WebCamera';
-import ReceiptPreviews from './ReceiptPreviews';
-
-type MobileWebCameraViewProps = {
-    initialTransaction: OnyxEntry<Transaction>;
-    initialTransactionID: string;
-    iouType: IOUType;
-    currentUserPersonalDetails: CurrentUserPersonalDetails;
-    reportID: string;
-    isMultiScanEnabled: boolean;
-    isStartingScan: boolean;
-    updateScanAndNavigate: (file: FileObject, source: string) => void;
-    setIsMultiScanEnabled: (value: boolean) => void;
-    PDFValidationComponent: React.ReactNode;
-    shouldAcceptMultipleFiles: boolean;
-    receiptFiles: ReceiptFile[];
-    isEditing: boolean;
-    validateFiles: (files: FileObject[], items?: DataTransferItem[]) => void;
-    setReceiptFiles: React.Dispatch<React.SetStateAction<ReceiptFile[]>>;
-    navigateToConfirmationStep: (files: ReceiptFile[], locationPermissionGranted?: boolean, isTestTransaction?: boolean) => void;
-    shouldSkipConfirmation: boolean;
-    setStartLocationPermissionFlow: (value: boolean) => void;
-    onBackButtonPress: () => void;
-    shouldShowWrapper: boolean;
-};
-
-function MobileWebCameraView({
-    initialTransaction,
-    initialTransactionID,
-    iouType,
-    currentUserPersonalDetails,
-    reportID,
-    isMultiScanEnabled,
-    isStartingScan,
-    updateScanAndNavigate,
-    setIsMultiScanEnabled,
-    PDFValidationComponent,
-    shouldAcceptMultipleFiles,
-    receiptFiles,
-    isEditing,
-    validateFiles,
-    setReceiptFiles,
-    navigateToConfirmationStep,
-    shouldSkipConfirmation,
-    setStartLocationPermissionFlow,
-    onBackButtonPress,
-    shouldShowWrapper,
-}: MobileWebCameraViewProps) {
-    const {blinkStyle, canUseMultiScan, shouldShowMultiScanEducationalPopup, showBlink, toggleMultiScan, dismissMultiScanEducationalPopup, submitReceipts, submitMultiScanReceipts} =
-        useMobileReceiptScan({
-            initialTransaction,
-            iouType,
-            isMultiScanEnabled,
-            isStartingScan,
-            receiptFiles,
-            navigateToConfirmationStep,
-            shouldSkipConfirmation,
-            setStartLocationPermissionFlow,
-            setIsMultiScanEnabled,
-            setReceiptFiles,
-        });
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const {translate} = useLocalize();
-    const lazyIllustrations = useMemoizedLazyIllustrations(['MultiScan', 'Hand', 'Shutter']);
-    const lazyIcons = useMemoizedLazyExpensifyIcons(['Bolt', 'Gallery', 'ReceiptMultiple', 'boltSlash']);
-
-    const onUnmount = useCallback(() => {
-        cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
-        cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-    }, []);
-
-    const {
-        cameraRef,
-        viewfinderLayout,
-        cameraPermissionState,
-        setCameraPermissionState,
-        isFlashLightOn,
-        toggleFlashlight,
-        isTorchAvailable,
-        isQueriedPermissionState,
-        videoConstraints,
-        requestCameraPermission,
-        setupCameraPermissionsAndCapabilities,
-        capturePhotoWithFlash,
-    } = useWebCamera({onUnmount});
-
-    const onCapture = (file: FileObject, filename: string, source: string) => {
-        const transaction =
-            isMultiScanEnabled && initialTransaction?.receipt?.source
-                ? buildOptimisticTransactionAndCreateDraft({
-                      initialTransaction,
-                      currentUserPersonalDetails,
-                      reportID,
-                  })
-                : initialTransaction;
-        const transactionID = transaction?.transactionID ?? initialTransactionID;
-        const newReceiptFiles = [...receiptFiles, {file, source, transactionID}];
-
-        setMoneyRequestReceipt(transactionID, source, filename, !isEditing, file.type);
-        setReceiptFiles(newReceiptFiles);
-
-        if (isMultiScanEnabled) {
-            return;
-        }
-
-        if (isEditing) {
-            updateScanAndNavigate(file, source);
-            return;
-        }
-
-        submitReceipts(newReceiptFiles);
-    };
-
-    const getScreenshot = () => {
-        if (!cameraRef.current) {
-            requestCameraPermission();
-            return;
-        }
-
-        if (!isMultiScanEnabled) {
-            startSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION, {
-                name: CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION,
-                op: CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION,
-                attributes: {[CONST.TELEMETRY.ATTRIBUTE_PLATFORM]: 'web'},
-            });
-        }
-        startSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE, {
-            name: CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE,
-            op: CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE,
-            parentSpan: getSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION),
-            attributes: {[CONST.TELEMETRY.ATTRIBUTE_PLATFORM]: 'web'},
-        });
-
-        const imageBase64 = cameraRef.current.getScreenshot();
-
-        if (imageBase64 === null) {
-            cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-            cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
-            return;
-        }
-
-        if (isMultiScanEnabled) {
-            showBlink();
-        }
-
-        const originalFileName = `receipt_${Date.now()}.png`;
-        const originalFile = base64ToFile(imageBase64 ?? '', originalFileName);
-
-        if (originalFile.size === 0) {
-            cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-            cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
-            return;
-        }
-
-        const imageObject: ImageObject = {file: originalFile, filename: originalFile.name, source: URL.createObjectURL(originalFile)};
-        // Some browsers center-crop the viewfinder inside the video element (due to object-position: center),
-        // while other browsers let the video element overflow and the container crops it from the top.
-        // We crop and align the result image the same way.
-        const videoHeight = cameraRef.current.video?.getBoundingClientRect?.()?.height ?? NaN;
-        const viewFinderHeight = viewfinderLayout.current?.height ?? NaN;
-        const shouldAlignTop = videoHeight > viewFinderHeight;
-        cropImageToAspectRatio(imageObject, viewfinderLayout.current?.width, viewfinderLayout.current?.height, shouldAlignTop).then(({file, filename, source}) => {
-            endSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-            onCapture(file, filename, source);
-        });
-    };
-
-    const capturePhoto = () => {
-        capturePhotoWithFlash(getScreenshot);
-    };
-
-    return (
-        <StepScreenWrapper
-            headerTitle={translate('common.receipt')}
-            onBackButtonPress={onBackButtonPress}
-            shouldShowWrapper={shouldShowWrapper}
-            testID="IOURequestStepScan"
-        >
-            <View style={[styles.flex1]}>
-                <View style={[styles.flex1, styles.justifyContentCenter]}>
-                    <View style={[styles.cameraView]}>
-                        {PDFValidationComponent}
-                        {((cameraPermissionState === 'prompt' && !isQueriedPermissionState) || (cameraPermissionState === 'granted' && isEmptyObject(videoConstraints))) && (
-                            <ActivityIndicator
-                                size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                                style={[styles.flex1]}
-                                color={theme.textSupporting}
-                                reasonAttributes={
-                                    {
-                                        context: 'MobileWebCameraView',
-                                        cameraPermissionState,
-                                        isQueriedPermissionState,
-                                    } satisfies SkeletonSpanReasonAttributes
-                                }
-                            />
-                        )}
-                        {cameraPermissionState !== 'granted' && isQueriedPermissionState && (
-                            <View style={[styles.flex1, styles.permissionView, styles.userSelectNone]}>
-                                <Icon
-                                    src={lazyIllustrations.Hand}
-                                    width={CONST.RECEIPT.HAND_ICON_WIDTH}
-                                    height={CONST.RECEIPT.HAND_ICON_HEIGHT}
-                                    additionalStyles={[styles.pb5]}
-                                />
-                                <Text style={[styles.textFileUpload]}>{translate('receipt.takePhoto')}</Text>
-                                {cameraPermissionState === 'denied' ? (
-                                    <Text style={[styles.subTextFileUpload]}>
-                                        <RenderHTML html={translate('receipt.deniedCameraAccess')} />
-                                    </Text>
-                                ) : (
-                                    <Text style={[styles.subTextFileUpload]}>{translate('receipt.cameraAccess')}</Text>
-                                )}
-                                <Button
-                                    success
-                                    text={translate('common.continue')}
-                                    accessibilityLabel={translate('common.continue')}
-                                    style={[styles.p9, styles.pt5]}
-                                    onPress={capturePhoto}
-                                    sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
-                                />
-                            </View>
-                        )}
-                        {cameraPermissionState === 'granted' && !isEmptyObject(videoConstraints) && (
-                            <View
-                                style={styles.flex1}
-                                onLayout={(e) => (viewfinderLayout.current = e.nativeEvent.layout)}
-                            >
-                                <NavigationAwareCamera
-                                    onUserMedia={setupCameraPermissionsAndCapabilities}
-                                    onUserMediaError={() => setCameraPermissionState('denied')}
-                                    style={{
-                                        ...styles.videoContainer,
-                                        display: cameraPermissionState !== 'granted' ? 'none' : 'block',
-                                    }}
-                                    ref={cameraRef}
-                                    screenshotFormat="image/png"
-                                    videoConstraints={videoConstraints}
-                                    forceScreenshotSourceSize
-                                    audio={false}
-                                    disablePictureInPicture={false}
-                                    imageSmoothing={false}
-                                    mirrored={false}
-                                    screenshotQuality={0}
-                                />
-                                {canUseMultiScan ? (
-                                    <View style={[styles.flashButtonContainer, styles.primaryMediumIcon, isFlashLightOn && styles.bgGreenSuccess, !isTorchAvailable && styles.opacity0]}>
-                                        <PressableWithFeedback
-                                            role={CONST.ROLE.BUTTON}
-                                            accessibilityLabel={translate('receipt.flash')}
-                                            disabled={!isTorchAvailable}
-                                            onPress={toggleFlashlight}
-                                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                                        >
-                                            <Icon
-                                                height={variables.iconSizeSmall}
-                                                width={variables.iconSizeSmall}
-                                                src={lazyIcons.Bolt}
-                                                fill={isFlashLightOn ? theme.white : theme.icon}
-                                            />
-                                        </PressableWithFeedback>
-                                    </View>
-                                ) : null}
-                                <Animated.View
-                                    pointerEvents="none"
-                                    style={[StyleSheet.absoluteFill, styles.backgroundWhite, blinkStyle, styles.zIndex10]}
-                                />
-                            </View>
-                        )}
-                    </View>
-
-                    <View style={[styles.flexRow, styles.justifyContentAround, styles.alignItemsCenter, styles.pv3]}>
-                        <AttachmentPicker
-                            acceptedFileTypes={[...CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_RECEIPT_EXTENSIONS]}
-                            allowMultiple={shouldAcceptMultipleFiles}
-                        >
-                            {({openPicker}) => (
-                                <PressableWithFeedback
-                                    accessibilityLabel={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
-                                    role={CONST.ROLE.BUTTON}
-                                    style={isMultiScanEnabled && styles.opacity0}
-                                    onPress={() => {
-                                        openPicker({
-                                            onPicked: (data) => validateFiles(data),
-                                        });
-                                    }}
-                                    sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
-                                >
-                                    <Icon
-                                        height={variables.iconSizeMenuItem}
-                                        width={variables.iconSizeMenuItem}
-                                        src={lazyIcons.Gallery}
-                                        fill={theme.textSupporting}
-                                    />
-                                </PressableWithFeedback>
-                            )}
-                        </AttachmentPicker>
-                        <PressableWithFeedback
-                            role={CONST.ROLE.BUTTON}
-                            accessibilityLabel={translate('receipt.shutter')}
-                            style={[styles.alignItemsCenter]}
-                            onPress={capturePhoto}
-                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.SHUTTER}
-                        >
-                            <Icon
-                                src={lazyIllustrations.Shutter}
-                                width={CONST.RECEIPT.SHUTTER_SIZE}
-                                height={CONST.RECEIPT.SHUTTER_SIZE}
-                            />
-                        </PressableWithFeedback>
-                        {canUseMultiScan ? (
-                            <PressableWithFeedback
-                                accessibilityRole="button"
-                                role={CONST.ROLE.BUTTON}
-                                accessibilityLabel={translate('receipt.multiScan')}
-                                style={styles.alignItemsEnd}
-                                onPress={toggleMultiScan}
-                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.MULTI_SCAN}
-                            >
-                                <Icon
-                                    height={variables.iconSizeMenuItem}
-                                    width={variables.iconSizeMenuItem}
-                                    src={lazyIcons.ReceiptMultiple}
-                                    fill={isMultiScanEnabled ? theme.iconMenu : theme.textSupporting}
-                                />
-                            </PressableWithFeedback>
-                        ) : (
-                            <PressableWithFeedback
-                                role={CONST.ROLE.BUTTON}
-                                accessibilityLabel={translate('receipt.flash')}
-                                style={[styles.alignItemsEnd, !isTorchAvailable && styles.opacity0]}
-                                onPress={toggleFlashlight}
-                                disabled={!isTorchAvailable}
-                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                            >
-                                <Icon
-                                    height={variables.iconSizeMenuItem}
-                                    width={variables.iconSizeMenuItem}
-                                    src={isFlashLightOn ? lazyIcons.Bolt : lazyIcons.boltSlash}
-                                    fill={theme.textSupporting}
-                                />
-                            </PressableWithFeedback>
-                        )}
-                    </View>
-                    {canUseMultiScan && shouldShowMultiScanEducationalPopup && (
-                        <FeatureTrainingModal
-                            title={translate('iou.scanMultipleReceipts')}
-                            image={lazyIllustrations.MultiScan}
-                            shouldRenderSVG
-                            imageHeight="auto"
-                            imageWidth="auto"
-                            modalInnerContainerStyle={styles.pt0}
-                            illustrationOuterContainerStyle={styles.multiScanEducationalPopupImage}
-                            onConfirm={dismissMultiScanEducationalPopup}
-                            titleStyles={styles.mb2}
-                            confirmText={translate('common.buttonConfirm')}
-                            description={translate('iou.scanMultipleReceiptsDescription')}
-                            contentInnerContainerStyles={styles.mb6}
-                            shouldGoBack={false}
-                        />
-                    )}
-                </View>
-
-                {canUseMultiScan && (
-                    <ReceiptPreviews
-                        isMultiScanEnabled={isMultiScanEnabled}
-                        submit={submitMultiScanReceipts}
-                    />
-                )}
-            </View>
-        </StepScreenWrapper>
-    );
-}
-
-export default MobileWebCameraView;
-export type {MobileWebCameraViewProps};
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
new file mode 100644
index 000000000000..758f9b03c37b
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -0,0 +1,72 @@
+import React from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import useOnyx from '@hooks/useOnyx';
+import usePolicy from '@hooks/usePolicy';
+import Navigation from '@libs/Navigation/Navigation';
+import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
+import {replaceReceipt} from '@userActions/IOU/Receipt';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import type {Report} from '@src/types/onyx';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+type ScanEditReceiptProps = {
+    report: OnyxEntry<Report>;
+    transactionID: string;
+    backTo: Route | undefined;
+};
+
+/**
+ * ScanEditReceipt — replace an existing receipt and navigate back.
+ * Simplest variant: no multi-scan, no participants, no confirmation page.
+ */
+function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps) {
+    const policy = usePolicy(report?.policyID);
+    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
+
+    const navigateBack = () => {
+        Navigation.goBack(backTo);
+    };
+
+    const handleCapture = (file: FileObject, source: string) => {
+        replaceReceipt({transactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
+        navigateBack();
+    };
+
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+        const file = files.at(0);
+        if (!file) {
+            return;
+        }
+        const source = getFileSource(file);
+        handleCapture(file, source);
+    });
+
+    return (
+        <StepScreenDragAndDropWrapper
+            headerTitle=""
+            onBackButtonPress={navigateBack}
+            shouldShowWrapper
+            testID="ScanEditReceipt"
+        >
+            {() => (
+                <>
+                    {PDFValidationComponent}
+                    <Camera
+                        onCapture={handleCapture}
+                        onDrop={validateFiles}
+                        isReplacingReceipt
+                    />
+                    {ErrorModal}
+                </>
+            )}
+        </StepScreenDragAndDropWrapper>
+    );
+}
+
+ScanEditReceipt.displayName = 'ScanEditReceipt';
+
+export default ScanEditReceipt;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
new file mode 100644
index 000000000000..f80e5a2ef10a
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -0,0 +1,93 @@
+import React, {useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
+import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useOnyx from '@hooks/useOnyx';
+import {navigateToConfirmationPage} from '@libs/IOUUtils';
+import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
+import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
+import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU';
+import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
+import type {IOUType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
+import type {Report} from '@src/types/onyx';
+import type Transaction from '@src/types/onyx/Transaction';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
+    report: OnyxEntry<Report>;
+    iouType: IOUType;
+    reportID: string;
+    transactionID: string;
+    transaction: OnyxEntry<Transaction>;
+    backToReport: string | undefined;
+};
+
+/**
+ * ScanFromReport — initiated from a report's (+) button.
+ * Sets participants from the report and navigates to the confirmation page.
+ */
+function ScanFromReport({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanFromReportProps) {
+    const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
+    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+
+    // TODO: derive transactions from useOptimisticDraftTransactions when wired up
+    const transactions = transaction ? [transaction] : [];
+
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+
+    const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+
+        const receiptFiles = buildReceiptFiles({
+            files,
+            getFileSource,
+            initialTransaction: transaction,
+            initialTransactionID: transactionID,
+            currentUserPersonalDetails,
+            reportID,
+            shouldAcceptMultipleFiles: true,
+            isMultiScanEnabled,
+            transactions,
+        });
+
+        startScanProcessSpan(isMultiScanEnabled);
+
+        const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
+        setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
+            navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
+        );
+    };
+
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+        processReceipts(files);
+    });
+
+    return (
+        <MultiScanGate>
+            {PDFValidationComponent}
+            <Camera
+                onCapture={(file, source) => {
+                    setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
+                    processReceipts([file]);
+                }}
+                onDrop={validateFiles}
+                shouldAcceptMultipleFiles
+            />
+            {ErrorModal}
+        </MultiScanGate>
+    );
+}
+
+ScanFromReport.displayName = 'ScanFromReport';
+
+export default withCurrentUserPersonalDetails(ScanFromReport);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
new file mode 100644
index 000000000000..93a3f6a0eb1f
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -0,0 +1,133 @@
+import React, {useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
+import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
+import useOnyx from '@hooks/useOnyx';
+import useSelfDMReport from '@hooks/useSelfDMReport';
+import {navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {getPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
+import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
+import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
+import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
+import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU';
+import {setTransactionReport} from '@userActions/Transaction';
+import CONST from '@src/CONST';
+import type {IOUType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
+import type {Report} from '@src/types/onyx';
+import type Transaction from '@src/types/onyx/Transaction';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
+    report: OnyxEntry<Report>;
+    iouType: IOUType;
+    reportID: string;
+    transactionID: string;
+    transaction: OnyxEntry<Transaction>;
+    backToReport: string | undefined;
+};
+
+/**
+ * ScanGlobalCreate — initiated from the FAB (+) button (no specific report).
+ * Uses default expense policy to auto-select workspace, or navigates to participant picker.
+ */
+function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
+    const defaultExpensePolicy = useDefaultExpensePolicy();
+    const selfDMReport = useSelfDMReport();
+    const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
+    const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
+    const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
+    const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
+    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+
+    const transactions = transaction ? [transaction] : [];
+
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+
+    const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+
+        const receiptFiles = buildReceiptFiles({
+            files,
+            getFileSource,
+            initialTransaction: transaction,
+            initialTransactionID: transactionID,
+            currentUserPersonalDetails,
+            reportID,
+            shouldAcceptMultipleFiles: true,
+            isMultiScanEnabled,
+            transactions,
+        });
+
+        startScanProcessSpan(isMultiScanEnabled);
+        navigateGlobalCreate(receiptFiles);
+    };
+
+    const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
+        if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
+            const shouldAutoReport = !!defaultExpensePolicy?.autoReporting;
+            const targetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport;
+            const transactionReportID = isSelfDM(targetReport) ? CONST.REPORT.UNREPORTED_REPORT_ID : targetReport?.reportID;
+            const iouTypeTrackOrSubmit = transactionReportID === CONST.REPORT.UNREPORTED_REPORT_ID ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT;
+
+            // If the user previously selected different participants in confirmation, preserve that choice
+            if (transaction?.participants && transaction.participants.at(0)?.reportID !== targetReport?.reportID) {
+                const isTrackExpense = transaction.participants.at(0)?.reportID === selfDMReport?.reportID;
+
+                const setParticipantsPromises = receiptFiles.map((rf) => setMoneyRequestParticipants(rf.transactionID, transaction.participants));
+                Promise.all(setParticipantsPromises).then(() => {
+                    if (isTrackExpense) {
+                        Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.TRACK, transactionID, selfDMReport?.reportID));
+                    } else {
+                        navigateToConfirmationPage(iouType, transactionID, reportID, backToReport, iouType === CONST.IOU.TYPE.CREATE, transaction.reportID);
+                    }
+                });
+                return;
+            }
+
+            const setParticipantsPromises = receiptFiles.map((rf) => {
+                setTransactionReport(rf.transactionID, {reportID: transactionReportID}, true);
+                return setMoneyRequestParticipantsFromReport(rf.transactionID, targetReport, currentUserPersonalDetails.accountID);
+            });
+            Promise.all(setParticipantsPromises).then(() =>
+                Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouTypeTrackOrSubmit, transactionID, targetReport?.reportID)),
+            );
+        } else {
+            navigateToParticipantPage(iouType, transactionID, reportID);
+        }
+    };
+
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+        processReceipts(files);
+    });
+
+    return (
+        <MultiScanGate>
+            {PDFValidationComponent}
+            <Camera
+                onCapture={(file, source) => {
+                    processReceipts([file]);
+                }}
+                onDrop={validateFiles}
+                shouldAcceptMultipleFiles
+            />
+            {ErrorModal}
+        </MultiScanGate>
+    );
+}
+
+ScanGlobalCreate.displayName = 'ScanGlobalCreate';
+
+export default withCurrentUserPersonalDetails(ScanGlobalCreate);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
new file mode 100644
index 000000000000..d0942d2f5a59
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -0,0 +1,251 @@
+import React, {useState} from 'react';
+import type {OnyxEntry} from 'react-native-onyx';
+import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
+import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useOnyx from '@hooks/useOnyx';
+import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
+import useParticipantsPolicyTags from '@hooks/useParticipantsPolicyTags';
+import usePermissions from '@hooks/usePermissions';
+import usePolicy from '@hooks/usePolicy';
+import usePolicyForMovingExpenses from '@hooks/usePolicyForMovingExpenses';
+import useReportAttributes from '@hooks/useReportAttributes';
+import useReportIsArchived from '@hooks/useReportIsArchived';
+import {createTransaction, getMoneyRequestParticipantOptions} from '@libs/actions/IOU/MoneyRequest';
+import {startSplitBill} from '@libs/actions/IOU/Split';
+import getCurrentPosition from '@libs/getCurrentPosition';
+import {calculateDefaultReimbursable} from '@libs/IOUUtils';
+import Log from '@libs/Log';
+import {cancelSpan} from '@libs/telemetry/activeSpans';
+import {getDefaultTaxCode, getTaxValue} from '@libs/TransactionUtils';
+import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
+import GpsPermissionGate from '@pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate';
+import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
+import CONST from '@src/CONST';
+import type {IOUType} from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import {validTransactionDraftIDsSelector, validTransactionDraftsSelector} from '@src/selectors/TransactionDraft';
+import type {Report} from '@src/types/onyx';
+import type Transaction from '@src/types/onyx/Transaction';
+import type {Receipt} from '@src/types/onyx/Transaction';
+import type {FileObject} from '@src/types/utils/Attachment';
+
+type ScanSkipConfirmationProps = WithCurrentUserPersonalDetailsProps & {
+    report: OnyxEntry<Report>;
+    iouType: IOUType;
+    reportID: string;
+    transactionID: string;
+    transaction: OnyxEntry<Transaction>;
+    backToReport: string | undefined;
+};
+
+/**
+ * ScanSkipConfirmation — directly creates the transaction without showing the confirmation page.
+ * Handles GPS permission flow, split bills, and direct submission.
+ * Most complex variant with the most Onyx subscriptions.
+ */
+function ScanSkipConfirmation({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanSkipConfirmationProps) {
+    const policy = usePolicy(report?.policyID);
+    const {policyForMovingExpenses} = usePolicyForMovingExpenses();
+    const isArchived = useReportIsArchived(report?.reportID);
+    const reportAttributesDerived = useReportAttributes();
+    const {isBetaEnabled} = usePermissions();
+    const isASAPSubmitBetaEnabled = isBetaEnabled(CONST.BETAS.ASAP_SUBMIT);
+
+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [quickAction] = useOnyx(ONYXKEYS.NVP_QUICK_ACTION_GLOBAL_CREATE);
+    const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
+    const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
+    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
+    const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (value: OnyxEntry<Record<string, unknown>>) => !!(value as Record<string, unknown>)?.hasSeenTour});
+    const [betas] = useOnyx(ONYXKEYS.BETAS);
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
+    const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector});
+    const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
+    const [shouldStartLocationPermissionFlow] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT);
+
+    const [transactions] = useOptimisticDraftTransactions(transaction);
+    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+    const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
+    const [receiptFiles, setReceiptFiles] = useState<ReceiptFile[]>([]);
+
+    const participants = getMoneyRequestParticipantOptions(currentUserPersonalDetails.accountID, report, policy, personalDetails, conciergeReportID, isArchived, reportAttributesDerived);
+    const participantsPolicyTags = useParticipantsPolicyTags(participants);
+
+    const defaultTaxCode = getDefaultTaxCode(policy, transaction);
+    const transactionTaxCode = (transaction?.taxCode ? transaction.taxCode : defaultTaxCode) ?? '';
+    const transactionTaxAmount = transaction?.taxAmount ?? 0;
+    const transactionTaxValue = transaction?.taxValue ?? getTaxValue(policy, transaction, transactionTaxCode) ?? '';
+
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+
+    const cancelShutterSpans = () => {
+        cancelSpan(CONST.TELEMETRY.SPAN_SCAN_PROCESS_AND_NAVIGATE);
+        cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_MOUNT);
+        cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
+        cancelSpan(CONST.TELEMETRY.SPAN_ODOMETER_TO_CONFIRMATION);
+        cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_LIST_READY);
+        cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_RECEIPT_LOAD);
+    };
+
+    const submitDirectly = (files: ReceiptFile[], locationPermissionGranted: boolean) => {
+        cancelShutterSpans();
+
+        const firstReceiptFile = files.at(0);
+
+        // Split bill flow
+        if (iouType === CONST.IOU.TYPE.SPLIT && firstReceiptFile) {
+            const splitReceipt: Receipt = firstReceiptFile.file ?? {};
+            splitReceipt.source = firstReceiptFile.source;
+            splitReceipt.state = CONST.IOU.RECEIPT_STATE.SCAN_READY;
+
+            startSplitBill({
+                participants,
+                currentUserLogin: currentUserPersonalDetails.login ?? '',
+                currentUserAccountID: currentUserPersonalDetails.accountID,
+                comment: '',
+                receipt: splitReceipt,
+                existingSplitChatReportID: reportID,
+                billable: false,
+                category: '',
+                tag: '',
+                currency: transaction?.currency ?? 'USD',
+                taxCode: transactionTaxCode,
+                taxAmount: transactionTaxAmount,
+                taxValue: transactionTaxValue,
+                quickAction,
+                policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [],
+                policyRecentlyUsedTags: undefined,
+                participantsPolicyTags,
+            });
+            return;
+        }
+
+        // Single expense flow
+        const participant = participants.at(0);
+        if (!participant) {
+            return;
+        }
+
+        const defaultReimbursable = calculateDefaultReimbursable({
+            iouType,
+            policy,
+            policyForMovingExpenses,
+            participant,
+            transactionReportID: transaction?.reportID,
+        });
+
+        const baseParams = {
+            transactions,
+            iouType,
+            report,
+            currentUserAccountID: currentUserPersonalDetails.accountID,
+            currentUserEmail: currentUserPersonalDetails.login,
+            backToReport,
+            shouldGenerateTransactionThreadReport: false,
+            isASAPSubmitBetaEnabled,
+            transactionViolations,
+            quickAction,
+            policyRecentlyUsedCurrencies,
+            introSelected,
+            activePolicyID,
+            files,
+            participant,
+            policyParams: {policy},
+            billable: false,
+            reimbursable: defaultReimbursable,
+            isSelfTourViewed,
+            allTransactionDrafts,
+            betas,
+            personalDetails,
+            recentWaypoints,
+        };
+
+        if (locationPermissionGranted) {
+            getCurrentPosition(
+                (successData) => {
+                    createTransaction({
+                        ...baseParams,
+                        gpsPoint: {
+                            lat: successData.coords.latitude,
+                            long: successData.coords.longitude,
+                        },
+                    });
+                },
+                (errorData) => {
+                    Log.info('[ScanSkipConfirmation] getCurrentPosition failed', false, errorData);
+                    createTransaction(baseParams);
+                },
+            );
+            return;
+        }
+
+        createTransaction(baseParams);
+    };
+
+    const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+
+        const newReceiptFiles = buildReceiptFiles({
+            files,
+            getFileSource,
+            initialTransaction: transaction,
+            initialTransactionID: transactionID,
+            currentUserPersonalDetails,
+            reportID,
+            shouldAcceptMultipleFiles: true,
+            isMultiScanEnabled,
+            transactions,
+        });
+
+        setReceiptFiles(newReceiptFiles);
+
+        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && files.length;
+        if (gpsRequired) {
+            if (shouldStartLocationPermissionFlow) {
+                setStartLocationPermissionFlow(true);
+                return;
+            }
+            submitDirectly(newReceiptFiles, true);
+            return;
+        }
+
+        submitDirectly(newReceiptFiles, false);
+    };
+
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+        processReceipts(files);
+    });
+
+    return (
+        <MultiScanGate>
+            {PDFValidationComponent}
+            <Camera
+                onCapture={(file, source) => {
+                    processReceipts([file]);
+                }}
+                onDrop={validateFiles}
+                shouldAcceptMultipleFiles
+            />
+            {ErrorModal}
+            <GpsPermissionGate
+                startLocationPermissionFlow={startLocationPermissionFlow}
+                receiptFiles={receiptFiles}
+                resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
+                onComplete={submitDirectly}
+            />
+        </MultiScanGate>
+    );
+}
+
+ScanSkipConfirmation.displayName = 'ScanSkipConfirmation';
+
+export default withCurrentUserPersonalDetails(ScanSkipConfirmation);
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
deleted file mode 100644
index 1ce304c611f8..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
+++ /dev/null
@@ -1,616 +0,0 @@
-import React, {useCallback, useEffect, useMemo, useRef} from 'react';
-import {Alert, StyleSheet, View} from 'react-native';
-import ReactNativeBlobUtil from 'react-native-blob-util';
-import {GestureDetector} from 'react-native-gesture-handler';
-import {RESULTS} from 'react-native-permissions';
-import Animated from 'react-native-reanimated';
-import type {PhotoFile} from 'react-native-vision-camera';
-import {useCameraFormat} from 'react-native-vision-camera';
-import ActivityIndicator from '@components/ActivityIndicator';
-import AttachmentPicker from '@components/AttachmentPicker';
-import Button from '@components/Button';
-import FeatureTrainingModal from '@components/FeatureTrainingModal';
-import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
-import Icon from '@components/Icon';
-import ImageSVG from '@components/ImageSVG';
-import LocationPermissionModal from '@components/LocationPermissionModal';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
-import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
-import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
-import useLocalize from '@hooks/useLocalize';
-import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
-import useNativeCamera from '@hooks/useNativeCamera';
-import useOnyx from '@hooks/useOnyx';
-import usePolicy from '@hooks/usePolicy';
-import useStyleUtils from '@hooks/useStyleUtils';
-import useTheme from '@hooks/useTheme';
-import useThemeStyles from '@hooks/useThemeStyles';
-import useWindowDimensions from '@hooks/useWindowDimensions';
-import getPhotoSource from '@libs/fileDownload/getPhotoSource';
-import getReceiptsUploadFolderPath from '@libs/getReceiptsUploadFolderPath';
-import Log from '@libs/Log';
-import Navigation from '@libs/Navigation/Navigation';
-import navigationRef from '@libs/Navigation/navigationRef';
-import {cancelSpan, endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
-import StepScreenWrapper from '@pages/iou/request/step/StepScreenWrapper';
-import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
-import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound';
-import variables from '@styles/variables';
-import {updateLastLocationPermissionPrompt} from '@userActions/IOU';
-import {replaceReceipt, setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
-import {buildOptimisticTransactionAndCreateDraft} from '@userActions/TransactionEdit';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import type {Route} from '@src/ROUTES';
-import ROUTES from '@src/ROUTES';
-import type {FileObject} from '@src/types/utils/Attachment';
-import captureReceipt from './captureReceipt';
-import NavigationAwareCamera from './components/NavigationAwareCamera/Camera';
-import ReceiptPreviews from './components/ReceiptPreviews';
-import getCameraAspectRatio from './getCameraAspectRatio';
-import useMobileReceiptScan from './hooks/useMobileReceiptScan';
-import useReceiptScan from './hooks/useReceiptScan';
-import type IOURequestStepScanProps from './types';
-
-function IOURequestStepScan({
-    report,
-    route: {
-        name: routeName,
-        params: {action, iouType, reportID, transactionID: initialTransactionID, backTo, backToReport},
-    },
-    transaction: initialTransaction,
-    currentUserPersonalDetails,
-}: IOURequestStepScanProps) {
-    const theme = useTheme();
-    const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
-    const {translate} = useLocalize();
-    const isInLandscapeMode = useIsInLandscapeMode();
-
-    // Ref for double-tap protection (doesn't trigger re-render)
-    const isCapturingPhoto = useRef(false);
-
-    const onFocusStart = () => {
-        isCapturingPhoto.current = false;
-    };
-
-    const onFocusCleanup = () => {
-        cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-        cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
-    };
-
-    const {
-        camera,
-        device,
-        cameraPermissionStatus,
-        flash,
-        setFlash,
-        hasFlash,
-        didCapturePhoto,
-        setDidCapturePhoto,
-        isAttachmentPickerActive,
-        setIsAttachmentPickerActive,
-        isPlatformMuted,
-        askForPermissions,
-        tapGesture,
-        cameraFocusIndicatorAnimatedStyle,
-        cameraLoadingReasonAttributes,
-    } = useNativeCamera({context: 'IOURequestStepScan', onFocusStart, onFocusCleanup});
-    const {setIsLoaderVisible} = useFullScreenLoaderActions();
-
-    const {windowWidth, windowHeight} = useWindowDimensions();
-
-    // Prioritize photoResolution over videoResolution so the format selector picks a 4032x3024
-    // format instead of the 5712x4284 (24.5MP) format that videoResolution:'max' would select.
-    // This cuts capture time roughly in half while maintaining the same output photo resolution.
-    // Use screen dimensions for video resolution since we only need enough for the preview.
-    const format = useCameraFormat(device, [
-        {photoAspectRatio: CONST.RECEIPT_CAMERA.PHOTO_ASPECT_RATIO},
-        {photoResolution: {width: CONST.RECEIPT_CAMERA.PHOTO_WIDTH, height: CONST.RECEIPT_CAMERA.PHOTO_HEIGHT}},
-        {videoResolution: {width: windowHeight, height: windowWidth}},
-    ]);
-
-    // Format dimensions are in landscape orientation, so height/width gives portrait aspect ratio
-    const cameraAspectRatio = getCameraAspectRatio(format, isInLandscapeMode);
-    const fps = useMemo(() => (format ? Math.min(Math.max(30, format.minFps), format.maxFps) : 30), [format]);
-
-    const navigateBack = () => {
-        Navigation.goBack(backTo);
-    };
-    const lazyIllustrations = useMemoizedLazyIllustrations(['MultiScan', 'Hand', 'Shutter']);
-    const lazyIcons = useMemoizedLazyExpensifyIcons(['Bolt', 'Gallery', 'ReceiptMultiple', 'boltSlash']);
-    const policy = usePolicy(report?.policyID);
-
-    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
-
-    // Track camera init telemetry
-    const cameraInitSpanStarted = useRef(false);
-    const cameraInitialized = useRef(false);
-
-    // Start camera init span when permission is granted and camera is ready
-    useEffect(() => {
-        if (cameraInitSpanStarted.current || cameraPermissionStatus !== RESULTS.GRANTED || device == null) {
-            return;
-        }
-        startSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT, {
-            name: CONST.TELEMETRY.SPAN_CAMERA_INIT,
-            op: CONST.TELEMETRY.SPAN_CAMERA_INIT,
-        });
-        cameraInitSpanStarted.current = true;
-    }, [cameraPermissionStatus, device]);
-
-    // Cancel spans when permission is denied/blocked/unavailable
-    useEffect(() => {
-        if (cameraPermissionStatus !== RESULTS.BLOCKED && cameraPermissionStatus !== RESULTS.UNAVAILABLE && cameraPermissionStatus !== RESULTS.DENIED) {
-            return;
-        }
-        cancelSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-    }, [cameraPermissionStatus]);
-
-    // Cancel spans on unmount if camera never initialized
-    useEffect(() => {
-        return () => {
-            // If camera initialized successfully, spans were already ended
-            if (cameraInitialized.current) {
-                return;
-            }
-            // Cancel camera init span if it was started
-            if (cameraInitSpanStarted.current) {
-                cancelSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT);
-            }
-            // Always cancel the create expense span if camera never initialized
-            cancelSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-        };
-    }, []);
-
-    const handleCameraInitialized = useCallback(() => {
-        // Prevent duplicate span endings if callback fires multiple times
-        if (cameraInitialized.current) {
-            return;
-        }
-        cameraInitialized.current = true;
-        // Only end camera init span if it was actually started
-        if (cameraInitSpanStarted.current) {
-            endSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT);
-        }
-        endSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-
-        // Preload the confirmation screen module so its JS is parsed and ready
-        // when we navigate after capture — eliminates cold-start module load cost.
-        require('../IOURequestStepConfirmation');
-
-        // Pre-create upload directory to avoid latency during capture
-        const path = getReceiptsUploadFolderPath();
-        ReactNativeBlobUtil.fs
-            .isDir(path)
-            .then((isDir) => {
-                if (isDir) {
-                    return;
-                }
-                ReactNativeBlobUtil.fs.mkdir(path).catch((error: string) => {
-                    Log.warn('Error creating the receipts upload directory', error);
-                });
-            })
-            .catch((error: string) => {
-                Log.warn('Error checking if the upload directory exists', error);
-            });
-    }, []);
-
-    const updateScanAndNavigate = useCallback(
-        (file: FileObject, source: string) => {
-            // Fix for the issue where the navigation state is lost after returning from device settings https://github.com/Expensify/App/issues/65992
-            const navigationState = navigationRef.current?.getState();
-            const reportsSplitNavigator = navigationState?.routes?.findLast((route) => route.name === 'ReportsSplitNavigator');
-            const hasLostNavigationsState = reportsSplitNavigator && !reportsSplitNavigator.state;
-            if (hasLostNavigationsState) {
-                if (backTo) {
-                    Navigation.navigate(backTo as Route);
-                } else {
-                    Navigation.navigate(ROUTES.INBOX);
-                }
-            } else {
-                navigateBack();
-            }
-            replaceReceipt({transactionID: initialTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
-        },
-        [initialTransactionID, policy, policyCategories, backTo, navigateBack],
-    );
-
-    const getSource = useCallback((file: FileObject) => file.uri ?? '', []);
-
-    const {
-        isEditing,
-        isMultiScanEnabled,
-        setIsMultiScanEnabled,
-        isStartingScan,
-        shouldAcceptMultipleFiles,
-        shouldSkipConfirmation,
-        startLocationPermissionFlow,
-        setStartLocationPermissionFlow,
-        receiptFiles,
-        setReceiptFiles,
-        navigateToConfirmationStep,
-        validateFiles,
-        PDFValidationComponent,
-        ErrorModal,
-    } = useReceiptScan({
-        report,
-        reportID,
-        initialTransactionID,
-        initialTransaction,
-        iouType,
-        action,
-        currentUserPersonalDetails,
-        backTo,
-        backToReport,
-        routeName,
-        updateScanAndNavigate,
-        getSource,
-    });
-
-    const {canUseMultiScan, shouldShowMultiScanEducationalPopup, submitReceipts, submitMultiScanReceipts, toggleMultiScan, dismissMultiScanEducationalPopup, blinkStyle, showBlink} =
-        useMobileReceiptScan({
-            initialTransaction,
-            iouType,
-            isMultiScanEnabled,
-            isStartingScan,
-            receiptFiles,
-            navigateToConfirmationStep,
-            shouldSkipConfirmation,
-            setStartLocationPermissionFlow,
-            setIsMultiScanEnabled,
-            setReceiptFiles,
-        });
-
-    const maybeCancelShutterSpan = useCallback(() => {
-        if (isMultiScanEnabled) {
-            return;
-        }
-
-        cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-        cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
-    }, [isMultiScanEnabled]);
-
-    const capturePhoto = () => {
-        if (!isMultiScanEnabled) {
-            startSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION, {
-                name: CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION,
-                op: CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION,
-                attributes: {[CONST.TELEMETRY.ATTRIBUTE_PLATFORM]: 'native'},
-            });
-        }
-
-        if (!camera.current && (cameraPermissionStatus === RESULTS.DENIED || cameraPermissionStatus === RESULTS.BLOCKED)) {
-            maybeCancelShutterSpan();
-            askForPermissions();
-            return;
-        }
-
-        const showCameraAlert = () => {
-            Alert.alert(translate('receipt.cameraErrorTitle'), translate('receipt.cameraErrorMessage'));
-        };
-
-        if (!camera.current) {
-            maybeCancelShutterSpan();
-            showCameraAlert();
-            return;
-        }
-
-        if (isCapturingPhoto.current) {
-            maybeCancelShutterSpan();
-            return;
-        }
-
-        startSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE, {
-            name: CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE,
-            op: CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE,
-            parentSpan: getSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION),
-            attributes: {[CONST.TELEMETRY.ATTRIBUTE_PLATFORM]: 'native'},
-        });
-
-        isCapturingPhoto.current = true;
-        showBlink();
-
-        const path = getReceiptsUploadFolderPath();
-
-        captureReceipt(camera.current, {flash, hasFlash, isPlatformMuted, path, isInLandscapeMode})
-            .then((photo: PhotoFile) => {
-                setDidCapturePhoto(true);
-
-                const transaction =
-                    isMultiScanEnabled && initialTransaction?.receipt?.source
-                        ? buildOptimisticTransactionAndCreateDraft({
-                              initialTransaction,
-                              currentUserPersonalDetails,
-                              reportID,
-                          })
-                        : initialTransaction;
-                const transactionID = transaction?.transactionID ?? initialTransactionID;
-                const source = getPhotoSource(photo.path);
-                const filename = photo.path;
-
-                endSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-
-                const cameraFile = {
-                    uri: source,
-                    name: filename,
-                    type: 'image/jpeg',
-                    source,
-                };
-
-                if (isEditing) {
-                    setMoneyRequestReceipt(transactionID, source, filename, !isEditing, 'image/jpeg');
-                    updateScanAndNavigate(cameraFile as FileObject, source);
-                    return;
-                }
-
-                const newReceiptFiles = [...receiptFiles, {file: cameraFile as FileObject, source, transactionID}];
-                setReceiptFiles(newReceiptFiles);
-
-                if (isMultiScanEnabled) {
-                    setMoneyRequestReceipt(transactionID, source, filename, !isEditing, 'image/jpeg');
-                    setDidCapturePhoto(false);
-                    isCapturingPhoto.current = false;
-                    return;
-                }
-
-                // Fire Onyx merge immediately (non-blocking) while we await thumbnail generation.
-                // Both run in parallel — navigation proceeds once the thumbnail is cached.
-                setMoneyRequestReceipt(transactionID, source, filename, !isEditing, 'image/jpeg');
-                pregenerateThumbnail(source).then(() => {
-                    submitReceipts(newReceiptFiles);
-                });
-            })
-            .catch((error: string) => {
-                isCapturingPhoto.current = false;
-                cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
-                maybeCancelShutterSpan();
-                showCameraAlert();
-                Log.warn('Error taking photo', error);
-            });
-    };
-
-    // Wait for camera permission status to render
-    if (cameraPermissionStatus == null) {
-        return null;
-    }
-
-    return (
-        <StepScreenWrapper
-            includeSafeAreaPaddingBottom
-            headerTitle={translate('common.receipt')}
-            onBackButtonPress={navigateBack}
-            shouldShowWrapper={!!backTo || isEditing}
-            testID="IOURequestStepScan"
-        >
-            <View style={styles.flex1}>
-                {PDFValidationComponent}
-                <View style={[styles.flex1, isInLandscapeMode && styles.flexRow]}>
-                    <View style={[styles.flex1]}>
-                        {cameraPermissionStatus !== RESULTS.GRANTED && (
-                            <ScrollView contentContainerStyle={styles.flexGrow1}>
-                                <View style={[styles.cameraView, isInLandscapeMode ? styles.permissionViewLandscape : styles.permissionView, styles.userSelectNone]}>
-                                    <ImageSVG
-                                        contentFit="contain"
-                                        src={lazyIllustrations.Hand}
-                                        width={CONST.RECEIPT.HAND_ICON_WIDTH}
-                                        height={CONST.RECEIPT.HAND_ICON_HEIGHT}
-                                        style={styles.pb5}
-                                    />
-
-                                    <Text style={[styles.textFileUpload]}>{translate('receipt.takePhoto')}</Text>
-                                    <Text style={[styles.subTextFileUpload]}>{translate('receipt.cameraAccess')}</Text>
-                                    <Button
-                                        success
-                                        text={translate('common.continue')}
-                                        accessibilityLabel={translate('common.continue')}
-                                        style={[styles.p9, styles.pt5]}
-                                        onPress={capturePhoto}
-                                        sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
-                                    />
-                                </View>
-                            </ScrollView>
-                        )}
-                        {cameraPermissionStatus === RESULTS.GRANTED && device == null && (
-                            <View style={[styles.cameraView]}>
-                                <ActivityIndicator
-                                    size={CONST.ACTIVITY_INDICATOR_SIZE.LARGE}
-                                    style={[styles.flex1]}
-                                    color={theme.textSupporting}
-                                    reasonAttributes={cameraLoadingReasonAttributes}
-                                />
-                            </View>
-                        )}
-                        {cameraPermissionStatus === RESULTS.GRANTED && device != null && (
-                            <View style={[styles.cameraView, styles.alignItemsCenter]}>
-                                <GestureDetector gesture={tapGesture}>
-                                    <View style={StyleUtils.getCameraViewfinderStyle(cameraAspectRatio, isInLandscapeMode)}>
-                                        <NavigationAwareCamera
-                                            ref={camera}
-                                            device={device}
-                                            format={format}
-                                            fps={fps}
-                                            style={styles.flex1}
-                                            zoom={device.neutralZoom}
-                                            photo
-                                            cameraTabIndex={1}
-                                            forceInactive={isAttachmentPickerActive || didCapturePhoto}
-                                            onInitialized={handleCameraInitialized}
-                                        />
-                                        <Animated.View style={[styles.cameraFocusIndicator, cameraFocusIndicatorAnimatedStyle]} />
-                                        <Animated.View
-                                            pointerEvents="none"
-                                            style={[StyleSheet.absoluteFill, StyleUtils.getBackgroundColorStyle(theme.appBG), blinkStyle, styles.zIndex10]}
-                                        />
-                                    </View>
-                                </GestureDetector>
-                                {canUseMultiScan ? (
-                                    <View style={[styles.flashButtonContainer, styles.primaryMediumIcon, flash && styles.bgGreenSuccess, !hasFlash && styles.opacity0]}>
-                                        <PressableWithFeedback
-                                            role={CONST.ROLE.BUTTON}
-                                            accessibilityLabel={translate('receipt.flash')}
-                                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                                            disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
-                                            onPress={() => setFlash((prevFlash) => !prevFlash)}
-                                        >
-                                            <Icon
-                                                height={variables.iconSizeSmall}
-                                                width={variables.iconSizeSmall}
-                                                src={lazyIcons.Bolt}
-                                                fill={flash ? theme.white : theme.icon}
-                                            />
-                                        </PressableWithFeedback>
-                                    </View>
-                                ) : null}
-                            </View>
-                        )}
-                    </View>
-
-                    <View style={[styles.justifyContentAround, styles.alignItemsCenter, styles.p3, !isInLandscapeMode && styles.flexRow]}>
-                        <AttachmentPicker
-                            onOpenPicker={() => {
-                                setIsAttachmentPickerActive(true);
-                                setIsLoaderVisible(true);
-                            }}
-                            fileLimit={shouldAcceptMultipleFiles ? CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT : 1}
-                            shouldValidateImage={false}
-                        >
-                            {({openPicker}) => (
-                                <PressableWithFeedback
-                                    role={CONST.ROLE.BUTTON}
-                                    accessibilityLabel={translate('receipt.gallery')}
-                                    sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
-                                    style={[styles.alignItemsStart, isMultiScanEnabled && styles.opacity0]}
-                                    onPress={() => {
-                                        openPicker({
-                                            onPicked: (data) => validateFiles(data),
-                                            onCanceled: () => setIsLoaderVisible(false),
-                                            // makes sure the loader is not visible anymore e.g. when there is an error while uploading a file
-                                            onClosed: () => {
-                                                setIsAttachmentPickerActive(false);
-                                                setIsLoaderVisible(false);
-                                            },
-                                        });
-                                    }}
-                                >
-                                    <Icon
-                                        height={variables.iconSizeMenuItem}
-                                        width={variables.iconSizeMenuItem}
-                                        src={lazyIcons.Gallery}
-                                        fill={theme.textSupporting}
-                                    />
-                                </PressableWithFeedback>
-                            )}
-                        </AttachmentPicker>
-                        <PressableWithFeedback
-                            role={CONST.ROLE.BUTTON}
-                            accessibilityLabel={translate('receipt.shutter')}
-                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.SHUTTER}
-                            style={[styles.alignItemsCenter]}
-                            onPress={capturePhoto}
-                        >
-                            <ImageSVG
-                                contentFit="contain"
-                                src={lazyIllustrations.Shutter}
-                                width={CONST.RECEIPT.SHUTTER_SIZE}
-                                height={CONST.RECEIPT.SHUTTER_SIZE}
-                            />
-                        </PressableWithFeedback>
-                        {canUseMultiScan ? (
-                            <PressableWithFeedback
-                                accessibilityRole="button"
-                                role={CONST.ROLE.BUTTON}
-                                accessibilityLabel={translate('receipt.multiScan')}
-                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.MULTI_SCAN}
-                                style={styles.alignItemsEnd}
-                                onPress={toggleMultiScan}
-                            >
-                                <Icon
-                                    height={variables.iconSizeMenuItem}
-                                    width={variables.iconSizeMenuItem}
-                                    src={lazyIcons.ReceiptMultiple}
-                                    fill={isMultiScanEnabled ? theme.iconMenu : theme.textSupporting}
-                                />
-                            </PressableWithFeedback>
-                        ) : (
-                            <PressableWithFeedback
-                                role={CONST.ROLE.BUTTON}
-                                accessibilityLabel={translate('receipt.flash')}
-                                sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                                style={[styles.alignItemsEnd, !hasFlash && styles.opacity0]}
-                                disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
-                                onPress={() => setFlash((prevFlash) => !prevFlash)}
-                            >
-                                <Icon
-                                    height={variables.iconSizeMenuItem}
-                                    width={variables.iconSizeMenuItem}
-                                    src={flash ? lazyIcons.Bolt : lazyIcons.boltSlash}
-                                    fill={theme.textSupporting}
-                                />
-                            </PressableWithFeedback>
-                        )}
-                    </View>
-
-                    {canUseMultiScan && isInLandscapeMode && (
-                        <ReceiptPreviews
-                            isMultiScanEnabled={isMultiScanEnabled}
-                            submit={submitMultiScanReceipts}
-                            isCapturingPhoto={didCapturePhoto}
-                            isInLandscapeMode
-                        />
-                    )}
-                </View>
-
-                {canUseMultiScan && !isInLandscapeMode && (
-                    <ReceiptPreviews
-                        isMultiScanEnabled={isMultiScanEnabled}
-                        submit={submitMultiScanReceipts}
-                        isCapturingPhoto={didCapturePhoto}
-                    />
-                )}
-
-                {startLocationPermissionFlow && !!receiptFiles.length && (
-                    <LocationPermissionModal
-                        startPermissionFlow={startLocationPermissionFlow}
-                        resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
-                        onGrant={() => navigateToConfirmationStep(receiptFiles, true)}
-                        onDeny={() => {
-                            updateLastLocationPermissionPrompt();
-                            navigateToConfirmationStep(receiptFiles, false);
-                        }}
-                    />
-                )}
-
-                {shouldShowMultiScanEducationalPopup && (
-                    <FeatureTrainingModal
-                        title={translate('iou.scanMultipleReceipts')}
-                        image={lazyIllustrations.MultiScan}
-                        shouldRenderSVG
-                        imageHeight={220}
-                        modalInnerContainerStyle={styles.pt0}
-                        illustrationOuterContainerStyle={styles.multiScanEducationalPopupImage}
-                        onConfirm={dismissMultiScanEducationalPopup}
-                        titleStyles={styles.mb2}
-                        confirmText={translate('common.buttonConfirm')}
-                        description={translate('iou.scanMultipleReceiptsDescription')}
-                        contentInnerContainerStyles={styles.mb6}
-                        shouldGoBack={false}
-                    />
-                )}
-
-                {ErrorModal}
-            </View>
-        </StepScreenWrapper>
-    );
-}
-
-const IOURequestStepScanWithCurrentUserPersonalDetails = withCurrentUserPersonalDetails(IOURequestStepScan);
-
-const IOURequestStepScanWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepScanWithCurrentUserPersonalDetails, true);
-
-const IOURequestStepScanWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepScanWithWritableReportOrNotFound);
-
-export default IOURequestStepScanWithFullTransactionOrNotFound;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
index fb346b53ed1a..a68a1c42d083 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -1,210 +1,37 @@
-import React, {useCallback, useEffect, useRef} from 'react';
-import {RESULTS} from 'react-native-permissions';
-import LocationPermissionModal from '@components/LocationPermissionModal';
+import React from 'react';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
-import useOnyx from '@hooks/useOnyx';
-import usePolicy from '@hooks/usePolicy';
-import {clearUserLocation, setUserLocation} from '@libs/actions/UserLocation';
-import {isMobile} from '@libs/Browser';
-import {isLocalFile as isLocalFileFileUtils} from '@libs/fileDownload/FileUtils';
-import getCurrentPosition from '@libs/getCurrentPosition';
-import Navigation from '@libs/Navigation/Navigation';
-import {endSpan} from '@libs/telemetry/activeSpans';
 import withFullTransactionOrNotFound from '@pages/iou/request/step/withFullTransactionOrNotFound';
 import withWritableReportOrNotFound from '@pages/iou/request/step/withWritableReportOrNotFound';
-import {updateLastLocationPermissionPrompt} from '@userActions/IOU';
-import {checkIfLocalFileIsAccessible, replaceReceipt} from '@userActions/IOU/Receipt';
-import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
-import CONST from '@src/CONST';
-import ONYXKEYS from '@src/ONYXKEYS';
-import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
-import type {FileObject} from '@src/types/utils/Attachment';
-import DesktopWebUploadView from './components/DesktopWebUploadView';
-import MobileWebCameraView from './components/MobileWebCameraView';
-import useReceiptScan from './hooks/useReceiptScan';
-import {getLocationPermission} from './LocationPermission';
+import ScanRouter from './ScanRouter';
 import type IOURequestStepScanProps from './types';
 
 function IOURequestStepScan({
     report,
     route: {
-        name: routeName,
-        params: {action, iouType, reportID, transactionID: initialTransactionID, backTo, backToReport},
+        params: {action, iouType, reportID, transactionID, backTo, backToReport},
     },
-    transaction: initialTransaction,
-    currentUserPersonalDetails,
+    transaction,
 }: Omit<IOURequestStepScanProps, 'user'>) {
-    const isMobileWeb = isMobile();
-    const policy = usePolicy(report?.policyID);
-    const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
-    const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
-
-    // End the create expense span on mount for web (no camera init tracking needed)
-    useEffect(() => {
-        endSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-    }, []);
-
-    const navigateBack = useCallback(() => {
-        Navigation.goBack(backTo);
-    }, [backTo]);
-
-    const updateScanAndNavigate = useCallback(
-        (file: FileObject, source: string) => {
-            replaceReceipt({transactionID: initialTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
-            navigateBack();
-        },
-        [initialTransactionID, navigateBack, policy, policyCategories],
-    );
-
-    const getSource = useCallback((file: FileObject) => file.uri ?? URL.createObjectURL(file as Blob), []);
-
-    const {
-        transactions,
-        isMultiScanEnabled,
-        setIsMultiScanEnabled,
-        isStartingScan,
-        isEditing,
-        isReplacingReceipt,
-        shouldAcceptMultipleFiles,
-        shouldSkipConfirmation,
-        startLocationPermissionFlow,
-        setStartLocationPermissionFlow,
-        receiptFiles,
-        setReceiptFiles,
-        navigateToConfirmationStep,
-        validateFiles,
-        PDFValidationComponent,
-        ErrorModal,
-    } = useReceiptScan({
-        report,
-        reportID,
-        initialTransactionID,
-        initialTransaction,
-        iouType,
-        action,
-        currentUserPersonalDetails,
-        backTo,
-        backToReport,
-        routeName,
-        updateScanAndNavigate,
-        getSource,
-    });
-
-    const hasValidatedInitialScanFiles = useRef(false);
-
-    // When the component mounts, if there is a receipt, see if the image can be read from the disk. If not, make the user start scanning flow from scratch.
-    // This is because until the request is saved, the receipt file is only stored in the browsers memory as a blob:// and if the browser is refreshed, then
-    // the image ceases to exist. The best way for the user to recover from this is to start over from the start of the request process.
-    useEffect(() => {
-        if (hasValidatedInitialScanFiles.current) {
-            return;
-        }
-        hasValidatedInitialScanFiles.current = true;
-
-        let isAllScanFilesCanBeRead = true;
-
-        Promise.all(
-            transactions.map((item) => {
-                const itemReceiptPath = item.receipt?.source;
-                const isLocalFile = isLocalFileFileUtils(itemReceiptPath);
-
-                if (!isLocalFile) {
-                    return Promise.resolve();
-                }
-
-                const onFailure = () => {
-                    isAllScanFilesCanBeRead = false;
-                };
-
-                return checkIfLocalFileIsAccessible(item.receipt?.filename, itemReceiptPath, item.receipt?.type, () => {}, onFailure);
-            }),
-        ).then(() => {
-            if (isAllScanFilesCanBeRead) {
-                return;
-            }
-            setIsMultiScanEnabled(false);
-            removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
-            removeDraftTransactionsByIDs(draftTransactionIDs, true);
-        });
-    }, [setIsMultiScanEnabled, transactions, draftTransactionIDs]);
-
-    // this effect will pre-fetch location in web if the location permission is already granted to optimize the flow
-    useEffect(() => {
-        const gpsRequired = initialTransaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
-        if (!gpsRequired) {
-            return;
-        }
-
-        getLocationPermission().then((status) => {
-            if (status !== RESULTS.GRANTED && status !== RESULTS.LIMITED) {
-                return;
-            }
-
-            clearUserLocation();
-            getCurrentPosition(
-                (successData) => {
-                    setUserLocation({longitude: successData.coords.longitude, latitude: successData.coords.latitude});
-                },
-                () => {},
-            );
-        });
-    }, [initialTransaction?.amount, iouType]);
-
     return (
-        <>
-            {isMobileWeb ? (
-                <MobileWebCameraView
-                    initialTransaction={initialTransaction}
-                    initialTransactionID={initialTransactionID}
-                    iouType={iouType}
-                    currentUserPersonalDetails={currentUserPersonalDetails}
-                    reportID={reportID}
-                    isMultiScanEnabled={isMultiScanEnabled}
-                    isStartingScan={isStartingScan}
-                    updateScanAndNavigate={updateScanAndNavigate}
-                    setIsMultiScanEnabled={setIsMultiScanEnabled}
-                    PDFValidationComponent={PDFValidationComponent}
-                    shouldAcceptMultipleFiles={shouldAcceptMultipleFiles}
-                    receiptFiles={receiptFiles}
-                    isEditing={isEditing}
-                    validateFiles={validateFiles}
-                    setReceiptFiles={setReceiptFiles}
-                    navigateToConfirmationStep={navigateToConfirmationStep}
-                    shouldSkipConfirmation={shouldSkipConfirmation}
-                    setStartLocationPermissionFlow={setStartLocationPermissionFlow}
-                    onBackButtonPress={navigateBack}
-                    shouldShowWrapper={!!backTo || isEditing}
-                />
-            ) : (
-                <DesktopWebUploadView
-                    PDFValidationComponent={PDFValidationComponent}
-                    shouldAcceptMultipleFiles={shouldAcceptMultipleFiles}
-                    isReplacingReceipt={isReplacingReceipt}
-                    validateFiles={validateFiles}
-                    onBackButtonPress={navigateBack}
-                    shouldShowWrapper={!!backTo || isEditing}
-                />
-            )}
-            {ErrorModal}
-            {startLocationPermissionFlow && !!receiptFiles.length && (
-                <LocationPermissionModal
-                    startPermissionFlow={startLocationPermissionFlow}
-                    resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
-                    onGrant={() => navigateToConfirmationStep(receiptFiles, true)}
-                    onDeny={() => {
-                        updateLastLocationPermissionPrompt();
-                        navigateToConfirmationStep(receiptFiles, false);
-                    }}
-                />
-            )}
-        </>
+        <ScanRouter
+            report={report}
+            action={action}
+            iouType={iouType}
+            reportID={reportID}
+            transactionID={transactionID}
+            transaction={transaction}
+            backTo={backTo}
+            backToReport={backToReport}
+        />
     );
 }
 
-const IOURequestStepScanWithCurrentUserPersonalDetails = withCurrentUserPersonalDetails(IOURequestStepScan);
+IOURequestStepScan.displayName = 'IOURequestStepScan';
 
+const IOURequestStepScanWithCurrentUserPersonalDetails = withCurrentUserPersonalDetails(IOURequestStepScan);
+// eslint-disable-next-line rulesdir/no-negated-variables
 const IOURequestStepScanWithWritableReportOrNotFound = withWritableReportOrNotFound(IOURequestStepScanWithCurrentUserPersonalDetails, true);
-
+// eslint-disable-next-line rulesdir/no-negated-variables
 const IOURequestStepScanWithFullTransactionOrNotFound = withFullTransactionOrNotFound(IOURequestStepScanWithWritableReportOrNotFound);
 
 export default IOURequestStepScanWithFullTransactionOrNotFound;

From d18c13309b3a69cbc9b79c9e0fdd8afd55cc4b71 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 30 Apr 2026 19:50:20 +0200
Subject: [PATCH 03/33] refactor: decompose IOURequestStepScan into variant
 router

---
 .../components/ScanFromReport.tsx             |  9 ++++--
 .../components/ScanGlobalCreate.tsx           |  5 +++
 .../components/ScanSkipConfirmation.tsx       | 32 ++++++++++++++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index f80e5a2ef10a..b01ba95d50dd 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -13,7 +13,7 @@ import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getF
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU';
-import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
+import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
@@ -48,6 +48,10 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
             return;
         }
 
+        if (!isMultiScanEnabled) {
+            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+        }
+
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -76,8 +80,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
         <MultiScanGate>
             {PDFValidationComponent}
             <Camera
-                onCapture={(file, source) => {
-                    setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
+                onCapture={(file) => {
                     processReceipts([file]);
                 }}
                 onDrop={validateFiles}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 93a3f6a0eb1f..8c976a40af19 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -19,6 +19,7 @@ import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/uti
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {setTransactionReport} from '@userActions/Transaction';
+import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -59,6 +60,10 @@ function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction
             return;
         }
 
+        if (!isMultiScanEnabled) {
+            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+        }
+
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index d0942d2f5a59..d5f41561cac5 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -1,5 +1,6 @@
-import React, {useState} from 'react';
+import React, {useEffect, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {RESULTS} from 'react-native-permissions';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
@@ -12,6 +13,7 @@ import useReportAttributes from '@hooks/useReportAttributes';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import {createTransaction, getMoneyRequestParticipantOptions} from '@libs/actions/IOU/MoneyRequest';
 import {startSplitBill} from '@libs/actions/IOU/Split';
+import {clearUserLocation, setUserLocation} from '@libs/actions/UserLocation';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import {calculateDefaultReimbursable} from '@libs/IOUUtils';
 import Log from '@libs/Log';
@@ -21,10 +23,12 @@ import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera
 import GpsPermissionGate from '@pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate';
 import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
 import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import {getLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
+import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -85,6 +89,28 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
 
     useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
 
+    // Pre-fetch location if GPS is required and permission is already granted
+    useEffect(() => {
+        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
+        if (!gpsRequired) {
+            return;
+        }
+
+        getLocationPermission().then((status) => {
+            if (status !== RESULTS.GRANTED && status !== RESULTS.LIMITED) {
+                return;
+            }
+
+            clearUserLocation();
+            getCurrentPosition(
+                (successData) => {
+                    setUserLocation({longitude: successData.coords.longitude, latitude: successData.coords.latitude});
+                },
+                () => {},
+            );
+        });
+    }, [transaction?.amount, iouType]);
+
     const cancelShutterSpans = () => {
         cancelSpan(CONST.TELEMETRY.SPAN_SCAN_PROCESS_AND_NAVIGATE);
         cancelSpan(CONST.TELEMETRY.SPAN_CONFIRMATION_MOUNT);
@@ -194,6 +220,10 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
             return;
         }
 
+        if (!isMultiScanEnabled) {
+            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+        }
+
         const newReceiptFiles = buildReceiptFiles({
             files,
             getFileSource,

From 3803d61e3bd794f67650bc47a7077918952802b4 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 4 May 2026 16:54:07 +0200
Subject: [PATCH 04/33] fix: address CI failures in scan decomposition PR

---
 .../step/IOURequestStepScan/ScanRouter.tsx    | 56 +++++++++++--------
 .../components/ScanEditReceipt.tsx            |  6 +-
 .../components/ScanFromReport.tsx             | 26 ++++-----
 .../components/ScanGlobalCreate.tsx           | 28 +++++-----
 .../components/ScanSkipConfirmation.tsx       | 28 +++++-----
 tests/ui/IOURequestStepScanTest.tsx           |  5 ++
 6 files changed, 81 insertions(+), 68 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index b50ed7f0087c..99af6df62173 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -4,16 +4,17 @@ import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import {isPolicyExpenseChat} from '@libs/ReportUtils';
-import ScanEditReceipt from '@pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt';
-import ScanFromReport from '@pages/iou/request/step/IOURequestStepScan/components/ScanFromReport';
-import ScanGlobalCreate from '@pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate';
-import ScanSkipConfirmation from '@pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation';
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
+import MultiScanGate from './components/MultiScanGate';
+import ScanEditReceipt from './components/ScanEditReceipt';
+import ScanFromReport from './components/ScanFromReport';
+import ScanGlobalCreate from './components/ScanGlobalCreate';
+import ScanSkipConfirmation from './components/ScanSkipConfirmation';
 
 type ScanRouterProps = {
     report: OnyxEntry<Report>;
@@ -30,6 +31,8 @@ type ScanRouterProps = {
  * ScanRouter — thin routing layer that selects the appropriate scan variant
  * based on route params and transaction state.
  *
+ * MultiScanGate wraps non-edit variants so they can access MultiScanContext.
+ *
  * Variant selection:
  *   Edit       — replacing an existing receipt (backTo or isEditing)
  *   SkipConfirm — quick action with skipConfirmation flag (direct submit)
@@ -43,7 +46,7 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
 
     const isEditing = action === CONST.IOU.ACTION.EDIT;
 
-    // Edit/replace receipt flow
+    // Edit/replace receipt flow — no multi-scan needed
     if (backTo || isEditing) {
         return (
             <ScanEditReceipt
@@ -58,11 +61,26 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
     const shouldSkipConfirmation =
         !!skipConfirmation && !!report?.reportID && !isArchived && !(isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
 
-    // From-report flows (not global create, not archived)
+    // Non-edit variants are wrapped in MultiScanGate so they can read multi-scan state
     if (!isFromGlobalCreate && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
         if (shouldSkipConfirmation) {
             return (
-                <ScanSkipConfirmation
+                <MultiScanGate>
+                    <ScanSkipConfirmation
+                        report={report}
+                        iouType={iouType}
+                        reportID={reportID}
+                        transactionID={transactionID}
+                        transaction={transaction}
+                        backToReport={backToReport}
+                    />
+                </MultiScanGate>
+            );
+        }
+
+        return (
+            <MultiScanGate>
+                <ScanFromReport
                     report={report}
                     iouType={iouType}
                     reportID={reportID}
@@ -70,11 +88,13 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
                     transaction={transaction}
                     backToReport={backToReport}
                 />
-            );
-        }
+            </MultiScanGate>
+        );
+    }
 
-        return (
-            <ScanFromReport
+    return (
+        <MultiScanGate>
+            <ScanGlobalCreate
                 report={report}
                 iouType={iouType}
                 reportID={reportID}
@@ -82,19 +102,7 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
                 transaction={transaction}
                 backToReport={backToReport}
             />
-        );
-    }
-
-    // Global create flow (FAB or archived report)
-    return (
-        <ScanGlobalCreate
-            report={report}
-            iouType={iouType}
-            reportID={reportID}
-            transactionID={transactionID}
-            transaction={transaction}
-            backToReport={backToReport}
-        />
+        </MultiScanGate>
     );
 }
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index 758f9b03c37b..e86bfc8afa34 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -3,15 +3,15 @@ import type {OnyxEntry} from 'react-native-onyx';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import Navigation from '@libs/Navigation/Navigation';
-import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
-import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import {replaceReceipt} from '@userActions/IOU/Receipt';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import type {FileObject} from '@src/types/utils/Attachment';
+import useScanCapture from '../hooks/useScanCapture';
+import getFileSource from '../utils/getFileSource';
+import Camera from './Camera';
 
 type ScanEditReceiptProps = {
     report: OnyxEntry<Report>;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index b01ba95d50dd..341c50cb793e 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -1,17 +1,9 @@
-import React, {useState} from 'react';
+import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
 import {navigateToConfirmationPage} from '@libs/IOUUtils';
-import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
-import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
-import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
-import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
-import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
-import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
-import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import type {IOUType} from '@src/CONST';
@@ -20,6 +12,14 @@ import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'
 import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
+import useScanCapture from '../hooks/useScanCapture';
+import type {ReceiptFile} from '../types';
+import buildReceiptFiles from '../utils/buildReceiptFiles';
+import getFileSource from '../utils/getFileSource';
+import startScanProcessSpan from '../utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
+import Camera from './Camera';
+import {useMultiScanState} from './MultiScanContext';
 
 type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
     report: OnyxEntry<Report>;
@@ -36,12 +36,12 @@ type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
  */
 function ScanFromReport({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanFromReportProps) {
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
-    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+    const {isMultiScanEnabled} = useMultiScanState();
 
     // TODO: derive transactions from useOptimisticDraftTransactions when wired up
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
 
     const processReceipts = (files: FileObject[]) => {
         if (files.length === 0) {
@@ -77,7 +77,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
     });
 
     return (
-        <MultiScanGate>
+        <>
             {PDFValidationComponent}
             <Camera
                 onCapture={(file) => {
@@ -87,7 +87,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
-        </MultiScanGate>
+        </>
     );
 }
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 8c976a40af19..63d34ac1a1d2 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -1,4 +1,4 @@
-import React, {useState} from 'react';
+import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
@@ -9,14 +9,6 @@ import {navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUt
 import Navigation from '@libs/Navigation/Navigation';
 import {getPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
-import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
-import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
-import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
-import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
-import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
-import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
-import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {setTransactionReport} from '@userActions/Transaction';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
@@ -28,6 +20,14 @@ import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'
 import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
+import useScanCapture from '../hooks/useScanCapture';
+import type {ReceiptFile} from '../types';
+import buildReceiptFiles from '../utils/buildReceiptFiles';
+import getFileSource from '../utils/getFileSource';
+import startScanProcessSpan from '../utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
+import Camera from './Camera';
+import {useMultiScanState} from './MultiScanContext';
 
 type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
     report: OnyxEntry<Report>;
@@ -49,11 +49,11 @@ function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
     const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
-    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+    const {isMultiScanEnabled} = useMultiScanState();
 
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
 
     const processReceipts = (files: FileObject[]) => {
         if (files.length === 0) {
@@ -119,17 +119,17 @@ function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction
     });
 
     return (
-        <MultiScanGate>
+        <>
             {PDFValidationComponent}
             <Camera
-                onCapture={(file, source) => {
+                onCapture={(file) => {
                     processReceipts([file]);
                 }}
                 onDrop={validateFiles}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
-        </MultiScanGate>
+        </>
     );
 }
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index d5f41561cac5..59cee163b164 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -19,15 +19,6 @@ import {calculateDefaultReimbursable} from '@libs/IOUUtils';
 import Log from '@libs/Log';
 import {cancelSpan} from '@libs/telemetry/activeSpans';
 import {getDefaultTaxCode, getTaxValue} from '@libs/TransactionUtils';
-import Camera from '@pages/iou/request/step/IOURequestStepScan/components/Camera';
-import GpsPermissionGate from '@pages/iou/request/step/IOURequestStepScan/components/GpsPermissionGate';
-import MultiScanGate from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanGate';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
-import {getLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
-import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
-import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
-import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
-import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
@@ -37,6 +28,15 @@ import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {Receipt} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
+import useScanCapture from '../hooks/useScanCapture';
+import {getLocationPermission} from '../LocationPermission';
+import type {ReceiptFile} from '../types';
+import buildReceiptFiles from '../utils/buildReceiptFiles';
+import getFileSource from '../utils/getFileSource';
+import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
+import Camera from './Camera';
+import GpsPermissionGate from './GpsPermissionGate';
+import {useMultiScanState} from './MultiScanContext';
 
 type ScanSkipConfirmationProps = WithCurrentUserPersonalDetailsProps & {
     report: OnyxEntry<Report>;
@@ -75,7 +75,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [shouldStartLocationPermissionFlow] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT);
 
     const [transactions] = useOptimisticDraftTransactions(transaction);
-    const [isMultiScanEnabled, setIsMultiScanEnabled] = useState(false);
+    const {isMultiScanEnabled} = useMultiScanState();
     const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
     const [receiptFiles, setReceiptFiles] = useState<ReceiptFile[]>([]);
 
@@ -87,7 +87,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const transactionTaxAmount = transaction?.taxAmount ?? 0;
     const transactionTaxValue = transaction?.taxValue ?? getTaxValue(policy, transaction, transactionTaxCode) ?? '';
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), setIsMultiScanEnabled);
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
 
     // Pre-fetch location if GPS is required and permission is already granted
     useEffect(() => {
@@ -256,10 +256,10 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     });
 
     return (
-        <MultiScanGate>
+        <>
             {PDFValidationComponent}
             <Camera
-                onCapture={(file, source) => {
+                onCapture={(file) => {
                     processReceipts([file]);
                 }}
                 onDrop={validateFiles}
@@ -272,7 +272,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
                 resetPermissionFlow={() => setStartLocationPermissionFlow(false)}
                 onComplete={submitDirectly}
             />
-        </MultiScanGate>
+        </>
     );
 }
 
diff --git a/tests/ui/IOURequestStepScanTest.tsx b/tests/ui/IOURequestStepScanTest.tsx
index c57d188f7bfc..3b65955cae0f 100644
--- a/tests/ui/IOURequestStepScanTest.tsx
+++ b/tests/ui/IOURequestStepScanTest.tsx
@@ -55,6 +55,11 @@ jest.mock('react-native-vision-camera', () => ({
     useCameraFormat: jest.fn(() => null),
 }));
 
+jest.mock('@pages/iou/request/step/IOURequestStepScan/hooks/useScanRouteParams', () => ({
+    __esModule: true,
+    default: () => ({iouType: 'submit', routeName: 'Money_Request_Create'}),
+}));
+
 function createMinimalReport(reportID: string, policyID: string): Report {
     return {
         reportID,

From cff9c8ba7e6890edbe82583d5d4f5312644b97df Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 4 May 2026 17:34:19 +0200
Subject: [PATCH 05/33] chore: lint fixes

---
 .../components/ScanEditReceipt.tsx            |  4 +-
 .../components/ScanFromReport.tsx             | 12 ++--
 .../components/ScanGlobalCreate.tsx           | 64 +++++++++----------
 .../components/ScanSkipConfirmation.tsx       | 14 ++--
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index e86bfc8afa34..1413e3efe3cb 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -3,14 +3,14 @@ import type {OnyxEntry} from 'react-native-onyx';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import Navigation from '@libs/Navigation/Navigation';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import {replaceReceipt} from '@userActions/IOU/Receipt';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import type {FileObject} from '@src/types/utils/Attachment';
-import useScanCapture from '../hooks/useScanCapture';
-import getFileSource from '../utils/getFileSource';
 import Camera from './Camera';
 
 type ScanEditReceiptProps = {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 341c50cb793e..5fae328080e8 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -4,6 +4,12 @@ import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalD
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
 import {navigateToConfirmationPage} from '@libs/IOUUtils';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import type {IOUType} from '@src/CONST';
@@ -12,12 +18,6 @@ import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'
 import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
-import useScanCapture from '../hooks/useScanCapture';
-import type {ReceiptFile} from '../types';
-import buildReceiptFiles from '../utils/buildReceiptFiles';
-import getFileSource from '../utils/getFileSource';
-import startScanProcessSpan from '../utils/startScanProcessSpan';
-import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
 import Camera from './Camera';
 import {useMultiScanState} from './MultiScanContext';
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 63d34ac1a1d2..e080cc49af36 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -9,6 +9,12 @@ import {navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUt
 import Navigation from '@libs/Navigation/Navigation';
 import {getPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {setTransactionReport} from '@userActions/Transaction';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
@@ -20,12 +26,6 @@ import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'
 import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
-import useScanCapture from '../hooks/useScanCapture';
-import type {ReceiptFile} from '../types';
-import buildReceiptFiles from '../utils/buildReceiptFiles';
-import getFileSource from '../utils/getFileSource';
-import startScanProcessSpan from '../utils/startScanProcessSpan';
-import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
 import Camera from './Camera';
 import {useMultiScanState} from './MultiScanContext';
 
@@ -42,7 +42,7 @@ type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
  * ScanGlobalCreate — initiated from the FAB (+) button (no specific report).
  * Uses default expense policy to auto-select workspace, or navigates to participant picker.
  */
-function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
+function ScanGlobalCreate({report: _report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
     const defaultExpensePolicy = useDefaultExpensePolicy();
     const selfDMReport = useSelfDMReport();
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
@@ -55,31 +55,6 @@ function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction
 
     useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
 
-    const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-
-        if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
-        }
-
-        const receiptFiles = buildReceiptFiles({
-            files,
-            getFileSource,
-            initialTransaction: transaction,
-            initialTransactionID: transactionID,
-            currentUserPersonalDetails,
-            reportID,
-            shouldAcceptMultipleFiles: true,
-            isMultiScanEnabled,
-            transactions,
-        });
-
-        startScanProcessSpan(isMultiScanEnabled);
-        navigateGlobalCreate(receiptFiles);
-    };
-
     const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
             const shouldAutoReport = !!defaultExpensePolicy?.autoReporting;
@@ -114,6 +89,31 @@ function ScanGlobalCreate({report, iouType, reportID, transactionID, transaction
         }
     };
 
+    const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+
+        if (!isMultiScanEnabled) {
+            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+        }
+
+        const receiptFiles = buildReceiptFiles({
+            files,
+            getFileSource,
+            initialTransaction: transaction,
+            initialTransactionID: transactionID,
+            currentUserPersonalDetails,
+            reportID,
+            shouldAcceptMultipleFiles: true,
+            isMultiScanEnabled,
+            transactions,
+        });
+
+        startScanProcessSpan(isMultiScanEnabled);
+        navigateGlobalCreate(receiptFiles);
+    };
+
     const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
         processReceipts(files);
     });
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 59cee163b164..e62a88bba9bf 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -19,6 +19,12 @@ import {calculateDefaultReimbursable} from '@libs/IOUUtils';
 import Log from '@libs/Log';
 import {cancelSpan} from '@libs/telemetry/activeSpans';
 import {getDefaultTaxCode, getTaxValue} from '@libs/TransactionUtils';
+import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
+import {getLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
+import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
+import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
+import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
@@ -28,12 +34,6 @@ import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {Receipt} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
-import useScanCapture from '../hooks/useScanCapture';
-import {getLocationPermission} from '../LocationPermission';
-import type {ReceiptFile} from '../types';
-import buildReceiptFiles from '../utils/buildReceiptFiles';
-import getFileSource from '../utils/getFileSource';
-import useScanFileReadabilityCheck from '../utils/useScanFileReadabilityCheck';
 import Camera from './Camera';
 import GpsPermissionGate from './GpsPermissionGate';
 import {useMultiScanState} from './MultiScanContext';
@@ -65,7 +65,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [policyRecentlyUsedCurrencies] = useOnyx(ONYXKEYS.RECENTLY_USED_CURRENCIES);
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
-    const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (value: OnyxEntry<Record<string, unknown>>) => !!(value as Record<string, unknown>)?.hasSeenTour});
+    const [isSelfTourViewed = false] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: (value: OnyxEntry<Record<string, unknown>>) => !!value?.hasSeenTour});
     const [betas] = useOnyx(ONYXKEYS.BETAS);
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);

From 0005ef1a22f2ee2621497cb9a03bde06338788a0 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 4 May 2026 17:54:22 +0200
Subject: [PATCH 06/33] fix: adjust ScanGlobalCreate report logic

---
 src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx   | 1 -
 .../step/IOURequestStepScan/components/ScanGlobalCreate.tsx    | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index 99af6df62173..3c49e71b6a80 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -95,7 +95,6 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
     return (
         <MultiScanGate>
             <ScanGlobalCreate
-                report={report}
                 iouType={iouType}
                 reportID={reportID}
                 transactionID={transactionID}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index e080cc49af36..8f9066317085 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -30,7 +30,6 @@ import Camera from './Camera';
 import {useMultiScanState} from './MultiScanContext';
 
 type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
-    report: OnyxEntry<Report>;
     iouType: IOUType;
     reportID: string;
     transactionID: string;
@@ -42,7 +41,7 @@ type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
  * ScanGlobalCreate — initiated from the FAB (+) button (no specific report).
  * Uses default expense policy to auto-select workspace, or navigates to participant picker.
  */
-function ScanGlobalCreate({report: _report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
+function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
     const defaultExpensePolicy = useDefaultExpensePolicy();
     const selfDMReport = useSelfDMReport();
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});

From 6bc2d670ed2affb6745d775a4bea157cfccbb9a9 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 4 May 2026 18:11:56 +0200
Subject: [PATCH 07/33] fix: scanGlobalCreate cleanup

---
 .../step/IOURequestStepScan/components/ScanGlobalCreate.tsx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 8f9066317085..29aa97c80a65 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -23,7 +23,6 @@ import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
-import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 import Camera from './Camera';

From 06af0661fb1f49fe746c4a8481b9e21925aa3c74 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 5 May 2026 13:45:38 +0200
Subject: [PATCH 08/33] add support for camera permission issue

---
 .../components/MultiScanContext.tsx                |  7 +++++++
 .../components/ScanEditReceipt.tsx                 | 14 +++++++++++++-
 .../components/ScanFromReport.tsx                  |  5 +++--
 .../components/ScanGlobalCreate.tsx                |  5 +++--
 .../components/ScanSkipConfirmation.tsx            |  5 +++--
 .../utils/useScanFileReadabilityCheck.ts           |  6 +++---
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/MultiScanContext.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/MultiScanContext.tsx
index efd63edb052a..bdf9d0ffae5f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/MultiScanContext.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/MultiScanContext.tsx
@@ -17,6 +17,7 @@ type MultiScanState = {
 type MultiScanActions = {
     toggleMultiScan: () => void;
     dismissEducationalPopup: () => void;
+    disableMultiScan: () => void;
 };
 
 const defaultState: MultiScanState = {
@@ -28,6 +29,7 @@ const defaultState: MultiScanState = {
 const defaultActions: MultiScanActions = {
     toggleMultiScan: () => {},
     dismissEducationalPopup: () => {},
+    disableMultiScan: () => {},
 };
 
 const MultiScanStateContext = createContext<MultiScanState>(defaultState);
@@ -65,6 +67,10 @@ function MultiScanProvider({children}: MultiScanProviderProps) {
         setIsMultiScanEnabled((prev) => !prev);
     }
 
+    function disableMultiScan() {
+        setIsMultiScanEnabled(false);
+    }
+
     function dismissEducationalPopup() {
         // Defer dismissal to avoid updating state during the modal close animation
         requestAnimationFrame(() => {
@@ -82,6 +88,7 @@ function MultiScanProvider({children}: MultiScanProviderProps) {
     const actionsValue: MultiScanActions = {
         toggleMultiScan,
         dismissEducationalPopup,
+        disableMultiScan,
     };
 
     return (
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index 1413e3efe3cb..24524ee7d663 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -3,12 +3,14 @@ import type {OnyxEntry} from 'react-native-onyx';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import Navigation from '@libs/Navigation/Navigation';
+import navigationRef from '@libs/Navigation/navigationRef';
 import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import {replaceReceipt} from '@userActions/IOU/Receipt';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
 import type {Report} from '@src/types/onyx';
 import type {FileObject} from '@src/types/utils/Attachment';
 import Camera from './Camera';
@@ -28,7 +30,17 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
 
     const navigateBack = () => {
-        Navigation.goBack(backTo);
+        // Fix for issue where navigation state is lost after returning from device settings
+        // https://github.com/Expensify/App/issues/65992
+        const navigationState = navigationRef.current?.getState();
+        const reportsSplitNavigator = navigationState?.routes?.findLast((route) => route.name === 'ReportsSplitNavigator');
+        const hasLostNavigationState = reportsSplitNavigator && !reportsSplitNavigator.state;
+
+        if (hasLostNavigationState) {
+            Navigation.navigate(backTo ?? ROUTES.INBOX);
+        } else {
+            Navigation.goBack(backTo);
+        }
     };
 
     const handleCapture = (file: FileObject, source: string) => {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 5fae328080e8..5e65c3f3914a 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -19,7 +19,7 @@ import type {Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 import Camera from './Camera';
-import {useMultiScanState} from './MultiScanContext';
+import {useMultiScanActions, useMultiScanState} from './MultiScanContext';
 
 type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
     report: OnyxEntry<Report>;
@@ -37,11 +37,12 @@ type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
 function ScanFromReport({report, iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanFromReportProps) {
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
     const {isMultiScanEnabled} = useMultiScanState();
+    const {disableMultiScan} = useMultiScanActions();
 
     // TODO: derive transactions from useOptimisticDraftTransactions when wired up
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
 
     const processReceipts = (files: FileObject[]) => {
         if (files.length === 0) {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 29aa97c80a65..ce43bb8d3cd7 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -26,7 +26,7 @@ import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft'
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 import Camera from './Camera';
-import {useMultiScanState} from './MultiScanContext';
+import {useMultiScanActions, useMultiScanState} from './MultiScanContext';
 
 type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
     iouType: IOUType;
@@ -48,10 +48,11 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     const [userBillingGracePeriodEnds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END);
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const {isMultiScanEnabled} = useMultiScanState();
+    const {disableMultiScan} = useMultiScanActions();
 
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
 
     const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index e62a88bba9bf..1e0a2950ca36 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -36,7 +36,7 @@ import type {Receipt} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 import Camera from './Camera';
 import GpsPermissionGate from './GpsPermissionGate';
-import {useMultiScanState} from './MultiScanContext';
+import {useMultiScanActions, useMultiScanState} from './MultiScanContext';
 
 type ScanSkipConfirmationProps = WithCurrentUserPersonalDetailsProps & {
     report: OnyxEntry<Report>;
@@ -76,6 +76,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
 
     const [transactions] = useOptimisticDraftTransactions(transaction);
     const {isMultiScanEnabled} = useMultiScanState();
+    const {disableMultiScan} = useMultiScanActions();
     const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
     const [receiptFiles, setReceiptFiles] = useState<ReceiptFile[]>([]);
 
@@ -87,7 +88,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const transactionTaxAmount = transaction?.taxAmount ?? 0;
     const transactionTaxValue = transaction?.taxValue ?? getTaxValue(policy, transaction, transactionTaxCode) ?? '';
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), () => {});
+    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
 
     // Pre-fetch location if GPS is required and permission is already granted
     useEffect(() => {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts
index a50b4eeb6a93..77b3af450bf4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck.ts
@@ -10,7 +10,7 @@ import type Transaction from '@src/types/onyx/Transaction';
  * If the browser was refreshed, blob URLs cease to exist — this resets the scan flow
  * so the user can start over rather than seeing broken images.
  */
-function useScanFileReadabilityCheck(transactions: Array<Partial<Transaction>>, draftTransactionIDs: string[], setIsMultiScanEnabled: (value: boolean) => void) {
+function useScanFileReadabilityCheck(transactions: Array<Partial<Transaction>>, draftTransactionIDs: string[], disableMultiScan: () => void) {
     const hasValidated = useRef(false);
 
     useEffect(() => {
@@ -40,11 +40,11 @@ function useScanFileReadabilityCheck(transactions: Array<Partial<Transaction>>,
             if (isAllScanFilesCanBeRead) {
                 return;
             }
-            setIsMultiScanEnabled(false);
+            disableMultiScan();
             removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
             removeDraftTransactionsByIDs(draftTransactionIDs, true);
         });
-    }, [setIsMultiScanEnabled, transactions, draftTransactionIDs]);
+    }, [disableMultiScan, transactions, draftTransactionIDs]);
 }
 
 export default useScanFileReadabilityCheck;

From aa8ed078303b76fa6908c64c0b0dfc2633cbdcc0 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 5 May 2026 13:53:50 +0200
Subject: [PATCH 09/33] chore: consts refactor

---
 .../step/IOURequestStepScan/components/ScanEditReceipt.tsx     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index 24524ee7d663..4d17a3eba808 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -8,6 +8,7 @@ import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/use
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import {replaceReceipt} from '@userActions/IOU/Receipt';
+import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
 import ROUTES from '@src/ROUTES';
@@ -33,7 +34,7 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
         // Fix for issue where navigation state is lost after returning from device settings
         // https://github.com/Expensify/App/issues/65992
         const navigationState = navigationRef.current?.getState();
-        const reportsSplitNavigator = navigationState?.routes?.findLast((route) => route.name === 'ReportsSplitNavigator');
+        const reportsSplitNavigator = navigationState?.routes?.findLast((route) => route.name === NAVIGATORS.REPORTS_SPLIT_NAVIGATOR);
         const hasLostNavigationState = reportsSplitNavigator && !reportsSplitNavigator.state;
 
         if (hasLostNavigationState) {

From 7c817b22527eb6a0e1a73b1c8cd893fa226174a2 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 5 May 2026 15:58:26 +0200
Subject: [PATCH 10/33] fix: restore nav state loss handling, wire multi-scan
 cleanup, add location permission selector

---
 .../components/ScanSkipConfirmation.tsx         | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 1e0a2950ca36..a37ae2c71216 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -1,3 +1,4 @@
+import shouldStartLocationPermissionFlowSelector from '@selectors/LocationPermission';
 import React, {useEffect, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {RESULTS} from 'react-native-permissions';
@@ -72,7 +73,9 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
     const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector});
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
-    const [shouldStartLocationPermissionFlow] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT);
+    const [shouldStartLocationPermissionFlow] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT, {
+        selector: shouldStartLocationPermissionFlowSelector,
+    });
 
     const [transactions] = useOptimisticDraftTransactions(transaction);
     const {isMultiScanEnabled} = useMultiScanState();
@@ -92,24 +95,32 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
 
     // Pre-fetch location if GPS is required and permission is already granted
     useEffect(() => {
+        let ignore = false;
         const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
         if (!gpsRequired) {
             return;
         }
 
         getLocationPermission().then((status) => {
-            if (status !== RESULTS.GRANTED && status !== RESULTS.LIMITED) {
+            if (ignore || (status !== RESULTS.GRANTED && status !== RESULTS.LIMITED)) {
                 return;
             }
 
             clearUserLocation();
             getCurrentPosition(
                 (successData) => {
+                    if (ignore) {
+                        return;
+                    }
                     setUserLocation({longitude: successData.coords.longitude, latitude: successData.coords.latitude});
                 },
                 () => {},
             );
         });
+
+        return () => {
+            ignore = true;
+        };
     }, [transaction?.amount, iouType]);
 
     const cancelShutterSpans = () => {
@@ -142,7 +153,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
                 billable: false,
                 category: '',
                 tag: '',
-                currency: transaction?.currency ?? 'USD',
+                currency: transaction?.currency ?? CONST.CURRENCY.USD,
                 taxCode: transactionTaxCode,
                 taxAmount: transactionTaxAmount,
                 taxValue: transactionTaxValue,

From 4e7da49a3f348699105918fbd273a277650be380 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 6 May 2026 16:48:25 +0200
Subject: [PATCH 11/33] fix: restore multi-scan, thumbnail pregen and draft
 cleanup

---
 .../components/Camera/index.native.tsx        | 12 +++++----
 .../components/ScanFromReport.tsx             | 26 ++++++++++++++-----
 .../components/ScanGlobalCreate.tsx           | 17 +++++++++---
 .../components/ScanSkipConfirmation.tsx       |  8 ++++--
 4 files changed, 47 insertions(+), 16 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 2fe80922aed6..d9c162218bf2 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -249,10 +249,15 @@ function Camera({onCapture, shouldAcceptMultipleFiles = false, onLayout, onCamer
 
         captureReceipt(camera.current, {flash, hasFlash, isPlatformMuted, path, isInLandscapeMode})
             .then((photo: PhotoFile) => {
-                setDidCapturePhoto(true);
-                const source = getPhotoSource(photo.path);
                 endSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
 
+                if (isMultiScanEnabled) {
+                    isCapturingPhoto.current = false;
+                } else {
+                    setDidCapturePhoto(true);
+                }
+
+                const source = getPhotoSource(photo.path);
                 const cameraFile: FileObject = {
                     uri: source,
                     name: photo.path,
@@ -260,9 +265,6 @@ function Camera({onCapture, shouldAcceptMultipleFiles = false, onLayout, onCamer
                 };
 
                 onCapture(cameraFile, source);
-
-                setDidCapturePhoto(false);
-                isCapturingPhoto.current = false;
             })
             .catch((error: string) => {
                 isCapturingPhoto.current = false;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 5e65c3f3914a..75fa9d9ffa9f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
 import {navigateToConfirmationPage} from '@libs/IOUUtils';
 import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
@@ -42,7 +43,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
     // TODO: derive transactions from useOptimisticDraftTransactions when wired up
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
+    useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     const processReceipts = (files: FileObject[]) => {
         if (files.length === 0) {
@@ -50,7 +51,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
         }
 
         if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
         }
 
         const receiptFiles = buildReceiptFiles({
@@ -67,10 +68,23 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
 
         startScanProcessSpan(isMultiScanEnabled);
 
-        const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
-        setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
-            navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
-        );
+        if (isMultiScanEnabled) {
+            return;
+        }
+
+        const navigate = () => {
+            const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
+            setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
+                navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
+            );
+        };
+
+        const firstSource = receiptFiles.at(0)?.source;
+        if (typeof firstSource === 'string' && firstSource) {
+            pregenerateThumbnail(firstSource).then(navigate);
+        } else {
+            navigate();
+        }
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index ce43bb8d3cd7..81ae6b81ba21 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -3,6 +3,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
+import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
 import useSelfDMReport from '@hooks/useSelfDMReport';
 import {navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUtils';
@@ -52,7 +53,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
 
     const transactions = transaction ? [transaction] : [];
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
+    useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
@@ -94,7 +95,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
         }
 
         if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
         }
 
         const receiptFiles = buildReceiptFiles({
@@ -110,7 +111,17 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
         });
 
         startScanProcessSpan(isMultiScanEnabled);
-        navigateGlobalCreate(receiptFiles);
+
+        if (isMultiScanEnabled) {
+            return;
+        }
+
+        const firstSource = receiptFiles.at(0)?.source;
+        if (typeof firstSource === 'string' && firstSource) {
+            pregenerateThumbnail(firstSource).then(() => navigateGlobalCreate(receiptFiles));
+        } else {
+            navigateGlobalCreate(receiptFiles);
+        }
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index a37ae2c71216..0a89ab16d868 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -91,7 +91,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const transactionTaxAmount = transaction?.taxAmount ?? 0;
     const transactionTaxValue = transaction?.taxValue ?? getTaxValue(policy, transaction, transactionTaxCode) ?? '';
 
-    useScanFileReadabilityCheck(transactions, Object.keys(draftTransactionIDs ?? {}), disableMultiScan);
+    useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     // Pre-fetch location if GPS is required and permission is already granted
     useEffect(() => {
@@ -233,7 +233,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
         }
 
         if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(Object.keys(draftTransactionIDs ?? {}), true);
+            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
         }
 
         const newReceiptFiles = buildReceiptFiles({
@@ -250,6 +250,10 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
 
         setReceiptFiles(newReceiptFiles);
 
+        if (isMultiScanEnabled) {
+            return;
+        }
+
         const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && files.length;
         if (gpsRequired) {
             if (shouldStartLocationPermissionFlow) {

From 02f2987b17ff553fbb1ea7e61116ac12ae62922c Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 6 May 2026 17:27:17 +0200
Subject: [PATCH 12/33] refactor: split ScanRouter, dedupe scan variants,
 complete Camera prop API

---
 .../step/IOURequestStepScan/ScanRouter.tsx    | 136 +++++++++++-------
 .../components/Camera/CameraCapture.tsx       |   7 +-
 .../components/Camera/FileUpload.tsx          |   8 +-
 .../components/Camera/index.native.tsx        |   7 +-
 .../components/Camera/types.ts                |   8 +-
 .../components/ScanEditReceipt.tsx            |  13 +-
 .../components/ScanFromReport.tsx             |  60 ++++----
 .../components/ScanGlobalCreate.tsx           |  56 +++++---
 .../components/ScanSkipConfirmation.tsx       |  22 ++-
 .../hooks/useScanCapture.ts                   |  19 ---
 .../utils/buildReceiptFiles.ts                |  27 +++-
 11 files changed, 209 insertions(+), 154 deletions(-)
 delete mode 100644 src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index 3c49e71b6a80..51c0d1b2291a 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -1,14 +1,13 @@
 import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import useOnyx from '@hooks/useOnyx';
-import usePolicy from '@hooks/usePolicy';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 import {isPolicyExpenseChat} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import type {IOUAction, IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
-import type {Report} from '@src/types/onyx';
+import type {Policy, Report} from '@src/types/onyx';
 import type Transaction from '@src/types/onyx/Transaction';
 import MultiScanGate from './components/MultiScanGate';
 import ScanEditReceipt from './components/ScanEditReceipt';
@@ -27,74 +26,113 @@ type ScanRouterProps = {
     backToReport: string | undefined;
 };
 
+type NonGlobalCreateProps = {
+    report: OnyxEntry<Report>;
+    iouType: IOUType;
+    reportID: string;
+    transactionID: string;
+    transaction: OnyxEntry<Transaction>;
+    backToReport: string | undefined;
+};
+
+type NewReceiptProps = NonGlobalCreateProps;
+
+const policyRequiresTagOrCategorySelector = (policy: OnyxEntry<Policy>) => (policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false);
+
 /**
- * ScanRouter — thin routing layer that selects the appropriate scan variant
- * based on route params and transaction state.
- *
- * MultiScanGate wraps non-edit variants so they can access MultiScanContext.
- *
- * Variant selection:
- *   Edit       — replacing an existing receipt (backTo or isEditing)
- *   SkipConfirm — quick action with skipConfirmation flag (direct submit)
- *   FromReport — initiated from report (+) button (sets participants, shows confirmation)
- *   GlobalCreate — FAB (+) global create (auto-selects workspace or shows participant picker)
+ * Owns the policy + skip-confirmation subscriptions so the edit and global-create branches don't pay for them.
+ * Decides between SkipConfirmation (quick action) and FromReport (report (+) entry).
  */
-function ScanRouter({report, action, iouType, reportID, transactionID, transaction, backTo, backToReport}: ScanRouterProps) {
-    const policy = usePolicy(report?.policyID);
-    const isArchived = useReportIsArchived(report?.reportID);
+function ScanNonGlobalCreate({report, iouType, reportID, transactionID, transaction, backToReport}: NonGlobalCreateProps) {
+    const [policyRequiresTagOrCategory] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`, {selector: policyRequiresTagOrCategorySelector});
     const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`);
+    const shouldSkipConfirmation = !!skipConfirmation && !!report?.reportID && !(isPolicyExpenseChat(report) && policyRequiresTagOrCategory);
 
-    const isEditing = action === CONST.IOU.ACTION.EDIT;
-
-    // Edit/replace receipt flow — no multi-scan needed
-    if (backTo || isEditing) {
+    if (shouldSkipConfirmation) {
         return (
-            <ScanEditReceipt
+            <ScanSkipConfirmation
                 report={report}
+                iouType={iouType}
+                reportID={reportID}
                 transactionID={transactionID}
-                backTo={backTo}
+                transaction={transaction}
+                backToReport={backToReport}
             />
         );
     }
 
+    return (
+        <ScanFromReport
+            report={report}
+            iouType={iouType}
+            reportID={reportID}
+            transactionID={transactionID}
+            transaction={transaction}
+            backToReport={backToReport}
+        />
+    );
+}
+
+ScanNonGlobalCreate.displayName = 'ScanNonGlobalCreate';
+
+/**
+ * Splits new-receipt flows: global-create (FAB) vs. report-scoped (FromReport / SkipConfirm).
+ * The archived-report check lives here so neither global-create nor non-global-create variants need to subscribe.
+ */
+function ScanNewReceipt({report, iouType, reportID, transactionID, transaction, backToReport}: NewReceiptProps) {
+    const isArchived = useReportIsArchived(report?.reportID);
     const isFromGlobalCreate = !!transaction?.isFromGlobalCreate;
-    const shouldSkipConfirmation =
-        !!skipConfirmation && !!report?.reportID && !isArchived && !(isPolicyExpenseChat(report) && ((policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false)));
 
-    // Non-edit variants are wrapped in MultiScanGate so they can read multi-scan state
     if (!isFromGlobalCreate && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
-        if (shouldSkipConfirmation) {
-            return (
-                <MultiScanGate>
-                    <ScanSkipConfirmation
-                        report={report}
-                        iouType={iouType}
-                        reportID={reportID}
-                        transactionID={transactionID}
-                        transaction={transaction}
-                        backToReport={backToReport}
-                    />
-                </MultiScanGate>
-            );
-        }
+        return (
+            <ScanNonGlobalCreate
+                report={report}
+                iouType={iouType}
+                reportID={reportID}
+                transactionID={transactionID}
+                transaction={transaction}
+                backToReport={backToReport}
+            />
+        );
+    }
+
+    return (
+        <ScanGlobalCreate
+            iouType={iouType}
+            reportID={reportID}
+            transactionID={transactionID}
+            transaction={transaction}
+            backToReport={backToReport}
+        />
+    );
+}
 
+ScanNewReceipt.displayName = 'ScanNewReceipt';
+
+/**
+ * ScanRouter — selects the appropriate scan variant based on route params and transaction state.
+ *
+ * Edit branch is a fast-path that subscribes to nothing extra. Non-edit branches go through MultiScanGate
+ * and the layered ScanNewReceipt/ScanNonGlobalCreate components, which scope their subscriptions to the
+ * narrowest variant that needs them.
+ */
+function ScanRouter({report, action, iouType, reportID, transactionID, transaction, backTo, backToReport}: ScanRouterProps) {
+    const isEditing = action === CONST.IOU.ACTION.EDIT;
+
+    if (backTo || isEditing) {
         return (
-            <MultiScanGate>
-                <ScanFromReport
-                    report={report}
-                    iouType={iouType}
-                    reportID={reportID}
-                    transactionID={transactionID}
-                    transaction={transaction}
-                    backToReport={backToReport}
-                />
-            </MultiScanGate>
+            <ScanEditReceipt
+                report={report}
+                transactionID={transactionID}
+                backTo={backTo}
+            />
         );
     }
 
     return (
         <MultiScanGate>
-            <ScanGlobalCreate
+            <ScanNewReceipt
+                report={report}
                 iouType={iouType}
                 reportID={reportID}
                 transactionID={transactionID}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
index b0cad6c717e5..36243178c8d6 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
@@ -34,7 +34,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a camera viewfinder, shutter button, flash toggle and gallery picker.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function CameraCapture({onCapture, shouldAcceptMultipleFiles = false, onLayout}: CameraProps) {
+function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -124,10 +124,7 @@ function CameraCapture({onCapture, shouldAcceptMultipleFiles = false, onLayout}:
     };
 
     const emitPickedFiles = (files: FileObject[]) => {
-        for (const file of files) {
-            const source = file.uri ?? URL.createObjectURL(file as Blob);
-            onCapture(file, source);
-        }
+        onPicked?.(files, []);
     };
 
     return (
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
index 0b94442ede36..d0be88abc544 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
@@ -24,7 +24,7 @@ const panResponder = PanResponder.create({
  * FileUpload — desktop web capture variant.
  * Renders a drag-and-drop zone + file picker button + receipt alternative methods.
  */
-function FileUpload({onDrop, shouldAcceptMultipleFiles = false, onLayout, isReplacingReceipt = false, isDraggingOverWrapper}: CameraProps) {
+function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isReplacingReceipt = false, isDraggingOverWrapper}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -51,9 +51,7 @@ function FileUpload({onDrop, shouldAcceptMultipleFiles = false, onLayout, isRepl
             return file;
         });
 
-        if (onDrop) {
-            onDrop(files, Array.from(e.dataTransfer?.items ?? []));
-        }
+        onPicked?.(files, Array.from(e.dataTransfer?.items ?? []));
     };
 
     return (
@@ -96,7 +94,7 @@ function FileUpload({onDrop, shouldAcceptMultipleFiles = false, onLayout, isRepl
                                     style={[styles.p5]}
                                     onPress={() => {
                                         openPicker({
-                                            onPicked: (data) => onDrop?.(data, []),
+                                            onPicked: (data) => onPicked?.(data, []),
                                         });
                                     }}
                                     sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index d9c162218bf2..7eada261d831 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -43,7 +43,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a react-native-vision-camera viewfinder with shutter, flash toggle, gallery picker, and focus gesture.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function Camera({onCapture, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange}: CameraProps) {
+function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -275,10 +275,7 @@ function Camera({onCapture, shouldAcceptMultipleFiles = false, onLayout, onCamer
     };
 
     const emitPickedFiles = (files: FileObject[]) => {
-        for (const file of files) {
-            const source = file.uri ?? '';
-            onCapture(file, source);
-        }
+        onPicked?.(files, []);
     };
 
     // Wait for camera permission status to render
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 987e0b0a2ffa..4db5f7878ede 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -10,8 +10,12 @@ type CameraProps = {
     /** Called when the camera view finishes layout */
     onLayout?: () => void;
 
-    /** Called to validate user-selected files (drag-and-drop or file picker) */
-    onDrop?: (files: FileObject[], items: DataTransferItem[]) => void;
+    /**
+     * Called when files are selected from the gallery picker (native), the file picker (web),
+     * or dropped onto the upload zone (desktop web). Files must be validated by the consumer
+     * before being treated as receipts; the camera shutter path stays on `onCapture`.
+     */
+    onPicked?: (files: FileObject[], items: DataTransferItem[]) => void;
 
     /** Whether we are replacing an existing receipt (affects drop zone icon/title on desktop) */
     isReplacingReceipt?: boolean;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index 4d17a3eba808..e4e4ab5b6452 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -1,10 +1,12 @@
 import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
+import useFilesValidation from '@hooks/useFilesValidation';
+import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import usePolicy from '@hooks/usePolicy';
 import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
 import {replaceReceipt} from '@userActions/IOU/Receipt';
@@ -27,8 +29,10 @@ type ScanEditReceiptProps = {
  * Simplest variant: no multi-scan, no participants, no confirmation page.
  */
 function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps) {
+    const {translate} = useLocalize();
     const policy = usePolicy(report?.policyID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
+    const {setIsLoaderVisible} = useFullScreenLoaderActions();
 
     const navigateBack = () => {
         // Fix for issue where navigation state is lost after returning from device settings
@@ -49,7 +53,7 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
         navigateBack();
     };
 
-    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
         const file = files.at(0);
         if (!file) {
             return;
@@ -60,7 +64,7 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
 
     return (
         <StepScreenDragAndDropWrapper
-            headerTitle=""
+            headerTitle={translate('common.receipt')}
             onBackButtonPress={navigateBack}
             shouldShowWrapper
             testID="ScanEditReceipt"
@@ -70,7 +74,8 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
                     {PDFValidationComponent}
                     <Camera
                         onCapture={handleCapture}
-                        onDrop={validateFiles}
+                        onPicked={validateFiles}
+                        onAttachmentPickerStatusChange={setIsLoaderVisible}
                         isReplacingReceipt
                     />
                     {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 75fa9d9ffa9f..e32e5f5fb8a2 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -1,18 +1,19 @@
 import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useFilesValidation from '@hooks/useFilesValidation';
 import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
+import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
 import {navigateToConfirmationPage} from '@libs/IOUUtils';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU';
-import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import {validTransactionDraftIDsSelector} from '@src/selectors/TransactionDraft';
@@ -31,6 +32,12 @@ type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
     backToReport: string | undefined;
 };
 
+const preloadConfirmation = () => {
+    // Preload the confirmation screen module so its JS is parsed and ready by the time
+    // we navigate after capture — avoids a cold-start module load on slower devices.
+    require('../../IOURequestStepConfirmation');
+};
+
 /**
  * ScanFromReport — initiated from a report's (+) button.
  * Sets participants from the report and navigates to the confirmation page.
@@ -39,21 +46,13 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
     const {isMultiScanEnabled} = useMultiScanState();
     const {disableMultiScan} = useMultiScanActions();
+    const {setIsLoaderVisible} = useFullScreenLoaderActions();
 
-    // TODO: derive transactions from useOptimisticDraftTransactions when wired up
-    const transactions = transaction ? [transaction] : [];
+    const [transactions] = useOptimisticDraftTransactions(transaction);
 
     useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-
-        if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
-        }
-
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -66,28 +65,23 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
             transactions,
         });
 
+        if (receiptFiles.length === 0) {
+            return;
+        }
+
         startScanProcessSpan(isMultiScanEnabled);
 
         if (isMultiScanEnabled) {
             return;
         }
 
-        const navigate = () => {
-            const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
-            setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
-                navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
-            );
-        };
-
-        const firstSource = receiptFiles.at(0)?.source;
-        if (typeof firstSource === 'string' && firstSource) {
-            pregenerateThumbnail(firstSource).then(navigate);
-        } else {
-            navigate();
-        }
+        const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
+        setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
+            navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
+        );
     };
 
-    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
         processReceipts(files);
     });
 
@@ -95,10 +89,18 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
         <>
             {PDFValidationComponent}
             <Camera
-                onCapture={(file) => {
-                    processReceipts([file]);
+                onCapture={(file, source) => {
+                    if (isMultiScanEnabled) {
+                        processReceipts([file]);
+                        return;
+                    }
+                    // Pre-warm the thumbnail cache before navigating so the confirm page
+                    // doesn't flash an un-thumbnailed receipt.
+                    pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
-                onDrop={validateFiles}
+                onPicked={validateFiles}
+                onCameraInitialized={preloadConfirmation}
+                onAttachmentPickerStatusChange={setIsLoaderVisible}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 81ae6b81ba21..5f358b8f58e8 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -1,16 +1,19 @@
 import React from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
+import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
+import useFilesValidation from '@hooks/useFilesValidation';
 import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
+import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
+import usePersonalPolicy from '@hooks/usePersonalPolicy';
 import useSelfDMReport from '@hooks/useSelfDMReport';
 import {navigateToConfirmationPage, navigateToParticipantPage} from '@libs/IOUUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getPolicyExpenseChat, isSelfDM} from '@libs/ReportUtils';
 import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
@@ -18,7 +21,6 @@ import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/uti
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU';
 import {setTransactionReport} from '@userActions/Transaction';
-import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -37,12 +39,19 @@ type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
     backToReport: string | undefined;
 };
 
+const preloadConfirmation = () => {
+    // Preload the confirmation screen module so its JS is parsed and ready by the time
+    // we navigate after capture — avoids a cold-start module load on slower devices.
+    require('../../IOURequestStepConfirmation');
+};
+
 /**
  * ScanGlobalCreate — initiated from the FAB (+) button (no specific report).
  * Uses default expense policy to auto-select workspace, or navigates to participant picker.
  */
 function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backToReport, currentUserPersonalDetails}: ScanGlobalCreateProps) {
     const defaultExpensePolicy = useDefaultExpensePolicy();
+    const personalPolicy = usePersonalPolicy();
     const selfDMReport = useSelfDMReport();
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
     const [amountOwed] = useOnyx(ONYXKEYS.NVP_PRIVATE_AMOUNT_OWED);
@@ -50,14 +59,15 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     const [ownerBillingGracePeriodEnd] = useOnyx(ONYXKEYS.NVP_PRIVATE_OWNER_BILLING_GRACE_PERIOD_END);
     const {isMultiScanEnabled} = useMultiScanState();
     const {disableMultiScan} = useMultiScanActions();
+    const {setIsLoaderVisible} = useFullScreenLoaderActions();
 
-    const transactions = transaction ? [transaction] : [];
+    const [transactions] = useOptimisticDraftTransactions(transaction);
 
     useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
-            const shouldAutoReport = !!defaultExpensePolicy?.autoReporting;
+            const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting;
             const targetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport;
             const transactionReportID = isSelfDM(targetReport) ? CONST.REPORT.UNREPORTED_REPORT_ID : targetReport?.reportID;
             const iouTypeTrackOrSubmit = transactionReportID === CONST.REPORT.UNREPORTED_REPORT_ID ? CONST.IOU.TYPE.TRACK : CONST.IOU.TYPE.SUBMIT;
@@ -90,14 +100,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     };
 
     const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-
-        if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
-        }
-
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -108,23 +110,25 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             shouldAcceptMultipleFiles: true,
             isMultiScanEnabled,
             transactions,
+            // Global create is the only flow that wipes stale drafts when starting fresh.
+            draftTransactionIDsToCleanUp: draftTransactionIDs ?? [],
+            isStartingScan: true,
         });
 
+        if (receiptFiles.length === 0) {
+            return;
+        }
+
         startScanProcessSpan(isMultiScanEnabled);
 
         if (isMultiScanEnabled) {
             return;
         }
 
-        const firstSource = receiptFiles.at(0)?.source;
-        if (typeof firstSource === 'string' && firstSource) {
-            pregenerateThumbnail(firstSource).then(() => navigateGlobalCreate(receiptFiles));
-        } else {
-            navigateGlobalCreate(receiptFiles);
-        }
+        navigateGlobalCreate(receiptFiles);
     };
 
-    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
         processReceipts(files);
     });
 
@@ -132,10 +136,18 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
         <>
             {PDFValidationComponent}
             <Camera
-                onCapture={(file) => {
-                    processReceipts([file]);
+                onCapture={(file, source) => {
+                    if (isMultiScanEnabled) {
+                        processReceipts([file]);
+                        return;
+                    }
+                    // Pre-warm the thumbnail cache before navigating so the confirm page
+                    // doesn't flash an un-thumbnailed receipt.
+                    pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
-                onDrop={validateFiles}
+                onPicked={validateFiles}
+                onCameraInitialized={preloadConfirmation}
+                onAttachmentPickerStatusChange={setIsLoaderVisible}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 0a89ab16d868..b63a58d25a95 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -2,8 +2,10 @@ import shouldStartLocationPermissionFlowSelector from '@selectors/LocationPermis
 import React, {useEffect, useState} from 'react';
 import type {OnyxEntry} from 'react-native-onyx';
 import {RESULTS} from 'react-native-permissions';
+import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
+import useFilesValidation from '@hooks/useFilesValidation';
 import useOnyx from '@hooks/useOnyx';
 import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
 import useParticipantsPolicyTags from '@hooks/useParticipantsPolicyTags';
@@ -20,13 +22,11 @@ import {calculateDefaultReimbursable} from '@libs/IOUUtils';
 import Log from '@libs/Log';
 import {cancelSpan} from '@libs/telemetry/activeSpans';
 import {getDefaultTaxCode, getTaxValue} from '@libs/TransactionUtils';
-import useScanCapture from '@pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture';
 import {getLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
-import {removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -80,6 +80,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [transactions] = useOptimisticDraftTransactions(transaction);
     const {isMultiScanEnabled} = useMultiScanState();
     const {disableMultiScan} = useMultiScanActions();
+    const {setIsLoaderVisible} = useFullScreenLoaderActions();
     const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
     const [receiptFiles, setReceiptFiles] = useState<ReceiptFile[]>([]);
 
@@ -228,14 +229,6 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     };
 
     const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-
-        if (!isMultiScanEnabled) {
-            removeDraftTransactionsByIDs(draftTransactionIDs ?? [], true);
-        }
-
         const newReceiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -248,6 +241,10 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
             transactions,
         });
 
+        if (newReceiptFiles.length === 0) {
+            return;
+        }
+
         setReceiptFiles(newReceiptFiles);
 
         if (isMultiScanEnabled) {
@@ -267,7 +264,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
         submitDirectly(newReceiptFiles, false);
     };
 
-    const {validateFiles, PDFValidationComponent, ErrorModal} = useScanCapture((files: FileObject[]) => {
+    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
         processReceipts(files);
     });
 
@@ -278,7 +275,8 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
                 onCapture={(file) => {
                     processReceipts([file]);
                 }}
-                onDrop={validateFiles}
+                onPicked={validateFiles}
+                onAttachmentPickerStatusChange={setIsLoaderVisible}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts b/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts
deleted file mode 100644
index 7048e37b2cc6..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/hooks/useScanCapture.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import useFilesValidation from '@hooks/useFilesValidation';
-import type {FileObject} from '@src/types/utils/Attachment';
-
-/**
- * Wraps useFilesValidation for scan-specific file capture.
- * Validates files (type, size, HEIC conversion, PDF thumbnails) and calls
- * the provided callback with the validated files.
- */
-function useScanCapture(onFilesValidated: (files: FileObject[], dataTransferItems: DataTransferItem[]) => void) {
-    const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation(onFilesValidated);
-
-    return {
-        validateFiles,
-        PDFValidationComponent,
-        ErrorModal,
-    };
-}
-
-export default useScanCapture;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
index b42368946ded..f9d951095e58 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
@@ -2,7 +2,7 @@ import type {OnyxEntry} from 'react-native-onyx';
 import {shouldReuseInitialTransaction} from '@libs/TransactionUtils';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import {setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
-import {buildOptimisticTransactionAndCreateDraft} from '@userActions/TransactionEdit';
+import {buildOptimisticTransactionAndCreateDraft, removeDraftTransactionsByIDs} from '@userActions/TransactionEdit';
 import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
 import type Transaction from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
@@ -17,11 +17,24 @@ type BuildReceiptFilesParams = {
     shouldAcceptMultipleFiles: boolean;
     isMultiScanEnabled: boolean;
     transactions: Transaction[];
+
+    /**
+     * IDs of stale draft transactions to wipe before building new ones.
+     * Only applied when {@link isStartingScan} is true and multi-scan is off — i.e. global-create entry, first capture.
+     */
+    draftTransactionIDsToCleanUp?: string[];
+
+    /**
+     * True when the scan is starting fresh from the global-create flow. Gates the draft cleanup so other entry points
+     * (FromReport, SkipConfirmation, EditReceipt) don't nuke unrelated drafts.
+     */
+    isStartingScan?: boolean;
 };
 
 /**
  * Builds ReceiptFile[] from captured/picked files, creating optimistic transaction drafts as needed
- * and storing receipts in Onyx via setMoneyRequestReceipt.
+ * and storing receipts in Onyx via setMoneyRequestReceipt. When invoked from the global-create flow
+ * with isStartingScan, wipes any stale drafts left from a previous scan first.
  */
 function buildReceiptFiles({
     files,
@@ -33,7 +46,17 @@ function buildReceiptFiles({
     shouldAcceptMultipleFiles,
     isMultiScanEnabled,
     transactions,
+    draftTransactionIDsToCleanUp,
+    isStartingScan = false,
 }: BuildReceiptFilesParams): ReceiptFile[] {
+    if (files.length === 0) {
+        return [];
+    }
+
+    if (!isMultiScanEnabled && isStartingScan && draftTransactionIDsToCleanUp && draftTransactionIDsToCleanUp.length > 0) {
+        removeDraftTransactionsByIDs(draftTransactionIDsToCleanUp, true);
+    }
+
     const receiptFiles: ReceiptFile[] = [];
 
     for (const [index, file] of files.entries()) {

From f63f86a6f79795447d8f21df653fc83f3f1ab9ff Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 6 May 2026 18:03:08 +0200
Subject: [PATCH 13/33] fix: spellcheck fix

---
 .../step/IOURequestStepScan/components/ScanGlobalCreate.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 5f358b8f58e8..983d3868ea24 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -142,7 +142,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                         return;
                     }
                     // Pre-warm the thumbnail cache before navigating so the confirm page
-                    // doesn't flash an un-thumbnailed receipt.
+                    // doesn't flash an un-thumbnail receipt.
                     pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}

From 89926ee10fa01cf9859db5c3420068926044490d Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 6 May 2026 19:51:23 +0200
Subject: [PATCH 14/33] fix: write optimistic receipt fields before
 replaceReceipt in edit

---
 .../step/IOURequestStepScan/components/ScanEditReceipt.tsx     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index e4e4ab5b6452..61b64b7c5b38 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -9,7 +9,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import navigationRef from '@libs/Navigation/navigationRef';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
 import StepScreenDragAndDropWrapper from '@pages/iou/request/step/StepScreenDragAndDropWrapper';
-import {replaceReceipt} from '@userActions/IOU/Receipt';
+import {replaceReceipt, setMoneyRequestReceipt} from '@userActions/IOU/Receipt';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
@@ -49,6 +49,7 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
     };
 
     const handleCapture = (file: FileObject, source: string) => {
+        setMoneyRequestReceipt(transactionID, source, file.name ?? '', false, file.type);
         replaceReceipt({transactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
         navigateBack();
     };

From 6f05e334df46b94094ad1948cdc3bb906ef7ce9b Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 6 May 2026 19:53:25 +0200
Subject: [PATCH 15/33] fix lint

---
 .../step/IOURequestStepScan/components/ScanFromReport.tsx       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index e32e5f5fb8a2..30864fca8ad0 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -95,7 +95,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                         return;
                     }
                     // Pre-warm the thumbnail cache before navigating so the confirm page
-                    // doesn't flash an un-thumbnailed receipt.
+                    // doesn't flash an un-thumbnail receipt.
                     pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}

From 1fdd06236a9af26b0250084f525e4188c346b63f Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Fri, 8 May 2026 17:31:30 +0200
Subject: [PATCH 16/33] fix: update scan start span, close span on empty size

---
 .../IOURequestStepScan/components/Camera/CameraCapture.tsx | 7 +++++++
 .../step/IOURequestStepScan/components/ScanFromReport.tsx  | 4 ++--
 .../IOURequestStepScan/components/ScanGlobalCreate.tsx     | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
index 36243178c8d6..eb7465ae7a94 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
@@ -106,6 +106,13 @@ function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false,
 
         const originalFileName = `receipt_${Date.now()}.png`;
         const originalFile = base64ToFile(imageBase64 ?? '', originalFileName);
+
+        if (originalFile.size === 0) {
+            cancelSpan(CONST.TELEMETRY.SPAN_RECEIPT_CAPTURE);
+            cancelSpan(CONST.TELEMETRY.SPAN_SHUTTER_TO_CONFIRMATION);
+            return;
+        }
+
         const imageObject: ImageObject = {file: originalFile, filename: originalFile.name, source: URL.createObjectURL(originalFile)};
         // Some browsers center-crop the viewfinder inside the video element (due to object-position: center),
         // while other browsers let the video element overflow and the container crops it from the top.
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 30864fca8ad0..ff8bd262c995 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -69,12 +69,12 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
             return;
         }
 
-        startScanProcessSpan(isMultiScanEnabled);
-
         if (isMultiScanEnabled) {
             return;
         }
 
+        startScanProcessSpan(isMultiScanEnabled);
+
         const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
         setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
             navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 983d3868ea24..80324b51bc3a 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -119,12 +119,12 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             return;
         }
 
-        startScanProcessSpan(isMultiScanEnabled);
-
         if (isMultiScanEnabled) {
             return;
         }
 
+        startScanProcessSpan(isMultiScanEnabled);
+
         navigateGlobalCreate(receiptFiles);
     };
 

From c9bd8a1003cca0b6025ae03c73ce63c6a4516198 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 11 May 2026 16:35:47 +0200
Subject: [PATCH 17/33] refactor: simplify onPicked logic

---
 .../request/step/IOURequestStepScan/ScanRouter.tsx   |  2 +-
 .../components/Camera/CameraCapture.tsx              | 11 +----------
 .../components/Camera/FileUpload.tsx                 |  8 ++------
 .../components/Camera/index.native.tsx               | 12 ++++--------
 .../IOURequestStepScan/components/Camera/types.ts    |  2 +-
 5 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index 51c0d1b2291a..0326792699cc 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -37,7 +37,7 @@ type NonGlobalCreateProps = {
 
 type NewReceiptProps = NonGlobalCreateProps;
 
-const policyRequiresTagOrCategorySelector = (policy: OnyxEntry<Policy>) => (policy?.requiresCategory ?? false) || (policy?.requiresTag ?? false);
+const policyRequiresTagOrCategorySelector = (policy: OnyxEntry<Policy>) => !!policy?.requiresCategory || !!policy?.requiresTag;
 
 /**
  * Owns the policy + skip-confirmation subscriptions so the edit and global-create branches don't pay for them.
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
index eb7465ae7a94..d14e2cfe0687 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
@@ -23,7 +23,6 @@ import {cropImageToAspectRatio} from '@pages/iou/request/step/IOURequestStepScan
 import type {ImageObject} from '@pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
-import type {FileObject} from '@src/types/utils/Attachment';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type {CameraProps} from './types';
 
@@ -130,10 +129,6 @@ function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false,
         capturePhotoWithFlash(getScreenshot);
     };
 
-    const emitPickedFiles = (files: FileObject[]) => {
-        onPicked?.(files, []);
-    };
-
     return (
         <View
             onLayout={onLayout}
@@ -239,11 +234,7 @@ function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false,
                                 accessibilityLabel={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
                                 role={CONST.ROLE.BUTTON}
                                 style={isMultiScanEnabled && styles.opacity0}
-                                onPress={() => {
-                                    openPicker({
-                                        onPicked: (data) => emitPickedFiles(data),
-                                    });
-                                }}
+                                onPress={() => openPicker({onPicked})}
                                 sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
                             >
                                 <Icon
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
index d0be88abc544..ae8ac6be8c42 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
@@ -51,7 +51,7 @@ function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isRe
             return file;
         });
 
-        onPicked?.(files, Array.from(e.dataTransfer?.items ?? []));
+        onPicked(files, Array.from(e.dataTransfer?.items ?? []));
     };
 
     return (
@@ -92,11 +92,7 @@ function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isRe
                                     text={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
                                     accessibilityLabel={translate(shouldAcceptMultipleFiles ? 'common.chooseFiles' : 'common.chooseFile')}
                                     style={[styles.p5]}
-                                    onPress={() => {
-                                        openPicker({
-                                            onPicked: (data) => onPicked?.(data, []),
-                                        });
-                                    }}
+                                    onPress={() => openPicker({onPicked})}
                                     sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
                                 />
                             )}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 7eada261d831..330f749d646a 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -274,10 +274,6 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
             });
     };
 
-    const emitPickedFiles = (files: FileObject[]) => {
-        onPicked?.(files, []);
-    };
-
     // Wait for camera permission status to render
     if (cameraPermissionStatus == null) {
         return null;
@@ -384,16 +380,16 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
                                 accessibilityLabel={translate('receipt.gallery')}
                                 sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
                                 style={[styles.alignItemsStart, isMultiScanEnabled && styles.opacity0]}
-                                onPress={() => {
+                                onPress={() =>
                                     openPicker({
-                                        onPicked: (data) => emitPickedFiles(data),
+                                        onPicked,
                                         onCanceled: () => onAttachmentPickerStatusChange?.(false),
                                         onClosed: () => {
                                             setIsAttachmentPickerActive(false);
                                             onAttachmentPickerStatusChange?.(false);
                                         },
-                                    });
-                                }}
+                                    })
+                                }
                             >
                                 <Icon
                                     height={variables.iconSizeMenuItem}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 4db5f7878ede..6f16160319d2 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -15,7 +15,7 @@ type CameraProps = {
      * or dropped onto the upload zone (desktop web). Files must be validated by the consumer
      * before being treated as receipts; the camera shutter path stays on `onCapture`.
      */
-    onPicked?: (files: FileObject[], items: DataTransferItem[]) => void;
+    onPicked: (files: FileObject[], items?: DataTransferItem[]) => void;
 
     /** Whether we are replacing an existing receipt (affects drop zone icon/title on desktop) */
     isReplacingReceipt?: boolean;

From f9f869c792854f1166d8b35260cd066d20b4a632 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 11 May 2026 16:54:37 +0200
Subject: [PATCH 18/33] refactor: reuse camera telemetry hook and subcomponents
 in Camera.native

---
 .../components/Camera/index.native.tsx        | 294 +++---------------
 .../components/CameraPermissionPrompt.tsx     |  10 +-
 .../components/ScanFromReport.tsx             |   7 -
 .../components/ScanGlobalCreate.tsx           |   7 -
 .../components/ScannerControlsBar.tsx         |  27 +-
 5 files changed, 63 insertions(+), 282 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 330f749d646a..6a746f51a535 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -1,24 +1,13 @@
-import React, {useEffect, useRef} from 'react';
-import {Alert, StyleSheet, View} from 'react-native';
-import ReactNativeBlobUtil from 'react-native-blob-util';
-import {GestureDetector} from 'react-native-gesture-handler';
+import React, {useRef} from 'react';
+import {Alert, View} from 'react-native';
 import {RESULTS} from 'react-native-permissions';
-import Animated, {useAnimatedStyle, useSharedValue, withSequence, withTiming} from 'react-native-reanimated';
+import {useAnimatedStyle, useSharedValue, withSequence, withTiming} from 'react-native-reanimated';
 import type {PhotoFile} from 'react-native-vision-camera';
 import {useCameraFormat} from 'react-native-vision-camera';
 import ActivityIndicator from '@components/ActivityIndicator';
-import AttachmentPicker from '@components/AttachmentPicker';
-import Button from '@components/Button';
-import Icon from '@components/Icon';
-import ImageSVG from '@components/ImageSVG';
-import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
-import ScrollView from '@components/ScrollView';
-import Text from '@components/Text';
 import useIsInLandscapeMode from '@hooks/useIsInLandscapeMode';
-import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useNativeCamera from '@hooks/useNativeCamera';
-import useStyleUtils from '@hooks/useStyleUtils';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -28,10 +17,12 @@ import HapticFeedback from '@libs/HapticFeedback';
 import Log from '@libs/Log';
 import {cancelSpan, endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
 import captureReceipt from '@pages/iou/request/step/IOURequestStepScan/captureReceipt';
+import CameraPermissionPrompt from '@pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt';
+import CameraViewport from '@pages/iou/request/step/IOURequestStepScan/components/CameraViewport';
 import {useMultiScanActions, useMultiScanState} from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanContext';
-import NavigationAwareCamera from '@pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/Camera';
+import ScannerControlsBar from '@pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar';
 import getCameraAspectRatio from '@pages/iou/request/step/IOURequestStepScan/getCameraAspectRatio';
-import variables from '@styles/variables';
+import useCameraInitTelemetry from '@pages/iou/request/step/IOURequestStepScan/hooks/useCameraInitTelemetry';
 import CONST from '@src/CONST';
 import type {FileObject} from '@src/types/utils/Attachment';
 import type {CameraProps} from './types';
@@ -46,12 +37,9 @@ const BLINK_DURATION_MS = 80;
 function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
-    const StyleUtils = useStyleUtils();
     const {translate} = useLocalize();
     const isInLandscapeMode = useIsInLandscapeMode();
     const {windowWidth, windowHeight} = useWindowDimensions();
-    const lazyIllustrations = useMemoizedLazyIllustrations(['Hand', 'Shutter']);
-    const lazyIcons = useMemoizedLazyExpensifyIcons(['Bolt', 'Gallery', 'ReceiptMultiple', 'boltSlash']);
     const {isMultiScanEnabled, canUseMultiScan} = useMultiScanState();
     const {toggleMultiScan} = useMultiScanActions();
 
@@ -97,10 +85,6 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
     const cameraAspectRatio = getCameraAspectRatio(format, isInLandscapeMode);
     const fps = format ? Math.min(Math.max(30, format.minFps), format.maxFps) : 30;
 
-    // Track camera init telemetry
-    const cameraInitSpanStarted = useRef(false);
-    const cameraInitialized = useRef(false);
-
     // Blink animation for shutter feedback
     const blinkOpacity = useSharedValue(0);
     const blinkStyle = useAnimatedStyle(() => ({
@@ -112,87 +96,10 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
         HapticFeedback.press();
     };
 
-    // End entry-to-scan navigation span and start entry-to-scan-ready on mount
-    useEffect(() => {
-        endSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_NAVIGATION);
-        const entryParentSpan = getSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN);
-        if (entryParentSpan) {
-            startSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY, {
-                name: CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY,
-                op: CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY,
-                parentSpan: entryParentSpan,
-            });
-        }
-    }, []);
-
-    // Start camera init span when permission is granted and camera is ready
-    useEffect(() => {
-        if (cameraInitSpanStarted.current || cameraPermissionStatus !== RESULTS.GRANTED || device == null) {
-            return;
-        }
-        startSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT, {
-            name: CONST.TELEMETRY.SPAN_CAMERA_INIT,
-            op: CONST.TELEMETRY.SPAN_CAMERA_INIT,
-        });
-        cameraInitSpanStarted.current = true;
-    }, [cameraPermissionStatus, device]);
-
-    // Cancel spans when permission is denied/blocked/unavailable
-    useEffect(() => {
-        if (cameraPermissionStatus !== RESULTS.BLOCKED && cameraPermissionStatus !== RESULTS.UNAVAILABLE && cameraPermissionStatus !== RESULTS.DENIED) {
-            return;
-        }
-        cancelSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-        cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_NAVIGATION);
-        cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY);
-        cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN);
-    }, [cameraPermissionStatus]);
-
-    // Cancel spans on unmount if camera never initialized
-    useEffect(() => {
-        return () => {
-            if (cameraInitialized.current) {
-                return;
-            }
-            if (cameraInitSpanStarted.current) {
-                cancelSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT);
-            }
-            cancelSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-            // Cancel entry-to-scan spans if they haven't ended naturally
-            cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_NAVIGATION);
-            cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY);
-            cancelSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN);
-        };
-    }, []);
+    const {handleCameraInitialized: handleTelemetryInitialized} = useCameraInitTelemetry({cameraPermissionStatus, device});
 
     const handleCameraInitialized = () => {
-        if (cameraInitialized.current) {
-            return;
-        }
-        cameraInitialized.current = true;
-        if (cameraInitSpanStarted.current) {
-            endSpan(CONST.TELEMETRY.SPAN_CAMERA_INIT);
-        }
-        endSpan(CONST.TELEMETRY.SPAN_OPEN_CREATE_EXPENSE);
-        endSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN_READY);
-        endSpan(CONST.TELEMETRY.SPAN_ENTRY_TO_SCAN);
-
-        // Pre-create upload directory to avoid latency during capture
-        const path = getReceiptsUploadFolderPath();
-        ReactNativeBlobUtil.fs
-            .isDir(path)
-            .then((isDir) => {
-                if (isDir) {
-                    return;
-                }
-                ReactNativeBlobUtil.fs.mkdir(path).catch((error: string) => {
-                    Log.warn('Error creating the receipts upload directory', error);
-                });
-            })
-            .catch((error: string) => {
-                Log.warn('Error checking if the upload directory exists', error);
-            });
-
+        handleTelemetryInitialized();
         onCameraInitialized?.();
     };
 
@@ -287,28 +194,10 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
             <View style={[styles.flex1, isInLandscapeMode && styles.flexRow]}>
                 <View style={[styles.flex1]}>
                     {cameraPermissionStatus !== RESULTS.GRANTED && (
-                        <ScrollView contentContainerStyle={styles.flexGrow1}>
-                            <View style={[styles.cameraView, isInLandscapeMode ? styles.permissionViewLandscape : styles.permissionView, styles.userSelectNone]}>
-                                <ImageSVG
-                                    contentFit="contain"
-                                    src={lazyIllustrations.Hand}
-                                    width={CONST.RECEIPT.HAND_ICON_WIDTH}
-                                    height={CONST.RECEIPT.HAND_ICON_HEIGHT}
-                                    style={styles.pb5}
-                                />
-
-                                <Text style={[styles.textFileUpload]}>{translate('receipt.takePhoto')}</Text>
-                                <Text style={[styles.subTextFileUpload]}>{translate('receipt.cameraAccess')}</Text>
-                                <Button
-                                    success
-                                    text={translate('common.continue')}
-                                    accessibilityLabel={translate('common.continue')}
-                                    style={[styles.p9, styles.pt5]}
-                                    onPress={capturePhoto}
-                                    sentryLabel={CONST.SENTRY_LABEL.IOU_REQUEST_STEP.SCAN_SUBMIT_BUTTON}
-                                />
-                            </View>
-                        </ScrollView>
+                        <CameraPermissionPrompt
+                            isInLandscapeMode={isInLandscapeMode}
+                            onPress={capturePhoto}
+                        />
                     )}
                     {cameraPermissionStatus === RESULTS.GRANTED && device == null && (
                         <View style={[styles.cameraView]}>
@@ -321,133 +210,42 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
                         </View>
                     )}
                     {cameraPermissionStatus === RESULTS.GRANTED && device != null && (
-                        <View style={[styles.cameraView, styles.alignItemsCenter]}>
-                            <GestureDetector gesture={tapGesture}>
-                                <View style={StyleUtils.getCameraViewfinderStyle(cameraAspectRatio, isInLandscapeMode)}>
-                                    <NavigationAwareCamera
-                                        ref={camera}
-                                        device={device}
-                                        format={format}
-                                        fps={fps}
-                                        style={styles.flex1}
-                                        zoom={device.neutralZoom}
-                                        photo
-                                        cameraTabIndex={1}
-                                        forceInactive={isAttachmentPickerActive || didCapturePhoto}
-                                        onInitialized={handleCameraInitialized}
-                                    />
-                                    <Animated.View style={[styles.cameraFocusIndicator, cameraFocusIndicatorAnimatedStyle]} />
-                                    <Animated.View
-                                        pointerEvents="none"
-                                        style={[StyleSheet.absoluteFill, StyleUtils.getBackgroundColorStyle(theme.appBG), blinkStyle, styles.zIndex10]}
-                                    />
-                                </View>
-                            </GestureDetector>
-                            {canUseMultiScan ? (
-                                <View style={[styles.flashButtonContainer, styles.primaryMediumIcon, flash && styles.bgGreenSuccess, !hasFlash && styles.opacity0]}>
-                                    <PressableWithFeedback
-                                        role={CONST.ROLE.BUTTON}
-                                        accessibilityLabel={translate('receipt.flash')}
-                                        sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                                        disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
-                                        onPress={() => setFlash((prevFlash) => !prevFlash)}
-                                    >
-                                        <Icon
-                                            height={variables.iconSizeSmall}
-                                            width={variables.iconSizeSmall}
-                                            src={lazyIcons.Bolt}
-                                            fill={flash ? theme.white : theme.icon}
-                                        />
-                                    </PressableWithFeedback>
-                                </View>
-                            ) : null}
-                        </View>
-                    )}
-                </View>
-
-                <View style={[styles.justifyContentAround, styles.alignItemsCenter, styles.p3, !isInLandscapeMode && styles.flexRow]}>
-                    <AttachmentPicker
-                        onOpenPicker={() => {
-                            setIsAttachmentPickerActive(true);
-                            onAttachmentPickerStatusChange?.(true);
-                        }}
-                        fileLimit={shouldAcceptMultipleFiles ? CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT : 1}
-                        shouldValidateImage={false}
-                    >
-                        {({openPicker}) => (
-                            <PressableWithFeedback
-                                role={CONST.ROLE.BUTTON}
-                                accessibilityLabel={translate('receipt.gallery')}
-                                sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
-                                style={[styles.alignItemsStart, isMultiScanEnabled && styles.opacity0]}
-                                onPress={() =>
-                                    openPicker({
-                                        onPicked,
-                                        onCanceled: () => onAttachmentPickerStatusChange?.(false),
-                                        onClosed: () => {
-                                            setIsAttachmentPickerActive(false);
-                                            onAttachmentPickerStatusChange?.(false);
-                                        },
-                                    })
-                                }
-                            >
-                                <Icon
-                                    height={variables.iconSizeMenuItem}
-                                    width={variables.iconSizeMenuItem}
-                                    src={lazyIcons.Gallery}
-                                    fill={theme.textSupporting}
-                                />
-                            </PressableWithFeedback>
-                        )}
-                    </AttachmentPicker>
-                    <PressableWithFeedback
-                        role={CONST.ROLE.BUTTON}
-                        accessibilityLabel={translate('receipt.shutter')}
-                        sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.SHUTTER}
-                        style={[styles.alignItemsCenter]}
-                        onPress={capturePhoto}
-                    >
-                        <ImageSVG
-                            contentFit="contain"
-                            src={lazyIllustrations.Shutter}
-                            width={CONST.RECEIPT.SHUTTER_SIZE}
-                            height={CONST.RECEIPT.SHUTTER_SIZE}
+                        <CameraViewport
+                            camera={camera}
+                            device={device}
+                            format={format}
+                            fps={fps}
+                            cameraAspectRatio={cameraAspectRatio}
+                            isInLandscapeMode={isInLandscapeMode}
+                            tapGesture={tapGesture}
+                            cameraFocusIndicatorAnimatedStyle={cameraFocusIndicatorAnimatedStyle}
+                            blinkStyle={blinkStyle}
+                            isAttachmentPickerActive={isAttachmentPickerActive}
+                            didCapturePhoto={didCapturePhoto}
+                            onInitialized={handleCameraInitialized}
+                            canUseMultiScan={canUseMultiScan}
+                            flash={flash}
+                            hasFlash={hasFlash}
+                            setFlash={setFlash}
                         />
-                    </PressableWithFeedback>
-                    {canUseMultiScan ? (
-                        <PressableWithFeedback
-                            accessibilityRole="button"
-                            role={CONST.ROLE.BUTTON}
-                            accessibilityLabel={translate('receipt.multiScan')}
-                            style={styles.alignItemsEnd}
-                            onPress={toggleMultiScan}
-                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.MULTI_SCAN}
-                        >
-                            <Icon
-                                height={variables.iconSizeMenuItem}
-                                width={variables.iconSizeMenuItem}
-                                src={lazyIcons.ReceiptMultiple}
-                                fill={isMultiScanEnabled ? theme.iconMenu : theme.textSupporting}
-                            />
-                        </PressableWithFeedback>
-                    ) : (
-                        <PressableWithFeedback
-                            role={CONST.ROLE.BUTTON}
-                            accessibilityLabel={translate('receipt.flash')}
-                            sentryLabel={CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.FLASH}
-                            style={[styles.alignItemsEnd, !hasFlash && styles.opacity0]}
-                            disabled={cameraPermissionStatus !== RESULTS.GRANTED || !hasFlash}
-                            onPress={() => setFlash((prevFlash) => !prevFlash)}
-                        >
-                            <Icon
-                                height={variables.iconSizeMenuItem}
-                                width={variables.iconSizeMenuItem}
-                                src={flash ? lazyIcons.Bolt : lazyIcons.boltSlash}
-                                fill={theme.textSupporting}
-                            />
-                        </PressableWithFeedback>
                     )}
                 </View>
+
+                <ScannerControlsBar
+                    isInLandscapeMode={isInLandscapeMode}
+                    isMultiScanEnabled={isMultiScanEnabled}
+                    canUseMultiScan={canUseMultiScan}
+                    shouldAcceptMultipleFiles={shouldAcceptMultipleFiles}
+                    cameraPermissionStatus={cameraPermissionStatus}
+                    flash={flash}
+                    hasFlash={hasFlash}
+                    setFlash={setFlash}
+                    setIsAttachmentPickerActive={setIsAttachmentPickerActive}
+                    onAttachmentPickerStatusChange={onAttachmentPickerStatusChange}
+                    onPicked={onPicked}
+                    capturePhoto={capturePhoto}
+                    toggleMultiScan={toggleMultiScan}
+                />
             </View>
         </View>
     );
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt.tsx
index 03300ad8be99..412bf7930e05 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt.tsx
@@ -4,32 +4,30 @@ import Button from '@components/Button';
 import ImageSVG from '@components/ImageSVG';
 import ScrollView from '@components/ScrollView';
 import Text from '@components/Text';
+import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
-import type IconAsset from '@src/types/utils/IconAsset';
 
 type CameraPermissionPromptProps = {
     /** Whether the device is currently in landscape orientation */
     isInLandscapeMode: boolean;
 
-    /** The hand illustration asset shown to prompt for camera access */
-    handIllustration: IconAsset | undefined;
-
     /** Callback fired when the continue button is pressed */
     onPress: () => void;
 };
 
-function CameraPermissionPrompt({isInLandscapeMode, handIllustration, onPress}: CameraPermissionPromptProps) {
+function CameraPermissionPrompt({isInLandscapeMode, onPress}: CameraPermissionPromptProps) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const lazyIllustrations = useMemoizedLazyIllustrations(['Hand']);
 
     return (
         <ScrollView contentContainerStyle={styles.flexGrow1}>
             <View style={[styles.cameraView, isInLandscapeMode ? styles.permissionViewLandscape : styles.permissionView, styles.userSelectNone]}>
                 <ImageSVG
                     contentFit="contain"
-                    src={handIllustration}
+                    src={lazyIllustrations.Hand}
                     width={CONST.RECEIPT.HAND_ICON_WIDTH}
                     height={CONST.RECEIPT.HAND_ICON_HEIGHT}
                     style={styles.pb5}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index ff8bd262c995..f8b0760cd311 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -32,12 +32,6 @@ type ScanFromReportProps = WithCurrentUserPersonalDetailsProps & {
     backToReport: string | undefined;
 };
 
-const preloadConfirmation = () => {
-    // Preload the confirmation screen module so its JS is parsed and ready by the time
-    // we navigate after capture — avoids a cold-start module load on slower devices.
-    require('../../IOURequestStepConfirmation');
-};
-
 /**
  * ScanFromReport — initiated from a report's (+) button.
  * Sets participants from the report and navigates to the confirmation page.
@@ -99,7 +93,6 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                     pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}
-                onCameraInitialized={preloadConfirmation}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
                 shouldAcceptMultipleFiles
             />
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 80324b51bc3a..a1997c68a384 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -39,12 +39,6 @@ type ScanGlobalCreateProps = WithCurrentUserPersonalDetailsProps & {
     backToReport: string | undefined;
 };
 
-const preloadConfirmation = () => {
-    // Preload the confirmation screen module so its JS is parsed and ready by the time
-    // we navigate after capture — avoids a cold-start module load on slower devices.
-    require('../../IOURequestStepConfirmation');
-};
-
 /**
  * ScanGlobalCreate — initiated from the FAB (+) button (no specific report).
  * Uses default expense policy to auto-select workspace, or navigates to participant picker.
@@ -146,7 +140,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                     pregenerateThumbnail(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}
-                onCameraInitialized={preloadConfirmation}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
                 shouldAcceptMultipleFiles
             />
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar.tsx
index 84b5397585e3..73c88fc63fa4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar.tsx
@@ -41,11 +41,11 @@ type ScannerControlsBarProps = {
     /** Sets whether the attachment picker modal is open */
     setIsAttachmentPickerActive: (value: boolean) => void;
 
-    /** Sets visibility of the full-screen loading indicator */
-    setIsLoaderVisible: (value: boolean) => void;
+    /** Notifies the consumer when the attachment picker opens or closes */
+    onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
 
-    /** Validates picked files and begins the receipt upload flow */
-    validateFiles: (files: FileObject[], items?: DataTransferItem[]) => void;
+    /** Called when files are selected from the gallery picker */
+    onPicked: (files: FileObject[], items?: DataTransferItem[]) => void;
 
     /** Triggers photo capture from the camera */
     capturePhoto: () => void;
@@ -64,8 +64,8 @@ function ScannerControlsBar({
     hasFlash,
     setFlash,
     setIsAttachmentPickerActive,
-    setIsLoaderVisible,
-    validateFiles,
+    onAttachmentPickerStatusChange,
+    onPicked,
     capturePhoto,
     toggleMultiScan,
 }: ScannerControlsBarProps) {
@@ -80,7 +80,7 @@ function ScannerControlsBar({
             <AttachmentPicker
                 onOpenPicker={() => {
                     setIsAttachmentPickerActive(true);
-                    setIsLoaderVisible(true);
+                    onAttachmentPickerStatusChange?.(true);
                 }}
                 fileLimit={shouldAcceptMultipleFiles ? CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT : 1}
                 shouldValidateImage={false}
@@ -91,17 +91,16 @@ function ScannerControlsBar({
                         accessibilityLabel={translate('receipt.gallery')}
                         sentryLabel={shouldAcceptMultipleFiles ? CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILES : CONST.SENTRY_LABEL.REQUEST_STEP.SCAN.CHOOSE_FILE}
                         style={[styles.alignItemsStart, isMultiScanEnabled && styles.opacity0]}
-                        onPress={() => {
+                        onPress={() =>
                             openPicker({
-                                onPicked: (data) => validateFiles(data),
-                                onCanceled: () => setIsLoaderVisible(false),
-                                // makes sure the loader is not visible anymore e.g. when there is an error while uploading a file
+                                onPicked,
+                                onCanceled: () => onAttachmentPickerStatusChange?.(false),
                                 onClosed: () => {
                                     setIsAttachmentPickerActive(false);
-                                    setIsLoaderVisible(false);
+                                    onAttachmentPickerStatusChange?.(false);
                                 },
-                            });
-                        }}
+                            })
+                        }
                     >
                         <Icon
                             height={variables.iconSizeMenuItem}

From 220377f434edaca15406c8e6b904ddfc10d50339 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 11 May 2026 17:27:02 +0200
Subject: [PATCH 19/33] fix: restore multi-scan receipt preview ribbon

---
 .../components/Camera/index.native.tsx        | 20 ++++++++++++++++-
 .../components/Camera/types.ts                |  3 +++
 .../components/ScanFromReport.tsx             | 21 +++++++++++++-----
 .../components/ScanGlobalCreate.tsx           | 22 ++++++++++++++-----
 .../components/ScanSkipConfirmation.tsx       | 21 +++++++++++++++++-
 5 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 6a746f51a535..6bdb3c2b3e45 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -20,6 +20,7 @@ import captureReceipt from '@pages/iou/request/step/IOURequestStepScan/captureRe
 import CameraPermissionPrompt from '@pages/iou/request/step/IOURequestStepScan/components/CameraPermissionPrompt';
 import CameraViewport from '@pages/iou/request/step/IOURequestStepScan/components/CameraViewport';
 import {useMultiScanActions, useMultiScanState} from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanContext';
+import ReceiptPreviews from '@pages/iou/request/step/IOURequestStepScan/components/ReceiptPreviews';
 import ScannerControlsBar from '@pages/iou/request/step/IOURequestStepScan/components/ScannerControlsBar';
 import getCameraAspectRatio from '@pages/iou/request/step/IOURequestStepScan/getCameraAspectRatio';
 import useCameraInitTelemetry from '@pages/iou/request/step/IOURequestStepScan/hooks/useCameraInitTelemetry';
@@ -34,7 +35,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a react-native-vision-camera viewfinder with shutter, flash toggle, gallery picker, and focus gesture.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange}: CameraProps) {
+function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange, submitMultiScan}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -246,7 +247,24 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
                     capturePhoto={capturePhoto}
                     toggleMultiScan={toggleMultiScan}
                 />
+
+                {canUseMultiScan && !!submitMultiScan && isInLandscapeMode && (
+                    <ReceiptPreviews
+                        isMultiScanEnabled={isMultiScanEnabled}
+                        submit={submitMultiScan}
+                        isCapturingPhoto={didCapturePhoto}
+                        isInLandscapeMode
+                    />
+                )}
             </View>
+
+            {canUseMultiScan && !!submitMultiScan && !isInLandscapeMode && (
+                <ReceiptPreviews
+                    isMultiScanEnabled={isMultiScanEnabled}
+                    submit={submitMultiScan}
+                    isCapturingPhoto={didCapturePhoto}
+                />
+            )}
         </View>
     );
 }
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 6f16160319d2..b4abfe1eba57 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -28,6 +28,9 @@ type CameraProps = {
 
     /** Called when the attachment picker opens or closes (useful for showing/hiding a full-screen loader) */
     onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
+
+    /** Called when the user taps the multi-scan submit button on the preview ribbon. Native multi-scan only. */
+    submitMultiScan?: () => void;
 };
 
 export default CameraProps;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index f8b0760cd311..a1f6fa32ca19 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -46,6 +46,13 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
 
     useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
+    const navigateFromReport = (fileTransactionIDs: string[]) => {
+        startScanProcessSpan(isMultiScanEnabled);
+        setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
+            navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
+        );
+    };
+
     const processReceipts = (files: FileObject[]) => {
         const receiptFiles = buildReceiptFiles({
             files,
@@ -67,12 +74,15 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
             return;
         }
 
-        startScanProcessSpan(isMultiScanEnabled);
+        navigateFromReport(receiptFiles.map((rf: ReceiptFile) => rf.transactionID));
+    };
 
-        const fileTransactionIDs = receiptFiles.map((rf: ReceiptFile) => rf.transactionID);
-        setMultipleMoneyRequestParticipantsFromReport(fileTransactionIDs, report, currentUserPersonalDetails.accountID).then(() =>
-            navigateToConfirmationPage(iouType, transactionID, reportID, backToReport),
-        );
+    const submitMultiScan = () => {
+        const ids = transactions.map((t) => t.transactionID).filter((id): id is string => !!id);
+        if (ids.length === 0) {
+            return;
+        }
+        navigateFromReport(ids);
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
@@ -94,6 +104,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
+                submitMultiScan={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index a1997c68a384..71ce43a13aea 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -59,7 +59,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
 
     useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
-    const navigateGlobalCreate = (receiptFiles: ReceiptFile[]) => {
+    const navigateGlobalCreate = (transactionIDs: string[]) => {
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
             const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting;
             const targetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport;
@@ -70,7 +70,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             if (transaction?.participants && transaction.participants.at(0)?.reportID !== targetReport?.reportID) {
                 const isTrackExpense = transaction.participants.at(0)?.reportID === selfDMReport?.reportID;
 
-                const setParticipantsPromises = receiptFiles.map((rf) => setMoneyRequestParticipants(rf.transactionID, transaction.participants));
+                const setParticipantsPromises = transactionIDs.map((tid) => setMoneyRequestParticipants(tid, transaction.participants));
                 Promise.all(setParticipantsPromises).then(() => {
                     if (isTrackExpense) {
                         Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, CONST.IOU.TYPE.TRACK, transactionID, selfDMReport?.reportID));
@@ -81,9 +81,9 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                 return;
             }
 
-            const setParticipantsPromises = receiptFiles.map((rf) => {
-                setTransactionReport(rf.transactionID, {reportID: transactionReportID}, true);
-                return setMoneyRequestParticipantsFromReport(rf.transactionID, targetReport, currentUserPersonalDetails.accountID);
+            const setParticipantsPromises = transactionIDs.map((tid) => {
+                setTransactionReport(tid, {reportID: transactionReportID}, true);
+                return setMoneyRequestParticipantsFromReport(tid, targetReport, currentUserPersonalDetails.accountID);
             });
             Promise.all(setParticipantsPromises).then(() =>
                 Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_CONFIRMATION.getRoute(CONST.IOU.ACTION.CREATE, iouTypeTrackOrSubmit, transactionID, targetReport?.reportID)),
@@ -119,7 +119,16 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
 
         startScanProcessSpan(isMultiScanEnabled);
 
-        navigateGlobalCreate(receiptFiles);
+        navigateGlobalCreate(receiptFiles.map((rf: ReceiptFile) => rf.transactionID));
+    };
+
+    const submitMultiScan = () => {
+        const ids = transactions.map((t) => t.transactionID).filter((id): id is string => !!id);
+        if (ids.length === 0) {
+            return;
+        }
+        startScanProcessSpan(true);
+        navigateGlobalCreate(ids);
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
@@ -141,6 +150,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
+                submitMultiScan={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index b63a58d25a95..1e48b63ee081 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -245,7 +245,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
             return;
         }
 
-        setReceiptFiles(newReceiptFiles);
+        setReceiptFiles((prev) => (isMultiScanEnabled ? [...prev, ...newReceiptFiles] : newReceiptFiles));
 
         if (isMultiScanEnabled) {
             return;
@@ -264,6 +264,24 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
         submitDirectly(newReceiptFiles, false);
     };
 
+    const submitMultiScan = () => {
+        const draftIDs = new Set(transactions.map((t) => t.transactionID).filter((id): id is string => !!id));
+        const validReceiptFiles = receiptFiles.filter((rf) => draftIDs.has(rf.transactionID));
+        if (validReceiptFiles.length === 0) {
+            return;
+        }
+        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
+        if (gpsRequired) {
+            if (shouldStartLocationPermissionFlow) {
+                setStartLocationPermissionFlow(true);
+                return;
+            }
+            submitDirectly(validReceiptFiles, true);
+            return;
+        }
+        submitDirectly(validReceiptFiles, false);
+    };
+
     const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {
         processReceipts(files);
     });
@@ -277,6 +295,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
+                submitMultiScan={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}

From d311279e20fe6e5b0970eb14799c815c7e7073ef Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 12 May 2026 16:04:56 +0200
Subject: [PATCH 20/33] fix: add multiscan parity

---
 .../components/Camera/CameraCapture.tsx                  | 9 ++++++++-
 .../step/IOURequestStepScan/components/Camera/types.ts   | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
index d14e2cfe0687..86e662c49315 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
@@ -19,6 +19,7 @@ import {cancelSpan, endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpa
 import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan';
 import {useMultiScanActions, useMultiScanState} from '@pages/iou/request/step/IOURequestStepScan/components/MultiScanContext';
 import NavigationAwareCamera from '@pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera';
+import ReceiptPreviews from '@pages/iou/request/step/IOURequestStepScan/components/ReceiptPreviews';
 import {cropImageToAspectRatio} from '@pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio';
 import type {ImageObject} from '@pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio';
 import variables from '@styles/variables';
@@ -33,7 +34,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a camera viewfinder, shutter button, flash toggle and gallery picker.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout}: CameraProps) {
+function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, submitMultiScan}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -294,6 +295,12 @@ function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false,
                     )}
                 </View>
             </View>
+            {canUseMultiScan && !!submitMultiScan && (
+                <ReceiptPreviews
+                    isMultiScanEnabled={isMultiScanEnabled}
+                    submit={submitMultiScan}
+                />
+            )}
         </View>
     );
 }
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index b4abfe1eba57..103205cdc0b4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -29,7 +29,7 @@ type CameraProps = {
     /** Called when the attachment picker opens or closes (useful for showing/hiding a full-screen loader) */
     onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
 
-    /** Called when the user taps the multi-scan submit button on the preview ribbon. Native multi-scan only. */
+    /** Called when the user taps the multi-scan submit button on the preview ribbon. Used by native and mobile web. */
     submitMultiScan?: () => void;
 };
 

From 4a1c35688cc306228928de189b076a37970bd46e Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 18 May 2026 15:55:55 +0200
Subject: [PATCH 21/33] fix: removed onCameraInitialized from the destructured
 props

---
 .../components/Camera/index.native.tsx                   | 9 ++-------
 .../step/IOURequestStepScan/components/Camera/types.ts   | 3 ---
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 6bdb3c2b3e45..8da554e1c4b0 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -35,7 +35,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a react-native-vision-camera viewfinder with shutter, flash toggle, gallery picker, and focus gesture.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onCameraInitialized, onAttachmentPickerStatusChange, submitMultiScan}: CameraProps) {
+function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onAttachmentPickerStatusChange, submitMultiScan}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -97,12 +97,7 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
         HapticFeedback.press();
     };
 
-    const {handleCameraInitialized: handleTelemetryInitialized} = useCameraInitTelemetry({cameraPermissionStatus, device});
-
-    const handleCameraInitialized = () => {
-        handleTelemetryInitialized();
-        onCameraInitialized?.();
-    };
+    const {handleCameraInitialized} = useCameraInitTelemetry({cameraPermissionStatus, device});
 
     const maybeCancelShutterSpan = () => {
         if (isMultiScanEnabled) {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 103205cdc0b4..8c77a181cfb4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -23,9 +23,6 @@ type CameraProps = {
     /** Whether a file is being dragged over a parent wrapper (used by desktop for dual drag-over providers) */
     isDraggingOverWrapper?: boolean;
 
-    /** Called when the native camera finishes initializing (useful for preloading subsequent screens) */
-    onCameraInitialized?: () => void;
-
     /** Called when the attachment picker opens or closes (useful for showing/hiding a full-screen loader) */
     onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
 

From 108aaa6db6d39da4083f5bf2184052013d2edb5d Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 18 May 2026 15:58:39 +0200
Subject: [PATCH 22/33] fix: adjust startScanProcessSpan in
 navigateGlobalCreate

---
 .../step/IOURequestStepScan/components/ScanGlobalCreate.tsx   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 79493b57dd89..e90d85fdbbf8 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -60,6 +60,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     useScanFileReadabilityCheck(transactions, draftTransactionIDs ?? [], disableMultiScan);
 
     const navigateGlobalCreate = (transactionIDs: string[]) => {
+        startScanProcessSpan(isMultiScanEnabled);
         if (shouldUseDefaultExpensePolicy(iouType, defaultExpensePolicy, amountOwed, userBillingGracePeriodEnds, ownerBillingGracePeriodEnd)) {
             const shouldAutoReport = !!defaultExpensePolicy?.autoReporting || !!personalPolicy?.autoReporting;
             const targetReport = shouldAutoReport ? getPolicyExpenseChat(currentUserPersonalDetails.accountID, defaultExpensePolicy?.id) : selfDMReport;
@@ -117,8 +118,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             return;
         }
 
-        startScanProcessSpan(isMultiScanEnabled);
-
         navigateGlobalCreate(receiptFiles.map((rf: ReceiptFile) => rf.transactionID));
     };
 
@@ -127,7 +126,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
         if (ids.length === 0) {
             return;
         }
-        startScanProcessSpan(true);
         navigateGlobalCreate(ids);
     };
 

From 7495f6dc29089704658dece61ff294906dec6300 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 18 May 2026 16:03:17 +0200
Subject: [PATCH 23/33] refactor: submitWithGpsCheck to avoid duplication

---
 .../components/ScanSkipConfirmation.tsx       | 36 ++++++++-----------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 1e48b63ee081..9da977f80c2f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -228,6 +228,19 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
         createTransaction(baseParams);
     };
 
+    const submitWithGpsCheck = (files: ReceiptFile[]) => {
+        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
+        if (gpsRequired) {
+            if (shouldStartLocationPermissionFlow) {
+                setStartLocationPermissionFlow(true);
+                return;
+            }
+            submitDirectly(files, true);
+            return;
+        }
+        submitDirectly(files, false);
+    };
+
     const processReceipts = (files: FileObject[]) => {
         const newReceiptFiles = buildReceiptFiles({
             files,
@@ -251,17 +264,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
             return;
         }
 
-        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && files.length;
-        if (gpsRequired) {
-            if (shouldStartLocationPermissionFlow) {
-                setStartLocationPermissionFlow(true);
-                return;
-            }
-            submitDirectly(newReceiptFiles, true);
-            return;
-        }
-
-        submitDirectly(newReceiptFiles, false);
+        submitWithGpsCheck(newReceiptFiles);
     };
 
     const submitMultiScan = () => {
@@ -270,16 +273,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
         if (validReceiptFiles.length === 0) {
             return;
         }
-        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT;
-        if (gpsRequired) {
-            if (shouldStartLocationPermissionFlow) {
-                setStartLocationPermissionFlow(true);
-                return;
-            }
-            submitDirectly(validReceiptFiles, true);
-            return;
-        }
-        submitDirectly(validReceiptFiles, false);
+        submitWithGpsCheck(validReceiptFiles);
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation((files: FileObject[]) => {

From 2795ed15f3a43a0d8619b6cdd164605fdbb519b7 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 18 May 2026 16:07:59 +0200
Subject: [PATCH 24/33] refactor: rename onMultiScanSubmit

---
 .../components/Camera/CameraCapture.tsx                |  6 +++---
 .../components/Camera/index.native.tsx                 | 10 +++++-----
 .../step/IOURequestStepScan/components/Camera/types.ts |  2 +-
 .../IOURequestStepScan/components/ScanFromReport.tsx   |  2 +-
 .../IOURequestStepScan/components/ScanGlobalCreate.tsx |  2 +-
 .../components/ScanSkipConfirmation.tsx                |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
index 86e662c49315..92b9408a26fc 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/CameraCapture.tsx
@@ -34,7 +34,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a camera viewfinder, shutter button, flash toggle and gallery picker.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, submitMultiScan}: CameraProps) {
+function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onMultiScanSubmit}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -295,10 +295,10 @@ function CameraCapture({onCapture, onPicked, shouldAcceptMultipleFiles = false,
                     )}
                 </View>
             </View>
-            {canUseMultiScan && !!submitMultiScan && (
+            {canUseMultiScan && !!onMultiScanSubmit && (
                 <ReceiptPreviews
                     isMultiScanEnabled={isMultiScanEnabled}
-                    submit={submitMultiScan}
+                    submit={onMultiScanSubmit}
                 />
             )}
         </View>
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
index 8da554e1c4b0..e9e425fa1371 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.native.tsx
@@ -35,7 +35,7 @@ const BLINK_DURATION_MS = 80;
  * Renders a react-native-vision-camera viewfinder with shutter, flash toggle, gallery picker, and focus gesture.
  * Calls `onCapture(file, source)` for each photo taken or file picked from the gallery.
  */
-function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onAttachmentPickerStatusChange, submitMultiScan}: CameraProps) {
+function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayout, onAttachmentPickerStatusChange, onMultiScanSubmit}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -243,20 +243,20 @@ function Camera({onCapture, onPicked, shouldAcceptMultipleFiles = false, onLayou
                     toggleMultiScan={toggleMultiScan}
                 />
 
-                {canUseMultiScan && !!submitMultiScan && isInLandscapeMode && (
+                {canUseMultiScan && !!onMultiScanSubmit && isInLandscapeMode && (
                     <ReceiptPreviews
                         isMultiScanEnabled={isMultiScanEnabled}
-                        submit={submitMultiScan}
+                        submit={onMultiScanSubmit}
                         isCapturingPhoto={didCapturePhoto}
                         isInLandscapeMode
                     />
                 )}
             </View>
 
-            {canUseMultiScan && !!submitMultiScan && !isInLandscapeMode && (
+            {canUseMultiScan && !!onMultiScanSubmit && !isInLandscapeMode && (
                 <ReceiptPreviews
                     isMultiScanEnabled={isMultiScanEnabled}
-                    submit={submitMultiScan}
+                    submit={onMultiScanSubmit}
                     isCapturingPhoto={didCapturePhoto}
                 />
             )}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 8c77a181cfb4..2e7a77062d03 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -27,7 +27,7 @@ type CameraProps = {
     onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
 
     /** Called when the user taps the multi-scan submit button on the preview ribbon. Used by native and mobile web. */
-    submitMultiScan?: () => void;
+    onMultiScanSubmit?: () => void;
 };
 
 export default CameraProps;
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 6208d0abcb67..3e576aaf213e 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -104,7 +104,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
-                submitMultiScan={submitMultiScan}
+                onMultiScanSubmit={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index e90d85fdbbf8..24a11017a204 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -148,7 +148,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
-                submitMultiScan={submitMultiScan}
+                onMultiScanSubmit={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 9da977f80c2f..82019d182bc8 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -289,7 +289,7 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
-                submitMultiScan={submitMultiScan}
+                onMultiScanSubmit={submitMultiScan}
                 shouldAcceptMultipleFiles
             />
             {ErrorModal}

From e51ae367a08dfc00307a6dd2338454c748f42a22 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 18 May 2026 19:08:19 +0200
Subject: [PATCH 25/33] refactor: remove isDraggingOverWrapper

---
 .../step/IOURequestStepScan/components/Camera/FileUpload.tsx | 5 ++---
 .../step/IOURequestStepScan/components/Camera/types.ts       | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
index bb4977996e55..874d2bcac029 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
@@ -24,7 +24,7 @@ const panResponder = PanResponder.create({
  * FileUpload — desktop web capture variant.
  * Renders a drag-and-drop zone + file picker button + receipt alternative methods.
  */
-function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isReplacingReceipt = false, isDraggingOverWrapper}: CameraProps) {
+function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isReplacingReceipt = false}: CameraProps) {
     const theme = useTheme();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
@@ -63,7 +63,7 @@ function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isRe
             style={[styles.flex1, styles.chooseFilesView(false)]}
         >
             <View style={[styles.flex1, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                {!(isDraggingOver ?? isDraggingOverWrapper) && (
+                {!isDraggingOver && (
                     <View
                         style={[styles.alignItemsCenter, styles.justifyContentCenter]}
                         onLayout={(e) => setUploadViewHeight(e.nativeEvent.layout.height)}
@@ -76,7 +76,6 @@ function FileUpload({onPicked, shouldAcceptMultipleFiles = false, onLayout, isRe
                         <View
                             style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
                             // PanResponder handlers must be spread onto the View for gesture recognition
-
                             {...panResponder.panHandlers}
                         >
                             <Text style={[styles.textFileUpload, styles.mb2]}>{translate(shouldAcceptMultipleFiles ? 'receipt.uploadMultiple' : 'receipt.upload')}</Text>
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
index 2e7a77062d03..4bfae6924dfc 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/types.ts
@@ -20,9 +20,6 @@ type CameraProps = {
     /** Whether we are replacing an existing receipt (affects drop zone icon/title on desktop) */
     isReplacingReceipt?: boolean;
 
-    /** Whether a file is being dragged over a parent wrapper (used by desktop for dual drag-over providers) */
-    isDraggingOverWrapper?: boolean;
-
     /** Called when the attachment picker opens or closes (useful for showing/hiding a full-screen loader) */
     onAttachmentPickerStatusChange?: (isOpen: boolean) => void;
 

From 87980277e22bddd73781ab98792ad50ddc6b881f Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 19 May 2026 10:40:08 +0200
Subject: [PATCH 26/33] fix: multiscan back flow upload fix

---
 .../components/ScanGlobalCreate.tsx               | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 24a11017a204..646546a321b4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -21,6 +21,7 @@ import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/uti
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU/MoneyRequest';
 import {setTransactionReport} from '@userActions/Transaction';
+import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -95,6 +96,17 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     };
 
     const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+
+        // Wipe any leftover drafts and the initial transaction's receipt before starting a fresh batch.
+        // Skipped when multi-scan is on, since multi-scan within a single session accumulates drafts on purpose.
+        if (!isMultiScanEnabled && draftTransactionIDs && draftTransactionIDs.length > 0) {
+            removeDraftTransactionsByIDs(draftTransactionIDs, true);
+            removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
+        }
+
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -105,9 +117,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             shouldAcceptMultipleFiles: true,
             isMultiScanEnabled,
             transactions,
-            // Global create is the only flow that wipes stale drafts when starting fresh.
-            draftTransactionIDsToCleanUp: draftTransactionIDs ?? [],
-            isStartingScan: true,
         });
 
         if (receiptFiles.length === 0) {

From 592c0c253b0b509dfff9a47bf7c1109a4c1f238a Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Tue, 19 May 2026 13:00:51 +0200
Subject: [PATCH 27/33] fix: add skipConfirmation for CREATE iouType in scan
 router

---
 .../iou/request/step/IOURequestStepScan/ScanRouter.tsx    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index 0326792699cc..a4506923a5ea 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -82,8 +82,14 @@ ScanNonGlobalCreate.displayName = 'ScanNonGlobalCreate';
 function ScanNewReceipt({report, iouType, reportID, transactionID, transaction, backToReport}: NewReceiptProps) {
     const isArchived = useReportIsArchived(report?.reportID);
     const isFromGlobalCreate = !!transaction?.isFromGlobalCreate;
+    // QAB → "Scan receipt" enters with iouType=CREATE but sets the skip-confirmation flag on a real policy chat,
+    // so it needs to land on ScanSkipConfirmation. Without this, the auto-submit flow falls through to
+    // ScanGlobalCreate's confirmation-page navigation. Plain FAB scans don't set the flag so they aren't affected.
+    const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`);
+    const isQuickActionScanWithSkip = !!skipConfirmation && !!report?.reportID;
+    const isReportScopedEntry = !isFromGlobalCreate && iouType !== CONST.IOU.TYPE.CREATE;
 
-    if (!isFromGlobalCreate && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
+    if (!isArchived && (isReportScopedEntry || isQuickActionScanWithSkip)) {
         return (
             <ScanNonGlobalCreate
                 report={report}

From 6989719e3cd40e74899d438bc48bd9aa5ade3338 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 20 May 2026 12:54:34 +0200
Subject: [PATCH 28/33] Revert "fix: add skipConfirmation for CREATE iouType in
 scan router"

---
 .../iou/request/step/IOURequestStepScan/ScanRouter.tsx    | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index a4506923a5ea..0326792699cc 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -82,14 +82,8 @@ ScanNonGlobalCreate.displayName = 'ScanNonGlobalCreate';
 function ScanNewReceipt({report, iouType, reportID, transactionID, transaction, backToReport}: NewReceiptProps) {
     const isArchived = useReportIsArchived(report?.reportID);
     const isFromGlobalCreate = !!transaction?.isFromGlobalCreate;
-    // QAB → "Scan receipt" enters with iouType=CREATE but sets the skip-confirmation flag on a real policy chat,
-    // so it needs to land on ScanSkipConfirmation. Without this, the auto-submit flow falls through to
-    // ScanGlobalCreate's confirmation-page navigation. Plain FAB scans don't set the flag so they aren't affected.
-    const [skipConfirmation] = useOnyx(`${ONYXKEYS.COLLECTION.SKIP_CONFIRMATION}${transactionID}`);
-    const isQuickActionScanWithSkip = !!skipConfirmation && !!report?.reportID;
-    const isReportScopedEntry = !isFromGlobalCreate && iouType !== CONST.IOU.TYPE.CREATE;
 
-    if (!isArchived && (isReportScopedEntry || isQuickActionScanWithSkip)) {
+    if (!isFromGlobalCreate && !isArchived && iouType !== CONST.IOU.TYPE.CREATE) {
         return (
             <ScanNonGlobalCreate
                 report={report}

From 8efe2f46f683f901ba32b84f01d82082197a783e Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Wed, 20 May 2026 13:45:52 +0200
Subject: [PATCH 29/33] fix: cleanup for leftovers for scan drafts

---
 .../components/ScanFromReport.tsx             |  6 ++++++
 .../components/ScanGlobalCreate.tsx           | 10 ++--------
 .../utils/resetStaleScanDrafts.ts             | 19 +++++++++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 3e576aaf213e..e2b5cf5c06d5 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -11,6 +11,7 @@ import {navigateToConfirmationPage} from '@libs/IOUUtils';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import resetStaleScanDrafts from '@pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts';
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU/MoneyRequest';
@@ -54,6 +55,11 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
     };
 
     const processReceipts = (files: FileObject[]) => {
+        if (files.length === 0) {
+            return;
+        }
+        resetStaleScanDrafts(isMultiScanEnabled, draftTransactionIDs);
+
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 646546a321b4..eafc9ad127c0 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -17,11 +17,11 @@ import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
+import resetStaleScanDrafts from '@pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts';
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU/MoneyRequest';
 import {setTransactionReport} from '@userActions/Transaction';
-import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -99,13 +99,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
         if (files.length === 0) {
             return;
         }
-
-        // Wipe any leftover drafts and the initial transaction's receipt before starting a fresh batch.
-        // Skipped when multi-scan is on, since multi-scan within a single session accumulates drafts on purpose.
-        if (!isMultiScanEnabled && draftTransactionIDs && draftTransactionIDs.length > 0) {
-            removeDraftTransactionsByIDs(draftTransactionIDs, true);
-            removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
-        }
+        resetStaleScanDrafts(isMultiScanEnabled, draftTransactionIDs);
 
         const receiptFiles = buildReceiptFiles({
             files,
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts
new file mode 100644
index 000000000000..55d44099f835
--- /dev/null
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts
@@ -0,0 +1,19 @@
+import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
+import CONST from '@src/CONST';
+
+/**
+ * Wipes leftover non-initial draft transactions and clears the receipt on the initial transaction
+ * before starting a fresh scan batch. Without this, picking files after returning from a previous
+ * submission can leave the previous session's drafts attached to the new batch.
+ *
+ * Skipped when multi-scan is on, since multi-scan within a single session accumulates drafts on purpose.
+ */
+function resetStaleScanDrafts(isMultiScanEnabled: boolean, draftTransactionIDs: string[] | undefined) {
+    if (isMultiScanEnabled || !draftTransactionIDs || draftTransactionIDs.length === 0) {
+        return;
+    }
+    removeDraftTransactionsByIDs(draftTransactionIDs, true);
+    removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
+}
+
+export default resetStaleScanDrafts;

From c66a536631a7d76dd7865e4a7b11cda09df3f6e3 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 21 May 2026 14:51:54 +0200
Subject: [PATCH 30/33] refactor: use draftTransactionIDsToCleanUp cleanup

---
 .../components/ScanFromReport.tsx             |  7 +------
 .../components/ScanGlobalCreate.tsx           |  7 +------
 .../utils/buildReceiptFiles.ts                | 14 +++-----------
 .../utils/resetStaleScanDrafts.ts             | 19 -------------------
 4 files changed, 5 insertions(+), 42 deletions(-)
 delete mode 100644 src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index e2b5cf5c06d5..4855d086913c 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -11,7 +11,6 @@ import {navigateToConfirmationPage} from '@libs/IOUUtils';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
-import resetStaleScanDrafts from '@pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts';
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMultipleMoneyRequestParticipantsFromReport} from '@userActions/IOU/MoneyRequest';
@@ -55,11 +54,6 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
     };
 
     const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-        resetStaleScanDrafts(isMultiScanEnabled, draftTransactionIDs);
-
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -70,6 +64,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
             shouldAcceptMultipleFiles: true,
             isMultiScanEnabled,
             transactions,
+            draftTransactionIDsToCleanUp: draftTransactionIDs,
         });
 
         if (receiptFiles.length === 0) {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index eafc9ad127c0..6ead28593871 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -17,7 +17,6 @@ import shouldUseDefaultExpensePolicy from '@libs/shouldUseDefaultExpensePolicy';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
 import buildReceiptFiles from '@pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles';
 import getFileSource from '@pages/iou/request/step/IOURequestStepScan/utils/getFileSource';
-import resetStaleScanDrafts from '@pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts';
 import startScanProcessSpan from '@pages/iou/request/step/IOURequestStepScan/utils/startScanProcessSpan';
 import useScanFileReadabilityCheck from '@pages/iou/request/step/IOURequestStepScan/utils/useScanFileReadabilityCheck';
 import {setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport} from '@userActions/IOU/MoneyRequest';
@@ -96,11 +95,6 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
     };
 
     const processReceipts = (files: FileObject[]) => {
-        if (files.length === 0) {
-            return;
-        }
-        resetStaleScanDrafts(isMultiScanEnabled, draftTransactionIDs);
-
         const receiptFiles = buildReceiptFiles({
             files,
             getFileSource,
@@ -111,6 +105,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
             shouldAcceptMultipleFiles: true,
             isMultiScanEnabled,
             transactions,
+            draftTransactionIDsToCleanUp: draftTransactionIDs,
         });
 
         if (receiptFiles.length === 0) {
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
index f9d951095e58..cac46a4e3685 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
+++ b/src/pages/iou/request/step/IOURequestStepScan/utils/buildReceiptFiles.ts
@@ -20,21 +20,14 @@ type BuildReceiptFilesParams = {
 
     /**
      * IDs of stale draft transactions to wipe before building new ones.
-     * Only applied when {@link isStartingScan} is true and multi-scan is off — i.e. global-create entry, first capture.
      */
     draftTransactionIDsToCleanUp?: string[];
-
-    /**
-     * True when the scan is starting fresh from the global-create flow. Gates the draft cleanup so other entry points
-     * (FromReport, SkipConfirmation, EditReceipt) don't nuke unrelated drafts.
-     */
-    isStartingScan?: boolean;
 };
 
 /**
  * Builds ReceiptFile[] from captured/picked files, creating optimistic transaction drafts as needed
- * and storing receipts in Onyx via setMoneyRequestReceipt. When invoked from the global-create flow
- * with isStartingScan, wipes any stale drafts left from a previous scan first.
+ * and storing receipts in Onyx via setMoneyRequestReceipt. When invoked with draftTransactionIDsToCleanUp,
+ * wipes any stale drafts left from a previous scan batch first.
  */
 function buildReceiptFiles({
     files,
@@ -47,13 +40,12 @@ function buildReceiptFiles({
     isMultiScanEnabled,
     transactions,
     draftTransactionIDsToCleanUp,
-    isStartingScan = false,
 }: BuildReceiptFilesParams): ReceiptFile[] {
     if (files.length === 0) {
         return [];
     }
 
-    if (!isMultiScanEnabled && isStartingScan && draftTransactionIDsToCleanUp && draftTransactionIDsToCleanUp.length > 0) {
+    if (!isMultiScanEnabled && draftTransactionIDsToCleanUp && draftTransactionIDsToCleanUp.length > 0) {
         removeDraftTransactionsByIDs(draftTransactionIDsToCleanUp, true);
     }
 
diff --git a/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts b/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts
deleted file mode 100644
index 55d44099f835..000000000000
--- a/src/pages/iou/request/step/IOURequestStepScan/utils/resetStaleScanDrafts.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import {removeDraftTransactionsByIDs, removeTransactionReceipt} from '@userActions/TransactionEdit';
-import CONST from '@src/CONST';
-
-/**
- * Wipes leftover non-initial draft transactions and clears the receipt on the initial transaction
- * before starting a fresh scan batch. Without this, picking files after returning from a previous
- * submission can leave the previous session's drafts attached to the new batch.
- *
- * Skipped when multi-scan is on, since multi-scan within a single session accumulates drafts on purpose.
- */
-function resetStaleScanDrafts(isMultiScanEnabled: boolean, draftTransactionIDs: string[] | undefined) {
-    if (isMultiScanEnabled || !draftTransactionIDs || draftTransactionIDs.length === 0) {
-        return;
-    }
-    removeDraftTransactionsByIDs(draftTransactionIDs, true);
-    removeTransactionReceipt(CONST.IOU.OPTIMISTIC_TRANSACTION_ID);
-}
-
-export default resetStaleScanDrafts;

From d290b7c2e0652af3f4b72f851c51383a442920c4 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Thu, 21 May 2026 15:26:17 +0200
Subject: [PATCH 31/33] ts fixes after main changes

---
 .../components/ScanFromReport.tsx                  |  4 ++--
 .../components/ScanGlobalCreate.tsx                |  4 ++--
 .../components/ScanSkipConfirmation.tsx            | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
index 4855d086913c..aac1e108aed4 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanFromReport.tsx
@@ -4,7 +4,7 @@ import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext';
 import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalDetails';
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useFilesValidation from '@hooks/useFilesValidation';
-import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
+import {precacheReceiptImage} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
 import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
 import {navigateToConfirmationPage} from '@libs/IOUUtils';
@@ -101,7 +101,7 @@ function ScanFromReport({report, iouType, reportID, transactionID, transaction,
                     }
                     // Pre-warm the thumbnail cache before navigating so the confirm page
                     // doesn't flash an un-thumbnail receipt.
-                    pregenerateThumbnail(source).then(() => processReceipts([file]));
+                    precacheReceiptImage(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
index 6ead28593871..dfe03b8d4e87 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanGlobalCreate.tsx
@@ -5,7 +5,7 @@ import withCurrentUserPersonalDetails from '@components/withCurrentUserPersonalD
 import type {WithCurrentUserPersonalDetailsProps} from '@components/withCurrentUserPersonalDetails';
 import useDefaultExpensePolicy from '@hooks/useDefaultExpensePolicy';
 import useFilesValidation from '@hooks/useFilesValidation';
-import {pregenerateThumbnail} from '@hooks/useLocalReceiptThumbnail';
+import {precacheReceiptImage} from '@hooks/useLocalReceiptThumbnail';
 import useOnyx from '@hooks/useOnyx';
 import useOptimisticDraftTransactions from '@hooks/useOptimisticDraftTransactions';
 import usePersonalPolicy from '@hooks/usePersonalPolicy';
@@ -142,7 +142,7 @@ function ScanGlobalCreate({iouType, reportID, transactionID, transaction, backTo
                     }
                     // Pre-warm the thumbnail cache before navigating so the confirm page
                     // doesn't flash an un-thumbnail receipt.
-                    pregenerateThumbnail(source).then(() => processReceipts([file]));
+                    precacheReceiptImage(source).then(() => processReceipts([file]));
                 }}
                 onPicked={validateFiles}
                 onAttachmentPickerStatusChange={setIsLoaderVisible}
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
index 82019d182bc8..5ce914fdaf8f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanSkipConfirmation.tsx
@@ -20,6 +20,7 @@ import {clearUserLocation, setUserLocation} from '@libs/actions/UserLocation';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import {calculateDefaultReimbursable} from '@libs/IOUUtils';
 import Log from '@libs/Log';
+import {isMoneyRequestReport} from '@libs/ReportUtils';
 import {cancelSpan} from '@libs/telemetry/activeSpans';
 import {getDefaultTaxCode, getTaxValue} from '@libs/TransactionUtils';
 import {getLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
@@ -71,6 +72,8 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
     const [recentWaypoints] = useOnyx(ONYXKEYS.NVP_RECENT_WAYPOINTS);
     const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID);
+    const reportIDToCheck = isMoneyRequestReport(report) ? report?.chatReportID : report?.reportID;
+    const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${reportIDToCheck}`);
     const [allTransactionDrafts] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftsSelector});
     const [draftTransactionIDs] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, {selector: validTransactionDraftIDsSelector});
     const [shouldStartLocationPermissionFlow] = useOnyx(ONYXKEYS.NVP_LAST_LOCATION_PERMISSION_PROMPT, {
@@ -84,7 +87,16 @@ function ScanSkipConfirmation({report, iouType, reportID, transactionID, transac
     const [startLocationPermissionFlow, setStartLocationPermissionFlow] = useState(false);
     const [receiptFiles, setReceiptFiles] = useState<ReceiptFile[]>([]);
 
-    const participants = getMoneyRequestParticipantOptions(currentUserPersonalDetails.accountID, report, policy, personalDetails, conciergeReportID, isArchived, reportAttributesDerived);
+    const participants = getMoneyRequestParticipantOptions(
+        currentUserPersonalDetails.accountID,
+        report,
+        policy,
+        personalDetails,
+        conciergeReportID,
+        isArchived,
+        reportAttributesDerived,
+        reportDraft,
+    );
     const participantsPolicyTags = useParticipantsPolicyTags(participants);
 
     const defaultTaxCode = getDefaultTaxCode(policy, transaction);

From e4925fcb3fd2addb9ef33662f4b662b2e2038856 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Fri, 22 May 2026 12:11:39 +0200
Subject: [PATCH 32/33] fix: add local replace logic for drafts

---
 .../components/ScanEditReceipt.tsx                   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index de8a90be028f..4754a0286af5 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -33,6 +33,8 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
     const policy = usePolicy(report?.policyID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
+    const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+    const isDraftTransaction = !!draftTransaction;
     const {setIsLoaderVisible} = useFullScreenLoaderActions();
 
     const navigateBack = () => {
@@ -50,8 +52,14 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
     };
 
     const handleCapture = (file: FileObject, source: string) => {
-        setMoneyRequestReceipt(transactionID, source, file.name ?? '', false, file.type);
-        replaceReceipt({transactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, transactionPolicyTagList: policyTagList});
+        // Drafts (e.g. multi-scan transactions on the confirmation page) live in TRANSACTION_DRAFT and have no
+        // backend record yet, so we just update the draft locally. Saved transactions need the replace-receipt API call.
+        if (isDraftTransaction) {
+            setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
+        } else {
+            setMoneyRequestReceipt(transactionID, source, file.name ?? '', false, file.type);
+            replaceReceipt({transactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, transactionPolicyTagList: policyTagList});
+        }
         navigateBack();
     };
 

From fd45aada6d94161e10d0d6ca6fd26b80e3e5e3e6 Mon Sep 17 00:00:00 2001
From: Tomasz Lesniakiewicz <tlesniakiewicz@gmail.com>
Date: Mon, 25 May 2026 11:06:14 +0200
Subject: [PATCH 33/33] fix: use action to check saved vs draft receipt replace

---
 .../request/step/IOURequestStepScan/ScanRouter.tsx  |  1 +
 .../components/ScanEditReceipt.tsx                  | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
index 0326792699cc..4ffd22281d27 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/ScanRouter.tsx
@@ -125,6 +125,7 @@ function ScanRouter({report, action, iouType, reportID, transactionID, transacti
                 report={report}
                 transactionID={transactionID}
                 backTo={backTo}
+                isEditing={isEditing}
             />
         );
     }
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
index 4754a0286af5..4deb4df08520 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
@@ -22,19 +22,18 @@ type ScanEditReceiptProps = {
     report: OnyxEntry<Report>;
     transactionID: string;
     backTo: Route | undefined;
+    isEditing: boolean;
 };
 
 /**
  * ScanEditReceipt — replace an existing receipt and navigate back.
  * Simplest variant: no multi-scan, no participants, no confirmation page.
  */
-function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps) {
+function ScanEditReceipt({report, transactionID, backTo, isEditing}: ScanEditReceiptProps) {
     const {translate} = useLocalize();
     const policy = usePolicy(report?.policyID);
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${report?.policyID}`);
     const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
-    const [draftTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
-    const isDraftTransaction = !!draftTransaction;
     const {setIsLoaderVisible} = useFullScreenLoaderActions();
 
     const navigateBack = () => {
@@ -52,13 +51,11 @@ function ScanEditReceipt({report, transactionID, backTo}: ScanEditReceiptProps)
     };
 
     const handleCapture = (file: FileObject, source: string) => {
-        // Drafts (e.g. multi-scan transactions on the confirmation page) live in TRANSACTION_DRAFT and have no
-        // backend record yet, so we just update the draft locally. Saved transactions need the replace-receipt API call.
-        if (isDraftTransaction) {
-            setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
-        } else {
+        if (isEditing) {
             setMoneyRequestReceipt(transactionID, source, file.name ?? '', false, file.type);
             replaceReceipt({transactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories, transactionPolicyTagList: policyTagList});
+        } else {
+            setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
         }
         navigateBack();
     };