Merge pull request Expensify#50770 from QichenZhu/fix/50083

Fix errors after quickly tapping the shutter
daledah · Oct 23, 2024 · ba29224 · ba29224
2 parents 41e8ef2 + 80bb24d
commit ba29224
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 18 deletions.
diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.native.tsx
@@ -480,6 +480,8 @@ function IOURequestStepScan({
             return;
         }
 
+        setDidCapturePhoto(true);
+
         camera?.current
             ?.takePhoto({
                 flash: flash && hasFlash ? 'on' : 'off',
@@ -490,26 +492,34 @@ function IOURequestStepScan({
                 const source = getPhotoSource(photo.path);
                 IOU.setMoneyRequestReceipt(transactionID, source, photo.path, !isEditing);
 
-                FileUtils.readFileAsync(source, photo.path, (file) => {
-                    if (isEditing) {
-                        updateScanAndNavigate(file, source);
-                        return;
-                    }
-                    setDidCapturePhoto(true);
-                    if (shouldSkipConfirmation) {
-                        setFileResize(file);
-                        setFileSource(source);
-                        const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && file;
-                        if (gpsRequired) {
-                            const shouldStartLocationPermissionFlow = IOUUtils.shouldStartLocationPermissionFlow();
-                            if (shouldStartLocationPermissionFlow) {
-                                setStartLocationPermissionFlow(true);
-                                return;
+                FileUtils.readFileAsync(
+                    source,
+                    photo.path,
+                    (file) => {
+                        if (isEditing) {
+                            updateScanAndNavigate(file, source);
+                            return;
+                        }
+                        if (shouldSkipConfirmation) {
+                            setFileResize(file);
+                            setFileSource(source);
+                            const gpsRequired = transaction?.amount === 0 && iouType !== CONST.IOU.TYPE.SPLIT && file;
+                            if (gpsRequired) {
+                                const shouldStartLocationPermissionFlow = IOUUtils.shouldStartLocationPermissionFlow();
+                                if (shouldStartLocationPermissionFlow) {
+                                    setStartLocationPermissionFlow(true);
+                                    return;
+                                }
                             }
                         }
-                    }
-                    navigateToConfirmationStep(file, source, false);
-                });
+                        navigateToConfirmationStep(file, source, false);
+                    },
+                    () => {
+                        setDidCapturePhoto(false);
+                        showCameraAlert();
+                        Log.warn('Error reading photo');
+                    },
+                );
             })
             .catch((error: string) => {
                 setDidCapturePhoto(false);

diff --git a/src/pages/iou/request/step/IOURequestStepScan/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/index.tsx
@@ -518,6 +518,10 @@ function IOURequestStepScan({
 
         const imageBase64 = cameraRef.current.getScreenshot();
 
+        if (imageBase64 === null) {
+            return;
+        }
+
         const filename = `receipt_${Date.now()}.png`;
         const file = FileUtils.base64ToFile(imageBase64 ?? '', filename);
         const source = URL.createObjectURL(file);