From de05c761ce1444e65e78bd7ac3d97a74b1ab70ed Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Tue, 14 Mar 2023 15:27:53 +0100
Subject: [PATCH] Use getBestName() for a matrix user name

---
 .../createroom/impl/selectusers/SelectUsersStateProvider.kt    | 1 +
 .../features/createroom/impl/selectusers/SelectUsersView.kt    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
index 4dd64013c3..c7b5956c99 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersStateProvider.kt
@@ -28,6 +28,7 @@ open class SelectUsersStateProvider : PreviewParameterProvider<SelectUsersState>
             aSelectUsersState(),
             aSelectUsersState().copy(
                 selectedUsers = persistentListOf(
+                    aMatrixUser(userName = ""),
                     aMatrixUser(userName = "User"),
                     aMatrixUser(userName = "User with long name"),
                 )
diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
index 421879b522..020b9c8d7b 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/selectusers/SelectUsersView.kt
@@ -54,6 +54,7 @@ import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.matrix.ui.model.MatrixUser
+import io.element.android.libraries.matrix.ui.model.getBestName
 import io.element.android.libraries.ui.strings.R as StringR
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -154,7 +155,7 @@ fun SelectedUser(
         ) {
             Avatar(matrixUser.avatarData.copy(size = AvatarSize.Custom(56)))
             Text(
-                text = matrixUser.username.orEmpty(),
+                text = matrixUser.getBestName(),
                 overflow = TextOverflow.Ellipsis,
                 maxLines = 1,
                 style = MaterialTheme.typography.bodyLarge,