From 0911007c77e35efbc0fd00712ffcdcfcaf025034 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Nov 2020 17:12:27 +0000
Subject: [PATCH] fix issue with server selector introduced in this PR

---
 src/components/structures/auth/Registration.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js
index 777d57344d..80bf3b72cd 100644
--- a/src/components/structures/auth/Registration.js
+++ b/src/components/structures/auth/Registration.js
@@ -507,6 +507,19 @@ export default class Registration extends React.Component {
             return null;
         }
 
+        // If we're on a different phase, we only show the server type selector,
+        // which is always shown if we allow custom URLs at all.
+        // (if there's a fatal server error, we need to show the full server
+        // config as the user may need to change servers to resolve the error).
+        if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS && !this.state.serverErrorIsFatal) {
+            return <div>
+                <ServerTypeSelector
+                    selected={this.state.serverType}
+                    onChange={this.onServerTypeChange}
+                />
+            </div>;
+        }
+
         const serverDetailsProps = {};
         if (PHASES_ENABLED) {
             serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
@@ -704,10 +717,10 @@ export default class Registration extends React.Component {
                 { errorText }
                 { serverDeadSection }
                 { this.renderServerComponent() }
-                <h3>
+                { this.state.phase !== PHASE_SERVER_DETAILS && <h3>
                     {yourMatrixAccountText}
                     {editLink}
-                </h3>
+                </h3> }
                 { this.renderRegisterComponent() }
                 { goBack }
                 { signIn }