From 9e2e1a17eac29707a52b666e5b05608f488c8a42 Mon Sep 17 00:00:00 2001 From: Yordan Neshkolov Date: Wed, 27 May 2020 18:16:50 +0300 Subject: [PATCH] NY-10506 [WEB]: Remove dialog for not supported browsers on Safari for iOs --- src/pages/JoinByLink/JoinByLink.js | 4 ++-- src/pages/NinjaApp/NinjaApp.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/JoinByLink/JoinByLink.js b/src/pages/JoinByLink/JoinByLink.js index f51df24aa..25ce7a82a 100644 --- a/src/pages/JoinByLink/JoinByLink.js +++ b/src/pages/JoinByLink/JoinByLink.js @@ -5,7 +5,7 @@ import stylesFunc from './JoinByLink.styles'; import { connect } from 'react-redux'; import { profileSelectors } from 'Resource/profile'; import { bindActionCreators } from 'redux'; -import { BrowserView, isMobileOnly, isAndroid, isIOS, isMobile } from 'react-device-detect'; +import { BrowserView, isMobileOnly, isAndroid, isIOS, isMobile, isMobileSafari } from 'react-device-detect'; import { JoinByLinkForm } from '../../containers'; import { LinkError, AudioVideo, AudioVideoAnonymousHeader, LoadingSpinner, NynjaHelmet } from '../../componets'; import { @@ -70,7 +70,7 @@ class JoinByLink extends Component { const agent = navigator.userAgent; if (!(isSafari || isChrome || isFirefox || isOpera || (isEdge && agent.indexOf("Edg/") > -1))){ this.openModal('isBrowserModalOpen'); - } else if (isSafari && browserVersion === '13.1') { + } else if (isSafari && browserVersion === '13.1' && !isMobileSafari) { this.setState({ showSafariWarning: true }); } diff --git a/src/pages/NinjaApp/NinjaApp.js b/src/pages/NinjaApp/NinjaApp.js index de923a907..af6d8d83a 100644 --- a/src/pages/NinjaApp/NinjaApp.js +++ b/src/pages/NinjaApp/NinjaApp.js @@ -11,7 +11,7 @@ import { bindActionCreators } from 'redux'; import { AudioVideo } from '../../componets'; import { requestNotificationPermission } from '../../core/managers/browserNotificationsManager'; import { withTranslation } from 'react-i18next'; -import { isSafari, browserVersion } from "react-device-detect"; +import { isSafari, browserVersion, isMobileSafari } from "react-device-detect"; import ConfirmDialog from "Components/Modals/ConfirmDialog/ConfirmDialog"; const styles = theme => (stylesFunc(theme, darkBgImg)); @@ -36,7 +36,7 @@ export class Dashboard extends Component { } checkSafari() { - if (isSafari && browserVersion === '13.1') { + if (isSafari && browserVersion === '13.1' && !isMobileSafari) { this.setState({ showSafariWarning: true }); } } -- GitLab