From 8efd0f0829f984887ffe5aeb1a11d9b2a626b5c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <saghul@jitsi.org>
Date: Thu, 11 Jun 2020 10:22:33 +0200
Subject: [PATCH] unsafe-room: hide unsafe room label if a password or lobby
 are set

---
 .../conference/components/AbstractInsecureRoomNameLabel.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/react/features/conference/components/AbstractInsecureRoomNameLabel.js b/react/features/conference/components/AbstractInsecureRoomNameLabel.js
index 5bcd446e2..30b4bf2cc 100644
--- a/react/features/conference/components/AbstractInsecureRoomNameLabel.js
+++ b/react/features/conference/components/AbstractInsecureRoomNameLabel.js
@@ -49,10 +49,13 @@ export default class AbstractInsecureRoomNameLabel extends PureComponent<Props>
  * @returns {Props}
  */
 export function _mapStateToProps(state: Object): $Shape<Props> {
-    const { room } = state['features/base/conference'];
+    const { locked, room } = state['features/base/conference'];
+    const { lobbyEnabled } = state['features/lobby'];
     const { enableInsecureRoomNameWarning = false } = state['features/base/config'];
 
     return {
-        _visible: enableInsecureRoomNameWarning && room && isInsecureRoomName(room)
+        _visible: enableInsecureRoomNameWarning
+            && room && isInsecureRoomName(room)
+            && !(lobbyEnabled || Boolean(locked))
     };
 }