diff --git a/react/features/lobby/components/native/LobbyScreen.js b/react/features/lobby/components/native/LobbyScreen.js index 69f6be5b2..201eeb5f4 100644 --- a/react/features/lobby/components/native/LobbyScreen.js +++ b/react/features/lobby/components/native/LobbyScreen.js @@ -12,6 +12,8 @@ import BaseTheme from '../../../base/ui/components/BaseTheme'; import InviteButton from '../../../invite/components/add-people-dialog/native/InviteButton'; import { LargeVideo } from '../../../large-video/components'; +import HeaderNavigationButton + from '../../../mobile/navigation/components/HeaderNavigationButton'; import { navigate } from '../../../mobile/navigation/components/lobby/LobbyNavigationContainerRef'; import { screen } from '../../../mobile/navigation/routes'; @@ -36,6 +38,25 @@ type Props = AbstractProps & { * Implements a waiting screen that represents the participant being in the lobby. */ class LobbyScreen extends AbstractLobbyScreen { + /** + * Implements React's {@link Component#componentDidMount()}. Invoked + * immediately after this component is mounted. + * + * @inheritdoc + * @returns {void} + */ + componentDidMount() { + const { navigation, t } = this.props; + + navigation.setOptions({ + headerLeft: () => ( + + ) + }); + } + /** * Implements {@code PureComponent#render}. * @@ -292,16 +313,6 @@ class LobbyScreen extends AbstractLobbyScreen { { t('lobby.enterPasswordButton') } } - - - { t('dialog.Cancel') } - - ); } diff --git a/react/features/lobby/components/native/styles.js b/react/features/lobby/components/native/styles.js index f2f2f8c8e..67f17a106 100644 --- a/react/features/lobby/components/native/styles.js +++ b/react/features/lobby/components/native/styles.js @@ -71,7 +71,7 @@ export default { alignItems: 'center', display: 'flex', justifyContent: 'center', - minHeight: '45%' + minHeight: '50%' }, largeVideoContainerWide: { @@ -214,18 +214,6 @@ export default { textAlign: 'center' }, - cancelButton: { - alignItems: 'center', - backgroundColor: BaseTheme.palette.action02Disabled, - marginTop: BaseTheme.spacing[4] - }, - - cancelButtonText: { - ...BaseTheme.typography.labelButtonLarge, - color: BaseTheme.palette.text01, - lineHeight: 30 - }, - // KnockingParticipantList knockingParticipantList: { diff --git a/react/features/mobile/navigation/components/lobby/components/LobbyNavigationContainer.js b/react/features/mobile/navigation/components/lobby/components/LobbyNavigationContainer.js index 1f20fd493..12c66898b 100644 --- a/react/features/mobile/navigation/components/lobby/components/LobbyNavigationContainer.js +++ b/react/features/mobile/navigation/components/lobby/components/LobbyNavigationContainer.js @@ -7,7 +7,8 @@ import { LobbyChatScreen, LobbyScreen } from '../../../../../lobby'; import { screen } from '../../../routes'; import { lobbyChatScreenOptions, - lobbyScreenOptions, navigationContainerTheme + lobbyScreenOptions, + navigationContainerTheme } from '../../../screenOptions'; import { lobbyNavigationContainerRef } from '../LobbyNavigationContainerRef'; diff --git a/react/features/mobile/navigation/screenOptions.js b/react/features/mobile/navigation/screenOptions.js index cf39be4e8..539b863db 100644 --- a/react/features/mobile/navigation/screenOptions.js +++ b/react/features/mobile/navigation/screenOptions.js @@ -168,11 +168,6 @@ export const helpScreenOptions = { */ export const conferenceScreenOptions = fullScreenOptions; -/** - * Screen options for lobby modal. - */ -export const lobbyScreenOptions = fullScreenOptions; - /** * Tab bar options for chat screen. */ @@ -238,6 +233,11 @@ export const recordingScreenOptions = presentationScreenOptions; */ export const liveStreamScreenOptions = presentationScreenOptions; +/** + * Screen options for lobby modal. + */ +export const lobbyScreenOptions = presentationScreenOptions; + /** * Screen options for lobby chat modal. */