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

Merge branch 'develop' into t3chguy/remove_bluebird

Browse Source
This commit is contained in:
Michael Telatynski
2019-11-20 15:21:23 +00:00
committed by GitHub
parent e144f1c368 1e6472723a
commit 6121420113
47 changed files with 1838 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/structures/auth/Login.js
View File

@@ -378,8 +378,19 @@ module.exports = createReactClass({
// Do a quick liveliness check on the URLs
try {
await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
this.setState({serverIsAlive: true, errorText: ""});
const { warning } =
await AutoDiscoveryUtils.validateServerConfigWithStaticUrls(hsUrl, isUrl);
if (warning) {
this.setState({
...AutoDiscoveryUtils.authComponentStateForError(warning),
errorText: "",
});
} else {
this.setState({
serverIsAlive: true,
errorText: "",
});
}
} catch (e) {
this.setState({
busy: false,