diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx index d632068fe0..16ffe65d65 100755 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/component.jsx @@ -5,7 +5,7 @@ import UserParticipantsContainer from './user-participants/container'; import UserMessages from './user-messages/container'; import UserNotesContainer from './user-notes/container'; import UserCaptionsContainer from './user-captions/container'; -import WaitingUsers from './waiting-users/component'; +import WaitingUsersContainer from './waiting-users/container'; import UserPolls from './user-polls/component'; import BreakoutRoomItem from './breakout-room/component'; @@ -33,7 +33,10 @@ class UserContent extends PureComponent { {CHAT_ENABLED ? : null} {currentUser.role === ROLE_MODERATOR ? : null} - {showWaitingRoom && currentUser.role === ROLE_MODERATOR ? : null} + {showWaitingRoom && currentUser.role === ROLE_MODERATOR + ? ( + + ) : null} diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx index a2d55b67e2..5f6c59b243 100644 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/component.jsx @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { defineMessages } from 'react-intl'; +import { defineMessages, injectIntl } from 'react-intl'; import Icon from '/imports/ui/components/icon/component'; import Styled from './styles'; import { ACTIONS, PANELS } from '../../../layout/enums'; @@ -75,4 +75,4 @@ const WaitingUsers = ({ WaitingUsers.propTypes = propTypes; -export default WaitingUsers; +export default injectIntl(WaitingUsers); diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/container.jsx b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/container.jsx new file mode 100644 index 0000000000..9c94a9a809 --- /dev/null +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/waiting-users/container.jsx @@ -0,0 +1,21 @@ +import React from 'react'; +import WaitingUsers from './component'; +import { layoutSelectInput, layoutDispatch } from '/imports/ui/components/layout/context'; + +const WaitingUsersContainer = ({ pendingUsers }) => { + const sidebarContent = layoutSelectInput((i) => i.sidebarContent); + const layoutContextDispatch = layoutDispatch(); + const { sidebarContentPanel } = sidebarContent; + + return ( + + ); +}; + +export default WaitingUsersContainer;