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

Don't show spinner once liveness check has failed

Browse Source 
We're not doing anything at that point so it's a lie
This commit is contained in:
David Baker
2019-06-11 12:10:44 +01:00
parent 5eccd14120
commit a6c5ac669b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,10 @@ module.exports = React.createClass({
); );
this.setState({serverIsAlive: true}); this.setState({serverIsAlive: true});
} catch (e) { } catch (e) {
this.setState(AutoDiscoveryUtils.authComponentStateForError(e, "register")); this.setState({
busy: false,
...AutoDiscoveryUtils.authComponentStateForError(e, "register"),
});
if (this.state.serverErrorIsFatal) { if (this.state.serverErrorIsFatal) {
return; // Server is dead - do not continue. return; // Server is dead - do not continue.
} }
@@ -455,6 +458,8 @@ module.exports = React.createClass({
emailSid={this.props.idSid} emailSid={this.props.idSid}
poll={true} poll={true}
/>; />;
} else if (!this.state.matrixClient && !this.state.busy) {
return null;
} else if (this.state.busy || !this.state.flows) { } else if (this.state.busy || !this.state.flows) {
return <div className="mx_AuthBody_spinner"> return <div className="mx_AuthBody_spinner">
<Spinner /> <Spinner />