Fixed issue when remote reaction wasn't appear in the chat real time (#…

…403)
unstoppabledomains · Feb 29, 2024 · 288a4e6 · 288a4e6
1 parent 9f7b73c
commit 288a4e6
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/unstoppable-ios-app/domains-manager-ios/Modules/Messaging/Chat/ChatView/ChatViewModel.swift b/unstoppable-ios-app/domains-manager-ios/Modules/Messaging/Chat/ChatView/ChatViewModel.swift
@@ -1120,20 +1120,27 @@ extension ChatViewModel: MessagingServiceListener {
            case .existingChat(let chat) = conversationState,
            chatId == chat.id,
            !messages.isEmpty {
-            let messages = messages.filter { !$0.isReactionMessage }
             await self.addMessages(messages, scrollToBottom: true)
         }
     }
 
     private func updateMessageFromUpdatedData(_ updatedMessage: MessagingChatMessageDisplayInfo, with newMessage: MessagingChatMessageDisplayInfo) async {
-        if case .existingChat(let chat) = conversationState,
-           updatedMessage.chatId == chat.id,
-           let i = self.messages.firstIndex(where: { $0.id == updatedMessage.id }) {
+        guard case .existingChat(let chat) = conversationState,
+              updatedMessage.chatId == chat.id else { return }
+
+        if let i = self.messages.firstIndex(where: { $0.id == updatedMessage.id }) {
             var newMessage = newMessage
             await newMessage.prepareToDisplay()
             self.messages[i] = newMessage
+            messagesCache.remove(updatedMessage)
             messagesCache.insert(newMessage)
         }
+
+        if case .reaction(let info) = updatedMessage.type {
+            let currentReactions = messagesToReactions[info.messageId] ?? []
+            let filteredReactions = currentReactions.filter({ $0.messageId == updatedMessage.id })
+            messagesToReactions[info.messageId] = filteredReactions
+        }
     }
 }