|
1 | 1 | import {Str} from 'expensify-common'; |
2 | 2 | import React, {useEffect, useRef, useState} from 'react'; |
3 | 3 | import {InteractionManager} from 'react-native'; |
4 | | -import type {ValueOf} from 'type-fest'; |
5 | 4 | import ConfirmModal from '@components/ConfirmModal'; |
6 | 5 | import {useFullScreenLoaderActions} from '@components/FullScreenLoaderContext'; |
7 | 6 | import PDFThumbnail from '@components/PDFThumbnail'; |
@@ -114,11 +113,6 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer |
114 | 113 | }); |
115 | 114 | }; |
116 | 115 |
|
117 | | - const setErrorAndOpenModal = (error: ValueOf<typeof CONST.FILE_VALIDATION_ERRORS>) => { |
118 | | - setFileError({error, isValidatingMultipleFiles}); |
119 | | - setIsErrorModalVisible(true); |
120 | | - }; |
121 | | - |
122 | 116 | const checkIfAllValidatedAndProceed = () => { |
123 | 117 | if (!validatedPDFs.current || !validFiles.current) { |
124 | 118 | return; |
@@ -265,9 +259,9 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer |
265 | 259 | } else { |
266 | 260 | const errorMessage = result.reason instanceof Error ? result.reason.message : undefined; |
267 | 261 | if (errorMessage === CONST.FILE_VALIDATION_ERRORS.IMAGE_DIMENSIONS_TOO_LARGE) { |
268 | | - collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.IMAGE_DIMENSIONS_TOO_LARGE, isValidatingMultipleFiles}); |
| 262 | + collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.IMAGE_DIMENSIONS_TOO_LARGE, isValidatingMultipleFiles: validationState.isValidatingMultipleFiles}); |
269 | 263 | } else { |
270 | | - collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.FILE_CORRUPTED, isValidatingMultipleFiles}); |
| 264 | + collectedErrors.current.push({error: CONST.FILE_VALIDATION_ERRORS.FILE_CORRUPTED, isValidatingMultipleFiles: validationState.isValidatingMultipleFiles}); |
271 | 265 | } |
272 | 266 | } |
273 | 267 | } |
@@ -347,7 +341,8 @@ function useFilesValidation(onFilesValidated: (files: FileObject[], dataTransfer |
347 | 341 | if (items) { |
348 | 342 | dataTransferItemList.current = items.slice(0, CONST.API_ATTACHMENT_VALIDATIONS.MAX_FILE_LIMIT); |
349 | 343 | } |
350 | | - setErrorAndOpenModal(CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED); |
| 344 | + setFileError({error: CONST.FILE_VALIDATION_ERRORS.MAX_FILE_LIMIT_EXCEEDED, isValidatingMultipleFiles: validationState.isValidatingMultipleFiles}); |
| 345 | + setIsErrorModalVisible(true); |
351 | 346 | } else { |
352 | 347 | validateAndResizeFiles(files, items ?? [], validationState); |
353 | 348 | } |
|
0 commit comments