From c6e9acdac6a7fe86c6ffb1e3f7f188e87460fad2 Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <ruslanmakhmatov@gmail.com>
Date: Thu, 19 Mar 2026 15:46:06 +0500
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D0=B1?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8B=D0=BC=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=20=D0=B2=D1=85=D0=BE=D0=B4=D0=B5=20?=
 =?UTF-8?q?=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=83=20=D0=B2=20=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BC=D0=BD=D0=BE=D0=B9=20=D1=82=D0=B5=D0=BC=D0=B5=20?=
 =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D0=BE=D0=B1=D0=BE=D1=8F=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/rosetta/messenger/ui/chats/ChatDetailScreen.kt |  3 +++
 .../ui/chats/components/ChatDetailComponents.kt        | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
index d0b52bd..b6764d7 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
@@ -2587,6 +2587,9 @@ fun ChatDetailScreen(
                                                                                                         message,
                                                                                                 isDarkTheme =
                                                                                                         isDarkTheme,
+                                                                                                hasWallpaper =
+                                                                                                        chatWallpaperResId !=
+                                                                                                                null,
                                                                                                 isSystemSafeChat =
                                                                                                         isSystemAccount,
                                                                                                 isSelectionMode =
diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
index dd29310..27f33f3 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/components/ChatDetailComponents.kt
@@ -287,6 +287,7 @@ fun TypingIndicator(isDarkTheme: Boolean) {
 fun MessageBubble(
         message: ChatMessage,
         isDarkTheme: Boolean,
+        hasWallpaper: Boolean = false,
         isSystemSafeChat: Boolean = false,
         isSelectionMode: Boolean = false,
         showTail: Boolean = true,
@@ -408,7 +409,8 @@ fun MessageBubble(
         if (isGroupActionSystemMessage) {
                 GroupActionSystemMessage(
                         text = groupActionSystemText.orEmpty(),
-                        isDarkTheme = isDarkTheme
+                        isDarkTheme = isDarkTheme,
+                        hasWallpaper = hasWallpaper
                 )
                 return
         }
@@ -1293,8 +1295,8 @@ private fun resolveGroupActionSystemText(text: String): String? {
 }
 
 @Composable
-private fun GroupActionSystemMessage(text: String, isDarkTheme: Boolean) {
-        val successColor = if (isDarkTheme) Color(0xFF7EE787) else Color(0xFF2E7D32)
+private fun GroupActionSystemMessage(text: String, isDarkTheme: Boolean, hasWallpaper: Boolean) {
+        val messageColor = if (isDarkTheme || hasWallpaper) Color.White else Color(0xFF2E7D32)
         Row(
                 modifier = Modifier.fillMaxWidth().padding(vertical = 6.dp),
                 horizontalArrangement = Arrangement.Center,
@@ -1302,7 +1304,7 @@ private fun GroupActionSystemMessage(text: String, isDarkTheme: Boolean) {
         ) {
                 Text(
                         text = text,
-                        color = successColor,
+                        color = messageColor,
                         fontSize = 12.sp,
                         fontWeight = FontWeight.SemiBold,
                         maxLines = 1,