Merge branch 'develop' into v4

2022-04-14 10:04:27 +02:00
parent a0c8522ed1 8bdcc6b7f0
commit 9d0f66ee8c
5 changed files with 22 additions and 1 deletions
@@ -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

@@ -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,
    };
@@ -22,6 +22,10 @@
 - Added OpenGraph preview support for links in `StreamMessageInput`.
 - Removed video compression.

+## 3.6.1
+
+- Updated `stream_chat_flutter_core` dependency to [`3.6.1`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
+
 ## 3.6.0

 🐞 Fixed
@@ -59,6 +63,7 @@
 - Fix default `Channel` route not opening from `ChannelListView` when `ChannelAvatar` is tapped

 ## 3.4.0
+
 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).

 🐞 Fixed
@@ -36,7 +36,11 @@ dependencies:
  rxdart: ^0.27.0
  share_plus: ^4.0.1
  shimmer: ^2.0.0
+<<<<<<< HEAD
  stream_chat_flutter_core: ^4.0.0-beta.0
+=======
+  stream_chat_flutter_core: ^3.6.1
+>>>>>>> develop
  substring_highlight: ^1.0.26
  url_launcher: ^6.0.3
  video_player: ^2.1.0
@@ -9,6 +9,10 @@

 - Updated `stream_chat` dependency to [`4.0.0-beta.0`](https://pub.dev/packages/stream_chat/changelog).

+## 3.6.1
+
+- Updated `stream_chat` dependency to [`3.6.1`](https://pub.dev/packages/stream_chat/changelog).
+
 ## 3.6.0

 - Updated `stream_chat` dependency to [`3.6.0`](https://pub.dev/packages/stream_chat/changelog).