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

---
 .../com/rosetta/messenger/ui/chats/ChatDetailScreen.kt    | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 b6764d7..251efa4 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
@@ -235,9 +235,12 @@ fun ChatDetailScreen(
         // UI Theme
         val backgroundColor = if (isDarkTheme) Color(0xFF1A1A1A) else Color(0xFFF2F2F7)
         val chatWallpaperResId = remember(chatWallpaperId) { ThemeWallpapers.drawableResOrNull(chatWallpaperId) }
+        val hasChatWallpaper = remember(chatWallpaperId, chatWallpaperResId) {
+                chatWallpaperId.isNotBlank() || chatWallpaperResId != null
+        }
         val textColor = if (isDarkTheme) Color.White else Color.Black
         val secondaryTextColor = if (isDarkTheme) Color(0xFF8E8E93) else Color(0xFF8E8E93)
-        val dateHeaderTextColor = if (isDarkTheme || chatWallpaperResId != null) Color.White else secondaryTextColor
+        val dateHeaderTextColor = if (isDarkTheme || hasChatWallpaper) Color.White else secondaryTextColor
         val headerIconColor = Color.White
 
         // 🔥 Keyboard & Emoji Coordinator
@@ -2588,8 +2591,7 @@ fun ChatDetailScreen(
                                                                                                 isDarkTheme =
                                                                                                         isDarkTheme,
                                                                                                 hasWallpaper =
-                                                                                                        chatWallpaperResId !=
-                                                                                                                null,
+                                                                                                        hasChatWallpaper,
                                                                                                 isSystemSafeChat =
                                                                                                         isSystemAccount,
                                                                                                 isSelectionMode =