diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js index 8791ec55b20d..b2d6751269e1 100755 --- a/src/components/AttachmentModal.js +++ b/src/components/AttachmentModal.js @@ -152,31 +152,31 @@ class AttachmentModal extends PureComponent { * @returns {Boolean} */ isValidFile(file) { - if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { + const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', '')); + if (!_.contains(CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS, fileExtension.toLowerCase())) { + const invalidReason = `${this.props.translate('attachmentPicker.notAllowedExtension')} ${CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS.join(', ')}`; this.setState({ isAttachmentInvalid: true, - attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.attachmentTooLarge'), - attachmentInvalidReason: this.props.translate('attachmentPicker.sizeExceeded'), + attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.wrongFileType'), + attachmentInvalidReason: invalidReason, }); return false; } - if (lodashGet(file, 'size', 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) { + if (lodashGet(file, 'size', 0) > CONST.API_ATTACHMENT_VALIDATIONS.MAX_SIZE) { this.setState({ isAttachmentInvalid: true, - attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.attachmentTooSmall'), - attachmentInvalidReason: this.props.translate('attachmentPicker.sizeNotMet'), + attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.attachmentTooLarge'), + attachmentInvalidReason: this.props.translate('attachmentPicker.sizeExceeded'), }); return false; } - const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', '')); - if (!_.contains(CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS, fileExtension.toLowerCase())) { - const invalidReason = `${this.props.translate('attachmentPicker.notAllowedExtension')} ${CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS.join(', ')}`; + if (lodashGet(file, 'size', 0) < CONST.API_ATTACHMENT_VALIDATIONS.MIN_SIZE) { this.setState({ isAttachmentInvalid: true, - attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.wrongFileType'), - attachmentInvalidReason: invalidReason, + attachmentInvalidReasonTitle: this.props.translate('attachmentPicker.attachmentTooSmall'), + attachmentInvalidReason: this.props.translate('attachmentPicker.sizeNotMet'), }); return false; }