From e1bde435f5dfb8ee0965c4567dc86a5b79bcdc94 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 23 Jun 2025 21:56:20 +0200
Subject: [PATCH] Avoid potential infinite loop.

---
 .../designsystem/components/avatar/AvatarCluster.kt        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
index 4827300394..d2dae9e25c 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
@@ -49,12 +49,13 @@ internal fun AvatarCluster(
             error("Unsupported number of avatars: 0")
         }
         1 -> {
-            Avatar(
+            InitialOrImageAvatar(
                 avatarData = limitedAvatars[0],
-                avatarType = avatarType,
+                hideAvatarImage = hideAvatarImages,
+                avatarShape = avatarType.avatarShape(),
+                forcedAvatarSize = null,
                 modifier = modifier,
                 contentDescription = contentDescription,
-                hideImage = hideAvatarImages
             )
         }
         else -> {