From bd5ae8702a653e7c9c313278566905dc480170ce Mon Sep 17 00:00:00 2001
From: callebtc <93376500+callebtc@users.noreply.github.com>
Date: Sat, 1 Aug 2026 20:45:42 +0200
Subject: [PATCH] feat(chat): never show our own nickname in bubbles mode

The end side and the author-colour wash already attribute own bubbles,
so the @name heading on the first bubble of an own run was redundant.
Received bubbles keep their sender names; matrix mode is unchanged.
---
 .../main/java/com/bitchat/android/ui/MessageComponents.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/bitchat/android/ui/MessageComponents.kt b/app/src/main/java/com/bitchat/android/ui/MessageComponents.kt
index 0c4af8ce..402bb395 100644
--- a/app/src/main/java/com/bitchat/android/ui/MessageComponents.kt
+++ b/app/src/main/java/com/bitchat/android/ui/MessageComponents.kt
@@ -960,8 +960,9 @@ private fun BubbleTextMessageLayout(
             ) {
                 Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
                     // The sender's name heads the first bubble of their run, like classic group
-                    // messengers, instead of floating above it. Continuation bubbles skip it.
-                    if (showSender) {
+                    // messengers, instead of floating above it. Own bubbles never show a name —
+                    // the end side is attribution enough. Continuation bubbles skip it too.
+                    if (showSender && !isSelf) {
                         AnnotatedClickableText(
                             text = senderText,
                             annotationTags = listOf("nickname_click"),