Merge pull request #3768 from mozilla/fix/safari-mic-dialog

Show safari mic modal if mic permissions denied
Hubs-Foundation · Jan 26, 2021 · 8553e13 · 8553e13
2 parents 4033fe7 + e453ddc
commit 8553e13
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/react-components/ui-root.js b/src/react-components/ui-root.js
@@ -203,10 +203,6 @@ class UIRoot extends Component {
   constructor(props) {
     super(props);
 
-    if (props.showSafariMicDialog) {
-      this.state.dialog = <SafariMicModal />;
-    }
-
     props.mediaSearchStore.setHistory(props.history);
 
     // An exit handler that discards event arguments and can be cleaned up.
@@ -954,9 +950,17 @@ class UIRoot extends Component {
       );
     }
 
+    if (this.props.showSafariMicDialog) {
+      return (
+        <div className={classNames(rootStyles)}>
+          <RoomLayoutContainer scene={this.props.scene} store={this.props.store} modal={<SafariMicModal />} />
+        </div>
+      );
+    }
+
     const preload = this.props.showPreload;
 
-    const isLoading = !preload && !this.state.hideLoader && !this.props.showSafariMicDialog;
+    const isLoading = !preload && !this.state.hideLoader;
 
     if (isLoading && this.state.showPrefs) {
       return (