|
|
@@ -2,7 +2,7 @@
|
|
2
|
2
|
// eslint-disable-next-line no-unused-vars
|
|
3
|
3
|
import React, { PureComponent } from 'react';
|
|
4
|
4
|
|
|
5
|
|
-import { getConferenceName } from '../../base/conference';
|
|
|
5
|
+import { conferenceWillJoin, getConferenceName } from '../../base/conference';
|
|
6
|
6
|
import { getFeatureFlag, INVITE_ENABLED } from '../../base/flags';
|
|
7
|
7
|
import { getLocalParticipant } from '../../base/participants';
|
|
8
|
8
|
import { getFieldValue } from '../../base/react';
|
|
|
@@ -33,6 +33,11 @@ export type Props = {
|
|
33
|
33
|
*/
|
|
34
|
34
|
_meetingName: string,
|
|
35
|
35
|
|
|
|
36
|
+ /**
|
|
|
37
|
+ * The members only conference if any,
|
|
|
38
|
+ */
|
|
|
39
|
+ _membersOnlyConference: Object,
|
|
|
40
|
+
|
|
36
|
41
|
/**
|
|
37
|
42
|
* The email of the participant about to knock/join.
|
|
38
|
43
|
*/
|
|
|
@@ -288,6 +293,9 @@ export default class AbstractLobbyScreen<P: Props = Props> extends PureComponent
|
|
288
|
293
|
screenState: this.state.displayName ? SCREEN_STATES.VIEW : SCREEN_STATES.EDIT
|
|
289
|
294
|
});
|
|
290
|
295
|
this.props.dispatch(setPasswordJoinFailed(false));
|
|
|
296
|
+
|
|
|
297
|
+ // let's return to the correct state after password failed
|
|
|
298
|
+ this.props.dispatch(conferenceWillJoin(this.props._membersOnlyConference));
|
|
291
|
299
|
}
|
|
292
|
300
|
|
|
293
|
301
|
_onSwitchToPasswordMode: () => void;
|
|
|
@@ -387,11 +395,13 @@ export function _mapStateToProps(state: Object): $Shape<Props> {
|
|
387
|
395
|
const { iAmSipGateway } = state['features/base/config'];
|
|
388
|
396
|
const showCopyUrlButton = inviteEnabledFlag || !disableInviteFunctions;
|
|
389
|
397
|
const deviceStatusVisible = isDeviceStatusVisible(state);
|
|
|
398
|
+ const { membersOnly } = state['features/base/conference'];
|
|
390
|
399
|
|
|
391
|
400
|
return {
|
|
392
|
401
|
_deviceStatusVisible: deviceStatusVisible,
|
|
393
|
402
|
_knocking: knocking,
|
|
394
|
403
|
_meetingName: getConferenceName(state),
|
|
|
404
|
+ _membersOnlyConference: membersOnly,
|
|
395
|
405
|
_participantEmail: localParticipant?.email,
|
|
396
|
406
|
_participantId: participantId,
|
|
397
|
407
|
_participantName: localParticipant?.name,
|