From b81e5b13b30a3dabc0ab1c7a61dc5c5616200eaf Mon Sep 17 00:00:00 2001
From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>
Date: Tue, 13 May 2025 14:01:53 +0000
Subject: [PATCH] ui: fix messages being sent in wrong scope after receiving an
 item in support scope (#5903)

---
 apps/ios/Shared/Model/ChatModel.swift                       | 6 +++++-
 .../kotlin/chat/simplex/common/model/ChatModel.kt           | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/ios/Shared/Model/ChatModel.swift b/apps/ios/Shared/Model/ChatModel.swift
index 3588ec8db4..4d3fd0808d 100644
--- a/apps/ios/Shared/Model/ChatModel.swift
+++ b/apps/ios/Shared/Model/ChatModel.swift
@@ -499,7 +499,11 @@ final class ChatModel: ObservableObject {
 
     func updateChatInfo(_ cInfo: ChatInfo) {
         if let i = getChatIndex(cInfo.id) {
-            chats[i].chatInfo = cInfo
+            if case let .group(groupInfo, groupChatScope) = cInfo, groupChatScope != nil {
+                chats[i].chatInfo = .group(groupInfo: groupInfo, groupChatScope: nil)
+            } else {
+                chats[i].chatInfo = cInfo
+            }
             chats[i].created = Date.now
         }
     }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
index d5344f5aa3..37c37cd211 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -355,6 +355,8 @@ object ChatModel {
               )
             )
           }
+        } else if (currentCInfo is ChatInfo.Group && newCInfo is ChatInfo.Group && newCInfo.groupChatScope != null) {
+          newCInfo = newCInfo.copy(groupInfo = newCInfo.groupInfo, groupChatScope = null)
         }
         chats[i] = chats[i].copy(chatInfo = newCInfo)
       }