From 13df95a1071bcf96964efd9a83d0147b0981f63e Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Mon, 26 Jul 2021 12:54:41 +0530
Subject: [PATCH] fix(llc): reverse user, event.me merge position

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md               | 1 +
 packages/stream_chat/lib/src/client/client.dart | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 430b0c36..12b65f70 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -3,6 +3,7 @@
 🐞 Fixed
 
 - [#563](https://github.com/GetStream/stream-chat-flutter/issues/563): `Channel.stopWatching()` not working 
+- [#575](https://github.com/GetStream/stream-chat-flutter/issues/575): Wrong `OwnUser.*`
 
 ## 2.0.0
 
diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart
index 41fe2e7a..6f90fe2f 100644
--- a/packages/stream_chat/lib/src/client/client.dart
+++ b/packages/stream_chat/lib/src/client/client.dart
@@ -332,7 +332,7 @@ class StreamChatClient {
     } catch (e, stk) {
       if (e is StreamWebSocketError && e.isRetriable) {
         final event = await _chatPersistenceClient?.getConnectionInfo();
-        if (event != null) return event.me?.merge(ownUser) ?? ownUser;
+        if (event != null) return ownUser.merge(event.me);
       }
       logger.severe('error connecting user : ${ownUser.id}', e, stk);
       rethrow;
@@ -371,7 +371,7 @@ class StreamChatClient {
 
     try {
       final event = await _ws.connect(user);
-      return event.me?.merge(user) ?? user;
+      return user.merge(event.me);
     } catch (e, stk) {
       logger.severe('error connecting ws', e, stk);
       rethrow;