Conflicts

Expensify · Aug 15, 2023 · c802b8c · c802b8c
1 parent a2a2012
commit c802b8c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 169 deletions.
diff --git a/src/components/AttachmentView.js b/src/components/AttachmentView.js
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewImage/index.js b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.js
@@ -12,13 +12,14 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, onPress, isImage, onScaleChanged, translate}) {
+function AttachmentViewImage({source, file, isAuthTokenRequired, loadComplete, onPress, onError, isImage, onScaleChanged, translate}) {
     const children = (
         <ImageView
             onScaleChanged={onScaleChanged}
             url={source}
             fileName={file.name}
             isAuthTokenRequired={isImage && isAuthTokenRequired}
+            onError={onError}
         />
     );
     return onPress ? (

diff --git a/src/components/Attachments/AttachmentView/AttachmentViewImage/index.native.js b/src/components/Attachments/AttachmentView/AttachmentViewImage/index.native.js
@@ -13,7 +13,7 @@ const propTypes = {
     ...withLocalizePropTypes,
 };
 
-function AttachmentViewImage({source, file, isAuthTokenRequired, isFocused, isUsedInCarousel, loadComplete, onPress, isImage, onScaleChanged, translate}) {
+function AttachmentViewImage({source, file, isAuthTokenRequired, isFocused, isUsedInCarousel, loadComplete, onPress, onError, isImage, onScaleChanged, translate}) {
     const children = isUsedInCarousel ? (
         <AttachmentCarouselPage
             source={source}
@@ -26,6 +26,7 @@ function AttachmentViewImage({source, file, isAuthTokenRequired, isFocused, isUs
             onScaleChanged={onScaleChanged}
             url={source}
             fileName={file.name}
+            onError={onError}
             isAuthTokenRequired={isImage && isAuthTokenRequired}
         />
     );

diff --git a/src/components/Attachments/AttachmentView/index.js b/src/components/Attachments/AttachmentView/index.js
@@ -59,6 +59,7 @@ function AttachmentView({
     isFocused,
 }) {
     const [loadComplete, setLoadComplete] = useState(false);
+    const [isValidImage, setIsValidImage] = useState(true);
 
     // Handles case where source is a component (ex: SVG)
     if (_.isFunction(source)) {
@@ -95,7 +96,7 @@ function AttachmentView({
     // For this check we use both source and file.name since temporary file source is a blob
     // both PDFs and images will appear as images when pasted into the the text field
     const isImage = Str.isImage(source);
-    if (isImage || (file && Str.isImage(file.name))) {
+    if ((isImage || (file && Str.isImage(file.name))) && isValidImage) {
         return (
             <AttachmentViewImage
                 source={source}
@@ -105,6 +106,7 @@ function AttachmentView({
                 loadComplete={loadComplete}
                 isFocused={isFocused}
                 isImage={isImage}
+                onError={() => setIsValidImage(false)}
                 onPress={onPress}
                 onScaleChanged={onScaleChanged}
             />