matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-11 20:22:36 +03:00
Code Activity

fix issue with server selector introduced in this PR

Browse Source
This commit is contained in:
Michael Telatynski
2020-11-11 17:12:27 +00:00
parent a2958f8f99
commit 0911007c77
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/structures/auth/Registration.js
View File

@@ -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 }