fix: Fixes #9869 Lobby and wrong password case.

This commit is contained in:
Дамян Минков 2021-09-30 17:21:50 -05:00
parent 31a7fbfa82
commit 432c4ada70
1 changed files with 11 additions and 1 deletions

View File

@ -2,7 +2,7 @@
// eslint-disable-next-line no-unused-vars
import React, { PureComponent } from 'react';
import { getConferenceName } from '../../base/conference';
import { conferenceWillJoin, getConferenceName } from '../../base/conference';
import { getFeatureFlag, INVITE_ENABLED } from '../../base/flags';
import { getLocalParticipant } from '../../base/participants';
import { getFieldValue } from '../../base/react';
@ -33,6 +33,11 @@ export type Props = {
*/
_meetingName: string,
/**
* The members only conference if any,
*/
_membersOnlyConference: Object,
/**
* The email of the participant about to knock/join.
*/
@ -288,6 +293,9 @@ export default class AbstractLobbyScreen<P: Props = Props> extends PureComponent
screenState: this.state.displayName ? SCREEN_STATES.VIEW : SCREEN_STATES.EDIT
});
this.props.dispatch(setPasswordJoinFailed(false));
// let's return to the correct state after password failed
this.props.dispatch(conferenceWillJoin(this.props._membersOnlyConference));
}
_onSwitchToPasswordMode: () => void;
@ -387,11 +395,13 @@ export function _mapStateToProps(state: Object): $Shape<Props> {
const { iAmSipGateway } = state['features/base/config'];
const showCopyUrlButton = inviteEnabledFlag || !disableInviteFunctions;
const deviceStatusVisible = isDeviceStatusVisible(state);
const { membersOnly } = state['features/base/conference'];
return {
_deviceStatusVisible: deviceStatusVisible,
_knocking: knocking,
_meetingName: getConferenceName(state),
_membersOnlyConference: membersOnly,
_participantEmail: localParticipant?.email,
_participantId: participantId,
_participantName: localParticipant?.name,