From 7cdd43402dac2e62bcb8ae93e65605a31f333fe9 Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <swerss564@gmail.com>
Date: Thu, 22 Jan 2026 00:41:53 +0500
Subject: [PATCH] feat: Add accountUsername to ChatsListScreen for improved
 user identification

---
 app/src/main/java/com/rosetta/messenger/MainActivity.kt      | 1 +
 .../java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt   | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/rosetta/messenger/MainActivity.kt b/app/src/main/java/com/rosetta/messenger/MainActivity.kt
index c33cb33..af29539 100644
--- a/app/src/main/java/com/rosetta/messenger/MainActivity.kt
+++ b/app/src/main/java/com/rosetta/messenger/MainActivity.kt
@@ -490,6 +490,7 @@ fun MainScreen(
             ChatsListScreen(
                 isDarkTheme = isDarkTheme,
                 accountName = accountName,
+                accountUsername = accountUsername,
                 accountPhone = accountPhone,
                 accountPublicKey = accountPublicKey,
                 accountPrivateKey = accountPrivateKey,
diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
index 20fb596..07c8939 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatsListScreen.kt
@@ -130,6 +130,7 @@ fun getAvatarText(publicKey: String): String {
 fun ChatsListScreen(
         isDarkTheme: Boolean,
         accountName: String,
+        accountUsername: String,
         accountPhone: String,
         accountPublicKey: String,
         accountPrivateKey: String = "",
@@ -562,10 +563,10 @@ fun ChatsListScreen(
                                                                 )
 
                                                                 // Username display
-                                                                if (accountName.isNotEmpty()) {
+                                                                if (accountUsername.isNotEmpty()) {
                                                                         Text(
                                                                                 text =
-                                                                                        "@$accountName",
+                                                                                        "@$accountUsername",
                                                                                 fontSize = 13.sp,
                                                                                 color =
                                                                                         Color.White