OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6980 from matrix-org/t3chguy/fix/19162

pull/21833/head
Michael Telatynski 2021-10-19 11:14:16 +01:00 committed by GitHub
parent 37e0151d29 e8b998c19c
commit d743e3d1d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/structures/MatrixChat.tsx
View File

@ -872,6 +872,15 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
params.hs_url, params.is_url, params.hs_url, params.is_url,
); );
// If the hs url matches then take the hs name we know locally as it is likely prettier
const defaultConfig = SdkConfig.get()["validated_server_config"] as ValidatedServerConfig;
if (defaultConfig && defaultConfig.hsUrl === newState.serverConfig.hsUrl) {
newState.serverConfig.hsName = defaultConfig.hsName;
newState.serverConfig.hsNameIsDifferent = defaultConfig.hsNameIsDifferent;
newState.serverConfig.isDefault = defaultConfig.isDefault;
newState.serverConfig.isNameResolvable = defaultConfig.isNameResolvable;
}
newState.register_client_secret = params.client_secret; newState.register_client_secret = params.client_secret;
newState.register_session_id = params.session_id; newState.register_session_id = params.session_id;
newState.register_id_sid = params.sid; newState.register_id_sid = params.sid;