diff --git a/react/features/base/connection/actions.web.js b/react/features/base/connection/actions.web.js
index 652a3504a..4e48024d5 100644
--- a/react/features/base/connection/actions.web.js
+++ b/react/features/base/connection/actions.web.js
@@ -95,7 +95,7 @@ export function connect() {
// Setting plugin required flag to false because
// it's already been installed.
dispatch(setUnsupportedBrowser({
- isPluginRequired: false
+ name: 'OK'
}));
dispatch(appNavigate(room));
});
diff --git a/react/features/base/util/interceptComponent.js b/react/features/base/util/interceptComponent.js
index 533f6e422..8ae0b2619 100644
--- a/react/features/base/util/interceptComponent.js
+++ b/react/features/base/util/interceptComponent.js
@@ -10,6 +10,7 @@ import {
declare var APP: Object;
declare var interfaceConfig: Object;
+declare var JitsiMeetJS: Object;
/**
* Array of rules defining whether we should intercept component to render
@@ -43,17 +44,12 @@ const _RULES = [
}
},
state => {
- const {
- isOldBrowser,
- isPluginRequired
- } = state['features/unsupported-browser'];
-
- if (isOldBrowser) {
- return UnsupportedDesktopBrowser;
- }
-
- if (isPluginRequired) {
+ switch (state['features/unsupported-browser'].name) {
+ case 'WEBRTC_NOT_READY':
return PluginRequiredBrowser;
+
+ case 'WEBRTC_NOT_SUPPORTED':
+ return UnsupportedDesktopBrowser;
}
}
];
diff --git a/react/features/conference/components/Conference.web.js b/react/features/conference/components/Conference.web.js
index e35838c6c..1175d477b 100644
--- a/react/features/conference/components/Conference.web.js
+++ b/react/features/conference/components/Conference.web.js
@@ -7,6 +7,7 @@ import { connect, disconnect } from '../../base/connection';
import { Watermarks } from '../../base/react';
import { FeedbackButton } from '../../feedback';
import { OverlayContainer } from '../../overlay';
+import { HideNotificationBarStyle } from '../../unsupported-browser';
declare var $: Function;
declare var APP: Object;
@@ -174,6 +175,7 @@ class Conference extends Component {
+
);
}
diff --git a/react/features/unsupported-browser/components/UnsupportedMobileBrowserStyle.js b/react/features/unsupported-browser/components/HideNotificationBarStyle.js
similarity index 94%
rename from react/features/unsupported-browser/components/UnsupportedMobileBrowserStyle.js
rename to react/features/unsupported-browser/components/HideNotificationBarStyle.js
index 95a9801c0..c308e4e62 100644
--- a/react/features/unsupported-browser/components/UnsupportedMobileBrowserStyle.js
+++ b/react/features/unsupported-browser/components/HideNotificationBarStyle.js
@@ -7,7 +7,7 @@ import React, { Component } from 'react';
* @private
* @returns {ReactElement}
*/
-export default class UnsupportedMobileBrowserStyle extends Component {
+export default class HideNotificationBarStyles extends Component {
/**
* Implements React's {@link Component#render()}.
diff --git a/react/features/unsupported-browser/components/NoMobileApp.js b/react/features/unsupported-browser/components/NoMobileApp.js
index 92bd6c898..78d04fdcb 100644
--- a/react/features/unsupported-browser/components/NoMobileApp.js
+++ b/react/features/unsupported-browser/components/NoMobileApp.js
@@ -2,7 +2,7 @@
import React, { Component } from 'react';
-import UnsupportedMobileBrowserStyle from './UnsupportedMobileBrowserStyle';
+import HideNotificationBarStyle from './HideNotificationBarStyle';
declare var interfaceConfig: Object;
@@ -30,7 +30,7 @@ export default class NoMobileApp extends Component {
Please use {interfaceConfig.APP_NAME} on
Desktop to join calls.
-
+
);
}
diff --git a/react/features/unsupported-browser/components/UnsupportedDesktopBrowser.js b/react/features/unsupported-browser/components/UnsupportedDesktopBrowser.js
index 1c63752ca..dd7820743 100644
--- a/react/features/unsupported-browser/components/UnsupportedDesktopBrowser.js
+++ b/react/features/unsupported-browser/components/UnsupportedDesktopBrowser.js
@@ -5,6 +5,7 @@ import React, { Component } from 'react';
import { Platform } from '../../base/react';
import { CHROME, FIREFOX, IE, SAFARI } from './browserLinks';
+import HideNotificationBarStyle from './HideNotificationBarStyle';
/**
* Describes styles namespace for this component.
@@ -41,6 +42,8 @@ export default class UnsupportedDesktopBrowser extends Component {
{ this._showSafariLinkIfRequired() }
{ this._showIELinkIfRequired() }.
+
+
);
}
diff --git a/react/features/unsupported-browser/components/UnsupportedMobileBrowser.js b/react/features/unsupported-browser/components/UnsupportedMobileBrowser.js
index c200635cb..b3db7a95e 100644
--- a/react/features/unsupported-browser/components/UnsupportedMobileBrowser.js
+++ b/react/features/unsupported-browser/components/UnsupportedMobileBrowser.js
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
import { Platform } from '../../base/react';
-import UnsupportedMobileBrowserStyle from './UnsupportedMobileBrowserStyle';
+import HideNotificationBarStyle from './HideNotificationBarStyle';
/**
* The map of platforms to URLs at which the mobile app for the associated
@@ -103,7 +103,8 @@ class UnsupportedMobileBrowser extends Component {
-
+
+
);
}
diff --git a/react/features/unsupported-browser/components/index.js b/react/features/unsupported-browser/components/index.js
index a74f65fbc..34be115bf 100644
--- a/react/features/unsupported-browser/components/index.js
+++ b/react/features/unsupported-browser/components/index.js
@@ -1,3 +1,5 @@
+export { default as HideNotificationBarStyle }
+ from './HideNotificationBarStyle';
export { default as NoMobileApp } from './NoMobileApp';
export { default as PluginRequiredBrowser } from './PluginRequiredBrowser';
export { default as UnsupportedDesktopBrowser }