From 91e0ae42c2a973ff76d79cdfe4c7fd0b777bc776 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 5 Sep 2023 11:06:34 -0600
Subject: [PATCH 1/2] update logic to render receipt

---
 .../ReportActionItem/ReportActionItemImage.js | 69 +++++++++----------
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js
index 5f8444af0b21..c25fef778c7b 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.js
+++ b/src/components/ReportActionItem/ReportActionItemImage.js
@@ -23,7 +23,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-    thumbnail: null,
+    thumbnail: '',
     enablePreviewModal: false,
 };
 
@@ -35,47 +35,44 @@ const defaultProps = {
 
 function ReportActionItemImage({thumbnail, image, enablePreviewModal}) {
     const {translate} = useLocalize();
+    const imageSource = tryResolveUrlFromApiRoot(image);
+    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail);
 
-    if (thumbnail) {
-        const imageSource = tryResolveUrlFromApiRoot(image);
-        const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail);
-        const thumbnailComponent = (
-            <ThumbnailImage
-                previewSourceURL={thumbnailSource}
-                style={[styles.w100, styles.h100]}
-                isAuthTokenRequired
-                shouldDynamicallyResize={false}
-            />
-        );
-
-        if (enablePreviewModal) {
-            return (
-                <ShowContextMenuContext.Consumer>
-                    {({report}) => (
-                        <PressableWithoutFocus
-                            style={[styles.noOutline, styles.w100, styles.h100]}
-                            onPress={() => {
-                                const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource);
-                                Navigation.navigate(route);
-                            }}
-                            accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
-                            accessibilityLabel={translate('accessibilityHints.viewAttachment')}
-                        >
-                            {thumbnailComponent}
-                        </PressableWithoutFocus>
-                    )}
-                </ShowContextMenuContext.Consumer>
-            );
-        }
-        return thumbnailComponent;
-    }
-
-    return (
+    const receiptImageComponent = thumbnail ? (
+        <ThumbnailImage
+            previewSourceURL={thumbnailSource}
+            style={[styles.w100, styles.h100]}
+            isAuthTokenRequired
+            shouldDynamicallyResize={false}
+        />
+    ) : (
         <Image
             source={{uri: image}}
             style={[styles.w100, styles.h100]}
         />
     );
+
+    if (enablePreviewModal) {
+        return (
+            <ShowContextMenuContext.Consumer>
+                {({report}) => (
+                    <PressableWithoutFocus
+                        style={[styles.noOutline, styles.w100, styles.h100]}
+                        onPress={() => {
+                            const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource);
+                            Navigation.navigate(route);
+                        }}
+                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
+                        accessibilityLabel={translate('accessibilityHints.viewAttachment')}
+                    >
+                        {receiptImageComponent}
+                    </PressableWithoutFocus>
+                )}
+            </ShowContextMenuContext.Consumer>
+        );
+    }
+
+    return receiptImageComponent;
 }
 
 ReportActionItemImage.propTypes = propTypes;

From 5b2c016390096a9c27c929daaf1c7921b11c6742 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Tue, 5 Sep 2023 11:20:49 -0600
Subject: [PATCH 2/2] fix defaults

---
 src/components/ReportActionItem/ReportActionItemImage.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js
index c25fef778c7b..070f534f4924 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.js
+++ b/src/components/ReportActionItem/ReportActionItemImage.js
@@ -23,7 +23,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-    thumbnail: '',
+    thumbnail: null,
     enablePreviewModal: false,
 };
 
@@ -35,8 +35,8 @@ const defaultProps = {
 
 function ReportActionItemImage({thumbnail, image, enablePreviewModal}) {
     const {translate} = useLocalize();
-    const imageSource = tryResolveUrlFromApiRoot(image);
-    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail);
+    const imageSource = tryResolveUrlFromApiRoot(image || '');
+    const thumbnailSource = tryResolveUrlFromApiRoot(thumbnail || '');
 
     const receiptImageComponent = thumbnail ? (
         <ThumbnailImage