Show waiting room dependent on isGuestLobbyMessageEnabled key

bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx

@@ -45,6 +45,7 @@ class UserContent extends PureComponent {
       hasBreakoutRoom,
       pendingUsers,
       isWaitingRoomEnabled,
+      isGuestLobbyMessageEnabled,
       requestUserInformation,
       currentClosedChats,
       sidebarContentPanel,
@@ -52,6 +53,9 @@ class UserContent extends PureComponent {
       startedChats,
     } = this.props;
 
+    const showWaitingRoom = (isGuestLobbyMessageEnabled && isWaitingRoomEnabled)
+      || pendingUsers.length > 0;
+
     return (
       <div
         data-test="userListContent"
@@ -83,7 +87,7 @@ class UserContent extends PureComponent {
             intl,
           }}
         />
-        { (isWaitingRoomEnabled || pendingUsers.length > 0) && currentUser.role === ROLE_MODERATOR
+        {showWaitingRoom && currentUser.role === ROLE_MODERATOR
           ? (
             <WaitingUsers
               {...{

bigbluebutton-html5/imports/ui/components/user-list/user-list-content/container.jsx

@@ -26,11 +26,14 @@ const UserContentContainer = (props) => {
     locked: users[Auth.meetingID][Auth.userID].locked,
     role: users[Auth.meetingID][Auth.userID].role,
   };
+  const { isGuestLobbyMessageEnabled } = WaitingUsersService;
+
   return (
     <UserContent
       {...{
         layoutContextDispatch,
         sidebarContentPanel,
+        isGuestLobbyMessageEnabled,
         ...props,
       }}
       currentUser={currentUser}

bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx

@@ -59,14 +59,13 @@ const WaitingUsers = ({
           >
             <Icon iconName="user" />
             <span>{intl.formatMessage(intlMessages.title)}</span>
-            { pendingUsers.length > 0
-              && (
-                <div className={styles.unreadMessages}>
-                  <div className={styles.unreadMessagesText}>
-                    {pendingUsers.length}
-                  </div>
+            {pendingUsers.length > 0 && (
+              <div className={styles.unreadMessages}>
+                <div className={styles.unreadMessagesText}>
+                  {pendingUsers.length}
                 </div>
-              )}
+              </div>
+            )}
           </div>
         </div>
       </div>