fix nip-17 (#305)

* NIP-59 stuff

* nip-17 ios to androing works, android to ios still wip

* fix impl

* ios compat

* default relays for DMs

* delivery ack works

* delivery ack

---------

Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>

app/src/main/java/com/bitchat/android/ui/ChatHeader.kt

@@ -257,11 +257,17 @@ fun ChatHeaderContent(
             
             Log.d("ChatHeader", "Header recomposing: peer=$selectedPrivatePeer, isFav=$isFavorite, sessionState=$sessionState")
             
+            // Pass geohash context and people for NIP-17 chat title formatting
+            val selectedLocationChannel by viewModel.selectedLocationChannel.observeAsState()
+            val geohashPeople by viewModel.geohashPeople.observeAsState(emptyList())
+
             PrivateChatHeader(
                 peerID = selectedPrivatePeer,
                 peerNicknames = peerNicknames,
                 isFavorite = isFavorite,
                 sessionState = sessionState,
+                selectedLocationChannel = selectedLocationChannel,
+                geohashPeople = geohashPeople,
                 onBackClick = onBackClick,
                 onToggleFavorite = { viewModel.toggleFavorite(selectedPrivatePeer) }
             )
@@ -296,11 +302,25 @@ private fun PrivateChatHeader(
     peerNicknames: Map<String, String>,
     isFavorite: Boolean,
     sessionState: String?,
+    selectedLocationChannel: com.bitchat.android.geohash.ChannelID?,
+    geohashPeople: List<GeoPerson>,
     onBackClick: () -> Unit,
     onToggleFavorite: () -> Unit
 ) {
     val colorScheme = MaterialTheme.colorScheme
-    val peerNickname = peerNicknames[peerID] ?: peerID
+    val isNostrDM = peerID.startsWith("nostr_") || peerID.startsWith("nostr:")
+
+    // Compute title text: for NIP-17 chats show "#geohash/@username" (iOS parity)
+    val titleText: String = if (isNostrDM) {
+        val geohash = (selectedLocationChannel as? com.bitchat.android.geohash.ChannelID.Location)?.channel?.geohash
+        val shortId = peerID.removePrefix("nostr_").removePrefix("nostr:")
+        val person = geohashPeople.firstOrNull { it.id.startsWith(shortId, ignoreCase = true) }
+        val baseName = person?.displayName?.substringBefore('#') ?: peerNicknames[peerID] ?: "unknown"
+        val geoPart = geohash?.let { "#$it" } ?: "#geohash"
+        "$geoPart/@$baseName"
+    } else {
+        peerNicknames[peerID] ?: peerID
+    }
     
     Box(modifier = Modifier.fillMaxWidth()) {
         // Back button - positioned all the way to the left with minimal margin
@@ -340,17 +360,20 @@ private fun PrivateChatHeader(
         ) {
             
             Text(
-                text = peerNickname,
+                text = titleText,
                 style = MaterialTheme.typography.titleMedium,
                 color = Color(0xFFFF9500) // Orange
             )
 
             Spacer(modifier = Modifier.width(4.dp))
 
-            NoiseSessionIcon(
-                sessionState = sessionState,
-                modifier = Modifier.size(14.dp)
-            )
+            // For NIP-17 chats, do not show Noise session state icon (remove warning icon)
+            if (!isNostrDM) {
+                NoiseSessionIcon(
+                    sessionState = sessionState,
+                    modifier = Modifier.size(14.dp)
+                )
+            }
 
         }