fix new tab opens when downloading offline

Expensify · Sep 25, 2023 · 79c2f61 · 79c2f61
1 parent 767bdae
commit 79c2f61
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
@@ -30,6 +30,7 @@ import useWindowDimensions from '../hooks/useWindowDimensions';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
 import useNativeDriver from '../libs/useNativeDriver';
+import * as NetworkStore from '../libs/Network/NetworkStore';
 
 /**
  * Modal render prop component that exposes modal launching triggers that can be used
@@ -350,7 +351,7 @@ function AttachmentModal(props) {
                 <HeaderWithBackButton
                     title={props.headerTitle || translate(isAttachmentReceipt ? 'common.receipt' : 'common.attachment')}
                     shouldShowBorderBottom
-                    shouldShowDownloadButton={props.allowDownload && shouldShowDownloadButton && !isAttachmentReceipt}
+                    shouldShowDownloadButton={props.allowDownload && shouldShowDownloadButton && !isAttachmentReceipt && !NetworkStore.isOffline()}
                     onDownloadButtonPress={() => downloadAttachment(source)}
                     shouldShowCloseButton={!props.isSmallScreenWidth}
                     shouldShowBackButton={props.isSmallScreenWidth}

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -25,6 +25,7 @@ import * as Task from '../../../../libs/actions/Task';
 import * as Localize from '../../../../libs/Localize';
 import * as TransactionUtils from '../../../../libs/TransactionUtils';
 import * as CurrencyUtils from '../../../../libs/CurrencyUtils';
+import * as NetworkStore from '../../../../libs/Network/NetworkStore';
 
 /**
  * Gets the HTML version of the message in an action.
@@ -101,7 +102,7 @@ export default [
         shouldShow: (type, reportAction) => {
             const isAttachment = ReportActionsUtils.isReportActionAttachment(reportAction);
             const messageHtml = lodashGet(reportAction, ['message', 0, 'html']);
-            return isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction);
+            return isAttachment && messageHtml !== CONST.ATTACHMENT_UPLOADING_MESSAGE_HTML && reportAction.reportActionID && !ReportActionsUtils.isMessageDeleted(reportAction) && !NetworkStore.isOffline();
         },
         onPress: (closePopover, {reportAction}) => {
             const message = _.last(lodashGet(reportAction, 'message', [{}]));