diff --git a/react/features/lobby/components/web/LobbySection.js b/react/features/lobby/components/web/LobbySection.js index 0feeac568..47cf27c2a 100644 --- a/react/features/lobby/components/web/LobbySection.js +++ b/react/features/lobby/components/web/LobbySection.js @@ -6,6 +6,7 @@ import { translate } from '../../../base/i18n'; import { isLocalParticipantModerator } from '../../../base/participants'; import { Switch } from '../../../base/react'; import { connect } from '../../../base/redux'; +import { isInBreakoutRoom } from '../../../breakout-rooms/functions'; import { toggleLobbyMode } from '../../actions'; type Props = { @@ -139,8 +140,10 @@ function mapStateToProps(state: Object): $Shape { return { _lobbyEnabled: state['features/lobby'].lobbyEnabled, - _visible: conference && conference.isLobbySupported() && isLocalParticipantModerator(state) - && !hideLobbyButton + + // $FlowExpectedError + _visible: conference?.isLobbySupported() && isLocalParticipantModerator(state) + && !hideLobbyButton && !isInBreakoutRoom(state) }; } diff --git a/react/features/security/components/security-dialog/native/SecurityDialog.js b/react/features/security/components/security-dialog/native/SecurityDialog.js index 5069f5ef0..d72c84f01 100644 --- a/react/features/security/components/security-dialog/native/SecurityDialog.js +++ b/react/features/security/components/security-dialog/native/SecurityDialog.js @@ -20,6 +20,7 @@ import { getFeatureFlag, MEETING_PASSWORD_ENABLED } from '../../../../base/flags import { translate } from '../../../../base/i18n'; import { isLocalParticipantModerator } from '../../../../base/participants'; import { StyleType } from '../../../../base/styles'; +import { isInBreakoutRoom } from '../../../../breakout-rooms/functions'; import { toggleLobbyMode } from '../../../../lobby/actions.any'; import LobbyModeSwitch from '../../../../lobby/components/native/LobbyModeSwitch'; @@ -430,7 +431,7 @@ function _mapStateToProps(state: Object): Object { _isModerator: isLocalParticipantModerator(state), _lobbyEnabled: lobbyEnabled, _lobbyModeSwitchVisible: - lobbySupported && isLocalParticipantModerator(state) && !hideLobbyButton, + lobbySupported && isLocalParticipantModerator(state) && !hideLobbyButton && !isInBreakoutRoom(state), _locked: locked, _lockedConference: Boolean(conference && locked), _password: password,