Merge branch 'develop' into v4

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ## 4.0.0-beta.0
 
 ✅ Added
@@ -7,6 +8,13 @@
 🐞 Fixed
 
 - Minor fixes and improvements.
+=======
+## 3.6.1
+
+🐞 Fixed
+
+- [[#1081]](https://github.com/GetStream/stream-chat-flutter/issues/1081) Fixed a bug with user reconnection.
+>>>>>>> develop
 
 ## 3.6.0
 

packages/stream_chat/lib/src/ws/websocket.dart

@@ -155,7 +155,7 @@ class WebSocket with TimerHelper {
     final token = await tokenManager.loadToken(refresh: refreshToken);
     final params = {
       'user_id': user.id,
-      if (includeUserDetails) 'user_details': user,
+      'user_details': includeUserDetails ? user : {'id': user.id},
       'user_token': token.rawValue,
       'server_determines_connection_id': true,
     };