Skip to content

Commit 0911007

Browse files
committed
fix issue with server selector introduced in this PR
1 parent a2958f8 commit 0911007

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/components/structures/auth/Registration.js

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,19 @@ export default class Registration extends React.Component {
507507
return null;
508508
}
509509

510+
// If we're on a different phase, we only show the server type selector,
511+
// which is always shown if we allow custom URLs at all.
512+
// (if there's a fatal server error, we need to show the full server
513+
// config as the user may need to change servers to resolve the error).
514+
if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS && !this.state.serverErrorIsFatal) {
515+
return <div>
516+
<ServerTypeSelector
517+
selected={this.state.serverType}
518+
onChange={this.onServerTypeChange}
519+
/>
520+
</div>;
521+
}
522+
510523
const serverDetailsProps = {};
511524
if (PHASES_ENABLED) {
512525
serverDetailsProps.onAfterSubmit = this.onServerDetailsNextPhaseClick;
@@ -704,10 +717,10 @@ export default class Registration extends React.Component {
704717
{ errorText }
705718
{ serverDeadSection }
706719
{ this.renderServerComponent() }
707-
<h3>
720+
{ this.state.phase !== PHASE_SERVER_DETAILS && <h3>
708721
{yourMatrixAccountText}
709722
{editLink}
710-
</h3>
723+
</h3> }
711724
{ this.renderRegisterComponent() }
712725
{ goBack }
713726
{ signIn }

0 commit comments

Comments
 (0)