From c5e6a8b0b68ce68837c3a09b065faad22d8927cd Mon Sep 17 00:00:00 2001
From: Kgothatso Ngako <kgothatso@machankura.com>
Date: Mon, 1 Jun 2026 02:03:37 +0200
Subject: [PATCH] Show message title

---
 .../ui/composable/ChatRoomDetailScreen.kt      | 18 ++++++++++++++----
 .../ui/view/model/ChatRoomListViewModel.kt     |  2 --
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ChatRoomDetailScreen.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ChatRoomDetailScreen.kt
index 54ba1624..8b841fbc 100644
--- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ChatRoomDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/composable/ChatRoomDetailScreen.kt
@@ -1,6 +1,7 @@
 package ac.cord.auxiliary.compose.ui.composable
 
 import ac.cord.auxiliary.compose.database.model.ChatRoom
+import ac.cord.auxiliary.compose.database.model.Participant
 import ac.cord.auxiliary.compose.database.model.intermdiate.LocalChatRoom
 import ac.cord.auxiliary.compose.repository.ChatRepository
 import ac.cord.auxiliary.compose.repository.NostrRepository
@@ -70,7 +71,16 @@ fun ChatRoomDetailScreen(
                 topBar = {
                     TopAppBar(
                         title = {
-                            Text(chatRoomDetailUIState.localChatRoom.chatRoom.subject ?: "Message")
+                            val messageTitle = chatRoomDetailUIState.localChatRoom.chatRoom.subject ?: if (chatRoomDetailUIState.localChatRoom.participants.size == 1) {
+                                    "Note to Self (${chatRoomDetailUIState.localChatRoom.participants.first().profile?.humanReadableNameOrPubkey()})"
+                                } else {
+                                    // Remove the active user publicKey from participants...
+                                    chatRoomDetailUIState.localChatRoom.participants.filter { it.participant.participantPublicKey != chatRoomDetailUIState.localChatRoom.chatRoom.userPublicKey }.map { it.profile?.humanReadableNameOrPubkey() ?: "unknown participant" }.joinToString()
+                                }
+
+                            Text(
+                                text = messageTitle
+                            )
                         }
                     )
                 },
@@ -133,7 +143,7 @@ fun ChatRoomDetailScreen(
 
 @Preview
 @Composable
-private fun UnqueuedProfileSynchronizationScreenPreview() {
+private fun ChatRoomDetailScreenPreview() {
     AuxTheme {
         Surface(
             modifier = Modifier.fillMaxSize()
@@ -145,9 +155,9 @@ private fun UnqueuedProfileSynchronizationScreenPreview() {
                         chatRoom = ChatRoom(
                             id = "",
                             userPublicKey = "",
-                            subject = "sdfa",
+                            subject = "Message title",
                             initialGiftWrapUnsignedId = ""
-                        )
+                        ),
                     )
                 ),
                 nostrRepository = NostrRepository.NO_OP_NOSTR_REPOSITORY,
diff --git a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/ChatRoomListViewModel.kt b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/ChatRoomListViewModel.kt
index 1c0731c0..3ae41fe4 100755
--- a/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/ChatRoomListViewModel.kt
+++ b/composeApp/src/commonMain/kotlin/ac/cord/auxiliary/compose/ui/view/model/ChatRoomListViewModel.kt
@@ -152,8 +152,6 @@ class ChatRoomListViewModel(
                                             modifier = Modifier.padding(20.dp),
                                             horizontalAlignment = Alignment.CenterHorizontally,
                                         ) {
-                                            // TODO: Remove active user pubKey
-
                                             if (localChatRoom.participants.size == 1) {
                                                 Text(
                                                     text = "Note to Self (${localChatRoom.participants.first().profile?.humanReadableNameOrPubkey()})"