From 5d1d45d334094e34238c7619b7c1d8a55cc49c76 Mon Sep 17 00:00:00 2001
From: Avently <7953703+avently@users.noreply.github.com>
Date: Sat, 11 Jan 2025 00:37:53 +0700
Subject: [PATCH] fix closing modal

---
 .../kotlin/chat/simplex/common/views/chatlist/ChatListView.kt   | 2 +-
 .../kotlin/chat/simplex/common/views/helpers/ModalView.kt       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
index 4ddf9326f7..80907062db 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatListView.kt
@@ -152,7 +152,7 @@ fun ChatListView(chatModel: ChatModel, userPickerState: MutableStateFlow<Animate
 
   if (appPlatform.isDesktop) {
     KeyChangeEffect(chatModel.chatId.value) {
-      if (chatModel.chatId.value != null) {
+      if (chatModel.chatId.value != null && !ModalManager.end.isLastModalOpen(ModalViewId.GROUP_REPORTS)) {
         ModalManager.end.closeModalsExceptFirst()
       }
       AudioPlayer.stop()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
index 54ea1c27b5..3e24629ab1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ModalView.kt
@@ -101,6 +101,8 @@ class ModalManager(private val placement: ModalPlacement? = null) {
 
   fun hasModalOpen(id: ModalViewId): Boolean = modalViews.any { it.id == id }
 
+  fun isLastModalOpen(id: ModalViewId): Boolean = modalViews.lastOrNull()?.id == id
+
   fun showModal(settings: Boolean = false, showClose: Boolean = true, id: ModalViewId? = null, endButtons: @Composable RowScope.() -> Unit = {}, content: @Composable ModalData.() -> Unit) {
     showCustomModal(id = id) { close ->
       ModalView(close, showClose = showClose, endButtons = endButtons, content = { content() })