From 2dc078c4312bc2e56da9d36dfff9176a02fe0682 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 29 Sep 2025 16:08:07 +0200
Subject: [PATCH] Improve fun VerificationUserProfileContent

---
 .../impl/incoming/IncomingVerificationView.kt |  4 +--
 .../impl/ui/VerificationUserProfileContent.kt | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
index 12d851b6bd..84528c69e7 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/IncomingVerificationView.kt
@@ -215,9 +215,7 @@ private fun ContentInitial(
                     .padding(top = 24.dp),
             ) {
                 VerificationUserProfileContent(
-                    userId = request.details.senderProfile.userId,
-                    displayName = request.details.senderProfile.displayName,
-                    avatarUrl = request.details.senderProfile.avatarUrl,
+                    user = request.details.senderProfile,
                 )
             }
         }
diff --git a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
index 5af47e6a9f..2e17b736f2 100644
--- a/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
+++ b/features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/ui/VerificationUserProfileContent.kt
@@ -24,7 +24,6 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.Avatar
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.components.avatar.AvatarType
 import io.element.android.libraries.designsystem.preview.ElementPreview
@@ -32,19 +31,20 @@ import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.user.MatrixUser
+import io.element.android.libraries.matrix.ui.model.getAvatarData
+import io.element.android.libraries.matrix.ui.model.getBestName
 
 /**
  * Ref: https://www.figma.com/design/lMrKOhS8BEb75GXVq7FnNI/ER-96--User-Verification-by-Emoji?node-id=116-52049
  */
 @Composable
 fun VerificationUserProfileContent(
-    userId: UserId,
-    displayName: String?,
-    avatarUrl: String?,
+    user: MatrixUser,
     modifier: Modifier = Modifier,
 ) {
-    val avatarData = remember(userId, displayName, avatarUrl) {
-        AvatarData(id = userId.value, name = displayName, url = avatarUrl, size = AvatarSize.UserVerification)
+    val avatarData = remember(user) {
+        user.getAvatarData(AvatarSize.UserVerification)
     }
     Row(
         modifier = modifier
@@ -60,10 +60,18 @@ fun VerificationUserProfileContent(
         )
         Spacer(modifier = Modifier.width(12.dp))
         Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
-            Text(text = displayName ?: userId.value, style = ElementTheme.typography.fontBodyLgMedium, color = ElementTheme.colors.textPrimary)
+            Text(
+                text = user.getBestName(),
+                style = ElementTheme.typography.fontBodyLgMedium,
+                color = ElementTheme.colors.textPrimary,
+            )
 
-            if (displayName != null) {
-                Text(text = userId.value, style = ElementTheme.typography.fontBodyMdRegular, color = ElementTheme.colors.textSecondary)
+            if (user.displayName.isNullOrEmpty().not()) {
+                Text(
+                    text = user.userId.value,
+                    style = ElementTheme.typography.fontBodyMdRegular,
+                    color = ElementTheme.colors.textSecondary,
+                )
             }
         }
     }
@@ -75,8 +83,10 @@ internal fun VerificationUserProfileContentPreview() = ElementPreview(
     drawableFallbackForImages = CommonDrawables.sample_avatar
 ) {
     VerificationUserProfileContent(
-        userId = UserId("@alice:example.com"),
-        displayName = "Alice",
-        avatarUrl = "https://example.com/avatar.png",
+        user = MatrixUser(
+            userId = UserId("@alice:example.com"),
+            displayName = "Alice",
+            avatarUrl = "https://example.com/avatar.png",
+        )
     )
 }