From ad6b745ea2d36e043b2420f9eb34b90c127c6d12 Mon Sep 17 00:00:00 2001
From: Aleks Pliekhov <aleks.plekhov@gmail.com>
Date: Thu, 26 Mar 2026 18:37:07 -0400
Subject: [PATCH 1/2] [ticket 640] added nickname to note

---
 .../bitchat/android/ui/LocationNotesSheet.kt  | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
index 8eea4db7a..46a2a6930 100644
--- a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
+++ b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
@@ -202,6 +202,7 @@ fun LocationNotesSheet(
                         onDraftChange = { draft = it },
                         sendButtonEnabled = sendButtonEnabled,
                         accentGreen = accentGreen,
+                        nickname = nickname,
                         onSend = {
                             val content = draft.trim()
                             if (content.isNotEmpty()) {
@@ -451,19 +452,38 @@ private fun LocationNotesInputSection(
     onDraftChange: (String) -> Unit,
     sendButtonEnabled: Boolean,
     accentGreen: Color,
+    nickname: String?,
     onSend: () -> Unit
 ) {
     val isDark = isSystemInDarkTheme()
     val colorScheme = MaterialTheme.colorScheme
-    
-    Row(
+
+    Column(
         modifier = Modifier
             .fillMaxWidth()
             .background(color = colorScheme.background)
-            .padding(horizontal = 12.dp, vertical = 8.dp), // Match main chat padding
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(8.dp) // Match main chat spacing
+            .padding(horizontal = 12.dp, vertical = 8.dp)
     ) {
+        if (nickname != null) {
+            val baseName = nickname.split("#", limit = 2).firstOrNull() ?: nickname
+            Row(verticalAlignment = Alignment.CenterVertically) {
+                Text(
+                    text = "@$baseName",
+                    fontFamily = FontFamily.Monospace,
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    color = colorScheme.onSurface
+                )
+                Spacer(modifier = Modifier.width(4.dp))
+            }
+            Spacer(modifier = Modifier.height(4.dp))
+        }
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(8.dp)
+        ) {
         // Text input with placeholder overlay (matches main chat exactly)
         Box(
             modifier = Modifier.weight(1f)
@@ -532,6 +552,7 @@ private fun LocationNotesInputSection(
             }
         }
     }
+    }
 }
 
 /**

From 7863d25c1e5a29462002c2ad53f9b75a1876d750 Mon Sep 17 00:00:00 2001
From: Aleks Pliekhov <aleks.plekhov@gmail.com>
Date: Thu, 2 Apr 2026 23:15:34 -0400
Subject: [PATCH 2/2] [640] added check for empty value

---
 app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
index 46a2a6930..29ead6a64 100644
--- a/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
+++ b/app/src/main/java/com/bitchat/android/ui/LocationNotesSheet.kt
@@ -464,7 +464,7 @@ private fun LocationNotesInputSection(
             .background(color = colorScheme.background)
             .padding(horizontal = 12.dp, vertical = 8.dp)
     ) {
-        if (nickname != null) {
+        if (!nickname.isNullOrBlank()) {
             val baseName = nickname.split("#", limit = 2).firstOrNull() ?: nickname
             Row(verticalAlignment = Alignment.CenterVertically) {
                 Text(