Skip to content

fix: Receipt validation not working in drag&drop section of report screen #72777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarioExpensify merged 7 commits into from
Oct 21, 2025
Merged

fix: Receipt validation not working in drag&drop section of report screen #72777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3865aff
fix: allow validating receipts and attachments with the same hook
chrispader Oct 16, 2025
53c4b11
fix: tests
chrispader Oct 16, 2025
fd945ba
Merge branch 'main' into pr/72777
chrispader Oct 21, 2025
18c18a9
fix: disable ESLint rule `@typescript-eslint/no-deprecated` for FileU…
chrispader Oct 21, 2025
6242b44
add dummy comment
chrispader Oct 21, 2025
761240c
remove dummy comment
chrispader Oct 21, 2025
3a5df72
Merge branch 'main' into pr/72777
chrispader Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 35 additions & 15 deletions src/hooks/useFilesValidation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,39 @@ import {
validateAttachment,
validateImageForCorruption,
} from '@libs/fileDownload/FileUtils';
import type {ValidateAttachmentOptions} from '@libs/fileDownload/FileUtils';
import convertHeicImage from '@libs/fileDownload/heicConverter';
import CONST from '@src/CONST';
import type {FileObject} from '@src/types/utils/Attachment';
import useLocalize from './useLocalize';
import useThemeStyles from './useThemeStyles';

const DEFAULT_IS_VALIDATING_RECEIPTS = true;

type ErrorObject = {
error: ValueOf<typeof CONST.FILE_VALIDATION_ERRORS>;
fileExtension?: string;
};

type ValidationOptions = {
isValidatingReceipts?: boolean;
};

const sortFilesByOriginalOrder = (files: FileObject[], orderMap: Map<string, number>) => {
return files.sort((a, b) => (orderMap.get(a.uri ?? '') ?? 0) - (orderMap.get(b.uri ?? '') ?? 0));
};

function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTransferItems: DataTransferItem[]) => void, isValidatingReceipts = true) {
function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransferItems: DataTransferItem[]) => void) {
const styles = useThemeStyles();
const {translate} = useLocalize();

const [isValidatingReceipts, setIsValidatingReceipts] = useState(DEFAULT_IS_VALIDATING_RECEIPTS);
const [isValidatingMultipleFiles, setIsValidatingMultipleFiles] = useState(false);

const [isErrorModalVisible, setIsErrorModalVisible] = useState(false);
const [fileError, setFileError] = useState<ValueOf<typeof CONST.FILE_VALIDATION_ERRORS> | null>(null);
const [pdfFilesToRender, setPdfFilesToRender] = useState<FileObject[]>([]);
const [validFilesToUpload, setValidFilesToUpload] = useState([] as FileObject[]);
const [isValidatingMultipleFiles, setIsValidatingMultipleFiles] = useState(false);
const [invalidFileExtension, setInvalidFileExtension] = useState('');
const [errorQueue, setErrorQueue] = useState<ErrorObject[]>([]);
const [currentErrorIndex, setCurrentErrorIndex] = useState(0);
Expand Down Expand Up @@ -101,7 +111,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
setIsErrorModalVisible(true);
};

const isValidFile = (originalFile: FileObject, item: DataTransferItem | undefined, isCheckingMultipleFiles?: boolean) => {
const isValidFile = (originalFile: FileObject, item: DataTransferItem | undefined, validationOptions: ValidateAttachmentOptions) => {
if (item && item.kind === 'file' && 'webkitGetAsEntry' in item) {
const entry = item.webkitGetAsEntry();

Expand All @@ -114,7 +124,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
return normalizeFileObject(originalFile)
.then((normalizedFile) =>
validateImageForCorruption(normalizedFile).then(() => {
const error = validateAttachment(normalizedFile, isCheckingMultipleFiles, isValidatingReceipts);
const error = validateAttachment(normalizedFile, validationOptions);
if (error) {
const errorData = {
error,
Expand Down Expand Up @@ -170,12 +180,12 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
}
} else if (validFiles.current.length > 0) {
const sortedFiles = sortFilesByOriginalOrder(validFiles.current, originalFileOrder.current);
proceedWithFilesAction(sortedFiles, dataTransferItemList.current);
onFilesValidated(sortedFiles, dataTransferItemList.current);
resetValidationState();
}
}, [deduplicateErrors, pdfFilesToRender.length, proceedWithFilesAction, resetValidationState]);
}, [deduplicateErrors, pdfFilesToRender.length, onFilesValidated, resetValidationState]);

const validateAndResizeFiles = (files: FileObject[], items: DataTransferItem[]) => {
const validateAndResizeFiles = (files: FileObject[], items: DataTransferItem[], validationOptions?: ValidationOptions) => {
// Early return for empty files
if (files.length === 0) {
return;
Expand All @@ -188,7 +198,13 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
originalFileOrder.current.set(file.uri ?? '', index);
});

Promise.all(files.map((file, index) => isValidFile(file, items.at(index), files.length > 1).then((isValid) => (isValid ? file : null))))
Promise.all(
files.map((file, index) =>
isValidFile(file, items.at(index), {isCheckingMultipleFiles: files.length > 1, isValidatingReceipts: validationOptions?.isValidatingReceipts ?? isValidatingReceipts}).then(
(isValid) => (isValid ? file : null),
),
),
)
.then((validationResults) => {
const filteredResults = validationResults.filter((result): result is FileObject => result !== null);
const pdfsToLoad = filteredResults.filter((file) => Str.isPDF(file.name ?? ''));
Expand Down Expand Up @@ -258,14 +274,18 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
}
} else if (processedFiles.length > 0) {
const sortedFiles = sortFilesByOriginalOrder(processedFiles, originalFileOrder.current);
proceedWithFilesAction(sortedFiles, dataTransferItemList.current);
onFilesValidated(sortedFiles, dataTransferItemList.current);
resetValidationState();
}
}
});
};

const validateFiles = (files: FileObject[], items?: DataTransferItem[]) => {
const validateFiles = (files: FileObject[], items?: DataTransferItem[], validationOptions?: ValidationOptions) => {
if (validationOptions?.isValidatingReceipts) {
setIsValidatingReceipts(validationOptions.isValidatingReceipts);
}

if (files.length > 1) {
setIsValidatingMultipleFiles(true);
}
Expand All @@ -276,7 +296,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
}
setErrorAndOpenModal(CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED);
} else {
validateAndResizeFiles(files, items ?? []);
validateAndResizeFiles(files, items ?? [], validationOptions);
}
};

Expand Down Expand Up @@ -309,13 +329,13 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
// eslint-disable-next-line @typescript-eslint/no-deprecated
InteractionManager.runAfterInteractions(() => {
if (sortedFiles.length !== 0) {
proceedWithFilesAction(sortedFiles, dataTransferItemList.current);
onFilesValidated(sortedFiles, dataTransferItemList.current);
}
resetValidationState();
});
} else {
if (sortedFiles.length !== 0) {
proceedWithFilesAction(sortedFiles, dataTransferItemList.current);
onFilesValidated(sortedFiles, dataTransferItemList.current);
}
hideModalAndReset();
}
Expand Down Expand Up @@ -350,7 +370,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
))
: undefined;

const getModalPrompt = useCallback(() => {
const getModalPrompt = () => {
if (!fileError) {
return '';
}
Expand All @@ -364,7 +384,7 @@ function useFilesValidation(proceedWithFilesAction: (files: FileObject[], dataTr
);
}
return prompt;
}, [fileError, invalidFileExtension, isValidatingReceipts, translate]);
};

const ErrorModal = (
<ConfirmModal
Expand Down
20 changes: 14 additions & 6 deletions src/libs/fileDownload/FileUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-deprecated */
import {Str} from 'expensify-common';
import {Alert, Linking, Platform} from 'react-native';
import type {ReactNativeBlobUtilReadStream} from 'react-native-blob-util';
Expand Down Expand Up @@ -549,18 +550,23 @@ const normalizeFileObject = (file: FileObject): Promise<FileObject> => {
});
};

const validateAttachment = (file: FileObject, isCheckingMultipleFiles?: boolean, isValidatingReceipt?: boolean) => {
const maxFileSize = isValidatingReceipt ? CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE : CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE;
type ValidateAttachmentOptions = {
isValidatingReceipts?: boolean;
isCheckingMultipleFiles?: boolean;
};

const validateAttachment = (file: FileObject, validationOptions?: ValidateAttachmentOptions) => {
const maxFileSize = validationOptions?.isValidatingReceipts ? CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE : CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE;

if (isValidatingReceipt && !isValidReceiptExtension(file)) {
return isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE;
if (validationOptions?.isValidatingReceipts && !isValidReceiptExtension(file)) {
return validationOptions?.isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE;
}

if (!Str.isImage(file.name ?? '') && !hasHeicOrHeifExtension(file) && (file?.size ?? 0) > maxFileSize) {
return isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE;
return validationOptions?.isCheckingMultipleFiles ? CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE : CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE;
}

if (isValidatingReceipt && (file?.size ?? 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
if (validationOptions?.isValidatingReceipts && (file?.size ?? 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) {
return CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL;
}

Expand Down Expand Up @@ -777,3 +783,5 @@ export {
cleanFileObject,
cleanFileObjectName,
};

export type {ValidateAttachmentOptions};
6 changes: 3 additions & 3 deletions src/pages/home/report/ReportActionCompose/useAttachmentUploadValidation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function useAttachmentUploadValidation({
);
};

const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation(onFilesValidated, false);
const {validateFiles, PDFValidationComponent, ErrorModal} = useFilesValidation(onFilesValidated);

const validateAttachments = useCallback(
({dragEvent, files}: {dragEvent?: DragEvent; files?: FileObject | FileObject[]}) => {
Expand Down Expand Up @@ -161,7 +161,7 @@ function useAttachmentUploadValidation({
const filteredItems = dataTransferItems && validIndices.length > 0 ? validIndices.map((index) => dataTransferItems.at(index) ?? ({} as DataTransferItem)) : undefined;

attachmentUploadType.current = 'attachment';
validateFiles(fileObjects, filteredItems);
validateFiles(fileObjects, filteredItems, {isValidatingReceipts: false});
},
[isAttachmentPreviewActive, validateFiles],
);
Expand All @@ -187,7 +187,7 @@ function useAttachmentUploadValidation({
}

attachmentUploadType.current = 'receipt';
validateFiles(files, items);
validateFiles(files, items, {isValidatingReceipts: true});
},
[policy, shouldAddOrReplaceReceipt, transactionID, validateFiles],
);
Expand Down
14 changes: 7 additions & 7 deletions tests/unit/FileUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ describe('FileUtils', () => {
describe('validateAttachment', () => {
it('should not return FILE_TOO_SMALL when validating small attachment', () => {
const file = createMockFile('file.csv', CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE - 1);
const error = FileUtils.validateAttachment(file, false, false);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: false, isValidatingReceipts: false});
expect(error).not.toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
});

it('should return FILE_TOO_SMALL when validating small receipt', () => {
const file = createMockFile('receipt.jpg', CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE - 1);
const error = FileUtils.validateAttachment(file, false, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: false, isValidatingReceipts: true});
expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_SMALL);
});

Expand All @@ -65,31 +65,31 @@ describe('FileUtils', () => {

it('should return FILE_TOO_LARGE_MULTIPLE when checking multiple files', () => {
const file = createMockFile('file.pdf', CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE + 1);
const error = FileUtils.validateAttachment(file, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: true, isValidatingReceipts: false});
expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.FILE_TOO_LARGE_MULTIPLE);
});

it('should return WRONG_FILE_TYPE for invalid receipt extension', () => {
const file = createMockFile('receipt.exe', CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE - 1);
const error = FileUtils.validateAttachment(file, false, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: false, isValidatingReceipts: true});
expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE);
});

it('should prioritize WRONG_FILE_TYPE over FILE_TOO_LARGE for receipts', () => {
const file = createMockFile('receipt.exe', CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE + 10);
const error = FileUtils.validateAttachment(file, false, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: false, isValidatingReceipts: true});
expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE);
});

it('should return WRONG_FILE_TYPE_MULTIPLE when checking multiple invalid receipt files', () => {
const file = createMockFile('receipt.exe', CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE + 10);
const error = FileUtils.validateAttachment(file, true, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: true, isValidatingReceipts: true});
expect(error).toBe(CONST.FILE_VALIDATION_ERRORS.WRONG_FILE_TYPE_MULTIPLE);
});

it('should return empty string for valid image receipt', () => {
const file = createMockFile('receipt.jpg', CONST.API_ATTACHMENT_VALIDATIONS.RECEIPT_MAX_SIZE - 1);
const error = FileUtils.validateAttachment(file, false, true);
const error = FileUtils.validateAttachment(file, {isCheckingMultipleFiles: false, isValidatingReceipts: true});
expect(error).toBe('');
});
});
Expand Down
Loading