From 6f397f101487f4a64c7b6600fba267078bc30950 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 10 Jan 2022 12:39:55 +0000
Subject: [PATCH 1/5] Truncate long server names on login/register screen

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 res/css/views/elements/_ServerPicker.scss      | 2 ++
 src/components/views/elements/ServerPicker.tsx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/res/css/views/elements/_ServerPicker.scss b/res/css/views/elements/_ServerPicker.scss
index b871c2cdf3a..850a1625965 100644
--- a/res/css/views/elements/_ServerPicker.scss
+++ b/res/css/views/elements/_ServerPicker.scss
@@ -62,6 +62,8 @@ limitations under the License.
         color: $authpage-primary-color;
         grid-column: 1;
         grid-row: 2;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 
     .mx_ServerPicker_change {
diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 51b18ac6c2b..461204aa5fc 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -86,7 +86,7 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
     return <div className="mx_ServerPicker">
         <h3>{ title || _t("Homeserver") }</h3>
         { !disableCustomUrls ? <AccessibleButton className="mx_ServerPicker_help" onClick={onHelpClick} /> : null }
-        <span className="mx_ServerPicker_server">{ serverName }</span>
+        <span className="mx_ServerPicker_server" title={serverName}>{ serverName }</span>
         { editBtn }
         { desc }
     </div>;

From f3c9e884ff658d7bee3cb6abeed9091c2c11bb38 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 10 Jan 2022 12:55:08 +0000
Subject: [PATCH 2/5] Fix error

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/elements/ServerPicker.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 461204aa5fc..6c4ee65c44d 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -70,11 +70,9 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
     }
 
     let serverName: React.ReactNode = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
-    if (serverConfig.hsNameIsDifferent) {
-        serverName = <TextWithTooltip class="mx_Login_underlinedServerName" tooltip={serverConfig.hsUrl}>
-            { serverConfig.hsName }
-        </TextWithTooltip>;
-    }
+    serverName = <TextWithTooltip class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""} tooltip={serverConfig.hsUrl}>
+        { serverConfig.hsName }
+    </TextWithTooltip>;
 
     let desc;
     if (serverConfig.hsName === "matrix.org") {
@@ -86,7 +84,7 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
     return <div className="mx_ServerPicker">
         <h3>{ title || _t("Homeserver") }</h3>
         { !disableCustomUrls ? <AccessibleButton className="mx_ServerPicker_help" onClick={onHelpClick} /> : null }
-        <span className="mx_ServerPicker_server" title={serverName}>{ serverName }</span>
+        <span className="mx_ServerPicker_server">{ serverName }</span>
         { editBtn }
         { desc }
     </div>;

From 2959cfbd19f74d00ae8e64651d5968bad80f9da2 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 10 Jan 2022 13:00:26 +0000
Subject: [PATCH 3/5] Lint

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/elements/ServerPicker.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 6c4ee65c44d..2949dd6854a 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -70,7 +70,9 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
     }
 
     let serverName: React.ReactNode = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
-    serverName = <TextWithTooltip class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""} tooltip={serverConfig.hsUrl}>
+    serverName = <TextWithTooltip
+                    class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""}
+                    tooltip={serverConfig.hsUrl}>
         { serverConfig.hsName }
     </TextWithTooltip>;
 

From 1737b8543e84836be735b3923fd2b8ff38281573 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 10 Jan 2022 13:46:14 +0000
Subject: [PATCH 4/5] Remove unnecessary line

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/elements/ServerPicker.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 2949dd6854a..7b87304fc14 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -69,8 +69,7 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
         </AccessibleButton>;
     }
 
-    let serverName: React.ReactNode = serverConfig.isNameResolvable ? serverConfig.hsName : serverConfig.hsUrl;
-    serverName = <TextWithTooltip
+    const serverName: JSX.Element = <TextWithTooltip
                     class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""}
                     tooltip={serverConfig.hsUrl}>
         { serverConfig.hsName }

From 5fee54eb0ae42b3e27da03906882b2d4cb20e933 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Mon, 10 Jan 2022 13:49:52 +0000
Subject: [PATCH 5/5] Lint

Signed-off-by: Aaron Raimist <aaron@raim.ist>
---
 src/components/views/elements/ServerPicker.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/ServerPicker.tsx b/src/components/views/elements/ServerPicker.tsx
index 7b87304fc14..2f23525716d 100644
--- a/src/components/views/elements/ServerPicker.tsx
+++ b/src/components/views/elements/ServerPicker.tsx
@@ -70,8 +70,8 @@ const ServerPicker = ({ title, dialogTitle, serverConfig, onServerConfigChange }
     }
 
     const serverName: JSX.Element = <TextWithTooltip
-                    class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""}
-                    tooltip={serverConfig.hsUrl}>
+        class={serverConfig.hsNameIsDifferent ? "mx_Login_underlinedServerName" : ""}
+        tooltip={serverConfig.hsUrl}>
         { serverConfig.hsName }
     </TextWithTooltip>;