From bcffe0bba542f2c7089544fb15f9f3df3a7aa344 Mon Sep 17 00:00:00 2001
From: Bettenbuk Zoltan <zoltan.bettenbuk@gmail.com>
Date: Wed, 17 Jun 2020 11:37:27 +0200
Subject: [PATCH] fix: lobby screen broken with prejoin disabled

---
 .../premeeting/components/web/InputField.js   |  2 ++
 .../lobby/components/AbstractLobbyScreen.js   |  2 ++
 .../lobby/components/web/LobbyScreen.js       | 19 +++++++++++++------
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/react/features/base/premeeting/components/web/InputField.js b/react/features/base/premeeting/components/web/InputField.js
index a23b28adf..a81d23653 100644
--- a/react/features/base/premeeting/components/web/InputField.js
+++ b/react/features/base/premeeting/components/web/InputField.js
@@ -92,6 +92,8 @@ export default class InputField extends PureComponent<Props, State> {
                 value
             };
         }
+
+        return null;
     }
 
     /**
diff --git a/react/features/lobby/components/AbstractLobbyScreen.js b/react/features/lobby/components/AbstractLobbyScreen.js
index 95bcc4661..50766057a 100644
--- a/react/features/lobby/components/AbstractLobbyScreen.js
+++ b/react/features/lobby/components/AbstractLobbyScreen.js
@@ -128,6 +128,8 @@ export default class AbstractLobbyScreen<P: Props = Props> extends PureComponent
                 passwordJoinFailed: true
             };
         }
+
+        return null;
     }
 
     /**
diff --git a/react/features/lobby/components/web/LobbyScreen.js b/react/features/lobby/components/web/LobbyScreen.js
index d6fb8916d..158a4ab73 100644
--- a/react/features/lobby/components/web/LobbyScreen.js
+++ b/react/features/lobby/components/web/LobbyScreen.js
@@ -70,13 +70,25 @@ class LobbyScreen extends AbstractLobbyScreen {
         );
     }
 
+    /**
+     * Renders the participant form to let the knocking participant enter its details.
+     *
+     * NOTE: We don't use edit action on web since the prejoin functionality got merged.
+     * Mobile won't use it either once prejoin gets implemented there too.
+     *
+     * @inheritdoc
+     */
+    _renderParticipantForm() {
+        return this._renderParticipantInfo();
+    }
+
     /**
      * Renders the participant info fragment when we have all the required details of the user.
      *
      * @inheritdoc
      */
     _renderParticipantInfo() {
-        const { displayName, email } = this.state;
+        const { displayName } = this.state;
         const { t } = this.props;
 
         return (
@@ -86,11 +98,6 @@ class LobbyScreen extends AbstractLobbyScreen {
                         onChange = { this._onChangeDisplayName }
                         placeHolder = { t('lobby.nameField') }
                         value = { displayName } />
-
-                    <InputField
-                        onChange = { this._onChangeEmail }
-                        placeHolder = { t('lobby.emailField') }
-                        value = { email } />
                 </div>
             </div>
         );