From f8a3f7ffaca8e25f5f1c1f160f25651b50da1085 Mon Sep 17 00:00:00 2001
From: ClaireG <claire.1817@hotmail.fr>
Date: Fri, 8 Apr 2022 17:14:41 +0200
Subject: [PATCH] Fix room name of DM in room creation item

---
 changelog.d/5570.bugfix                                      | 1 +
 .../home/room/detail/timeline/item/MergedRoomCreationItem.kt | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/5570.bugfix

diff --git a/changelog.d/5570.bugfix b/changelog.d/5570.bugfix
new file mode 100644
index 0000000000..c3743d252f
--- /dev/null
+++ b/changelog.d/5570.bugfix
@@ -0,0 +1 @@
+Use member name instead of room name in DM creation item
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
index 9f631f7a0e..f3ca525136 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt
@@ -133,7 +133,10 @@ abstract class MergedRoomCreationItem : BasedMergedItem<MergedRoomCreationItem.H
         val membersCount = roomSummary?.otherMemberIds?.size ?: 0
 
         if (isDirect) {
-            holder.roomDescriptionText.text = holder.view.resources.getString(R.string.this_is_the_beginning_of_dm, roomSummary?.displayName ?: "")
+            holder.roomDescriptionText.text = holder.view.resources.getString(
+                    R.string.this_is_the_beginning_of_dm,
+                    distinctMergeData.lastOrNull()?.memberName ?: ""
+            )
         } else if (roomDisplayName.isNullOrBlank() || roomSummary.name.isBlank()) {
             holder.roomDescriptionText.text = holder.view.resources.getString(R.string.this_is_the_beginning_of_room_no_name)
         } else {