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

Merge pull request #5477 from matrix-org/t3chguy/fix/15913

Browse Source 
Handle manual hs urls better for the server picker
This commit is contained in:
Michael Telatynski
2020-12-09 11:32:33 +00:00
committed by GitHub
parent 5f4320e80d 5be65a525d
commit 91ae8df423
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/dialogs/ServerPickerDialog.tsx
View File

@@ -49,9 +49,19 @@ export default class ServerPickerDialog extends React.PureComponent<IProps, ISta
const config = SdkConfig.get();
this.defaultServer = config["validated_server_config"] as ValidatedServerConfig;
const { serverConfig } = this.props;
let otherHomeserver = "";
if (!serverConfig.isDefault) {
if (serverConfig.isNameResolvable && serverConfig.hsName) {
otherHomeserver = serverConfig.hsName;
} else {
otherHomeserver = serverConfig.hsUrl;
}
}
this.state = {
defaultChosen: serverConfig.isDefault,
otherHomeserver: serverConfig.isDefault ? "" : (serverConfig.hsName || serverConfig.hsUrl),
otherHomeserver,
};
}

2
src/components/views/elements/ServerPicker.tsx
View File

@@ -67,7 +67,7 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
</AccessibleButton>;
}
let serverName = serverConfig.hsName;
let serverName = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
if (serverConfig.hsNameIsDifferent) {
serverName = <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={serverConfig.hsUrl}>
{serverConfig.hsName}