From b27cb7493391c92ea8a9a82aa8e8ac733674d58d Mon Sep 17 00:00:00 2001 From: annaweber Date: Mon, 13 Jul 2026 21:43:29 -0700 Subject: [PATCH 1/7] fix: Block raw HEIC upload when conversion fails --- src/CONST/index.ts | 1 + .../AttachmentPicker/index.native.tsx | 5 +- src/hooks/useFilesValidation.tsx | 72 +++++++------- src/languages/de.ts | 1 + src/languages/en.ts | 1 + src/languages/es.ts | 1 + src/languages/fr.ts | 1 + src/languages/it.ts | 1 + src/languages/ja.ts | 1 + src/languages/nl.ts | 1 + src/languages/pl.ts | 1 + src/languages/pt-BR.ts | 1 + src/languages/zh-hans.ts | 1 + src/libs/fileDownload/FileUtils.ts | 5 + .../heicConverter/index.native.ts | 64 ++++--------- tests/unit/HeicConverterTest.ts | 94 +++++++++++++++++++ 16 files changed, 167 insertions(+), 84 deletions(-) create mode 100644 tests/unit/HeicConverterTest.ts diff --git a/src/CONST/index.ts b/src/CONST/index.ts index d4e2b69aa5c0..ba6b40e4783f 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -2742,6 +2742,7 @@ const CONST = { FILE_TOO_LARGE: 'fileTooLarge', FILE_TOO_SMALL: 'fileTooSmall', FILE_CORRUPTED: 'fileCorrupted', + HEIC_CONVERSION_FAILED: 'heicConversionFailed', PROTECTED_FILE: 'protectedFile', HEIC_OR_HEIF_IMAGE: 'heicOrHeifImage', IMAGE_DIMENSIONS_TOO_LARGE: 'imageDimensionsTooLarge', diff --git a/src/components/AttachmentPicker/index.native.tsx b/src/components/AttachmentPicker/index.native.tsx index 3fa8cba4721f..3608b29b195f 100644 --- a/src/components/AttachmentPicker/index.native.tsx +++ b/src/components/AttachmentPicker/index.native.tsx @@ -260,9 +260,8 @@ function AttachmentPicker({ checkAllProcessed(); }) .catch((error: Error) => { - Log.warn('Failed to convert HEIC image, falling back to original', {error: error.message}); - const fallbackAsset = processAssetWithFallbacks(asset); - processedAssets.push(fallbackAsset); + Log.warn('Failed to convert HEIC image, skipping asset', {error: error.message}); + showGeneralAlert(translate('attachmentPicker.errorWhileConvertingHeic')); checkAllProcessed(); }); } else { diff --git a/src/hooks/useFilesValidation.tsx b/src/hooks/useFilesValidation.tsx index b9a21e841e7c..5d8711689f5c 100644 --- a/src/hooks/useFilesValidation.tsx +++ b/src/hooks/useFilesValidation.tsx @@ -211,46 +211,46 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer const convertedFilesToResize: FileObject[] = []; const convertedFiles: FileObject[] = []; - await Promise.all( - filesToConvert.map( - (file) => - new Promise((resolve) => { - convertHeicImage(file, { - onSuccess: (convertedFile) => { - if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { - convertedFilesToResize.push(convertedFile); - resolve(); - return; - } - - if (!validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { - collectedErrors.current.push({ - error: CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE, - isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, - }); - resolve(); - return; - } - - convertedFiles.push(convertedFile); - resolve(); - }, - onError: () => { - Log.warn('HEIC conversion failed, falling back to original file', {fileName: file.name}); - convertedFiles.push(file); - resolve(); - }, + + for (const file of filesToConvert) { + // eslint-disable-next-line no-await-in-loop + await new Promise((resolve) => { + convertHeicImage(file, { + onSuccess: (convertedFile) => { + if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { + convertedFilesToResize.push(convertedFile); + updateFileOrderMapping(file, convertedFile); + resolve(); + return; + } + + if (!validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { + collectedErrors.current.push({ + error: CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE, + isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, + }); + resolve(); + return; + } + + convertedFiles.push(convertedFile); + updateFileOrderMapping(file, convertedFile); + resolve(); + }, + onError: () => { + Log.warn('HEIC conversion failed, blocking file', {fileName: file.name}); + collectedErrors.current.push({ + error: CONST.FILE_VALIDATION_ERRORS.HEIC_CONVERSION_FAILED, + isValidatingMultipleFiles: validationState.isValidatingMultipleFiles, }); - }), - ), - ); + resolve(); + }, + }); + }); + } filesToResize.push(...convertedFilesToResize); validNonPdfFiles.push(...convertedFiles); - - for (const [index, convertedFile] of convertedFiles.entries()) { - updateFileOrderMapping(filesToConvert.at(index), convertedFile); - } } if (filesToResize.length > 0) { diff --git a/src/languages/de.ts b/src/languages/de.ts index dfaba0dfdccf..5fdbfeb25336 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -570,6 +570,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Anlagenfehler', errorWhileSelectingAttachment: 'Beim Auswählen eines Anhangs ist ein Fehler aufgetreten. Bitte versuche es erneut.', errorWhileSelectingCorruptedAttachment: 'Beim Auswählen eines beschädigten Anhangs ist ein Fehler aufgetreten. Bitte versuchen Sie es mit einer anderen Datei.', + errorWhileConvertingHeic: 'Wir konnten dieses Bild nicht verarbeiten. Bitte versuchen Sie es erneut oder nehmen Sie das Foto neu auf.', takePhoto: 'Foto aufnehmen', chooseFromGallery: 'Aus Galerie wählen', chooseDocument: 'Datei auswählen', diff --git a/src/languages/en.ts b/src/languages/en.ts index 3ac7840f2d56..7a630e1e7516 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -598,6 +598,7 @@ const translations = { attachmentError: 'Attachment error', errorWhileSelectingAttachment: 'An error occurred while selecting an attachment. Please try again.', errorWhileSelectingCorruptedAttachment: 'An error occurred while selecting a corrupted attachment. Please try another file.', + errorWhileConvertingHeic: "We couldn't process this image. Please try again, or retake it as a photo.", takePhoto: 'Take photo', chooseFromGallery: 'Choose from gallery', chooseDocument: 'Choose file', diff --git a/src/languages/es.ts b/src/languages/es.ts index 79f0d15940cf..7c21958dd544 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -526,6 +526,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Error al adjuntar archivo', errorWhileSelectingAttachment: 'Se ha producido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.', errorWhileSelectingCorruptedAttachment: 'Se ha producido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.', + errorWhileConvertingHeic: 'No hemos podido procesar esta imagen. Inténtalo de nuevo o vuelve a hacer la foto.', takePhoto: 'Hacer una foto', chooseFromGallery: 'Elegir de la galería', chooseDocument: 'Elegir un archivo', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 93296ba0c867..601b427cf1dd 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -570,6 +570,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erreur de pièce jointe', errorWhileSelectingAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe. Veuillez réessayer.', errorWhileSelectingCorruptedAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe corrompue. Veuillez essayer un autre fichier.', + errorWhileConvertingHeic: 'Nous n’avons pas pu traiter cette image. Veuillez réessayer ou reprendre la photo.', takePhoto: 'Prendre une photo', chooseFromGallery: 'Choisir depuis la galerie', chooseDocument: 'Choisir un fichier', diff --git a/src/languages/it.ts b/src/languages/it.ts index 76e1e35e8da4..e05e52a7fb84 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -570,6 +570,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Errore allegato', errorWhileSelectingAttachment: 'Si è verificato un errore durante la selezione di un allegato. Riprova.', errorWhileSelectingCorruptedAttachment: 'Si è verificato un errore durante la selezione di un allegato danneggiato. Riprova con un altro file.', + errorWhileConvertingHeic: 'Non siamo riusciti a elaborare questa immagine. Riprova o scatta di nuovo la foto.', takePhoto: 'Scatta foto', chooseFromGallery: 'Scegli dalla galleria', chooseDocument: 'Scegli file', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 8dd2b5985b27..033600c36503 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -572,6 +572,7 @@ const translations: TranslationDeepObject = { attachmentError: '添付ファイルエラー', errorWhileSelectingAttachment: '添付ファイルの選択中にエラーが発生しました。もう一度お試しください。', errorWhileSelectingCorruptedAttachment: '破損した添付ファイルを選択した際にエラーが発生しました。別のファイルをお試しください。', + errorWhileConvertingHeic: 'この画像を処理できませんでした。もう一度お試しいただくか、写真を撮り直してください。', takePhoto: '写真を撮る', chooseFromGallery: 'ギャラリーから選択', chooseDocument: 'ファイルを選択', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 6447c3750ab8..1a63084f0802 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -569,6 +569,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Bijlagefout', errorWhileSelectingAttachment: 'Er is een fout opgetreden bij het selecteren van een bijlage. Probeer het opnieuw.', errorWhileSelectingCorruptedAttachment: 'Er is een fout opgetreden bij het selecteren van een beschadigde bijlage. Probeer een ander bestand.', + errorWhileConvertingHeic: 'We konden deze afbeelding niet verwerken. Probeer het opnieuw of maak de foto opnieuw.', takePhoto: 'Maak foto', chooseFromGallery: 'Kies uit galerij', chooseDocument: 'Bestand kiezen', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index cfe363ea0ce3..4bf403bd8e69 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -569,6 +569,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Błąd załącznika', errorWhileSelectingAttachment: 'Wystąpił błąd podczas wybierania załącznika. Spróbuj ponownie.', errorWhileSelectingCorruptedAttachment: 'Wystąpił błąd podczas wybierania uszkodzonego załącznika. Spróbuj użyć innego pliku.', + errorWhileConvertingHeic: 'Nie udało się przetworzyć tego obrazu. Spróbuj ponownie lub zrób zdjęcie jeszcze raz.', takePhoto: 'Zrób zdjęcie', chooseFromGallery: 'Wybierz z galerii', chooseDocument: 'Wybierz plik', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index f1142ced7e69..86054cfb257f 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -568,6 +568,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erro de anexo', errorWhileSelectingAttachment: 'Ocorreu um erro ao selecionar um anexo. Tente novamente.', errorWhileSelectingCorruptedAttachment: 'Ocorreu um erro ao selecionar um anexo corrompido. Tente outro arquivo.', + errorWhileConvertingHeic: 'Não conseguimos processar esta imagem. Tente novamente ou tire a foto de novo.', takePhoto: 'Tirar foto', chooseFromGallery: 'Escolher da galeria', chooseDocument: 'Escolher arquivo', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 8a879ded36f7..3cc45a478f24 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -567,6 +567,7 @@ const translations: TranslationDeepObject = { attachmentError: '附件错误', errorWhileSelectingAttachment: '选择附件时发生错误。请重试。', errorWhileSelectingCorruptedAttachment: '选择已损坏的附件时发生错误。请尝试另一个文件。', + errorWhileConvertingHeic: '我们无法处理此图片。请重试,或重新拍摄照片。', takePhoto: '拍照', chooseFromGallery: '从相册中选择', chooseDocument: '选择文件', diff --git a/src/libs/fileDownload/FileUtils.ts b/src/libs/fileDownload/FileUtils.ts index 1d51a8bb96b2..431d19941608 100644 --- a/src/libs/fileDownload/FileUtils.ts +++ b/src/libs/fileDownload/FileUtils.ts @@ -825,6 +825,11 @@ const getFileValidationErrorText = ( title: translate('attachmentPicker.attachmentError'), reason: translate('attachmentPicker.errorWhileSelectingCorruptedAttachment'), }; + case CONST.FILE_VALIDATION_ERRORS.HEIC_CONVERSION_FAILED: + return { + title: translate('attachmentPicker.attachmentError'), + reason: translate('attachmentPicker.errorWhileConvertingHeic'), + }; case CONST.FILE_VALIDATION_ERRORS.PROTECTED_FILE: return { title: translate('attachmentPicker.attachmentError'), diff --git a/src/libs/fileDownload/heicConverter/index.native.ts b/src/libs/fileDownload/heicConverter/index.native.ts index 750dea50e680..0707fb8bf7ca 100644 --- a/src/libs/fileDownload/heicConverter/index.native.ts +++ b/src/libs/fileDownload/heicConverter/index.native.ts @@ -1,13 +1,14 @@ -import {verifyFileFormat} from '@libs/fileDownload/FileUtils'; import Log from '@libs/Log'; -import CONST from '@src/CONST'; import type {FileObject} from '@src/types/utils/Attachment'; import {ImageManipulator, SaveFormat} from 'expo-image-manipulator'; import type {HeicConverterFunction} from './types'; +/** Conversion failures are usually transient memory-pressure errors, so a single delayed retry recovers most of them */ +const HEIC_CONVERSION_RETRY_DELAY_MS = 300; + /** * Helper function to convert HEIC/HEIF image to JPEG using ImageManipulator * @param file - The original file object @@ -28,7 +29,9 @@ const convertImageWithManipulator = ( onError?: (error: unknown, originalFile: FileObject) => void; onFinish?: () => void; } = {}, + retriesLeft = 1, ) => { + let willRetry = false; const imageManipulatorContext = ImageManipulator.manipulate(sourceUri); imageManipulatorContext .renderAsync() @@ -45,10 +48,19 @@ const convertImageWithManipulator = ( onSuccess(convertedFile); }) .catch((err) => { + if (retriesLeft > 0) { + willRetry = true; + Log.info('HEIC/HEIF conversion failed, retrying', false, {error: err instanceof Error ? err.message : String(err)}); + setTimeout(() => convertImageWithManipulator(file, sourceUri, originalExtension, {onSuccess, onError, onFinish}, retriesLeft - 1), HEIC_CONVERSION_RETRY_DELAY_MS); + return; + } Log.warn('Error converting HEIC/HEIF to JPEG', {error: err instanceof Error ? err.message : String(err)}); onError(err, file); }) .finally(() => { + if (willRetry) { + return; + } onFinish(); }); }; @@ -69,50 +81,12 @@ const convertHeicImage: HeicConverterFunction = (file, {onSuccess = () => {}, on onStart(); - if (!file.uri) { - onError(new Error('File URI is undefined'), file); - onFinish(); - return; - } - // Conversion based on extension - if (needsConversion) { - const fileUri = file.uri; - convertImageWithManipulator(file, fileUri, /\.(heic|heif)$/i, { - onSuccess, - onError, - onFinish, - }); - return; - } - - // If not detected by extension, check using file signatures - verifyFileFormat({fileUri: file.uri, formatSignatures: CONST.HEIC_SIGNATURES}) - .then((isHEIC) => { - if (isHEIC) { - const fileUri = file.uri; - if (!fileUri) { - onError(new Error('File URI is undefined'), file); - onFinish(); - return; - } - convertImageWithManipulator(file, fileUri, /\.heic$/i, { - onSuccess, - onError, - onFinish, - }); - return; - } - - onSuccess(file); - }) - .catch((err) => { - Log.warn('Error processing the file', {error: err instanceof Error ? err.message : String(err)}); - onError(err, file); - }) - .finally(() => { - onFinish(); - }); + convertImageWithManipulator(file, file.uri, /\.(heic|heif)$/i, { + onSuccess, + onError, + onFinish, + }); }; export default convertHeicImage; diff --git a/tests/unit/HeicConverterTest.ts b/tests/unit/HeicConverterTest.ts new file mode 100644 index 000000000000..db25fc7e3608 --- /dev/null +++ b/tests/unit/HeicConverterTest.ts @@ -0,0 +1,94 @@ +import convertHeicImage from '@libs/fileDownload/heicConverter/index.native'; + +const mockSaveAsync = jest.fn(); +const mockRenderAsync = jest.fn(); + +jest.mock('expo-image-manipulator', () => ({ + ImageManipulator: { + manipulate: () => ({ + renderAsync: () => mockRenderAsync() as unknown, + }), + }, + SaveFormat: {JPEG: 'jpeg'}, +})); + +jest.mock('@libs/Log', () => ({ + info: jest.fn(), + warn: jest.fn(), +})); + +const heicFile = {uri: 'file:///photo.heic', name: 'photo.heic', type: 'image/heic', size: 1024}; + +const mockRenderSuccess = () => mockRenderAsync.mockResolvedValueOnce({saveAsync: () => mockSaveAsync() as unknown}); + +describe('convertHeicImage (native)', () => { + beforeEach(() => { + jest.clearAllMocks(); + jest.useFakeTimers(); + mockSaveAsync.mockResolvedValue({uri: 'file:///photo.jpg', width: 100, height: 200}); + }); + + afterEach(() => { + jest.useRealTimers(); + }); + + it('converts a HEIC file to JPEG and reports success', async () => { + mockRenderSuccess(); + const onSuccess = jest.fn(); + const onError = jest.fn(); + const onFinish = jest.fn(); + + convertHeicImage(heicFile, {onSuccess, onError, onFinish}); + await jest.runAllTimersAsync(); + + expect(onError).not.toHaveBeenCalled(); + expect(onFinish).toHaveBeenCalledTimes(1); + expect(onSuccess).toHaveBeenCalledWith(expect.objectContaining({uri: 'file:///photo.jpg', name: 'photo.jpg', type: 'image/jpeg'})); + }); + + it('retries once when conversion fails, and succeeds on the retry', async () => { + // "Image context has been lost" is the transient memory-pressure failure this retry exists for. + mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); + mockRenderSuccess(); + const onSuccess = jest.fn(); + const onError = jest.fn(); + const onFinish = jest.fn(); + + convertHeicImage(heicFile, {onSuccess, onError, onFinish}); + await jest.runAllTimersAsync(); + + expect(mockRenderAsync).toHaveBeenCalledTimes(2); + expect(onError).not.toHaveBeenCalled(); + expect(onSuccess).toHaveBeenCalledWith(expect.objectContaining({type: 'image/jpeg'})); + // The first attempt must not fire onFinish: the retry owns it, so the caller sees exactly one completion. + expect(onFinish).toHaveBeenCalledTimes(1); + }); + + it('reports an error, and never falls back to the original HEIC, once the retry is exhausted', async () => { + mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); + mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); + const onSuccess = jest.fn(); + const onError = jest.fn(); + const onFinish = jest.fn(); + + convertHeicImage(heicFile, {onSuccess, onError, onFinish}); + await jest.runAllTimersAsync(); + + expect(mockRenderAsync).toHaveBeenCalledTimes(2); + expect(onError).toHaveBeenCalledTimes(1); + expect(onFinish).toHaveBeenCalledTimes(1); + // The raw HEIC must never be surfaced as a success: the server rejects image/heic. + expect(onSuccess).not.toHaveBeenCalled(); + }); + + it('passes non-HEIC files straight through without conversion', async () => { + const onSuccess = jest.fn(); + const jpegFile = {uri: 'file:///photo.jpg', name: 'photo.jpg', type: 'image/jpeg', size: 1024}; + + convertHeicImage(jpegFile, {onSuccess}); + await jest.runAllTimersAsync(); + + expect(mockRenderAsync).not.toHaveBeenCalled(); + expect(onSuccess).toHaveBeenCalledWith(jpegFile); + }); +}); From dc4e477765207f67aa209e8bd281615e5e998852 Mon Sep 17 00:00:00 2001 From: annaweber Date: Fri, 17 Jul 2026 09:41:18 -0700 Subject: [PATCH 2/7] fix: commment add --- src/hooks/useFilesValidation.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hooks/useFilesValidation.tsx b/src/hooks/useFilesValidation.tsx index b81b9ad5b01a..3e91c80843b1 100644 --- a/src/hooks/useFilesValidation.tsx +++ b/src/hooks/useFilesValidation.tsx @@ -220,12 +220,14 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer const convertedFiles: FileObject[] = []; for (const file of filesToConvert) { + // Convert sequentially to avoid the native memory pressure caused by processing multiple HEIC images in parallel. // eslint-disable-next-line no-await-in-loop await new Promise((resolve) => { convertHeicImage(file, { onSuccess: (convertedFile) => { if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { convertedFilesToResize.push(convertedFile); + // Preserve the original index so the resize step can transfer it to the final file. updateFileOrderMapping(file, convertedFile); resolve(); return; From 7aafacf17a479596040265de4a7a416679eb15fb Mon Sep 17 00:00:00 2001 From: annaweber Date: Mon, 27 Jul 2026 09:54:22 -0700 Subject: [PATCH 3/7] fix: error message --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index 944988a364ee..d80b569d1c0a 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -604,7 +604,7 @@ const translations = { attachmentError: 'Attachment error', errorWhileSelectingAttachment: 'An error occurred while selecting an attachment. Please try again.', errorWhileSelectingCorruptedAttachment: 'An error occurred while selecting a corrupted attachment. Please try another file.', - errorWhileConvertingHeic: "We couldn't process this image. Please try again, or retake it as a photo.", + errorWhileConvertingHeic: "We couldn't process this image. Please try again, or upload the photo in a different format.", takePhoto: 'Take photo', chooseFromGallery: 'Choose from gallery', chooseDocument: 'Choose file', From 8463ab6f507a8df44a63fe9c6957706f3df5cefb Mon Sep 17 00:00:00 2001 From: annaweber Date: Mon, 27 Jul 2026 21:26:52 -0700 Subject: [PATCH 4/7] fix: remove resize part --- src/hooks/useFilesValidation.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/hooks/useFilesValidation.tsx b/src/hooks/useFilesValidation.tsx index 3e91c80843b1..74ab78224136 100644 --- a/src/hooks/useFilesValidation.tsx +++ b/src/hooks/useFilesValidation.tsx @@ -227,8 +227,6 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer onSuccess: (convertedFile) => { if (validationState.isValidatingReceipts && convertedFile.size && convertedFile.size > CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE) { convertedFilesToResize.push(convertedFile); - // Preserve the original index so the resize step can transfer it to the final file. - updateFileOrderMapping(file, convertedFile); resolve(); return; } From a20ae248c2f0b0b325589e3a8a20fbcb14e2da4f Mon Sep 17 00:00:00 2001 From: annaweber Date: Fri, 31 Jul 2026 11:45:29 -0700 Subject: [PATCH 5/7] fix: translation --- src/languages/de.ts | 2 +- src/languages/es.ts | 2 +- src/languages/fr.ts | 2 +- src/languages/it.ts | 2 +- src/languages/ja.ts | 2 +- src/languages/nl.ts | 2 +- src/languages/pl.ts | 2 +- src/languages/pt-BR.ts | 2 +- src/languages/zh-hans.ts | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/languages/de.ts b/src/languages/de.ts index d75579283b01..3a4472855f2a 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -580,7 +580,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Anlagenfehler', errorWhileSelectingAttachment: 'Beim Auswählen eines Anhangs ist ein Fehler aufgetreten. Bitte versuche es erneut.', errorWhileSelectingCorruptedAttachment: 'Beim Auswählen eines beschädigten Anhangs ist ein Fehler aufgetreten. Bitte versuchen Sie es mit einer anderen Datei.', - errorWhileConvertingHeic: 'Wir konnten dieses Bild nicht verarbeiten. Bitte versuchen Sie es erneut oder nehmen Sie das Foto neu auf.', + errorWhileConvertingHeic: 'Wir konnten dieses Bild nicht verarbeiten. Bitte versuchen Sie es erneut oder laden Sie das Foto in einem anderen Format hoch.', takePhoto: 'Foto aufnehmen', chooseFromGallery: 'Aus Galerie wählen', chooseDocument: 'Datei auswählen', diff --git a/src/languages/es.ts b/src/languages/es.ts index d60a5738cc9d..30d7733320c1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -540,7 +540,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Error al adjuntar archivo', errorWhileSelectingAttachment: 'Se ha producido un error al seleccionar un archivo adjunto. Por favor, inténtalo de nuevo.', errorWhileSelectingCorruptedAttachment: 'Se ha producido un error al seleccionar un archivo adjunto corrupto. Por favor, inténtalo con otro archivo.', - errorWhileConvertingHeic: 'No hemos podido procesar esta imagen. Inténtalo de nuevo o vuelve a hacer la foto.', + errorWhileConvertingHeic: 'No hemos podido procesar esta imagen. Inténtalo de nuevo o sube la foto en un formato diferente.', takePhoto: 'Hacer una foto', chooseFromGallery: 'Elegir de la galería', chooseDocument: 'Elegir un archivo', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 78bc1abcde26..5c0a18c1bfc2 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -580,7 +580,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erreur de pièce jointe', errorWhileSelectingAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe. Veuillez réessayer.', errorWhileSelectingCorruptedAttachment: 'Une erreur s’est produite lors de la sélection d’une pièce jointe corrompue. Veuillez essayer un autre fichier.', - errorWhileConvertingHeic: 'Nous n’avons pas pu traiter cette image. Veuillez réessayer ou reprendre la photo.', + errorWhileConvertingHeic: 'Nous n’avons pas pu traiter cette image. Veuillez réessayer ou téléverser la photo dans un format différent.', takePhoto: 'Prendre une photo', chooseFromGallery: 'Choisir depuis la galerie', chooseDocument: 'Choisir un fichier', diff --git a/src/languages/it.ts b/src/languages/it.ts index be5ba89d29a0..688d95c27ce3 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -580,7 +580,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Errore allegato', errorWhileSelectingAttachment: 'Si è verificato un errore durante la selezione di un allegato. Riprova.', errorWhileSelectingCorruptedAttachment: 'Si è verificato un errore durante la selezione di un allegato danneggiato. Riprova con un altro file.', - errorWhileConvertingHeic: 'Non siamo riusciti a elaborare questa immagine. Riprova o scatta di nuovo la foto.', + errorWhileConvertingHeic: 'Non è stato possibile elaborare questa immagine. Riprova o carica la foto in un altro formato.', takePhoto: 'Scatta foto', chooseFromGallery: 'Scegli dalla galleria', chooseDocument: 'Scegli file', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 8a0b6b609bd3..c611da99715f 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -582,7 +582,7 @@ const translations: TranslationDeepObject = { attachmentError: '添付ファイルエラー', errorWhileSelectingAttachment: '添付ファイルの選択中にエラーが発生しました。もう一度お試しください。', errorWhileSelectingCorruptedAttachment: '破損した添付ファイルを選択した際にエラーが発生しました。別のファイルをお試しください。', - errorWhileConvertingHeic: 'この画像を処理できませんでした。もう一度お試しいただくか、写真を撮り直してください。', + errorWhileConvertingHeic: 'この画像を処理できませんでした。もう一度お試しいただくか、別の形式で写真をアップロードしてください。', takePhoto: '写真を撮る', chooseFromGallery: 'ギャラリーから選択', chooseDocument: 'ファイルを選択', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 194c6169b733..f351140ab783 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -579,7 +579,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Bijlagefout', errorWhileSelectingAttachment: 'Er is een fout opgetreden bij het selecteren van een bijlage. Probeer het opnieuw.', errorWhileSelectingCorruptedAttachment: 'Er is een fout opgetreden bij het selecteren van een beschadigde bijlage. Probeer een ander bestand.', - errorWhileConvertingHeic: 'We konden deze afbeelding niet verwerken. Probeer het opnieuw of maak de foto opnieuw.', + errorWhileConvertingHeic: 'We konden deze afbeelding niet verwerken. Probeer het opnieuw of upload de foto in een ander formaat.', takePhoto: 'Maak foto', chooseFromGallery: 'Kies uit galerij', chooseDocument: 'Bestand kiezen', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index 04a40f5b781c..1ea51d153b68 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -579,7 +579,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Błąd załącznika', errorWhileSelectingAttachment: 'Wystąpił błąd podczas wybierania załącznika. Spróbuj ponownie.', errorWhileSelectingCorruptedAttachment: 'Wystąpił błąd podczas wybierania uszkodzonego załącznika. Spróbuj użyć innego pliku.', - errorWhileConvertingHeic: 'Nie udało się przetworzyć tego obrazu. Spróbuj ponownie lub zrób zdjęcie jeszcze raz.', + errorWhileConvertingHeic: 'Nie udało nam się przetworzyć tego obrazu. Spróbuj ponownie lub prześlij zdjęcie w innym formacie.', takePhoto: 'Zrób zdjęcie', chooseFromGallery: 'Wybierz z galerii', chooseDocument: 'Wybierz plik', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 33a6dbee997c..206b803db9a4 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -578,7 +578,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Erro de anexo', errorWhileSelectingAttachment: 'Ocorreu um erro ao selecionar um anexo. Tente novamente.', errorWhileSelectingCorruptedAttachment: 'Ocorreu um erro ao selecionar um anexo corrompido. Tente outro arquivo.', - errorWhileConvertingHeic: 'Não conseguimos processar esta imagem. Tente novamente ou tire a foto de novo.', + errorWhileConvertingHeic: 'Não foi possível processar esta imagem. Tente novamente ou envie a foto em um formato diferente.', takePhoto: 'Tirar foto', chooseFromGallery: 'Escolher da galeria', chooseDocument: 'Escolher arquivo', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 91dd0f1dc4ae..b685f472229c 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -577,7 +577,7 @@ const translations: TranslationDeepObject = { attachmentError: '附件错误', errorWhileSelectingAttachment: '选择附件时发生错误。请重试。', errorWhileSelectingCorruptedAttachment: '选择已损坏的附件时发生错误。请尝试另一个文件。', - errorWhileConvertingHeic: '我们无法处理此图片。请重试,或重新拍摄照片。', + errorWhileConvertingHeic: '我们无法处理此图片。请重试,或以其他格式上传照片。', takePhoto: '拍照', chooseFromGallery: '从相册中选择', chooseDocument: '选择文件', From 94d679ae45d679f42af0c1931f82b8de60d39c0d Mon Sep 17 00:00:00 2001 From: annaweber Date: Tue, 4 Aug 2026 08:10:57 -0700 Subject: [PATCH 6/7] fix: remove retry logic --- .../heicConverter/index.native.ts | 14 ----------- tests/unit/HeicConverterTest.ts | 23 ++----------------- 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/src/libs/fileDownload/heicConverter/index.native.ts b/src/libs/fileDownload/heicConverter/index.native.ts index 0707fb8bf7ca..fe97617463ac 100644 --- a/src/libs/fileDownload/heicConverter/index.native.ts +++ b/src/libs/fileDownload/heicConverter/index.native.ts @@ -6,9 +6,6 @@ import {ImageManipulator, SaveFormat} from 'expo-image-manipulator'; import type {HeicConverterFunction} from './types'; -/** Conversion failures are usually transient memory-pressure errors, so a single delayed retry recovers most of them */ -const HEIC_CONVERSION_RETRY_DELAY_MS = 300; - /** * Helper function to convert HEIC/HEIF image to JPEG using ImageManipulator * @param file - The original file object @@ -29,9 +26,7 @@ const convertImageWithManipulator = ( onError?: (error: unknown, originalFile: FileObject) => void; onFinish?: () => void; } = {}, - retriesLeft = 1, ) => { - let willRetry = false; const imageManipulatorContext = ImageManipulator.manipulate(sourceUri); imageManipulatorContext .renderAsync() @@ -48,19 +43,10 @@ const convertImageWithManipulator = ( onSuccess(convertedFile); }) .catch((err) => { - if (retriesLeft > 0) { - willRetry = true; - Log.info('HEIC/HEIF conversion failed, retrying', false, {error: err instanceof Error ? err.message : String(err)}); - setTimeout(() => convertImageWithManipulator(file, sourceUri, originalExtension, {onSuccess, onError, onFinish}, retriesLeft - 1), HEIC_CONVERSION_RETRY_DELAY_MS); - return; - } Log.warn('Error converting HEIC/HEIF to JPEG', {error: err instanceof Error ? err.message : String(err)}); onError(err, file); }) .finally(() => { - if (willRetry) { - return; - } onFinish(); }); }; diff --git a/tests/unit/HeicConverterTest.ts b/tests/unit/HeicConverterTest.ts index db25fc7e3608..26a3259568a5 100644 --- a/tests/unit/HeicConverterTest.ts +++ b/tests/unit/HeicConverterTest.ts @@ -46,26 +46,7 @@ describe('convertHeicImage (native)', () => { expect(onSuccess).toHaveBeenCalledWith(expect.objectContaining({uri: 'file:///photo.jpg', name: 'photo.jpg', type: 'image/jpeg'})); }); - it('retries once when conversion fails, and succeeds on the retry', async () => { - // "Image context has been lost" is the transient memory-pressure failure this retry exists for. - mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); - mockRenderSuccess(); - const onSuccess = jest.fn(); - const onError = jest.fn(); - const onFinish = jest.fn(); - - convertHeicImage(heicFile, {onSuccess, onError, onFinish}); - await jest.runAllTimersAsync(); - - expect(mockRenderAsync).toHaveBeenCalledTimes(2); - expect(onError).not.toHaveBeenCalled(); - expect(onSuccess).toHaveBeenCalledWith(expect.objectContaining({type: 'image/jpeg'})); - // The first attempt must not fire onFinish: the retry owns it, so the caller sees exactly one completion. - expect(onFinish).toHaveBeenCalledTimes(1); - }); - - it('reports an error, and never falls back to the original HEIC, once the retry is exhausted', async () => { - mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); + it('reports an error on conversion failure, and never falls back to the original HEIC', async () => { mockRenderAsync.mockRejectedValueOnce(new Error('Image context has been lost')); const onSuccess = jest.fn(); const onError = jest.fn(); @@ -74,7 +55,7 @@ describe('convertHeicImage (native)', () => { convertHeicImage(heicFile, {onSuccess, onError, onFinish}); await jest.runAllTimersAsync(); - expect(mockRenderAsync).toHaveBeenCalledTimes(2); + expect(mockRenderAsync).toHaveBeenCalledTimes(1); expect(onError).toHaveBeenCalledTimes(1); expect(onFinish).toHaveBeenCalledTimes(1); // The raw HEIC must never be surfaced as a success: the server rejects image/heic. From b21437c107e012c486bb7e609054b2d3139cb9f0 Mon Sep 17 00:00:00 2001 From: annaweber Date: Tue, 4 Aug 2026 08:28:01 -0700 Subject: [PATCH 7/7] fix: el.ts --- src/languages/el.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/languages/el.ts b/src/languages/el.ts index 4391e63ad2cd..e37d42143800 100644 --- a/src/languages/el.ts +++ b/src/languages/el.ts @@ -588,6 +588,7 @@ const translations: TranslationDeepObject = { attachmentError: 'Σφάλμα συνημμένου', errorWhileSelectingAttachment: 'Παρουσιάστηκε σφάλμα κατά την επιλογή συνημμένου. Παρακαλούμε δοκιμάστε ξανά.', errorWhileSelectingCorruptedAttachment: 'Προέκυψε σφάλμα κατά την επιλογή κατεστραμμένου συνημμένου. Παρακαλούμε δοκιμάστε άλλο αρχείο.', + errorWhileConvertingHeic: 'Δεν μπορέσαμε να επεξεργαστούμε αυτήν την εικόνα. Δοκιμάστε ξανά ή ανεβάστε τη φωτογραφία σε διαφορετική μορφή.', takePhoto: 'Βγάλτε φωτογραφία', chooseFromGallery: 'Επιλογή από τη συλλογή', chooseDocument: 'Επιλέξτε αρχείο',