diff --git a/src/components/ReportActionItem/ReportActionItemImage.js b/src/components/ReportActionItem/ReportActionItemImage.js index 5f8444af0b21..070f534f4924 100644 --- a/src/components/ReportActionItem/ReportActionItemImage.js +++ b/src/components/ReportActionItem/ReportActionItemImage.js @@ -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 = ( - - ); - - if (enablePreviewModal) { - return ( - - {({report}) => ( - { - const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource); - Navigation.navigate(route); - }} - accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON} - accessibilityLabel={translate('accessibilityHints.viewAttachment')} - > - {thumbnailComponent} - - )} - - ); - } - return thumbnailComponent; - } - - return ( + const receiptImageComponent = thumbnail ? ( + + ) : ( ); + + if (enablePreviewModal) { + return ( + + {({report}) => ( + { + const route = ROUTES.getReportAttachmentRoute(report.reportID, imageSource); + Navigation.navigate(route); + }} + accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON} + accessibilityLabel={translate('accessibilityHints.viewAttachment')} + > + {receiptImageComponent} + + )} + + ); + } + + return receiptImageComponent; } ReportActionItemImage.propTypes = propTypes;