Merge pull request Expensify#33586 from namhihi237/fix/33412-loading-pdf

fix loading pdf failed
mollfpr · Jan 3, 2024 · 446ceb1 · 446ceb1
2 parents 53afb94 + 494d5fd
commit 446ceb1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
@@ -366,7 +366,7 @@ function AttachmentModal(props) {
         setIsAuthTokenRequired(props.isAuthTokenRequired);
     }, [props.isAuthTokenRequired]);
 
-    const sourceForAttachmentView = props.source || source;
+    const sourceForAttachmentView = source || props.source;
 
     const threeDotsMenuItems = useMemo(() => {
         if (!props.isReceiptAttachment || !props.parentReport || !props.parentReportActions) {

diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js
@@ -1,3 +1,4 @@
+import Str from 'expensify-common/lib/str';
 import PropTypes from 'prop-types';
 import React from 'react';
 import {View} from 'react-native';
@@ -60,7 +61,7 @@ function ReportActionItemImage({thumbnail, image, enablePreviewModal, transactio
                 <EReceiptThumbnail transactionID={transaction.transactionID} />
             </View>
         );
-    } else if (thumbnail && !isLocalFile) {
+    } else if (thumbnail && !isLocalFile && !Str.isPDF(imageSource)) {
         receiptImageComponent = (
             <ThumbnailImage
                 previewSourceURL={thumbnailSource}

diff --git a/src/libs/ReceiptUtils.ts b/src/libs/ReceiptUtils.ts
@@ -66,7 +66,8 @@ function getThumbnailAndImageURIs(transaction: Transaction, receiptPath: string
         image = ReceiptSVG;
     }
 
-    return {thumbnail: image, image: path, isLocalFile: true};
+    const isLocalFile = path.startsWith('blob:') || path.startsWith('file:');
+    return {thumbnail: image, image: path, isLocalFile};
 }
 
 // eslint-disable-next-line import/prefer-default-export