Merge pull request #37322 from dukenv0307/fix/37240

Fix unable to add the file that is not image
Expensify · Feb 27, 2024 · 59511b0 · 59511b0
2 parents e35876f + f2c9300
commit 59511b0
Showing 1 changed file with 33 additions and 17 deletions.
diff --git a/src/components/AttachmentPicker/index.native.js b/src/components/AttachmentPicker/index.native.js
@@ -1,3 +1,4 @@
+import Str from 'expensify-common/lib/str';
 import lodashCompact from 'lodash/compact';
 import PropTypes from 'prop-types';
 import React, {useCallback, useMemo, useRef, useState} from 'react';
@@ -230,6 +231,28 @@ function AttachmentPicker({type, children, shouldHideCameraOption}) {
         setIsVisible(false);
     };
 
+    /**
+     * @param {Object} fileData
+     * @returns {Promise}
+     */
+    const validateAndCompleteAttachmentSelection = useCallback(
+        (fileData) => {
+            if (fileData.width === -1 || fileData.height === -1) {
+                showImageCorruptionAlert();
+                return Promise.resolve();
+            }
+            return getDataForUpload(fileData)
+                .then((result) => {
+                    completeAttachmentSelection.current(result);
+                })
+                .catch((error) => {
+                    showGeneralAlert(error.message);
+                    throw error;
+                });
+        },
+        [showGeneralAlert, showImageCorruptionAlert],
+    );
+
     /**
      * Handles the image/document picker result and
      * sends the selected attachment to the caller (parent component)
@@ -244,24 +267,17 @@ function AttachmentPicker({type, children, shouldHideCameraOption}) {
                 return Promise.resolve();
             }
             const fileData = _.first(attachments);
-            RNImage.getSize(fileData.uri, (width, height) => {
-                fileData.width = width;
-                fileData.height = height;
-                if (fileData.width === -1 || fileData.height === -1) {
-                    showImageCorruptionAlert();
-                    return Promise.resolve();
-                }
-                return getDataForUpload(fileData)
-                    .then((result) => {
-                        completeAttachmentSelection.current(result);
-                    })
-                    .catch((error) => {
-                        showGeneralAlert(error.message);
-                        throw error;
-                    });
-            });
+            if (Str.isImage(fileData.fileName || fileData.name)) {
+                RNImage.getSize(fileData.fileCopyUri || fileData.uri, (width, height) => {
+                    fileData.width = width;
+                    fileData.height = height;
+                    return validateAndCompleteAttachmentSelection(fileData);
+                });
+            } else {
+                return validateAndCompleteAttachmentSelection(fileData);
+            }
         },
-        [showGeneralAlert, showImageCorruptionAlert],
+        [validateAndCompleteAttachmentSelection],
     );
 
     /**