From c364ec8755d403bbb1356bcf605d94a05d092fea Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Fri, 27 Mar 2026 13:12:35 -0700 Subject: [PATCH 01/15] Fix silent receipt drop when file is missing from cache When a receipt image was written to an ephemeral iOS cache directory (e.g. Library/Caches/ImageManipulator/) and the SequentialQueue was delayed, iOS could purge the file before upload. prepareRequestPayload would silently omit the receipt from the FormData, creating an expense with no receipt attached and no error shown to the user. Changes: - Throw an error in prepareRequestPayload when a receipt file is missing instead of silently dropping it, so the request fails visibly - Add moveReceiptToDurableStorage utility that copies files from ephemeral cache to the durable Receipts-Upload directory - Use durable storage after crop/rotate in TransactionReceiptModalContent and IOURequestStepOdometerImage native flows - Add unit tests for prepareRequestPayload covering receipt file existence, missing files, and edge cases Made-with: Cursor --- .../index.native.ts | 37 ++++++++ src/libs/moveReceiptToDurableStorage/index.ts | 8 ++ src/libs/moveReceiptToDurableStorage/types.ts | 3 + .../prepareRequestPayload/index.native.ts | 2 +- .../index.native.tsx | 2 + .../routes/TransactionReceiptModalContent.tsx | 79 ++++++++-------- .../libs/prepareRequestPayloadNativeTest.ts | 89 +++++++++++++++++++ 7 files changed, 184 insertions(+), 36 deletions(-) create mode 100644 src/libs/moveReceiptToDurableStorage/index.native.ts create mode 100644 src/libs/moveReceiptToDurableStorage/index.ts create mode 100644 src/libs/moveReceiptToDurableStorage/types.ts create mode 100644 tests/unit/libs/prepareRequestPayloadNativeTest.ts diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts new file mode 100644 index 000000000000..b6d07b235948 --- /dev/null +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -0,0 +1,37 @@ +import RNFS from 'react-native-fs'; +import getReceiptsUploadFolderPath from '@libs/getReceiptsUploadFolderPath'; +import Log from '@libs/Log'; +import type MoveReceiptToDurableStorage from './types'; + +/** + * Moves a receipt image from an ephemeral location (e.g., ImageManipulator cache) + * to the durable Receipts-Upload directory so it persists until the upload completes. + * + * iOS can purge files in Library/Caches/ at any time, so receipts that are queued + * for upload via the SequentialQueue must live in a durable directory. + */ +const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUri, fileName) => { + const uploadFolder = getReceiptsUploadFolderPath(); + if (!uploadFolder) { + return sourceUri; + } + + try { + const folderExists = await RNFS.exists(uploadFolder); + if (!folderExists) { + await RNFS.mkdir(uploadFolder); + } + + const sourcePath = sourceUri.replace('file://', ''); + const destPath = `${uploadFolder}/${fileName}`; + + await RNFS.copyFile(sourcePath, destPath); + + return `file://${destPath}`; + } catch (error) { + Log.warn('[moveReceiptToDurableStorage] Failed to move receipt, using original path', {error: error instanceof Error ? error.message : String(error)}); + return sourceUri; + } +}; + +export default moveReceiptToDurableStorage; diff --git a/src/libs/moveReceiptToDurableStorage/index.ts b/src/libs/moveReceiptToDurableStorage/index.ts new file mode 100644 index 000000000000..7ad9c66f55c0 --- /dev/null +++ b/src/libs/moveReceiptToDurableStorage/index.ts @@ -0,0 +1,8 @@ +import type MoveReceiptToDurableStorage from './types'; + +/** + * Web no-op: blob/object URLs are held in memory and don't need durable filesystem storage. + */ +const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = (sourceUri) => Promise.resolve(sourceUri); + +export default moveReceiptToDurableStorage; diff --git a/src/libs/moveReceiptToDurableStorage/types.ts b/src/libs/moveReceiptToDurableStorage/types.ts new file mode 100644 index 000000000000..dd3ef3465d9b --- /dev/null +++ b/src/libs/moveReceiptToDurableStorage/types.ts @@ -0,0 +1,3 @@ +type MoveReceiptToDurableStorage = (sourceUri: string, fileName: string) => Promise; + +export default MoveReceiptToDurableStorage; diff --git a/src/libs/prepareRequestPayload/index.native.ts b/src/libs/prepareRequestPayload/index.native.ts index 5232f8d3365e..7b26b1d4c064 100644 --- a/src/libs/prepareRequestPayload/index.native.ts +++ b/src/libs/prepareRequestPayload/index.native.ts @@ -24,7 +24,7 @@ const prepareRequestPayload: PrepareRequestPayload = (command, data, initiatedOf if (source) { return checkFileExists(source).then((exists) => { if (!exists) { - return; + throw new Error(`Receipt file not found at path: ${source}. The file may have been deleted from a temporary cache before upload.`); } const receiptFormData = { uri, diff --git a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx index d0c9a512fb85..370ba3b304c9 100644 --- a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx +++ b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx @@ -30,6 +30,7 @@ import type Platform from '@libs/getPlatform/types'; import getReceiptsUploadFolderPath from '@libs/getReceiptsUploadFolderPath'; import {shouldUseTransactionDraft} from '@libs/IOUUtils'; import Log from '@libs/Log'; +import moveReceiptToDurableStorage from '@libs/moveReceiptToDurableStorage'; import Navigation from '@libs/Navigation/Navigation'; import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan'; import CameraPermission from '@pages/iou/request/step/IOURequestStepScan/CameraPermission'; @@ -239,6 +240,7 @@ function IOURequestStepOdometerImage({ .then((photo: PhotoFile) => { const imageObject: ImageObject = {file: photo, filename: photo.path, source: getPhotoSource(photo.path)}; cropImageToAspectRatio(imageObject, viewfinderLayout.current?.width, viewfinderLayout.current?.height, undefined, photo.orientation) + .then(({file, filename, source}) => moveReceiptToDurableStorage(source, filename).then((durableSource) => ({file, filename, source: durableSource}))) .then(({file, filename, source}) => { setMoneyRequestOdometerImage( transactionID, diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx index 94e73084d48c..e8bfac09a117 100644 --- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx @@ -25,6 +25,7 @@ import cropOrRotateImage from '@libs/cropOrRotateImage'; import fetchImage from '@libs/fetchImage'; import getNonEmptyStringOnyxID from '@libs/getNonEmptyStringOnyxID'; import getPlatform from '@libs/getPlatform'; +import moveReceiptToDurableStorage from '@libs/moveReceiptToDurableStorage'; import Navigation from '@libs/Navigation/Navigation'; import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils'; import {getReportAction, isTrackExpenseAction} from '@libs/ReportActionsUtils'; @@ -296,34 +297,38 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre .then((rotatedImage) => { if (!rotatedImage) { setIsRotating(false); - return; + return Promise.resolve(); } const imageUriResult = 'uri' in rotatedImage && rotatedImage.uri ? rotatedImage.uri : undefined; if (!imageUriResult) { setIsRotating(false); - return; + return Promise.resolve(); } const file = rotatedImage as File; const rotatedFilename = file.name ?? receiptFilename; - if (isOdometerImage) { - setMoneyRequestOdometerImage(transaction.transactionID, imageType, file, isDraftTransaction); - } else if (isDraftTransaction) { - setMoneyRequestReceipt(transaction.transactionID, imageUriResult, rotatedFilename, isDraftTransaction, fileType); - } else { - replaceReceipt({ - transactionID: transaction.transactionID, - file, - source: imageUriResult, - state: transaction.receipt?.state, - transactionPolicyCategories: policyCategories, - transactionPolicy: policy, - isSameReceipt: true, - }); - } - setIsRotating(false); + return moveReceiptToDurableStorage(imageUriResult, rotatedFilename).then((durableUri) => { + const durableFile = {...file, uri: durableUri, source: durableUri}; + + if (isOdometerImage) { + setMoneyRequestOdometerImage(transaction.transactionID, imageType, durableFile, isDraftTransaction); + } else if (isDraftTransaction) { + setMoneyRequestReceipt(transaction.transactionID, durableUri, rotatedFilename, isDraftTransaction, fileType); + } else { + replaceReceipt({ + transactionID: transaction.transactionID, + file: durableFile, + source: durableUri, + state: transaction.receipt?.state, + transactionPolicyCategories: policyCategories, + transactionPolicy: policy, + isSameReceipt: true, + }); + } + setIsRotating(false); + }); }) .catch(() => { setIsRotating(false); @@ -383,33 +388,37 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre .then((croppedImage) => { if (!croppedImage) { setIsCropSaving(false); - return; + return Promise.resolve(); } const imageUriResult = 'uri' in croppedImage && croppedImage.uri ? croppedImage.uri : undefined; if (!imageUriResult) { setIsCropSaving(false); - return; + return Promise.resolve(); } const file = croppedImage as File; const croppedFilename = file.name ?? receiptFilename; - if (isOdometerImage) { - setMoneyRequestOdometerImage(transaction.transactionID, imageType, file, isDraftTransaction); - } else if (isDraftTransaction) { - setMoneyRequestReceipt(transaction.transactionID, imageUriResult, croppedFilename, isDraftTransaction, fileType); - } else { - replaceReceipt({ - transactionID: transaction.transactionID, - file, - source: imageUriResult, - transactionPolicyCategories: policyCategories, - transactionPolicy: policy, - }); - } - setIsCropSaving(false); - exitCropMode(); + return moveReceiptToDurableStorage(imageUriResult, croppedFilename).then((durableUri) => { + const durableFile = {...file, uri: durableUri, source: durableUri}; + + if (isOdometerImage) { + setMoneyRequestOdometerImage(transaction.transactionID, imageType, durableFile, isDraftTransaction); + } else if (isDraftTransaction) { + setMoneyRequestReceipt(transaction.transactionID, durableUri, croppedFilename, isDraftTransaction, fileType); + } else { + replaceReceipt({ + transactionID: transaction.transactionID, + file: durableFile, + source: durableUri, + transactionPolicyCategories: policyCategories, + transactionPolicy: policy, + }); + } + setIsCropSaving(false); + exitCropMode(); + }); }) .catch(() => { setIsCropSaving(false); diff --git a/tests/unit/libs/prepareRequestPayloadNativeTest.ts b/tests/unit/libs/prepareRequestPayloadNativeTest.ts new file mode 100644 index 000000000000..33fc00dec915 --- /dev/null +++ b/tests/unit/libs/prepareRequestPayloadNativeTest.ts @@ -0,0 +1,89 @@ +import type PrepareRequestPayload from '@libs/prepareRequestPayload/types'; + +const mockCheckFileExists = jest.fn, [string | undefined]>(); +jest.mock('@libs/fileDownload/checkFileExists', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: mockCheckFileExists, +})); + +jest.mock('@libs/fileDownload/FileUtils', () => ({ + readFileAsync: jest.fn(() => Promise.resolve(null)), +})); + +jest.mock('@libs/validateFormDataParameter', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: jest.fn(), +})); + +// Bypass the global jest/setup.ts mock to test the real native implementation. +// Dependencies above are still resolved through their respective mocks. +// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires +const {default: prepareRequestPayload}: {default: PrepareRequestPayload} = jest.requireActual('@libs/prepareRequestPayload/index.native.ts'); + +describe('prepareRequestPayload (native)', () => { + afterEach(() => { + jest.clearAllMocks(); + }); + + it('should include receipt in FormData when the file exists', async () => { + mockCheckFileExists.mockResolvedValue(true); + + const receipt = { + source: 'file:///var/mobile/Documents/Receipts-Upload/receipt.jpg', + name: 'receipt.jpg', + type: 'image/jpeg', + uri: 'file:///var/mobile/Documents/Receipts-Upload/receipt.jpg', + }; + + const formData = await prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false); + + expect(formData.has('receipt')).toBe(true); + expect(formData.get('amount')).toBe('100'); + }); + + it('should reject when receipt file does not exist instead of silently dropping it', async () => { + mockCheckFileExists.mockResolvedValue(false); + + const receipt = { + source: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg', + name: 'receipt.jpg', + type: 'image/jpeg', + uri: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg', + }; + + await expect(prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false)).rejects.toThrow('Receipt file not found'); + }); + + it('should handle non-receipt data normally', async () => { + const formData = await prepareRequestPayload('SomeCommand', {amount: '100', currency: 'USD'}, false); + + expect(formData.get('amount')).toBe('100'); + expect(formData.get('currency')).toBe('USD'); + }); + + it('should skip undefined values', async () => { + const formData = await prepareRequestPayload('SomeCommand', {amount: '100', undefinedField: undefined}, false); + + expect(formData.get('amount')).toBe('100'); + expect(formData.has('undefinedField')).toBe(false); + }); + + it('should still append receipt metadata when source is empty (no file to check)', async () => { + const receipt = { + source: '', + name: 'receipt.jpg', + type: 'image/jpeg', + uri: '', + }; + + const formData = await prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false); + + // Receipt with empty source skips the file existence check and falls through + // to the generic append, so it IS included (as metadata, not a file upload) + expect(formData.has('receipt')).toBe(true); + expect(formData.get('amount')).toBe('100'); + expect(mockCheckFileExists).not.toHaveBeenCalled(); + }); +}); From 326cb51bb5f550824439810e859732ae884b8714 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Fri, 27 Mar 2026 13:48:30 -0700 Subject: [PATCH 02/15] Replace throw with Log.alert when receipt file is missing Instead of throwing an error that could disrupt the SequentialQueue, log an alert with the command name, source path, and filename so the issue is surfaced without breaking the request flow. Made-with: Cursor --- .../prepareRequestPayload/index.native.ts | 4 +++- .../libs/prepareRequestPayloadNativeTest.ts | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/libs/prepareRequestPayload/index.native.ts b/src/libs/prepareRequestPayload/index.native.ts index 7b26b1d4c064..d84c505f0618 100644 --- a/src/libs/prepareRequestPayload/index.native.ts +++ b/src/libs/prepareRequestPayload/index.native.ts @@ -1,5 +1,6 @@ import checkFileExists from '@libs/fileDownload/checkFileExists'; import {readFileAsync} from '@libs/fileDownload/FileUtils'; +import Log from '@libs/Log'; import validateFormDataParameter from '@libs/validateFormDataParameter'; import type PrepareRequestPayload from './types'; @@ -24,7 +25,8 @@ const prepareRequestPayload: PrepareRequestPayload = (command, data, initiatedOf if (source) { return checkFileExists(source).then((exists) => { if (!exists) { - throw new Error(`Receipt file not found at path: ${source}. The file may have been deleted from a temporary cache before upload.`); + Log.alert('[prepareRequestPayload] Receipt file missing at upload time', {command, source, fileName: name}); + return; } const receiptFormData = { uri, diff --git a/tests/unit/libs/prepareRequestPayloadNativeTest.ts b/tests/unit/libs/prepareRequestPayloadNativeTest.ts index 33fc00dec915..54ba4c7ca454 100644 --- a/tests/unit/libs/prepareRequestPayloadNativeTest.ts +++ b/tests/unit/libs/prepareRequestPayloadNativeTest.ts @@ -17,6 +17,13 @@ jest.mock('@libs/validateFormDataParameter', () => ({ default: jest.fn(), })); +const mockLogAlert = jest.fn(); +jest.mock('@libs/Log', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: {alert: mockLogAlert}, +})); + // Bypass the global jest/setup.ts mock to test the real native implementation. // Dependencies above are still resolved through their respective mocks. // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires @@ -43,7 +50,7 @@ describe('prepareRequestPayload (native)', () => { expect(formData.get('amount')).toBe('100'); }); - it('should reject when receipt file does not exist instead of silently dropping it', async () => { + it('should log an alert and omit receipt from FormData when file does not exist', async () => { mockCheckFileExists.mockResolvedValue(false); const receipt = { @@ -53,7 +60,15 @@ describe('prepareRequestPayload (native)', () => { uri: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg', }; - await expect(prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false)).rejects.toThrow('Receipt file not found'); + const formData = await prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false); + + expect(formData.has('receipt')).toBe(false); + expect(formData.get('amount')).toBe('100'); + expect(mockLogAlert).toHaveBeenCalledWith('[prepareRequestPayload] Receipt file missing at upload time', { + command: 'RequestMoney', + source: 'file:///var/mobile/Library/Caches/ImageManipulator/receipt.jpg', + fileName: 'receipt.jpg', + }); }); it('should handle non-receipt data normally', async () => { From dfdaeefb26d3b93e41da2c3b902b2f3e7fe1f782 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Mon, 30 Mar 2026 14:00:04 -0700 Subject: [PATCH 03/15] Add durable storage tests for receipt crop/rotate flows Verifies that receipts produced by crop/rotate operations are moved from the ephemeral ImageManipulator cache to the durable Receipts-Upload directory. These tests fail on main (where cache URIs pass through unchanged) and pass with the moveReceiptToDurableStorage fix. Made-with: Cursor --- tests/unit/libs/receiptDurableStorageTest.ts | 60 ++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 tests/unit/libs/receiptDurableStorageTest.ts diff --git a/tests/unit/libs/receiptDurableStorageTest.ts b/tests/unit/libs/receiptDurableStorageTest.ts new file mode 100644 index 000000000000..2424b11542b7 --- /dev/null +++ b/tests/unit/libs/receiptDurableStorageTest.ts @@ -0,0 +1,60 @@ +jest.mock('react-native-fs', () => ({ + exists: jest.fn(() => Promise.resolve(true)), + mkdir: jest.fn(() => Promise.resolve()), + copyFile: jest.fn(() => Promise.resolve()), +})); + +const DURABLE_UPLOAD_DIR = '/var/mobile/Documents/Receipts-Upload'; +jest.mock('@libs/getReceiptsUploadFolderPath', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: () => DURABLE_UPLOAD_DIR, +})); + +jest.mock('@libs/Log', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: {warn: jest.fn(), alert: jest.fn()}, +})); + +type MoveReceiptFn = (uri: string, fileName: string) => Promise; + +let moveReceiptToDurableStorage: MoveReceiptFn; +try { + // On the fix branch the module exists and moves files from cache → durable storage. + // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires + const mod: {default: MoveReceiptFn} = jest.requireActual('@libs/moveReceiptToDurableStorage/index.native.ts'); + moveReceiptToDurableStorage = mod.default; +} catch { + // On main this module doesn't exist — fall back to identity, which mirrors + // the pre-fix component behavior (cache URI passes straight to the action). + moveReceiptToDurableStorage = async (uri: string) => uri; +} + +describe('Receipt flows should persist to durable storage after crop/rotate', () => { + it('should move a cropped receipt out of ImageManipulator cache into Receipts-Upload', async () => { + const cachePath = 'file:///var/mobile/Library/Caches/ImageManipulator/cropped-abc123.jpg'; + + const result = await moveReceiptToDurableStorage(cachePath, 'receipt.jpg'); + + expect(result).toContain('Receipts-Upload'); + expect(result).not.toContain('Library/Caches'); + }); + + it('should move a rotated receipt out of ImageManipulator cache into Receipts-Upload', async () => { + const cachePath = 'file:///var/mobile/Library/Caches/ImageManipulator/rotated-def456.jpg'; + + const result = await moveReceiptToDurableStorage(cachePath, 'rotated-receipt.jpg'); + + expect(result).toContain('Receipts-Upload'); + expect(result).not.toContain('Library/Caches'); + }); + + it('should preserve receipts already in a durable directory', async () => { + const durablePath = `file://${DURABLE_UPLOAD_DIR}/existing-receipt.jpg`; + + const result = await moveReceiptToDurableStorage(durablePath, 'existing-receipt.jpg'); + + expect(result).toContain('Receipts-Upload'); + }); +}); From 842d2895f180d6124bcab9fdac863da9f6e4f19d Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Mon, 30 Mar 2026 14:09:56 -0700 Subject: [PATCH 04/15] Remove branch-relative comments from durable storage test Comments referencing "fix branch" vs "main" become misleading once merged. Simplified to a direct requireActual import. Made-with: Cursor --- tests/unit/libs/receiptDurableStorageTest.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tests/unit/libs/receiptDurableStorageTest.ts b/tests/unit/libs/receiptDurableStorageTest.ts index 2424b11542b7..0d639e58c511 100644 --- a/tests/unit/libs/receiptDurableStorageTest.ts +++ b/tests/unit/libs/receiptDurableStorageTest.ts @@ -19,17 +19,8 @@ jest.mock('@libs/Log', () => ({ type MoveReceiptFn = (uri: string, fileName: string) => Promise; -let moveReceiptToDurableStorage: MoveReceiptFn; -try { - // On the fix branch the module exists and moves files from cache → durable storage. - // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires - const mod: {default: MoveReceiptFn} = jest.requireActual('@libs/moveReceiptToDurableStorage/index.native.ts'); - moveReceiptToDurableStorage = mod.default; -} catch { - // On main this module doesn't exist — fall back to identity, which mirrors - // the pre-fix component behavior (cache URI passes straight to the action). - moveReceiptToDurableStorage = async (uri: string) => uri; -} +// eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires +const {default: moveReceiptToDurableStorage}: {default: MoveReceiptFn} = jest.requireActual('@libs/moveReceiptToDurableStorage/index.native.ts'); describe('Receipt flows should persist to durable storage after crop/rotate', () => { it('should move a cropped receipt out of ImageManipulator cache into Receipts-Upload', async () => { From 0995ca71ab69fd8b956e1673fde636d9cde51a2b Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Mon, 30 Mar 2026 14:18:08 -0700 Subject: [PATCH 05/15] Remove empty-source receipt test case The empty-source scenario is not a realistic receipt flow and the test was just verifying an implementation detail of the fallthrough logic. Made-with: Cursor --- .../unit/libs/prepareRequestPayloadNativeTest.ts | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/unit/libs/prepareRequestPayloadNativeTest.ts b/tests/unit/libs/prepareRequestPayloadNativeTest.ts index 54ba4c7ca454..7416e6420d51 100644 --- a/tests/unit/libs/prepareRequestPayloadNativeTest.ts +++ b/tests/unit/libs/prepareRequestPayloadNativeTest.ts @@ -85,20 +85,4 @@ describe('prepareRequestPayload (native)', () => { expect(formData.has('undefinedField')).toBe(false); }); - it('should still append receipt metadata when source is empty (no file to check)', async () => { - const receipt = { - source: '', - name: 'receipt.jpg', - type: 'image/jpeg', - uri: '', - }; - - const formData = await prepareRequestPayload('RequestMoney', {receipt, amount: '100'}, false); - - // Receipt with empty source skips the file existence check and falls through - // to the generic append, so it IS included (as metadata, not a file upload) - expect(formData.has('receipt')).toBe(true); - expect(formData.get('amount')).toBe('100'); - expect(mockCheckFileExists).not.toHaveBeenCalled(); - }); }); From ce7b65cad08ef6c5b0d8eb49fdf9d613b7d4768d Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Mon, 30 Mar 2026 14:28:15 -0700 Subject: [PATCH 06/15] Fix CI: prettier formatting and deprecated absoluteFillObject - Fix trailing blank line in prepareRequestPayloadNativeTest.ts - Replace deprecated StyleSheet.absoluteFillObject with absoluteFill Made-with: Cursor --- .../request/step/IOURequestStepOdometerImage/index.native.tsx | 2 +- tests/unit/libs/prepareRequestPayloadNativeTest.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx index 370ba3b304c9..bce08fdcae17 100644 --- a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx +++ b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.native.tsx @@ -365,7 +365,7 @@ function IOURequestStepOdometerImage({ diff --git a/tests/unit/libs/prepareRequestPayloadNativeTest.ts b/tests/unit/libs/prepareRequestPayloadNativeTest.ts index 7416e6420d51..cf03f39fd67d 100644 --- a/tests/unit/libs/prepareRequestPayloadNativeTest.ts +++ b/tests/unit/libs/prepareRequestPayloadNativeTest.ts @@ -84,5 +84,4 @@ describe('prepareRequestPayload (native)', () => { expect(formData.get('amount')).toBe('100'); expect(formData.has('undefinedField')).toBe(false); }); - }); From dadbfd3756e822076804d32ae8f9e445cd96a9a8 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Tue, 31 Mar 2026 09:29:58 -0700 Subject: [PATCH 07/15] Address AI review feedback: extract helper, preserve File, add comment - Extract shared durable receipt logic into applyDurableReceipt helper to eliminate duplication between rotate and crop handlers (CONSISTENCY-3) - Pass original file to replaceReceipt instead of spreading, which preserves the File prototype and Blob data on web (Codex P1) - Add explanatory comment for eslint-disable in durable storage test (CONSISTENCY-5) Made-with: Cursor --- .../routes/TransactionReceiptModalContent.tsx | 76 +++++++------------ tests/unit/libs/receiptDurableStorageTest.ts | 1 + 2 files changed, 27 insertions(+), 50 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx index e8bfac09a117..ae5defee26e0 100644 --- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx @@ -283,6 +283,28 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const allowDownload = !isEReceipt; + const applyDurableReceipt = useCallback( + (txnID: string, imageUri: string, filename: string, file: File, isSameReceipt?: boolean) => { + return moveReceiptToDurableStorage(imageUri, filename).then((durableUri) => { + if (isOdometerImage) { + setMoneyRequestOdometerImage(txnID, imageType, {...file, uri: durableUri, source: durableUri}, isDraftTransaction); + } else if (isDraftTransaction) { + setMoneyRequestReceipt(txnID, durableUri, filename, isDraftTransaction, fileType); + } else { + replaceReceipt({ + transactionID: txnID, + file, + source: durableUri, + transactionPolicyCategories: policyCategories, + transactionPolicy: policy, + ...(isSameReceipt ? {state: transaction?.receipt?.state, isSameReceipt: true} : {}), + }); + } + }); + }, + [isDraftTransaction, isOdometerImage, imageType, fileType, policyCategories, policy, transaction?.receipt?.state], + ); + const rotateReceipt = useCallback(() => { if (!transaction?.transactionID || !sourceUri || !isImage) { return; @@ -309,31 +331,14 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const file = rotatedImage as File; const rotatedFilename = file.name ?? receiptFilename; - return moveReceiptToDurableStorage(imageUriResult, rotatedFilename).then((durableUri) => { - const durableFile = {...file, uri: durableUri, source: durableUri}; - - if (isOdometerImage) { - setMoneyRequestOdometerImage(transaction.transactionID, imageType, durableFile, isDraftTransaction); - } else if (isDraftTransaction) { - setMoneyRequestReceipt(transaction.transactionID, durableUri, rotatedFilename, isDraftTransaction, fileType); - } else { - replaceReceipt({ - transactionID: transaction.transactionID, - file: durableFile, - source: durableUri, - state: transaction.receipt?.state, - transactionPolicyCategories: policyCategories, - transactionPolicy: policy, - isSameReceipt: true, - }); - } + return applyDurableReceipt(transaction.transactionID, imageUriResult, rotatedFilename, file, true).then(() => { setIsRotating(false); }); }) .catch(() => { setIsRotating(false); }); - }, [transaction?.transactionID, isDraftTransaction, isOdometerImage, imageType, sourceUri, isImage, receiptFilename, fileName, fileType, policyCategories, transaction?.receipt, policy]); + }, [transaction?.transactionID, sourceUri, isImage, receiptFilename, fileName, fileType, applyDurableReceipt]); const shouldShowRotateAndCropReceiptButton = useMemo( () => @@ -400,22 +405,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const file = croppedImage as File; const croppedFilename = file.name ?? receiptFilename; - return moveReceiptToDurableStorage(imageUriResult, croppedFilename).then((durableUri) => { - const durableFile = {...file, uri: durableUri, source: durableUri}; - - if (isOdometerImage) { - setMoneyRequestOdometerImage(transaction.transactionID, imageType, durableFile, isDraftTransaction); - } else if (isDraftTransaction) { - setMoneyRequestReceipt(transaction.transactionID, durableUri, croppedFilename, isDraftTransaction, fileType); - } else { - replaceReceipt({ - transactionID: transaction.transactionID, - file: durableFile, - source: durableUri, - transactionPolicyCategories: policyCategories, - transactionPolicy: policy, - }); - } + return applyDurableReceipt(transaction.transactionID, imageUriResult, croppedFilename, file).then(() => { setIsCropSaving(false); exitCropMode(); }); @@ -423,21 +413,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre .catch(() => { setIsCropSaving(false); }); - }, [ - transaction?.transactionID, - isDraftTransaction, - isOdometerImage, - imageType, - sourceUri, - isImage, - cropRect, - receiptFilename, - fileName, - fileType, - policyCategories, - policy, - exitCropMode, - ]); + }, [transaction?.transactionID, sourceUri, isImage, cropRect, receiptFilename, fileName, fileType, exitCropMode, applyDurableReceipt]); const threeDotsMenuItems: ThreeDotsMenuItemFactory = useCallback( ({file, source: innerSource, isLocalSource}) => { diff --git a/tests/unit/libs/receiptDurableStorageTest.ts b/tests/unit/libs/receiptDurableStorageTest.ts index 0d639e58c511..a34eef889d36 100644 --- a/tests/unit/libs/receiptDurableStorageTest.ts +++ b/tests/unit/libs/receiptDurableStorageTest.ts @@ -19,6 +19,7 @@ jest.mock('@libs/Log', () => ({ type MoveReceiptFn = (uri: string, fileName: string) => Promise; +// Bypass the global jest/setup.ts mock to test the real native implementation. // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires const {default: moveReceiptToDurableStorage}: {default: MoveReceiptFn} = jest.requireActual('@libs/moveReceiptToDurableStorage/index.native.ts'); From e80445c0b66ab42a933af34b170a0e310a484de4 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 11:26:14 -0700 Subject: [PATCH 08/15] Preserve File prototype in applyDurableReceipt after durable storage move Use Object.assign(new File([file], ...), {uri, source}) for odometer and replaceReceipt paths so the receipt stays a real File instance (CONSISTENCY-3). Made-with: Cursor --- .../routes/TransactionReceiptModalContent.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx index ae5defee26e0..0ab61f277e4f 100644 --- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx @@ -286,14 +286,15 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const applyDurableReceipt = useCallback( (txnID: string, imageUri: string, filename: string, file: File, isSameReceipt?: boolean) => { return moveReceiptToDurableStorage(imageUri, filename).then((durableUri) => { + const durableFile = Object.assign(new File([file], file.name || filename, {type: file.type}), {uri: durableUri, source: durableUri}); if (isOdometerImage) { - setMoneyRequestOdometerImage(txnID, imageType, {...file, uri: durableUri, source: durableUri}, isDraftTransaction); + setMoneyRequestOdometerImage(txnID, imageType, durableFile, isDraftTransaction); } else if (isDraftTransaction) { setMoneyRequestReceipt(txnID, durableUri, filename, isDraftTransaction, fileType); } else { replaceReceipt({ transactionID: txnID, - file, + file: durableFile, source: durableUri, transactionPolicyCategories: policyCategories, transactionPolicy: policy, From 7b3ab0dbe640f70946ef9e6e9a2be4adfda5bda9 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 11:50:54 -0700 Subject: [PATCH 09/15] Address reviewer feedback: eliminate redundant param, use moveFile - Remove txnID parameter from applyDurableReceipt, use transaction?.transactionID directly from component scope - Change RNFS.copyFile to RNFS.moveFile to actually move the file and avoid temporarily doubling disk usage Made-with: Cursor --- src/libs/moveReceiptToDurableStorage/index.native.ts | 2 +- .../routes/TransactionReceiptModalContent.tsx | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts index b6d07b235948..242d3f2359bd 100644 --- a/src/libs/moveReceiptToDurableStorage/index.native.ts +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -25,7 +25,7 @@ const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUr const sourcePath = sourceUri.replace('file://', ''); const destPath = `${uploadFolder}/${fileName}`; - await RNFS.copyFile(sourcePath, destPath); + await RNFS.moveFile(sourcePath, destPath); return `file://${destPath}`; } catch (error) { diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx index 0ab61f277e4f..2aec9a6a1d17 100644 --- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx @@ -284,7 +284,11 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const allowDownload = !isEReceipt; const applyDurableReceipt = useCallback( - (txnID: string, imageUri: string, filename: string, file: File, isSameReceipt?: boolean) => { + (imageUri: string, filename: string, file: File, isSameReceipt?: boolean) => { + const txnID = transaction?.transactionID; + if (!txnID) { + return Promise.resolve(); + } return moveReceiptToDurableStorage(imageUri, filename).then((durableUri) => { const durableFile = Object.assign(new File([file], file.name || filename, {type: file.type}), {uri: durableUri, source: durableUri}); if (isOdometerImage) { @@ -303,7 +307,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre } }); }, - [isDraftTransaction, isOdometerImage, imageType, fileType, policyCategories, policy, transaction?.receipt?.state], + [transaction?.transactionID, transaction?.receipt?.state, isDraftTransaction, isOdometerImage, imageType, fileType, policyCategories, policy], ); const rotateReceipt = useCallback(() => { @@ -332,7 +336,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const file = rotatedImage as File; const rotatedFilename = file.name ?? receiptFilename; - return applyDurableReceipt(transaction.transactionID, imageUriResult, rotatedFilename, file, true).then(() => { + return applyDurableReceipt(imageUriResult, rotatedFilename, file, true).then(() => { setIsRotating(false); }); }) @@ -406,7 +410,7 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const file = croppedImage as File; const croppedFilename = file.name ?? receiptFilename; - return applyDurableReceipt(transaction.transactionID, imageUriResult, croppedFilename, file).then(() => { + return applyDurableReceipt(imageUriResult, croppedFilename, file).then(() => { setIsCropSaving(false); exitCropMode(); }); From eece09c12787aaba156def1f6ec09f691f1d373c Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 12:01:54 -0700 Subject: [PATCH 10/15] Use transaction.transactionID directly instead of abbreviated local Avoids the abbreviated txnID variable and the no-shadow conflict with the transactionID route param by reading transaction.transactionID directly after the null guard. Made-with: Cursor --- .../routes/TransactionReceiptModalContent.tsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx index 2aec9a6a1d17..61d0602ac48b 100644 --- a/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx +++ b/src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx @@ -285,19 +285,18 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre const applyDurableReceipt = useCallback( (imageUri: string, filename: string, file: File, isSameReceipt?: boolean) => { - const txnID = transaction?.transactionID; - if (!txnID) { + if (!transaction?.transactionID) { return Promise.resolve(); } return moveReceiptToDurableStorage(imageUri, filename).then((durableUri) => { const durableFile = Object.assign(new File([file], file.name || filename, {type: file.type}), {uri: durableUri, source: durableUri}); if (isOdometerImage) { - setMoneyRequestOdometerImage(txnID, imageType, durableFile, isDraftTransaction); + setMoneyRequestOdometerImage(transaction.transactionID, imageType, durableFile, isDraftTransaction); } else if (isDraftTransaction) { - setMoneyRequestReceipt(txnID, durableUri, filename, isDraftTransaction, fileType); + setMoneyRequestReceipt(transaction.transactionID, durableUri, filename, isDraftTransaction, fileType); } else { replaceReceipt({ - transactionID: txnID, + transactionID: transaction.transactionID, file: durableFile, source: durableUri, transactionPolicyCategories: policyCategories, From 54d1d94ea6c74fced89275cb51807a569410f3c9 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 12:03:42 -0700 Subject: [PATCH 11/15] Simplify upload folder creation: mkdir first, verify after Instead of checking existence before mkdir and separately after, always call mkdir (which is a no-op if it already exists) then verify it was created. Log an alert and bail if it still doesn't exist after the mkdir attempt. Made-with: Cursor --- src/libs/moveReceiptToDurableStorage/index.native.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts index 242d3f2359bd..6dbf643d4a01 100644 --- a/src/libs/moveReceiptToDurableStorage/index.native.ts +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -17,9 +17,11 @@ const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUr } try { - const folderExists = await RNFS.exists(uploadFolder); - if (!folderExists) { - await RNFS.mkdir(uploadFolder); + await RNFS.mkdir(uploadFolder); + + if (!(await RNFS.exists(uploadFolder))) { + Log.alert('[moveReceiptToDurableStorage] Upload folder does not exist after mkdir', {uploadFolder}); + return sourceUri; } const sourcePath = sourceUri.replace('file://', ''); From cab659650411fb634fb196bf9a8721a14f98a3a0 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 12:06:41 -0700 Subject: [PATCH 12/15] Generate unique durable paths to prevent filename collisions Two offline crop/rotate operations on different transactions could both produce a file named receipt.jpg, causing one to overwrite the other in Receipts-Upload. Generate a unique name using timestamp + random suffix while preserving the file extension. Also update the test mock from copyFile to moveFile and add a collision test. Made-with: Cursor --- .../moveReceiptToDurableStorage/index.native.ts | 4 +++- tests/unit/libs/receiptDurableStorageTest.ts | 14 +++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts index 6dbf643d4a01..2972271b68ea 100644 --- a/src/libs/moveReceiptToDurableStorage/index.native.ts +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -25,7 +25,9 @@ const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUr } const sourcePath = sourceUri.replace('file://', ''); - const destPath = `${uploadFolder}/${fileName}`; + const extension = fileName.includes('.') ? `.${fileName.split('.').pop()}` : ''; + const uniqueName = `${Date.now()}_${Math.random().toString(36).slice(2, 8)}${extension}`; + const destPath = `${uploadFolder}/${uniqueName}`; await RNFS.moveFile(sourcePath, destPath); diff --git a/tests/unit/libs/receiptDurableStorageTest.ts b/tests/unit/libs/receiptDurableStorageTest.ts index a34eef889d36..ea2e9e96f710 100644 --- a/tests/unit/libs/receiptDurableStorageTest.ts +++ b/tests/unit/libs/receiptDurableStorageTest.ts @@ -1,7 +1,7 @@ jest.mock('react-native-fs', () => ({ exists: jest.fn(() => Promise.resolve(true)), mkdir: jest.fn(() => Promise.resolve()), - copyFile: jest.fn(() => Promise.resolve()), + moveFile: jest.fn(() => Promise.resolve()), })); const DURABLE_UPLOAD_DIR = '/var/mobile/Documents/Receipts-Upload'; @@ -42,6 +42,18 @@ describe('Receipt flows should persist to durable storage after crop/rotate', () expect(result).not.toContain('Library/Caches'); }); + it('should generate unique destination paths to avoid filename collisions', async () => { + const cachePath1 = 'file:///var/mobile/Library/Caches/ImageManipulator/img1.jpg'; + const cachePath2 = 'file:///var/mobile/Library/Caches/ImageManipulator/img2.jpg'; + + const result1 = await moveReceiptToDurableStorage(cachePath1, 'receipt.jpg'); + const result2 = await moveReceiptToDurableStorage(cachePath2, 'receipt.jpg'); + + expect(result1).not.toBe(result2); + expect(result1).toMatch(/\.jpg$/); + expect(result2).toMatch(/\.jpg$/); + }); + it('should preserve receipts already in a durable directory', async () => { const durablePath = `file://${DURABLE_UPLOAD_DIR}/existing-receipt.jpg`; From f693d7e95168d2244e50d96ffac1f332b8592576 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 12:13:14 -0700 Subject: [PATCH 13/15] Use rand64() for unique durable receipt filenames Replace the ad-hoc Date.now + Math.random approach with the codebase's existing rand64() utility from NumberUtils, which is the standard client-side ID generator used for transaction IDs and report IDs. Made-with: Cursor --- src/libs/moveReceiptToDurableStorage/index.native.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts index 2972271b68ea..55b6a17359b4 100644 --- a/src/libs/moveReceiptToDurableStorage/index.native.ts +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -1,6 +1,7 @@ import RNFS from 'react-native-fs'; import getReceiptsUploadFolderPath from '@libs/getReceiptsUploadFolderPath'; import Log from '@libs/Log'; +import {rand64} from '@libs/NumberUtils'; import type MoveReceiptToDurableStorage from './types'; /** @@ -26,7 +27,7 @@ const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUr const sourcePath = sourceUri.replace('file://', ''); const extension = fileName.includes('.') ? `.${fileName.split('.').pop()}` : ''; - const uniqueName = `${Date.now()}_${Math.random().toString(36).slice(2, 8)}${extension}`; + const uniqueName = `${rand64()}${extension}`; const destPath = `${uploadFolder}/${uniqueName}`; await RNFS.moveFile(sourcePath, destPath); From 8c511f22188386582a37054e3dae3ad92ef50835 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 13:50:27 -0700 Subject: [PATCH 14/15] Retain original filename in durable receipt path Insert the rand64 suffix before the file extension instead of replacing the entire name, so receipt_4611686018427387903.jpg preserves the original name for debugging context. Made-with: Cursor --- src/libs/moveReceiptToDurableStorage/index.native.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/moveReceiptToDurableStorage/index.native.ts b/src/libs/moveReceiptToDurableStorage/index.native.ts index 55b6a17359b4..768ac5a2314f 100644 --- a/src/libs/moveReceiptToDurableStorage/index.native.ts +++ b/src/libs/moveReceiptToDurableStorage/index.native.ts @@ -26,8 +26,8 @@ const moveReceiptToDurableStorage: MoveReceiptToDurableStorage = async (sourceUr } const sourcePath = sourceUri.replace('file://', ''); - const extension = fileName.includes('.') ? `.${fileName.split('.').pop()}` : ''; - const uniqueName = `${rand64()}${extension}`; + const dotIndex = fileName.lastIndexOf('.'); + const uniqueName = dotIndex > 0 ? `${fileName.slice(0, dotIndex)}_${rand64()}${fileName.slice(dotIndex)}` : `${fileName}_${rand64()}`; const destPath = `${uploadFolder}/${uniqueName}`; await RNFS.moveFile(sourcePath, destPath); From 545c88f72e7be0d8fda7a8231a60d5cdd2795466 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 1 Apr 2026 14:14:58 -0700 Subject: [PATCH 15/15] Remove weird file --- node_modules | 1 - 1 file changed, 1 deletion(-) delete mode 120000 node_modules diff --git a/node_modules b/node_modules deleted file mode 120000 index 1111094bf332..000000000000 --- a/node_modules +++ /dev/null @@ -1 +0,0 @@ -/Users/neilmarcellini/Expensidev/App/node_modules \ No newline at end of file