fix issue with server selector introduced in this PR
This commit is contained in:
parent
a2958f8f99
commit
0911007c77
1 changed files with 15 additions and 2 deletions
|
@ -507,6 +507,19 @@ export default class Registration extends React.Component {
|
||||||
return null;
|
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 = {};
|
const serverDetailsProps = {};
|
||||||
if (PHASES_ENABLED) {
|
if (PHASES_ENABLED) {
|
||||||
serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
|
serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
|
||||||
|
@ -704,10 +717,10 @@ export default class Registration extends React.Component {
|
||||||
{ errorText }
|
{ errorText }
|
||||||
{ serverDeadSection }
|
{ serverDeadSection }
|
||||||
{ this.renderServerComponent() }
|
{ this.renderServerComponent() }
|
||||||
<h3>
|
{ this.state.phase !== PHASE_SERVER_DETAILS && <h3>
|
||||||
{yourMatrixAccountText}
|
{yourMatrixAccountText}
|
||||||
{editLink}
|
{editLink}
|
||||||
</h3>
|
</h3> }
|
||||||
{ this.renderRegisterComponent() }
|
{ this.renderRegisterComponent() }
|
||||||
{ goBack }
|
{ goBack }
|
||||||
{ signIn }
|
{ signIn }
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue