From d65a068fdb2014b59a2bb421d9760da7b8eaa3ab Mon Sep 17 00:00:00 2001 From: Leonard Kim Date: Thu, 6 Jun 2019 18:15:30 -0700 Subject: [PATCH] feat(deep-linking): hide web button on unsupported browsers --- lang/main.json | 1 + .../components/DeepLinkingDesktopPage.web.js | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lang/main.json b/lang/main.json index 346fbb59f8..fa3e9bad9b 100644 --- a/lang/main.json +++ b/lang/main.json @@ -121,6 +121,7 @@ "deepLinking": { "appNotInstalled": "You need the __app__ mobile app to join this meeting on your phone.", "description": "Nothing happened? We tried launching your meeting in the __app__ desktop app. Try again or launch it in the __app__ web app.", + "descriptionWithoutWeb": "Nothing happened? We tried launching your meeting in the __app__ desktop app.", "downloadApp": "Download the app", "launchWebButton": "Launch in web", "openApp": "Continue to the app", diff --git a/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js b/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js index 22a5de4ecd..293de340c0 100644 --- a/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js +++ b/react/features/deep-linking/components/DeepLinkingDesktopPage.web.js @@ -7,6 +7,7 @@ import { connect } from '../../base/redux'; import type { Dispatch } from 'redux'; import { createDeepLinkingPageEvent, sendAnalytics } from '../../analytics'; +import { isSupportedBrowser } from '../../base/environment'; import { translate } from '../../base/i18n'; import { @@ -107,8 +108,12 @@ class DeepLinkingDesktopPage

extends Component

{

{ - t(`${_TNS}.description`, - { app: NATIVE_APP_NAME }) + t( + `${_TNS}.${isSupportedBrowser() + ? 'description' + : 'descriptionWithoutWeb'}`, + { app: NATIVE_APP_NAME } + ) }

@@ -118,9 +123,12 @@ class DeepLinkingDesktopPage

extends Component

{ onClick = { this._onTryAgain }> { t(`${_TNS}.tryAgainButton`) } - + { + isSupportedBrowser() + && + }