Merge pull request Expensify#72299 from TaduJR/fix-Android-Multi-scan-App-closes-when-scanning-multiple-receipt-at-once

fix: Android - Multi scan - App closes when scanning multiple receipt at once

Author: NikkiWines

src/components/AttachmentPicker/index.native.tsx

@@ -42,6 +42,26 @@ type Item = {
     pickAttachment: () => Promise<Asset[] | void | LocalCopy[]>;
 };
 
+/**
+ * Ensures asset has proper fileName and type properties
+ */
+const processAssetWithFallbacks = (asset: Asset): Asset => {
+    // Generate fallback name: extract from URI if available, otherwise use timestamped default
+    const fallbackName = asset.uri
+        ? asset.uri
+              .substring(asset.uri.lastIndexOf('/') + 1)
+              .split('?')
+              .at(0)
+        : `image_${Date.now()}.jpeg`;
+    const fileName = asset.fileName ?? fallbackName;
+    return {
+        ...asset,
+        fileName,
+        // Default to JPEG if no type specified
+        type: asset.type ?? 'image/jpeg',
+    };
+};
+
 /**
  * Return imagePickerOptions based on the type
  */
@@ -202,7 +222,9 @@ function AttachmentPicker({
                                                 checkAllProcessed();
                                             });
                                     } else {
-                                        processedAssets.push(asset);
+                                        // Ensure the asset has proper fileName and type for non-HEIC images
+                                        const processedAsset = processAssetWithFallbacks(asset);
+                                        processedAssets.push(processedAsset);
                                         checkAllProcessed();
                                     }
                                 })
@@ -211,7 +233,9 @@ function AttachmentPicker({
                                     checkAllProcessed();
                                 });
                         } else {
-                            processedAssets.push(asset);
+                            // Ensure the asset has proper fileName and type
+                            const processedAsset = processAssetWithFallbacks(asset);
+                            processedAssets.push(processedAsset);
                             checkAllProcessed();
                         }
                     });

src/libs/actions/IOU.ts

@@ -12096,7 +12096,7 @@ function navigateToStartStepIfScanFileCannotBeRead(
     }
 
     const onFailure = () => {
-        setMoneyRequestReceipt(transactionID, '', '', true);
+        setMoneyRequestReceipt(transactionID, '', '', true, '');
         if (requestType === CONST.IOU.REQUEST_TYPE.MANUAL) {
             if (onFailureCallback) {
                 onFailureCallback();

src/libs/fileDownload/checkFileExists/index.ts

@@ -0,0 +1,36 @@
+import RNFS from 'react-native-fs';
+
+/**
+ * Checks if a file exists at the given path without loading it into memory.
+ * This is a memory-safe alternative to readFileAsync for validation.
+ *
+ * @param path - The file path to check (typically starts with file://)
+ * @returns Promise that resolves to true if file exists, false otherwise
+ */
+function checkFileExists(path: string | undefined): Promise<boolean> {
+    if (!path) {
+        return Promise.resolve(false);
+    }
+
+    // Decode URI if it's URL-encoded (handles special characters in filenames)
+    let decodedPath = path;
+    try {
+        decodedPath = decodeURI(path);
+    } catch (e) {
+        // If decoding fails, use the original path
+        decodedPath = path;
+    }
+
+    // RNFS.stat() returns file info without loading the file content
+    return RNFS.stat(decodedPath)
+        .then((fileStat) => {
+            // File exists if we get stats and it's actually a file (not directory)
+            return fileStat.isFile();
+        })
+        .catch(() => {
+            // File doesn't exist or can't be accessed
+            return false;
+        });
+}
+
+export default checkFileExists;

src/libs/fileDownload/validateReceiptFile/index.native.ts

@@ -0,0 +1,26 @@
+import checkFileExists from '@libs/fileDownload/checkFileExists';
+import type {ReceiptSource} from '@src/types/onyx/Transaction';
+
+/**
+ * Validates a receipt file and processes it for upload
+ * Uses checkFileExists for memory-efficient file validation without loading the entire file
+ */
+function validateReceiptFile(
+    receiptFilename: string | undefined,
+    receiptPath: ReceiptSource | undefined,
+    receiptType: string | undefined,
+    onSuccess: (file: File) => void,
+    onFailure: () => void,
+): Promise<void> {
+    const receiptPathString = receiptPath?.toString();
+    return checkFileExists(receiptPathString).then((exists) => {
+        if (!exists) {
+            onFailure();
+            return;
+        }
+
+        onSuccess({uri: receiptPathString, name: receiptFilename, type: receiptType, source: receiptPathString} as File);
+    });
+}
+
+export default validateReceiptFile;

src/libs/fileDownload/validateReceiptFile/index.ts

@@ -0,0 +1,18 @@
+import {checkIfScanFileCanBeRead} from '@libs/actions/IOU';
+import type {ReceiptSource} from '@src/types/onyx/Transaction';
+
+/**
+ * Validates a receipt file and processes it for upload
+ * Uses readFileAsync to load the file into memory for processing
+ */
+function validateReceiptFile(
+    receiptFilename: string | undefined,
+    receiptPath: ReceiptSource | undefined,
+    receiptType: string | undefined,
+    onSuccess: (file: File) => void,
+    onFailure: () => void,
+): Promise<void | File> | undefined {
+    return checkIfScanFileCanBeRead(receiptFilename, receiptPath, receiptType, onSuccess, onFailure);
+}
+
+export default validateReceiptFile;

src/libs/prepareRequestPayload/index.native.ts

@@ -1,3 +1,4 @@
+import checkFileExists from '@libs/fileDownload/checkFileExists';
 import {readFileAsync} from '@libs/fileDownload/FileUtils';
 import validateFormDataParameter from '@libs/validateFormDataParameter';
 import type PrepareRequestPayload from './types';
@@ -18,7 +19,25 @@ const prepareRequestPayload: PrepareRequestPayload = (command, data, initiatedOf
                 return Promise.resolve();
             }
 
-            if ((key === 'receipt' || key === 'file') && initiatedOffline) {
+            if (key === 'receipt') {
+                const {source, name, type, uri} = value as File;
+                if (source) {
+                    return checkFileExists(source).then((exists) => {
+                        if (!exists) {
+                            return;
+                        }
+                        const receiptFormData = {
+                            uri,
+                            name,
+                            type,
+                        };
+                        validateFormDataParameter(command, key, receiptFormData);
+                        formData.append(key, receiptFormData as File);
+                    });
+                }
+            }
+
+            if (key === 'file' && initiatedOffline) {
                 const {uri: path = '', source} = value as File;
                 if (!source) {
                     validateFormDataParameter(command, key, value);

src/pages/Search/SearchPage.tsx

@@ -255,6 +255,7 @@ function SearchPage({route}: SearchPageProps) {
             ) as PaymentData[];
 
             payMoneyRequestOnSearch(hash, paymentData, transactionIDList);
+            // eslint-disable-next-line @typescript-eslint/no-deprecated
             InteractionManager.runAfterInteractions(() => {
                 clearSelectedTransactions();
             });
@@ -614,7 +615,7 @@ function SearchPage({route}: SearchPageProps) {
                 source,
                 transactionID,
             });
-            setMoneyRequestReceipt(transactionID, source, file.name ?? '', true);
+            setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
         });
 
         if (isPaidGroupPolicy(activePolicy) && activePolicy?.isPolicyExpenseChatEnabled && !shouldRestrictUserBillableActions(activePolicy.id)) {

src/pages/home/report/ReportActionCompose/useAttachmentUploadValidation.ts

@@ -103,7 +103,7 @@ function useAttachmentUploadValidation({
                           reportID,
                       });
             const newTransactionID = newTransaction?.transactionID ?? CONST.IOU.OPTIMISTIC_TRANSACTION_ID;
-            setMoneyRequestReceipt(newTransactionID, source, file.name ?? '', true);
+            setMoneyRequestReceipt(newTransactionID, source, file.name ?? '', true, file.type);
             setMoneyRequestParticipantsFromReport(newTransactionID, report);
         });
         Navigation.navigate(

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

@@ -32,6 +32,7 @@ import {completeTestDriveTask} from '@libs/actions/Task';
 import DateUtils from '@libs/DateUtils';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import {isLocalFile as isLocalFileFileUtils} from '@libs/fileDownload/FileUtils';
+import validateReceiptFile from '@libs/fileDownload/validateReceiptFile';
 import getCurrentPosition from '@libs/getCurrentPosition';
 import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID';
 import getReceiptFilenameFromTransaction from '@libs/getReceiptFilenameFromTransaction';
@@ -62,7 +63,6 @@ import {
 } from '@libs/TransactionUtils';
 import type {GpsPoint} from '@userActions/IOU';
 import {
-    checkIfScanFileCanBeRead,
     createDistanceRequest as createDistanceRequestIOUActions,
     getIOURequestPolicyID,
     getReceiverType,
@@ -452,11 +452,11 @@ function IOURequestStepConfirmation({
                 const onFailure = () => {
                     isScanFilesCanBeRead = false;
                     if (initialTransactionID === item.transactionID) {
-                        setMoneyRequestReceipt(item.transactionID, '', '', true);
+                        setMoneyRequestReceipt(item.transactionID, '', '', true, '');
                     }
                 };
 
-                return checkIfScanFileCanBeRead(itemReceiptFilename, itemReceiptPath, itemReceiptType, onSuccess, onFailure);
+                return validateReceiptFile(itemReceiptFilename, itemReceiptPath, itemReceiptType, onSuccess, onFailure) ?? Promise.resolve();
             }),
         ).then(() => {
             if (isScanFilesCanBeRead) {
@@ -1107,7 +1107,7 @@ function IOURequestStepConfirmation({
             return;
         }
         const source = URL.createObjectURL(file as Blob);
-        setMoneyRequestReceipt(currentTransactionID, source, file.name ?? '', true);
+        setMoneyRequestReceipt(currentTransactionID, source, file.name ?? '', true, file.type);
     };
 
     const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation(setReceiptOnDrop);

src/pages/iou/request/step/IOURequestStepScan/cropImageToAspectRatio.ts

@@ -32,7 +32,7 @@ function calculateCropRect(imageWidth: number, imageHeight: number, aspectRatioW
     return {width, height, originX, originY};
 }
 
-const IMAGE_TYPE = 'png';
+const IMAGE_TYPE = 'image/jpeg';
 
 function cropImageToAspectRatio(
     /** Source image */
@@ -58,7 +58,7 @@ function cropImageToAspectRatio(
             }
 
             const crop = calculateCropRect(imageWidth, imageHeight, aspectRatioWidth, aspectRatioHeight, shouldAlignTop);
-            const croppedFilename = `receipt_cropped_${Date.now()}.${IMAGE_TYPE}`;
+            const croppedFilename = `receipt_cropped_${Date.now()}.jpeg`;
 
             return cropOrRotateImage(image.source, [{crop}], {compress: 1, name: croppedFilename, type: IMAGE_TYPE}).then((croppedImage) => {
                 if (!croppedImage?.uri || !croppedImage?.name) {