Improve scanned receipt quality without slowing the shutter

cspell.json

@@ -125,6 +125,7 @@
         "EUVAT",
         "elif",
         "evals",
+        "EXIF",
         "EXPENSIDEV",
         "EXPENSIFYAPI",
         "EXPENSIFYPDBUSINESS",

src/CONST/index.ts

@@ -427,6 +427,9 @@ const CONST = {
     RECEIPT_CAMERA: {
         PHOTO_WIDTH: 2880,
         PHOTO_HEIGHT: 2160,
+        // iPhones offer no 4:3 photo size between 3 MP and 12 MP, so the 6 MP target above selects 2016x1512
+        IOS_STILL_WIDTH: 4032,
+        IOS_STILL_HEIGHT: 3024,
         PHOTO_ASPECT_RATIO: 4 / 3,
     },
 
@@ -2425,6 +2428,7 @@ const CONST = {
         SPAN_SHUTTER_TO_CONFIRMATION: 'ManualShutterToConfirmation',
         SPAN_RECEIPT_CAPTURE: 'ManualReceiptCapture',
         SPAN_RECEIPT_PREPARE: 'ManualReceiptPrepare',
+        SPAN_RECEIPT_UPGRADE: 'ManualReceiptUpgrade',
         SPAN_SCAN_PROCESS_AND_NAVIGATE: 'ManualScanProcessAndNavigate',
         SPAN_CONFIRMATION_MOUNT: 'ManualConfirmationMount',
         SPAN_CONFIRMATION_LIST_READY: 'ManualConfirmationListReady',
@@ -2535,6 +2539,8 @@ const CONST = {
         ATTRIBUTE_IS_MULTI_SCAN: 'is_multi_scan',
         ATTRIBUTE_CAPTURE_METHOD: 'capture_method',
         ATTRIBUTE_FLASH_USED: 'flash_used',
+        ATTRIBUTE_UPGRADE_ATTEMPTED: 'upgrade_attempted',
+        ATTRIBUTE_UPGRADE_OUTCOME: 'upgrade_outcome',
         ATTRIBUTE_PHOTO_WIDTH: 'photo_width',
         ATTRIBUTE_PHOTO_HEIGHT: 'photo_height',
         ATTRIBUTE_SOURCE: 'source',
@@ -2550,6 +2556,16 @@ const CONST = {
             PHOTO: 'photo',
             SNAPSHOT: 'snapshot',
         },
+        UPGRADE_OUTCOME: {
+            UPGRADED: 'upgraded',
+            CAPTURE_FAILED: 'capture_failed',
+            CAPTURE_TIMED_OUT: 'capture_timed_out',
+            ROTATE_TIMED_OUT: 'rotate_timed_out',
+            ROTATE_FAILED: 'rotate_failed',
+            CLAIMED_FOR_UPLOAD: 'claimed_for_upload',
+            SWAP_FAILED: 'swap_failed',
+            STACKED_CAPTURE_SKIPPED: 'stacked_capture_skipped',
+        },
         SPAN_PLATFORM: {
             NATIVE: 'native',
             WEB: 'web',

src/components/MoneyRequestConfirmationListFooter/hooks/useReceiptThumbnailSource.ts

@@ -1,4 +1,5 @@
 import useLocalReceiptThumbnail from '@hooks/useLocalReceiptThumbnail';
+import useReceiptUpgradeCount from '@hooks/useReceiptUpgradeCount';
 
 import type {ThumbnailAndImageURI} from '@libs/ReceiptUtils';
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
@@ -42,10 +43,16 @@ function useReceiptThumbnailSource({transaction, receiptPath, receiptFilename}:
     // (react-hooks/refs). React handles this synchronously before painting, so there is no visible
     // double-render or layout thrash.
     const resolvedReceiptImageStr = resolvedReceiptImage != null ? String(resolvedReceiptImage) : undefined;
-    const [initialLocalSource, setInitialLocalSource] = useState<{source: string | undefined; resolvedImage: string | undefined}>({source: undefined, resolvedImage: undefined});
-    if (isLocalFile && (initialLocalSource.source === undefined || initialLocalSource.resolvedImage !== resolvedReceiptImageStr)) {
+
+    const upgradeCount = useReceiptUpgradeCount(resolvedReceiptImageStr);
+    const [initialLocalSource, setInitialLocalSource] = useState<{source: string | undefined; resolvedImage: string | undefined; upgradeCount: number}>({
+        source: undefined,
+        resolvedImage: undefined,
+        upgradeCount: 0,
+    });
+    if (isLocalFile && (initialLocalSource.source === undefined || initialLocalSource.resolvedImage !== resolvedReceiptImageStr || initialLocalSource.upgradeCount !== upgradeCount)) {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- empty string fallback is intentional: we want to skip the empty-string case in the OR chain, not treat it as a valid source
-        setInitialLocalSource({source: thumbnailUri || resolvedReceiptImageStr || '', resolvedImage: resolvedReceiptImageStr});
+        setInitialLocalSource({source: thumbnailUri || resolvedReceiptImageStr || '', resolvedImage: resolvedReceiptImageStr, upgradeCount});
     }
 
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- empty string fallback is intentional: we want to skip the empty-string case in the OR chain, not treat it as a valid source

src/hooks/useLocalReceiptThumbnail.ts

@@ -2,6 +2,8 @@ import {generateThumbnail} from '@pages/iou/request/step/IOURequestStepScan/crop
 
 import {useEffect, useRef, useState, useTransition} from 'react';
 
+import useReceiptUpgradeCount from './useReceiptUpgradeCount';
+
 const thumbnailCache = new Map<string, string>();
 /** Track how many mounted hook instances reference each sourceUri */
 const thumbnailRefCount = new Map<string, number>();
@@ -42,10 +44,13 @@ function useLocalReceiptThumbnail(sourceUri: string | undefined, isLocalFile: bo
     const [, startTransition] = useTransition();
     const retainedUriRef = useRef<string | undefined>(undefined);
 
+    const upgradeCount = useReceiptUpgradeCount(sourceUri);
+
     // Resolve cached thumbnails synchronously during render (fast path)
     const cachedUri = sourceUri ? thumbnailCache.get(sourceUri) : undefined;
     const resultForCurrentSource = asyncResult?.source === sourceUri ? asyncResult : undefined;
-    const thumbnailUri = cachedUri ?? resultForCurrentSource?.uri;
+    const resolvedUri = cachedUri ?? resultForCurrentSource?.uri;
+    const thumbnailUri = resolvedUri && upgradeCount > 0 ? `${resolvedUri.split('#').at(0) ?? resolvedUri}#upgraded${upgradeCount}` : resolvedUri;
 
     const shouldGenerate = !!sourceUri && isLocalFile && !cachedUri;
     const isGenerating = shouldGenerate && !resultForCurrentSource?.done;

src/hooks/useReceiptUpgradeCount.ts

@@ -0,0 +1,16 @@
+import {getUpgradeCount, subscribe} from '@libs/ReceiptStorage/receiptUpgrades';
+
+import {useSyncExternalStore} from 'react';
+
+function toUpgradeKey(sourceUri: unknown): string {
+    if (typeof sourceUri !== 'string') {
+        return '';
+    }
+    return sourceUri.split('/').pop()?.split('#').at(0)?.split('?').at(0) ?? '';
+}
+
+function useReceiptUpgradeCount(sourceUri: string | number | undefined): number {
+    return useSyncExternalStore(subscribe, () => getUpgradeCount(toUpgradeKey(sourceUri)));
+}
+
+export default useReceiptUpgradeCount;