From e5cc4938ad7b47abbb568898699717afac7eec42 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 23 Sep 2025 21:56:03 +0200
Subject: [PATCH] More cleanup

---
 .../features/messages/impl/topbars/MessagesViewTopBar.kt   | 7 ++++---
 .../android/features/messages/impl/topbars/ThreadTopBar.kt | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
index c66170596b..62c9c3e206 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/MessagesViewTopBar.kt
@@ -50,6 +50,7 @@ import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -164,14 +165,14 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
             size = AvatarSize.TimelineRoom,
         ),
         isTombstoned: Boolean = false,
-        heroes: List<AvatarData> = emptyList(),
+        heroes: ImmutableList<AvatarData> = persistentListOf(),
         roomCallState: RoomCallState = RoomCallState.Unavailable,
         dmUserIdentityState: IdentityState? = null,
     ) = MessagesViewTopBar(
         roomName = roomName,
         roomAvatar = roomAvatar,
         isTombstoned = isTombstoned,
-        heroes = heroes.toImmutableList(),
+        heroes = heroes,
         roomCallState = roomCallState,
         dmUserIdentityState = dmUserIdentityState,
         onRoomDetailsClick = {},
@@ -182,7 +183,7 @@ internal fun MessagesViewTopBarPreview() = ElementPreview {
         AMessagesViewTopBar()
         HorizontalDivider()
         AMessagesViewTopBar(
-            heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) },
+            heroes = aMatrixUserList().map { it.getAvatarData(AvatarSize.TimelineRoom) }.toImmutableList(),
             roomCallState = anOngoingCallState(),
         )
         HorizontalDivider()
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
index 3b3890bd23..5a95c2c4b2 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/topbars/ThreadTopBar.kt
@@ -37,6 +37,7 @@ import io.element.android.libraries.matrix.ui.components.aMatrixUserList
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.ui.strings.CommonStrings
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -100,12 +101,12 @@ internal fun ThreadTopBarPreview() = ElementPreview {
             size = AvatarSize.TimelineRoom,
         ),
         isTombstoned: Boolean = false,
-        heroes: List<AvatarData> = emptyList(),
+        heroes: ImmutableList<AvatarData> = persistentListOf(),
     ) = ThreadTopBar(
         roomName = roomName,
         roomAvatarData = roomAvatarData,
         isTombstoned = isTombstoned,
-        heroes = heroes.toImmutableList(),
+        heroes = heroes,
         onBackClick = {},
     )
     Column {