fix(prejoin) Remove no longer needed hack

react/features/prejoin/components/Prejoin.web.js

@@ -3,10 +3,8 @@
 import InlineDialog from '@atlaskit/inline-dialog';
 import React, { Component } from 'react';
 
-import { LoginDialog, WaitForOwnerDialog } from '../../authentication/components';
 import { Avatar } from '../../base/avatar';
 import { isNameReadOnly } from '../../base/config';
-import { isDialogOpen } from '../../base/dialog/functions';
 import { translate } from '../../base/i18n';
 import { IconArrowDown, IconArrowUp, IconPhone, IconVolumeOff } from '../../base/icons';
 import { isVideoMutedByUser } from '../../base/media';
@@ -15,8 +13,6 @@ import { ActionButton, InputField, PreMeetingScreen } from '../../base/premeetin
 import { connect } from '../../base/redux';
 import { getDisplayName, updateSettings } from '../../base/settings';
 import { getLocalJitsiVideoTrack } from '../../base/tracks';
-import { getIsLobbyVisible } from '../../lobby/functions';
-import { PasswordRequiredPrompt } from '../../room-lock/components';
 import {
     joinConference as joinConferenceAction,
     joinConferenceWithoutAudio as joinConferenceWithoutAudioAction,
@@ -50,11 +46,6 @@ type Props = {
      */
     hasJoinByPhoneButton: boolean,
 
-    /**
-     * Whether authentication is taking place or not.
-     */
-    isAuthInProgress: boolean,
-
     /**
      * Joins the current meeting.
      */
@@ -345,7 +336,6 @@ class Prejoin extends Component<Props, State> {
         const {
             deviceStatusVisible,
             hasJoinByPhoneButton,
-            isAuthInProgress,
             joinConference,
             joinConferenceWithoutAudio,
             name,
@@ -382,7 +372,7 @@ class Prejoin extends Component<Props, State> {
                     data-testid = 'prejoin.screen'>
                     {this.showDisplayNameField ? (<InputField
                         autoComplete = { 'name' }
-                        autoFocus = { !isAuthInProgress }
+                        autoFocus = { true }
                         className = { showError ? 'error' : '' }
                         hasError = { showError }
                         onChange = { _setName }
@@ -454,16 +444,11 @@ function mapStateToProps(state): Object {
     const name = getDisplayName(state);
     const showErrorOnJoin = isDisplayNameRequired(state) && !name;
     const { id: participantId } = getLocalParticipant(state);
-    const isLobbyVisible = getIsLobbyVisible(state);
-    const isAuthInProgress = isDialogOpen(state, WaitForOwnerDialog)
-        || isDialogOpen(state, LoginDialog) || isDialogOpen(state, PasswordRequiredPrompt)
-        || isLobbyVisible;
 
     return {
         canEditDisplayName: isPrejoinDisplayNameVisible(state),
         deviceStatusVisible: isDeviceStatusVisible(state),
         hasJoinByPhoneButton: isJoinByPhoneButtonVisible(state),
-        isAuthInProgress,
         name,
         participantId,
         prejoinConfig: state['features/base/config'].prejoinConfig,