From cf675269f0ed3856fd9349b147b6c31f0b179708 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Thu, 29 Jul 2021 13:23:42 +0200
Subject: [PATCH] merge event user to current user

---
 packages/stream_chat/lib/src/client/client.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index 8507423b..104b23fc 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -1340,7 +1340,7 @@ class ClientState {
               event.me != null && event.type != EventType.healthCheck)
           .map((e) => e.me!)
           .listen((user) {
-        currentUser = user;
+        currentUser = currentUser?.merge(user) ?? user;
         final totalUnreadCount = user.totalUnreadCount;
         _totalUnreadCountController.add(totalUnreadCount);