Browse Source

unsafe-room: hide unsafe room label if a password or lobby are set

master
Saúl Ibarra Corretgé 5 years ago
parent
commit
8efd0f0829

+ 5
- 2
react/features/conference/components/AbstractInsecureRoomNameLabel.js View File

49
  * @returns {Props}
49
  * @returns {Props}
50
  */
50
  */
51
 export function _mapStateToProps(state: Object): $Shape<Props> {
51
 export function _mapStateToProps(state: Object): $Shape<Props> {
52
-    const { room } = state['features/base/conference'];
52
+    const { locked, room } = state['features/base/conference'];
53
+    const { lobbyEnabled } = state['features/lobby'];
53
     const { enableInsecureRoomNameWarning = false } = state['features/base/config'];
54
     const { enableInsecureRoomNameWarning = false } = state['features/base/config'];
54
 
55
 
55
     return {
56
     return {
56
-        _visible: enableInsecureRoomNameWarning && room && isInsecureRoomName(room)
57
+        _visible: enableInsecureRoomNameWarning
58
+            && room && isInsecureRoomName(room)
59
+            && !(lobbyEnabled || Boolean(locked))
57
     };
60
     };
58
 }
61
 }

Loading…
Cancel
Save