From a822fda6acea904e702cf8123b8b0f896b3cfae3 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 12 Sep 2025 00:51:09 +0600
Subject: [PATCH 1/9] flash chat button on new message

---
 .../unciv/logic/multiplayer/chat/ChatStore.kt | 45 +++++++++++++---
 .../src/com/unciv/ui/images/IconTextButton.kt |  8 +--
 .../ui/screens/worldscreen/chat/ChatButton.kt | 54 ++++++++++++++++++-
 .../ui/screens/worldscreen/chat/ChatPopup.kt  |  6 ++-
 core/src/com/unciv/utils/StringExtensions.kt  | 14 +++--
 5 files changed, 108 insertions(+), 19 deletions(-)

diff --git a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
index 910df82725..82dbbc2df4 100644
--- a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
+++ b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
@@ -1,7 +1,9 @@
 package com.unciv.logic.multiplayer.chat
 
 import com.badlogic.gdx.Gdx
+import com.unciv.UncivGame
 import com.unciv.ui.screens.worldscreen.chat.ChatPopup
+import com.unciv.utils.toUUIDOrNull
 import java.util.Collections.synchronizedMap
 import java.util.LinkedList
 import java.util.Queue
@@ -10,6 +12,8 @@ import java.util.UUID
 data class Chat(
     val gameId: UUID,
 ) {
+    var read = true
+
     // <civName, message> pairs
     private val messages: MutableList<Pair<String, String>> = mutableListOf(INITIAL_MESSAGE)
 
@@ -52,6 +56,8 @@ object ChatStore {
      */
     var chatPopup: ChatPopup? = null
 
+    var hasGlobalMessage = false
+
     private var gameIdToChat: MutableMap<UUID, Chat> = synchronizedMap(mutableMapOf())
 
     /** When no [ChatPopup] is open to receive these oddities, we keep them here.
@@ -72,21 +78,34 @@ object ChatStore {
         globalMessages = LinkedList()
     }
 
-    fun relayChatMessage(chat: Response.Chat) {
+    fun relayChatMessage(incomingChatMsg: Response.Chat) {
         Gdx.app.postRunnable {
-            if (chat.gameId == null || chat.gameId.isBlank()) {
-                relayGlobalMessage(chat.message, chat.civName)
+            if (incomingChatMsg.gameId == null || incomingChatMsg.gameId.isBlank()) {
+                relayGlobalMessage(incomingChatMsg.message, incomingChatMsg.civName)
             } else {
                 val gameId = try {
-                    UUID.fromString(chat.gameId)
+                    UUID.fromString(incomingChatMsg.gameId)
                 } catch (_: Throwable) {
                     // Discard messages with invalid UUID
                     return@postRunnable
                 }
 
-                getChatByGameId(gameId).addMessage(chat.civName, chat.message)
-                if (chatPopup?.chat?.gameId == gameId) {
-                    chatPopup?.addMessage(chat.civName, chat.message)
+                val chat = (chatPopup?.chat ?: getChatByGameId(gameId))
+                chat.addMessage(incomingChatMsg.civName, incomingChatMsg.message)
+                if (gameId.equals(chatPopup?.chat?.gameId)) {
+                    chatPopup?.addMessage(incomingChatMsg.civName, incomingChatMsg.message)
+                }
+
+                if (chatPopup == null && incomingChatMsg.civName != "System") {
+                    if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
+                        if (UncivGame.Current.worldScreen?.gameInfo?.currentPlayer != incomingChatMsg.civName) {
+                            UncivGame.Current.worldScreen?.chatButton?.chat?.read = false
+                            UncivGame.Current.worldScreen?.chatButton?.startFlashing()
+                        }
+                    } else {
+                        // some other game not currently on screen has a message
+                        chat.read = false
+                    }
                 }
             }
         }
@@ -103,7 +122,17 @@ object ChatStore {
 
     fun relayGlobalMessage(message: String, civName: String = "System") {
         Gdx.app.postRunnable {
-            chatPopup?.addMessage(civName, message, suffix = "one time") ?: globalMessages.add(Pair(civName, message))
+            if (civName != "System") {
+                hasGlobalMessage = chatPopup == null
+                if (hasGlobalMessage) UncivGame.Current.worldScreen?.chatButton?.startFlashing()
+            }
+
+            chatPopup?.addMessage(civName, message, suffix = "one time") ?: globalMessages.add(
+                Pair(
+                    civName,
+                    message
+                )
+            )
         }
     }
 }
diff --git a/core/src/com/unciv/ui/images/IconTextButton.kt b/core/src/com/unciv/ui/images/IconTextButton.kt
index ba0f8e0ed6..5a7a8921a3 100644
--- a/core/src/com/unciv/ui/images/IconTextButton.kt
+++ b/core/src/com/unciv/ui/images/IconTextButton.kt
@@ -7,8 +7,8 @@ import com.badlogic.gdx.scenes.scene2d.ui.Cell
 import com.badlogic.gdx.scenes.scene2d.ui.Label
 import com.badlogic.gdx.utils.Align
 import com.unciv.Constants
-import com.unciv.ui.components.fonts.Fonts
 import com.unciv.ui.components.extensions.toLabel
+import com.unciv.ui.components.fonts.Fonts
 import com.unciv.ui.screens.basescreen.BaseScreen
 
 /**
@@ -23,10 +23,11 @@ open class IconTextButton(
     text: String,
     val icon: Actor? = null,
     fontSize: Int = Constants.defaultFontSize,
-    fontColor: Color = Color.WHITE
-): Button(BaseScreen.skin) {
+    val fontColor: Color = Color.WHITE
+) : Button(BaseScreen.skin) {
     /** [Label] instance produced by, and with content and formatting as specified in [String.toLabel]. */
     val label = text.toLabel(fontColor, fontSize, hideIcons = true) // Since by definition we already have an icon
+
     /** Table cell containing the [icon] if any, or `null` (that is, when no [icon] was supplied, the Cell will exist but have no Actor). */
     val iconCell: Cell<Actor> =
         if (icon != null) {
@@ -37,6 +38,7 @@ open class IconTextButton(
         } else {
             add().padRight(fontSize / 2f)
         }
+
     /** Table cell instance containing the [label]. */
     val labelCell: Cell<Label> = add(label)
 
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index ea304e7c7f..ef674a724d 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -1,22 +1,38 @@
 package com.unciv.ui.screens.worldscreen.chat
 
+import com.badlogic.gdx.Gdx
+import com.badlogic.gdx.graphics.Color
+import com.badlogic.gdx.utils.Disposable
 import com.unciv.UncivGame
+import com.unciv.logic.multiplayer.chat.ChatStore
 import com.unciv.logic.multiplayer.chat.ChatWebSocket
 import com.unciv.logic.multiplayer.chat.Message
 import com.unciv.ui.components.input.onClick
 import com.unciv.ui.images.IconTextButton
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.worldscreen.WorldScreen
+import com.unciv.utils.Concurrency
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
 
 class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
     "Chat", ImageGetter.getImage("OtherIcons/Chat"), 23
-) {
+), Disposable {
+    val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
+
     init {
         width = 95f
         iconCell.pad(3f).center()
 
+        if (!chat.read || ChatStore.hasGlobalMessage) {
+            startFlashing()
+        }
+
         onClick {
-            ChatPopup(worldScreen).open()
+            stopFlashing()
+            ChatPopup(chat, worldScreen).open()
         }
 
         refreshVisibility()
@@ -45,4 +61,38 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
         worldScreen.techPolicyAndDiplomacy.x.coerceAtLeast(1f),
         worldScreen.techPolicyAndDiplomacy.y - height - 1f
     )
+
+    private var flashJob: Job? = null
+
+    fun startFlashing(targetColor: Color = Color.ORANGE, interval: Duration = 500.milliseconds) {
+        flashJob?.cancel()
+        flashJob = Concurrency.run("ChatButton color flash") {
+            var isAlternatingColor = true
+            while (true) {
+                Gdx.app.postRunnable {
+                    if (isAlternatingColor) {
+                        icon?.color = targetColor
+                        label.color = targetColor
+                    } else {
+                        icon?.color = fontColor
+                        label.color = fontColor
+                    }
+
+                    isAlternatingColor = !isAlternatingColor
+                }
+
+                delay(interval)
+            }
+        }
+    }
+
+    private fun stopFlashing() {
+        flashJob?.cancel()
+        icon?.color = fontColor
+        label.color = fontColor
+    }
+
+    override fun dispose() {
+        flashJob?.cancel()
+    }
 }
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
index 69df3b5333..a5e55b93a1 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
@@ -11,6 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
 import com.badlogic.gdx.scenes.scene2d.ui.Table
 import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
+import com.unciv.logic.multiplayer.chat.Chat
 import com.unciv.logic.multiplayer.chat.ChatStore
 import com.unciv.models.translations.tr
 import com.unciv.ui.components.extensions.coerceLightnessAtLeast
@@ -28,6 +29,7 @@ private val civChatColorsMap = mapOf<String, Color>(
 )
 
 class ChatPopup(
+    val chat: Chat,
     private val worldScreen: WorldScreen,
 ) : Popup(screen = worldScreen, scrollable = Scrollability.None) {
     companion object {
@@ -35,8 +37,6 @@ class ChatPopup(
         const val CIVNAME_COLOR_MIN_LIGHTNESS = 0.60f
     }
 
-    val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
-
     private val chatTable = Table(skin)
     private val scrollPane = ScrollPane(chatTable, skin)
     private val messageField = UncivTextField(
@@ -44,7 +44,9 @@ class ChatPopup(
     )
 
     init {
+        chat.read = true
         ChatStore.chatPopup = this
+        ChatStore.hasGlobalMessage = false
         chatTable.defaults().growX().pad(5f).center()
 
         /**
diff --git a/core/src/com/unciv/utils/StringExtensions.kt b/core/src/com/unciv/utils/StringExtensions.kt
index 5b928a05d6..88b2f954e8 100644
--- a/core/src/com/unciv/utils/StringExtensions.kt
+++ b/core/src/com/unciv/utils/StringExtensions.kt
@@ -4,12 +4,18 @@ import yairm210.purity.annotations.Pure
 import java.util.UUID
 
 /**
- * Checks if a [String] is a valid UUID
+ * Tries to convert a [String] to a valid [UUID]
+ * and returns `null` upon failure
  */
 @Pure
-fun String.isUUID(): Boolean = try {
+fun String.toUUIDOrNull(): UUID? = try {
     UUID.fromString(this)
-    true
 } catch (_: Throwable) {
-    false
+    null
 }
+
+/**
+ * Checks if a [String] is a valid [UUID]
+ */
+@Pure
+fun String.isUUID(): Boolean = toUUIDOrNull() != null

From 1433ba1a8d28e6f6d885a8730826500aa67c5fa5 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 12 Sep 2025 01:13:24 +0600
Subject: [PATCH 2/9] some minor refactor and comments improvement

---
 .../src/com/unciv/logic/multiplayer/chat/ChatStore.kt | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
index 82dbbc2df4..b0038c32ae 100644
--- a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
+++ b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
@@ -90,7 +90,7 @@ object ChatStore {
                     return@postRunnable
                 }
 
-                val chat = (chatPopup?.chat ?: getChatByGameId(gameId))
+                val chat = chatPopup?.chat ?: getChatByGameId(gameId)
                 chat.addMessage(incomingChatMsg.civName, incomingChatMsg.message)
                 if (gameId.equals(chatPopup?.chat?.gameId)) {
                     chatPopup?.addMessage(incomingChatMsg.civName, incomingChatMsg.message)
@@ -98,6 +98,7 @@ object ChatStore {
 
                 if (chatPopup == null && incomingChatMsg.civName != "System") {
                     if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
+                        // ensures that you are not getting notified for your own messages
                         if (UncivGame.Current.worldScreen?.gameInfo?.currentPlayer != incomingChatMsg.civName) {
                             UncivGame.Current.worldScreen?.chatButton?.chat?.read = false
                             UncivGame.Current.worldScreen?.chatButton?.startFlashing()
@@ -127,12 +128,8 @@ object ChatStore {
                 if (hasGlobalMessage) UncivGame.Current.worldScreen?.chatButton?.startFlashing()
             }
 
-            chatPopup?.addMessage(civName, message, suffix = "one time") ?: globalMessages.add(
-                Pair(
-                    civName,
-                    message
-                )
-            )
+            chatPopup?.addMessage(civName, message, suffix = "one time")
+                ?: globalMessages.add(Pair(civName, message))
         }
     }
 }

From 76d969074a0c2e5d397904068f623f444c042975 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 12 Sep 2025 21:23:31 +0600
Subject: [PATCH 3/9] handle case where player is out of WorldScreen

---
 core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
index b0038c32ae..23c5245759 100644
--- a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
+++ b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
@@ -97,10 +97,13 @@ object ChatStore {
                 }
 
                 if (chatPopup == null && incomingChatMsg.civName != "System") {
-                    if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
+                    if (UncivGame.Current.worldScreen == null) {
+                        // user is out of world screen
+                        chat.read = false
+                    } else if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
                         // ensures that you are not getting notified for your own messages
                         if (UncivGame.Current.worldScreen?.gameInfo?.currentPlayer != incomingChatMsg.civName) {
-                            UncivGame.Current.worldScreen?.chatButton?.chat?.read = false
+                            chat.read = false
                             UncivGame.Current.worldScreen?.chatButton?.startFlashing()
                         }
                     } else {

From 437f89bffcb987c7a0cb58acfb680880812311da Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 12 Sep 2025 21:29:19 +0600
Subject: [PATCH 4/9] minor refactor

---
 core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
index 23c5245759..e5d6e2b858 100644
--- a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
+++ b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
@@ -97,16 +97,14 @@ object ChatStore {
                 }
 
                 if (chatPopup == null && incomingChatMsg.civName != "System") {
-                    if (UncivGame.Current.worldScreen == null) {
-                        // user is out of world screen
-                        chat.read = false
-                    } else if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
+                    if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
                         // ensures that you are not getting notified for your own messages
                         if (UncivGame.Current.worldScreen?.gameInfo?.currentPlayer != incomingChatMsg.civName) {
                             chat.read = false
                             UncivGame.Current.worldScreen?.chatButton?.startFlashing()
                         }
                     } else {
+                        // user is out of world screen or
                         // some other game not currently on screen has a message
                         chat.read = false
                     }

From 16c561b9a186e21210ed751f6ce5468e0a80ec0c Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Sun, 14 Sep 2025 16:13:07 +0600
Subject: [PATCH 5/9] add badge to display unread messages count, and set flash
 time to 5s, isolate flash logic in a new class `AlternatingStateManager`

---
 .../unciv/logic/AlternatingStateManager.kt    |  52 +++++++++
 .../unciv/logic/multiplayer/chat/ChatStore.kt |  10 +-
 .../ui/screens/worldscreen/chat/ChatButton.kt | 107 +++++++++++-------
 .../ui/screens/worldscreen/chat/ChatPopup.kt  |   1 -
 .../status/MultiplayerStatusButton.kt         |  60 +++++-----
 5 files changed, 151 insertions(+), 79 deletions(-)
 create mode 100644 core/src/com/unciv/logic/AlternatingStateManager.kt

diff --git a/core/src/com/unciv/logic/AlternatingStateManager.kt b/core/src/com/unciv/logic/AlternatingStateManager.kt
new file mode 100644
index 0000000000..b3624da95e
--- /dev/null
+++ b/core/src/com/unciv/logic/AlternatingStateManager.kt
@@ -0,0 +1,52 @@
+package com.unciv.logic
+
+import com.unciv.utils.Concurrency
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlin.time.Clock
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+import kotlin.time.ExperimentalTime
+
+class AlternatingStateManager<State>(
+    private val name: String,
+    private val state: State,
+    private val originalState: (State) -> Unit,
+    private val alternateState: (State) -> Unit
+) {
+    private var job: Job? = null
+
+    @OptIn(ExperimentalTime::class)
+    fun start(
+        duration: Duration = 5.seconds, interval: Duration = 500.milliseconds
+    ) {
+        job?.cancel()
+        job = Concurrency.run(name) {
+            val startTime = Clock.System.now()
+
+            var isAlternateState = true
+            while (true) {
+                if (isAlternateState) {
+                    alternateState(state)
+                    isAlternateState = false
+                } else {
+                    originalState(state)
+                    isAlternateState = true
+                }
+
+                if (Clock.System.now() - startTime >= duration) {
+                    originalState(state)
+                    return@run
+                }
+
+                delay(interval)
+            }
+        }
+    }
+
+    fun stop() {
+        job?.cancel()
+        originalState(state)
+    }
+}
diff --git a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
index e5d6e2b858..f7b5fc10b7 100644
--- a/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
+++ b/core/src/com/unciv/logic/multiplayer/chat/ChatStore.kt
@@ -12,7 +12,7 @@ import java.util.UUID
 data class Chat(
     val gameId: UUID,
 ) {
-    var read = true
+    var unreadCount = 0
 
     // <civName, message> pairs
     private val messages: MutableList<Pair<String, String>> = mutableListOf(INITIAL_MESSAGE)
@@ -100,13 +100,13 @@ object ChatStore {
                     if (gameId.equals(UncivGame.Current.worldScreen?.gameInfo?.gameId?.toUUIDOrNull())) {
                         // ensures that you are not getting notified for your own messages
                         if (UncivGame.Current.worldScreen?.gameInfo?.currentPlayer != incomingChatMsg.civName) {
-                            chat.read = false
-                            UncivGame.Current.worldScreen?.chatButton?.startFlashing()
+                            chat.unreadCount++
+                            UncivGame.Current.worldScreen?.chatButton?.triggerChatIndication()
                         }
                     } else {
                         // user is out of world screen or
                         // some other game not currently on screen has a message
-                        chat.read = false
+                        chat.unreadCount++
                     }
                 }
             }
@@ -126,7 +126,7 @@ object ChatStore {
         Gdx.app.postRunnable {
             if (civName != "System") {
                 hasGlobalMessage = chatPopup == null
-                if (hasGlobalMessage) UncivGame.Current.worldScreen?.chatButton?.startFlashing()
+                if (hasGlobalMessage) UncivGame.Current.worldScreen?.chatButton?.triggerChatIndication()
             }
 
             chatPopup?.addMessage(civName, message, suffix = "one time")
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index ef674a724d..2f9e03e77f 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -2,36 +2,88 @@ package com.unciv.ui.screens.worldscreen.chat
 
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
-import com.badlogic.gdx.utils.Disposable
+import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
+import com.unciv.logic.AlternatingStateManager
 import com.unciv.logic.multiplayer.chat.ChatStore
 import com.unciv.logic.multiplayer.chat.ChatWebSocket
 import com.unciv.logic.multiplayer.chat.Message
+import com.unciv.ui.components.extensions.disable
+import com.unciv.ui.components.extensions.toTextButton
 import com.unciv.ui.components.input.onClick
 import com.unciv.ui.images.IconTextButton
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.worldscreen.WorldScreen
-import com.unciv.utils.Concurrency
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.milliseconds
 
 class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
     "Chat", ImageGetter.getImage("OtherIcons/Chat"), 23
-), Disposable {
+) {
     val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
 
+    val badge = "".toTextButton().apply {
+        disable()
+        setColor(Color.valueOf("da1e28"))
+        label.setColor(Color.WHITE)
+        label.setAlignment(Align.center)
+        label.setFontScale(0.2f)
+    }
+
+    val flash = AlternatingStateManager(
+        name = "ChatButton color flash",
+        state = object {
+            val initialColor = fontColor
+            val targetColor = Color.ORANGE
+        }, originalState = { state ->
+            Gdx.app.postRunnable {
+                icon?.color = state.initialColor
+                label.color = state.initialColor
+            }
+        }, alternateState = { state ->
+            Gdx.app.postRunnable {
+                icon?.color = state.targetColor
+                label.color = state.targetColor
+            }
+        }
+    )
+
+    private fun updateBadge(visible: Boolean = false) {
+        badge.height = height / 3
+        badge.setPosition(
+            width - badge.width / 1.5f,
+            height - badge.height / 1.5f
+        )
+
+        badge.isVisible = visible || chat.unreadCount > 0 || ChatStore.hasGlobalMessage
+
+        if (badge.isVisible) {
+            var text = chat.unreadCount.toString()
+            if (ChatStore.hasGlobalMessage) {
+                text += '+'
+            }
+            badge.setText(text)
+        }
+    }
+
+    fun triggerChatIndication() {
+        updateBadge()
+        flash.start()
+    }
+
     init {
         width = 95f
         iconCell.pad(3f).center()
+        addActor(badge)
 
-        if (!chat.read || ChatStore.hasGlobalMessage) {
-            startFlashing()
+        if (chat.unreadCount > 0 || ChatStore.hasGlobalMessage) {
+            updateBadge(true)
+            flash.stop()
         }
 
         onClick {
-            stopFlashing()
+            chat.unreadCount = 0
+            updateBadge()
+            flash.stop()
+
             ChatPopup(chat, worldScreen).open()
         }
 
@@ -50,6 +102,7 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
                 Message.Join(listOf(worldScreen.gameInfo.gameId)),
             )
             updatePosition()
+            updateBadge()
             true
         } else {
             ChatWebSocket.stop()
@@ -61,38 +114,4 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
         worldScreen.techPolicyAndDiplomacy.x.coerceAtLeast(1f),
         worldScreen.techPolicyAndDiplomacy.y - height - 1f
     )
-
-    private var flashJob: Job? = null
-
-    fun startFlashing(targetColor: Color = Color.ORANGE, interval: Duration = 500.milliseconds) {
-        flashJob?.cancel()
-        flashJob = Concurrency.run("ChatButton color flash") {
-            var isAlternatingColor = true
-            while (true) {
-                Gdx.app.postRunnable {
-                    if (isAlternatingColor) {
-                        icon?.color = targetColor
-                        label.color = targetColor
-                    } else {
-                        icon?.color = fontColor
-                        label.color = fontColor
-                    }
-
-                    isAlternatingColor = !isAlternatingColor
-                }
-
-                delay(interval)
-            }
-        }
-    }
-
-    private fun stopFlashing() {
-        flashJob?.cancel()
-        icon?.color = fontColor
-        label.color = fontColor
-    }
-
-    override fun dispose() {
-        flashJob?.cancel()
-    }
 }
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
index a5e55b93a1..6bf74798e4 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
@@ -44,7 +44,6 @@ class ChatPopup(
     )
 
     init {
-        chat.read = true
         ChatStore.chatPopup = this
         ChatStore.hasGlobalMessage = false
         chatTable.defaults().growX().pad(5f).center()
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
index aa5d7f5d40..fb65e82634 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
@@ -1,21 +1,22 @@
 package com.unciv.ui.screens.worldscreen.status
 
+import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.ui.Button
 import com.badlogic.gdx.scenes.scene2d.ui.Cell
 import com.badlogic.gdx.scenes.scene2d.ui.HorizontalGroup
-import com.badlogic.gdx.scenes.scene2d.ui.Image
 import com.badlogic.gdx.scenes.scene2d.ui.Label
 import com.badlogic.gdx.utils.Disposable
 import com.unciv.UncivGame
+import com.unciv.logic.AlternatingStateManager
 import com.unciv.logic.event.EventBus
 import com.unciv.logic.multiplayer.HasMultiplayerGameName
 import com.unciv.logic.multiplayer.MultiplayerGameNameChanged
+import com.unciv.logic.multiplayer.MultiplayerGamePreview
 import com.unciv.logic.multiplayer.MultiplayerGameUpdateEnded
 import com.unciv.logic.multiplayer.MultiplayerGameUpdateStarted
 import com.unciv.logic.multiplayer.MultiplayerGameUpdated
-import com.unciv.logic.multiplayer.MultiplayerGamePreview
 import com.unciv.logic.multiplayer.isUsersTurn
 import com.unciv.models.translations.tr
 import com.unciv.ui.components.extensions.setSize
@@ -24,20 +25,20 @@ import com.unciv.ui.components.widgets.LoadingImage
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.basescreen.BaseScreen
 import com.unciv.utils.Concurrency
-import com.unciv.utils.launchOnGLThread
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
+import kotlin.time.Duration.Companion.seconds
 
 class MultiplayerStatusButton(
     screen: BaseScreen,
     curGame: MultiplayerGamePreview?
 ) : Button(BaseScreen.skin), Disposable {
     private var curGameName = curGame?.name
-    private val loadingImage = LoadingImage(style = LoadingImage.Style(
-        idleImageName = "OtherIcons/Multiplayer",
-        idleIconColor = Color.WHITE,
-        minShowTime = 500
-    ))
+    private val loadingImage = LoadingImage(
+        style = LoadingImage.Style(
+            idleImageName = "OtherIcons/Multiplayer",
+            idleIconColor = Color.WHITE,
+            minShowTime = 500
+        )
+    )
     private val turnIndicator = TurnIndicator()
     private val turnIndicatorCell: Cell<Actor>
     private val gameNamesWithCurrentTurn = getInitialGamesWithCurrentTurn()
@@ -96,7 +97,7 @@ class MultiplayerStatusButton(
     }
 
     private fun updateTurnIndicator(flash: Boolean = true) {
-        if (gameNamesWithCurrentTurn.size == 0) {
+        if (gameNamesWithCurrentTurn.isEmpty()) {
             turnIndicatorCell.clearActor()
         } else {
             turnIndicatorCell.setActor(turnIndicator)
@@ -105,7 +106,7 @@ class MultiplayerStatusButton(
 
         // flash so the user sees an better update
         if (flash) {
-            turnIndicator.flash()
+            turnIndicator.flash.start(3.seconds)
         }
     }
 
@@ -118,10 +119,9 @@ class MultiplayerStatusButton(
 
 private class TurnIndicator : HorizontalGroup(), Disposable {
     val gameAmount = Label("2", BaseScreen.skin)
-    val image: Image
-    private var job: Job? = null
+    val image = ImageGetter.getImage("OtherIcons/ExclamationMark")
+
     init {
-        image = ImageGetter.getImage("OtherIcons/ExclamationMark")
         image.setSize(30f)
         addActor(image)
     }
@@ -135,23 +135,25 @@ private class TurnIndicator : HorizontalGroup(), Disposable {
         }
     }
 
-    fun flash() {
-        // using a gdx Action would be nicer, but we don't necessarily have continuousRendering on and we still want to flash
-        flash(6, Color.WHITE, Color.ORANGE)
-    }
-    private fun flash(alternations: Int, curColor: Color, nextColor: Color) {
-        if (alternations == 0) return
-        gameAmount.color = nextColor
-        image.color = nextColor
-        job = Concurrency.run("StatusButton color flash") {
-            delay(500)
-            launchOnGLThread {
-                flash(alternations - 1, nextColor, curColor)
+    val flash = AlternatingStateManager(
+        name = "StatusButton color flash",
+        state = object {
+            val initialColor = Color.WHITE
+            val targetColor = Color.ORANGE
+        }, originalState = { state ->
+            Gdx.app.postRunnable {
+                image.color = state.initialColor
+                gameAmount.color = state.initialColor
+            }
+        }, alternateState = { state ->
+            Gdx.app.postRunnable {
+                image.color = state.targetColor
+                gameAmount.color = state.targetColor
             }
         }
-    }
+    )
 
     override fun dispose() {
-        job?.cancel()
+        flash.stop()
     }
 }

From 62630d53ddd08a48a20fe7be28c37afcd0359978 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 19 Sep 2025 23:16:52 +0600
Subject: [PATCH 6/9] lighten `AlternatingStateManager`

---
 .../unciv/logic/AlternatingStateManager.kt    | 16 +++++++--------
 .../ui/screens/worldscreen/chat/ChatButton.kt | 20 ++++++-------------
 .../status/MultiplayerStatusButton.kt         | 20 ++++++-------------
 3 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/core/src/com/unciv/logic/AlternatingStateManager.kt b/core/src/com/unciv/logic/AlternatingStateManager.kt
index b3624da95e..707186035c 100644
--- a/core/src/com/unciv/logic/AlternatingStateManager.kt
+++ b/core/src/com/unciv/logic/AlternatingStateManager.kt
@@ -1,5 +1,6 @@
 package com.unciv.logic
 
+import com.badlogic.gdx.Gdx
 import com.unciv.utils.Concurrency
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
@@ -9,11 +10,10 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.ExperimentalTime
 
-class AlternatingStateManager<State>(
+class AlternatingStateManager(
     private val name: String,
-    private val state: State,
-    private val originalState: (State) -> Unit,
-    private val alternateState: (State) -> Unit
+    private val originalState: () -> Unit,
+    private val alternateState: () -> Unit
 ) {
     private var job: Job? = null
 
@@ -28,15 +28,15 @@ class AlternatingStateManager<State>(
             var isAlternateState = true
             while (true) {
                 if (isAlternateState) {
-                    alternateState(state)
+                    Gdx.app.postRunnable(alternateState)
                     isAlternateState = false
                 } else {
-                    originalState(state)
+                    Gdx.app.postRunnable(originalState)
                     isAlternateState = true
                 }
 
                 if (Clock.System.now() - startTime >= duration) {
-                    originalState(state)
+                    Gdx.app.postRunnable(originalState)
                     return@run
                 }
 
@@ -47,6 +47,6 @@ class AlternatingStateManager<State>(
 
     fun stop() {
         job?.cancel()
-        originalState(state)
+        Gdx.app.postRunnable(originalState)
     }
 }
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index 2f9e03e77f..73fdf7e8dd 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -1,6 +1,5 @@
 package com.unciv.ui.screens.worldscreen.chat
 
-import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.utils.Align
 import com.unciv.UncivGame
@@ -30,19 +29,12 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
 
     val flash = AlternatingStateManager(
         name = "ChatButton color flash",
-        state = object {
-            val initialColor = fontColor
-            val targetColor = Color.ORANGE
-        }, originalState = { state ->
-            Gdx.app.postRunnable {
-                icon?.color = state.initialColor
-                label.color = state.initialColor
-            }
-        }, alternateState = { state ->
-            Gdx.app.postRunnable {
-                icon?.color = state.targetColor
-                label.color = state.targetColor
-            }
+        originalState = {
+            icon?.color = fontColor
+            label.color = fontColor
+        }, alternateState = {
+            icon?.color = Color.ORANGE
+            label.color = Color.ORANGE
         }
     )
 
diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
index fb65e82634..b9351cc76d 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/status/MultiplayerStatusButton.kt
@@ -1,6 +1,5 @@
 package com.unciv.ui.screens.worldscreen.status
 
-import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.Actor
 import com.badlogic.gdx.scenes.scene2d.ui.Button
@@ -137,19 +136,12 @@ private class TurnIndicator : HorizontalGroup(), Disposable {
 
     val flash = AlternatingStateManager(
         name = "StatusButton color flash",
-        state = object {
-            val initialColor = Color.WHITE
-            val targetColor = Color.ORANGE
-        }, originalState = { state ->
-            Gdx.app.postRunnable {
-                image.color = state.initialColor
-                gameAmount.color = state.initialColor
-            }
-        }, alternateState = { state ->
-            Gdx.app.postRunnable {
-                image.color = state.targetColor
-                gameAmount.color = state.targetColor
-            }
+        originalState = {
+            image.color = Color.WHITE
+            gameAmount.color = Color.WHITE
+        }, alternateState = {
+            image.color = Color.ORANGE
+            gameAmount.color = Color.ORANGE
         }
     )
 

From 5e866144a0395c4c5ff3a4c55f8ab8bcf940e19c Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Fri, 19 Sep 2025 23:36:44 +0600
Subject: [PATCH 7/9] use `SmallButtonStyle`

---
 .../src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index 73fdf7e8dd..6108622129 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -7,6 +7,7 @@ import com.unciv.logic.AlternatingStateManager
 import com.unciv.logic.multiplayer.chat.ChatStore
 import com.unciv.logic.multiplayer.chat.ChatWebSocket
 import com.unciv.logic.multiplayer.chat.Message
+import com.unciv.ui.components.SmallButtonStyle
 import com.unciv.ui.components.extensions.disable
 import com.unciv.ui.components.extensions.toTextButton
 import com.unciv.ui.components.input.onClick
@@ -14,14 +15,15 @@ import com.unciv.ui.images.IconTextButton
 import com.unciv.ui.images.ImageGetter
 import com.unciv.ui.screens.worldscreen.WorldScreen
 
+private val smallButtonStyle = SmallButtonStyle()
+
 class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
     "Chat", ImageGetter.getImage("OtherIcons/Chat"), 23
 ) {
     val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
 
-    val badge = "".toTextButton().apply {
+    val badge = "".toTextButton(smallButtonStyle).apply {
         disable()
-        setColor(Color.valueOf("da1e28"))
         label.setColor(Color.WHITE)
         label.setAlignment(Align.center)
         label.setFontScale(0.2f)

From 65716d6db94ab9f7ba1c7fb4f232f9ef0def9967 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Sat, 20 Sep 2025 00:04:32 +0600
Subject: [PATCH 8/9] fix a bug where clicking `ChatButton` does not update
 badge state properly

---
 .../ui/screens/worldscreen/chat/ChatButton.kt      | 14 +++++---------
 .../unciv/ui/screens/worldscreen/chat/ChatPopup.kt |  1 -
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index 6108622129..08d42da4bd 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -40,14 +40,14 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
         }
     )
 
-    private fun updateBadge(visible: Boolean = false) {
+    private fun updateBadge() {
         badge.height = height / 3
         badge.setPosition(
             width - badge.width / 1.5f,
             height - badge.height / 1.5f
         )
 
-        badge.isVisible = visible || chat.unreadCount > 0 || ChatStore.hasGlobalMessage
+        badge.isVisible = chat.unreadCount > 0 || ChatStore.hasGlobalMessage
 
         if (badge.isVisible) {
             var text = chat.unreadCount.toString()
@@ -55,7 +55,7 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
                 text += '+'
             }
             badge.setText(text)
-        }
+        } else flash.stop()
     }
 
     fun triggerChatIndication() {
@@ -67,16 +67,12 @@ class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
         width = 95f
         iconCell.pad(3f).center()
         addActor(badge)
-
-        if (chat.unreadCount > 0 || ChatStore.hasGlobalMessage) {
-            updateBadge(true)
-            flash.stop()
-        }
+        updateBadge()
 
         onClick {
             chat.unreadCount = 0
+            ChatStore.hasGlobalMessage = false
             updateBadge()
-            flash.stop()
 
             ChatPopup(chat, worldScreen).open()
         }
diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
index 6bf74798e4..86d75947ed 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatPopup.kt
@@ -45,7 +45,6 @@ class ChatPopup(
 
     init {
         ChatStore.chatPopup = this
-        ChatStore.hasGlobalMessage = false
         chatTable.defaults().growX().pad(5f).center()
 
         /**

From 63755fd8db79b13f7f12c27b66983f86181a0b50 Mon Sep 17 00:00:00 2001
From: "Md. Touhidur Rahman" <touhidurrr@pm.me>
Date: Sat, 20 Sep 2025 00:12:38 +0600
Subject: [PATCH 9/9] make some values `private`

---
 .../src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
index 08d42da4bd..b3f078c7da 100644
--- a/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
+++ b/core/src/com/unciv/ui/screens/worldscreen/chat/ChatButton.kt
@@ -20,16 +20,16 @@ private val smallButtonStyle = SmallButtonStyle()
 class ChatButton(val worldScreen: WorldScreen) : IconTextButton(
     "Chat", ImageGetter.getImage("OtherIcons/Chat"), 23
 ) {
-    val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
+    private val chat = ChatStore.getChatByGameId(worldScreen.gameInfo.gameId)
 
-    val badge = "".toTextButton(smallButtonStyle).apply {
+    private val badge = "".toTextButton(smallButtonStyle).apply {
         disable()
         label.setColor(Color.WHITE)
         label.setAlignment(Align.center)
         label.setFontScale(0.2f)
     }
 
-    val flash = AlternatingStateManager(
+    private val flash = AlternatingStateManager(
         name = "ChatButton color flash",
         originalState = {
             icon?.color = fontColor