From 3e91125872d57ea63e740f7b66e4a2c5bcde8002 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 15 Nov 2019 15:02:09 +0100
Subject: [PATCH] Fix issues

---
 .../main/java/im/vector/riotx/features/login/LoginFragment.kt | 4 ++--
 .../features/login/LoginSignUpSignInSelectionFragment.kt      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
index 3a59ea51b5..4161673a52 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginFragment.kt
@@ -67,7 +67,7 @@ class LoginFragment @Inject constructor(
             ServerType.MatrixOrg -> {
                 loginServerIcon.isVisible = true
                 loginServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
-                loginTitle.text = getString(R.string.login_connect_to, "matrix.org")
+                loginTitle.text = getString(R.string.login_connect_to, loginViewModel.getHomeServerUrlSimple())
                 loginNotice.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.Modular   -> {
@@ -80,7 +80,7 @@ class LoginFragment @Inject constructor(
             ServerType.Other     -> {
                 loginServerIcon.isVisible = false
                 loginTitle.text = getString(R.string.login_server_other_title)
-                loginNotice.text = loginViewModel.getHomeServerUrlSimple()
+                loginNotice.text = getString(R.string.login_connect_to, loginViewModel.getHomeServerUrlSimple())
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
index ec59f95874..c1023f3356 100644
--- a/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
+++ b/vector/src/main/java/im/vector/riotx/features/login/LoginSignUpSignInSelectionFragment.kt
@@ -42,7 +42,7 @@ class LoginSignUpSignInSelectionFragment @Inject constructor() : AbstractLoginFr
             ServerType.MatrixOrg -> {
                 loginSignupSigninServerIcon.setImageResource(R.drawable.ic_logo_matrix_org)
                 loginSignupSigninServerIcon.isVisible = true
-                loginSignupSigninTitle.text = getString(R.string.login_connect_to, "matrix.org")
+                loginSignupSigninTitle.text = getString(R.string.login_connect_to, loginViewModel.getHomeServerUrlSimple())
                 loginSignupSigninText.text = getString(R.string.login_server_matrix_org_text)
             }
             ServerType.Modular   -> {