From 578c4efade12d83a2bb63fd5365ce535b06dcceb Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 1 Mar 2021 10:12:41 +0100
Subject: [PATCH] fix ChannelState.addMessage

---
 packages/stream_chat/lib/src/api/channel.dart     | 2 +-
 packages/stream_chat/lib/src/api/retry_queue.dart | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/stream_chat/lib/src/api/channel.dart b/packages/stream_chat/lib/src/api/channel.dart
index 1f5da466..38f990b0 100644
--- a/packages/stream_chat/lib/src/api/channel.dart
+++ b/packages/stream_chat/lib/src/api/channel.dart
@@ -1441,7 +1441,7 @@ class ChannelClientState {
 
       final oldIndex = newMessages.indexWhere((m) => m.id == message.id);
       if (oldIndex != -1) {
-        newMessages[oldIndex] = newMessages[oldIndex].merge(message);
+        newMessages[oldIndex] = message;
       } else {
         newMessages.add(message);
       }
diff --git a/packages/stream_chat/lib/src/api/retry_queue.dart b/packages/stream_chat/lib/src/api/retry_queue.dart
index de3ca610..34046545 100644
--- a/packages/stream_chat/lib/src/api/retry_queue.dart
+++ b/packages/stream_chat/lib/src/api/retry_queue.dart
@@ -47,6 +47,7 @@ class RetryQueue {
 
   /// Add a list of messages
   void add(List<Message> messages) {
+    logger?.info('added ${messages.length} messages');
     final messageList = _messageQueue.toList();
     _messageQueue.addAll(messages
         .where((element) => !messageList.any((m) => m.id == element.id)));