From 9a4677a7b852c34344722455a64a20d5af462241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Stolin=CC=81ski?= <b.stolinski@fivedottwelve.com>
Date: Tue, 8 Feb 2022 15:47:42 +0100
Subject: [PATCH 01/14] decrease parent message reply count only once

---
 .../stream_chat/lib/src/client/channel.dart   | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index d3900842..84f0321e 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1083,7 +1083,7 @@ class Channel {
     } else {
       // remove the passed message if response does
       // not contain message
-      state!.removeMessage(message);
+      state!.removeMessage(message, decreaseReplyCount: true);
       await _client.chatPersistenceClient?.deleteMessageById(messageId);
     }
     return res;
@@ -1752,6 +1752,7 @@ class ChannelClientState {
     _subscriptions.add(_channel.on(EventType.messageDeleted).listen((event) {
       final message = event.message!;
       if (event.hardDelete == true) {
+        //do not decrease reply count here - it is done in _listenMessageUpdated
         removeMessage(message, hardDelete: true);
       } else {
         addMessage(message);
@@ -1810,24 +1811,30 @@ class ChannelClientState {
   }
 
   /// Remove a [message] from this [channelState].
-  void removeMessage(Message message, {bool hardDelete = false}) {
+  void removeMessage(
+    Message message, {
+    bool hardDelete = false,
+    bool decreaseReplyCount = false,
+  }) {
     final parentId = message.parentId;
     // i.e. it's a thread message
     // 1. Remove the thread message
     // 2. Reduce total reply count of parent message
     if (parentId != null) {
-      final allMessages = [...messages];
-      final parentMessage = allMessages.firstWhereOrNull(
-        (it) => it.id == parentId,
-      );
+      if (decreaseReplyCount) {
+        final allMessages = [...messages];
+        final parentMessage = allMessages.firstWhereOrNull(
+          (it) => it.id == parentId,
+        );
 
-      // return if message not available in the memory
-      if (parentMessage == null) return;
-      final replyCount = parentMessage.replyCount;
-      // return if reply count is null or zero
-      if (replyCount == null || replyCount == 0) return;
+        // return if message not available in the memory
+        if (parentMessage == null) return;
+        final replyCount = parentMessage.replyCount;
+        // return if reply count is null or zero
+        if (replyCount == null || replyCount == 0) return;
 
-      addMessage(parentMessage.copyWith(replyCount: replyCount - 1));
+        addMessage(parentMessage.copyWith(replyCount: replyCount - 1));
+      }
       updateThreadInfo(
         parentId,
         threads[parentId]!

From 8f6bfd7b472acfbe007c4501b87c3b3584680fb7 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Thu, 17 Feb 2022 17:17:52 +0530
Subject: [PATCH 02/14] fix(llc): improve removeMessage logic.

---
 .../stream_chat/lib/src/client/channel.dart   | 116 ++++++++----------
 .../lib/src/client/retry_queue.dart           |   2 +-
 2 files changed, 51 insertions(+), 67 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 84f0321e..b5bad6cb 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -407,7 +407,7 @@ class Channel {
       if (index != -1) {
         final newAttachments = [...message!.attachments]..[index] = attachment;
         final updatedMessage = message!.copyWith(attachments: newAttachments);
-        state?.addMessage(updatedMessage);
+        state?.updateMessage(updatedMessage);
         // updating original message for next iteration
         message = message!.merge(updatedMessage);
       }
@@ -512,7 +512,7 @@ class Channel {
       ).toList(),
     );
 
-    state!.addMessage(message);
+    state!.updateMessage(message);
 
     try {
       if (message.attachments.any((it) => !it.uploadState.isSuccess)) {
@@ -535,7 +535,7 @@ class Channel {
         type,
         skipPush: skipPush,
       );
-      state!.addMessage(response.message);
+      state!.updateMessage(response.message);
       if (cooldown > 0) cooldownStartedAt = DateTime.now();
       return response;
     } catch (e) {
@@ -571,7 +571,7 @@ class Channel {
       ).toList(),
     );
 
-    state?.addMessage(message);
+    state?.updateMessage(message);
 
     try {
       if (message.attachments.any((it) => !it.uploadState.isSuccess)) {
@@ -594,7 +594,7 @@ class Channel {
         ownReactions: message.ownReactions,
       );
 
-      state?.addMessage(m);
+      state?.updateMessage(m);
 
       return response;
     } catch (e) {
@@ -602,7 +602,7 @@ class Channel {
         if (e.isRetriable) {
           state!._retryQueue.add([message]);
         } else {
-          state?.addMessage(originalMessage);
+          state?.updateMessage(originalMessage);
         }
       }
       rethrow;
@@ -630,7 +630,7 @@ class Channel {
         ownReactions: message.ownReactions,
       );
 
-      state?.addMessage(updatedMessage);
+      state?.updateMessage(updatedMessage);
 
       return response;
     } catch (e) {
@@ -646,7 +646,7 @@ class Channel {
     // Directly deleting the local messages which are not yet sent to server
     if (message.status == MessageSendingStatus.sending ||
         message.status == MessageSendingStatus.failed) {
-      state!.addMessage(message.copyWith(
+      state!.updateMessage(message.copyWith(
         type: 'deleted',
         status: MessageSendingStatus.sent,
       ));
@@ -667,11 +667,11 @@ class Channel {
         deletedAt: message.deletedAt ?? DateTime.now(),
       );
 
-      state?.addMessage(message);
+      state?.updateMessage(message);
 
       final response = await _client.deleteMessage(message.id, hard: hard);
 
-      state?.addMessage(message.copyWith(status: MessageSendingStatus.sent));
+      state?.updateMessage(message.copyWith(status: MessageSendingStatus.sent));
 
       return response;
     } catch (e) {
@@ -860,7 +860,7 @@ class Channel {
       ownReactions: ownReactions,
     );
 
-    state?.addMessage(newMessage);
+    state?.updateMessage(newMessage);
 
     try {
       final reactionResp = await _client.sendReaction(
@@ -872,7 +872,7 @@ class Channel {
       return reactionResp;
     } catch (_) {
       // Reset the message if the update fails
-      state?.addMessage(message);
+      state?.updateMessage(message);
       rethrow;
     }
   }
@@ -912,7 +912,7 @@ class Channel {
       ownReactions: ownReactions,
     );
 
-    state?.addMessage(newMessage);
+    state?.updateMessage(newMessage);
 
     try {
       final deleteResponse = await _client.deleteReaction(
@@ -922,7 +922,7 @@ class Channel {
       return deleteResponse;
     } catch (_) {
       // Reset the message if the update fails
-      state?.addMessage(message);
+      state?.updateMessage(message);
       rethrow;
     }
   }
@@ -1079,11 +1079,11 @@ class Channel {
 
     // update the passed message with response message
     if (res.message != null) {
-      state!.addMessage(res.message!);
+      state!.updateMessage(res.message!);
     } else {
       // remove the passed message if response does
       // not contain message
-      state!.removeMessage(message, decreaseReplyCount: true);
+      state!.removeMessage(message);
       await _client.chatPersistenceClient?.deleteMessageById(messageId);
     }
     return res;
@@ -1322,7 +1322,8 @@ class Channel {
 
   /// Remove the ban for the user with given [userID] in the channel.
   @Deprecated(
-      "Use 'unbanMember' instead. This method will be removed in v4.0.0")
+    "Use 'unbanMember' instead. This method will be removed in v4.0.0",
+  )
   Future<EmptyResponse> unbanUser(String userID) => unbanMember(userID);
 
   /// Remove the ban for the member with given [userID] in the channel.
@@ -1694,7 +1695,9 @@ class ChannelClientState {
   void _listenReactionDeleted() {
     _subscriptions.add(_channel.on(EventType.reactionDeleted).listen((event) {
       final oldMessage =
-          messages.firstWhereOrNull((it) => it.id == event.message?.id);
+          messages.firstWhereOrNull((it) => it.id == event.message?.id) ??
+              threads[event.message?.parentId]
+                  ?.firstWhereOrNull((e) => e.id == event.message?.id);
       final reaction = event.reaction;
       final ownReactions = oldMessage?.ownReactions
           ?.whereNot((it) =>
@@ -1707,18 +1710,20 @@ class ChannelClientState {
       final message = event.message!.copyWith(
         ownReactions: ownReactions,
       );
-      addMessage(message);
+      updateMessage(message);
     }));
   }
 
   void _listenReactions() {
     _subscriptions.add(_channel.on(EventType.reactionNew).listen((event) {
       final oldMessage =
-          messages.firstWhereOrNull((it) => it.id == event.message?.id);
+          messages.firstWhereOrNull((it) => it.id == event.message?.id) ??
+              threads[event.message?.parentId]
+                  ?.firstWhereOrNull((e) => e.id == event.message?.id);
       final message = event.message!.copyWith(
         ownReactions: oldMessage?.ownReactions,
       );
-      addMessage(message);
+      updateMessage(message);
     }));
   }
 
@@ -1730,12 +1735,13 @@ class ChannelClientState {
     )
         .listen((event) {
       final oldMessage =
-          messages.firstWhereOrNull((it) => it.id == event.message?.id);
-
+          messages.firstWhereOrNull((it) => it.id == event.message?.id) ??
+              threads[event.message?.parentId]
+                  ?.firstWhereOrNull((e) => e.id == event.message?.id);
       final message = event.message!.copyWith(
         ownReactions: oldMessage?.ownReactions,
       );
-      addMessage(message);
+      updateMessage(message);
 
       if (message.pinned) {
         _channelState = _channelState.copyWith(
@@ -1752,10 +1758,9 @@ class ChannelClientState {
     _subscriptions.add(_channel.on(EventType.messageDeleted).listen((event) {
       final message = event.message!;
       if (event.hardDelete == true) {
-        //do not decrease reply count here - it is done in _listenMessageUpdated
-        removeMessage(message, hardDelete: true);
+        removeMessage(message);
       } else {
-        addMessage(message);
+        updateMessage(message);
       }
     }));
   }
@@ -1770,7 +1775,7 @@ class ChannelClientState {
       final message = event.message!;
       if (isUpToDate ||
           (message.parentId != null && message.showInChannel != true)) {
-        addMessage(message);
+        updateMessage(message);
       }
 
       if (_countMessageAsUnread(message)) {
@@ -1780,9 +1785,13 @@ class ChannelClientState {
   }
 
   /// Add a [message] to this [channelState].
-  void addMessage(Message message) {
+  @Deprecated('Use updateMessage instead')
+  void addMessage(Message message) => updateMessage(message);
+
+  /// Updates the [message] in the state if it exists. Adds it otherwise.
+  void updateMessage(Message message) {
     if (message.parentId == null || message.showInChannel == true) {
-      final newMessages = List<Message>.from(_channelState.messages);
+      final newMessages = [...messages];
       final oldIndex = newMessages.indexWhere((m) => m.id == message.id);
       if (oldIndex != -1) {
         Message? m;
@@ -1811,47 +1820,22 @@ class ChannelClientState {
   }
 
   /// Remove a [message] from this [channelState].
-  void removeMessage(
-    Message message, {
-    bool hardDelete = false,
-    bool decreaseReplyCount = false,
-  }) {
+  void removeMessage(Message message) {
     final parentId = message.parentId;
-    // i.e. it's a thread message
-    // 1. Remove the thread message
-    // 2. Reduce total reply count of parent message
+    // i.e. it's a thread message, Remove it
     if (parentId != null) {
-      if (decreaseReplyCount) {
-        final allMessages = [...messages];
-        final parentMessage = allMessages.firstWhereOrNull(
-          (it) => it.id == parentId,
-        );
-
-        // return if message not available in the memory
-        if (parentMessage == null) return;
-        final replyCount = parentMessage.replyCount;
-        // return if reply count is null or zero
-        if (replyCount == null || replyCount == 0) return;
-
-        addMessage(parentMessage.copyWith(replyCount: replyCount - 1));
-      }
-      updateThreadInfo(
+      final threadMessages = [...threads[parentId]!];
+      return updateThreadInfo(
         parentId,
-        threads[parentId]!
-          ..removeWhere(
-            (e) => e.id == message.id,
-          ),
+        threadMessages..removeWhere((e) => e.id == message.id),
       );
-    } else {
-      // Remove regular message
-      final allMessages = [...messages];
-      if (hardDelete) {
-        allMessages.removeWhere((e) => e.id == message.id);
-        _channelState = _channelState.copyWith(messages: allMessages);
-      } else if (allMessages.remove(message)) {
-        _channelState = _channelState.copyWith(messages: allMessages);
-      }
     }
+
+    // Remove regular message
+    final allMessages = [...messages];
+    _channelState = _channelState.copyWith(
+      messages: allMessages..removeWhere((e) => e.id == message.id),
+    );
   }
 
   void _listenReadEvents() {
diff --git a/packages/stream_chat/lib/src/client/retry_queue.dart b/packages/stream_chat/lib/src/client/retry_queue.dart
index 17b019a5..5dfa9aa3 100644
--- a/packages/stream_chat/lib/src/client/retry_queue.dart
+++ b/packages/stream_chat/lib/src/client/retry_queue.dart
@@ -158,7 +158,7 @@ class RetryQueue {
         : message.status == MessageSendingStatus.updating
             ? MessageSendingStatus.failed_update
             : MessageSendingStatus.failed_delete;
-    channel.state?.addMessage(message.copyWith(status: newStatus));
+    channel.state?.updateMessage(message.copyWith(status: newStatus));
   }
 
   Future<void> _retryMessage(Message message) async {

From ae44406b96ec39a9cc275c8d51ddf841bf7df9eb Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Mon, 21 Feb 2022 15:31:23 +0530
Subject: [PATCH 03/14] fix(llc): Fix `channelState.copyWith` with respect to
 pinnedMessages.

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

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 82225b27..ef66f835 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -10,6 +10,7 @@
 - [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890) Fixed Reactions not updating on thread messages.
   Thanks [bstolinski](https://github.com/bstolinski).
 - [[#897]](https://github.com/GetStream/stream-chat-flutter/issues/897) Fixed error type mis-match in `AuthInterceptor`.
+- Fix `channelState.copyWith` with respect to pinnedMessages.
 
 ## 3.4.0
 
diff --git a/packages/stream_chat/lib/src/core/models/channel_state.dart b/packages/stream_chat/lib/src/core/models/channel_state.dart
index 3ddc2b68..8b500d18 100644
--- a/packages/stream_chat/lib/src/core/models/channel_state.dart
+++ b/packages/stream_chat/lib/src/core/models/channel_state.dart
@@ -67,9 +67,10 @@ class ChannelState {
         members: members ?? this.members,
         // Hack to avoid using the default value in case nothing is provided.
         // FIXME: Use non-nullable by default instead of empty list.
-        pinnedMessages: pinnedMessages == _emptyPinnedMessages
-            ? this.pinnedMessages
-            : pinnedMessages ?? _emptyPinnedMessages,
+        pinnedMessages:
+            pinnedMessages == null || pinnedMessages == _emptyPinnedMessages
+                ? this.pinnedMessages
+                : pinnedMessages,
         watcherCount: watcherCount ?? this.watcherCount,
         watchers: watchers ?? this.watchers,
         read: read ?? this.read,

From de4f531af114f506ac8f92695265e7dbe288ba22 Mon Sep 17 00:00:00 2001
From: Sacha Arbonel <sacha.arbonel@hotmail.fr>
Date: Mon, 21 Feb 2022 14:29:12 -0400
Subject: [PATCH 04/14] fix(ui): sample app version bump

---
 packages/stream_chat_flutter/example/pubspec.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index 9977c198..75aba62c 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -27,9 +27,9 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  stream_chat_flutter: ^2.2.1
-  stream_chat_localizations: ^1.1.0
-  stream_chat_persistence: ^2.2.0
+  stream_chat_flutter: ^3.4.0
+  stream_chat_localizations: ^2.1.0
+  stream_chat_persistence: ^3.1.0
 
 dev_dependencies:
   flutter_test:

From 68643da42b257bf060501fdcd4b70b0890292383 Mon Sep 17 00:00:00 2001
From: Sacha Arbonel <sacha.arbonel@hotmail.fr>
Date: Mon, 21 Feb 2022 14:29:50 -0400
Subject: [PATCH 05/14] fix(ui): sample app gradle fixes

---
 packages/stream_chat_flutter/example/android/app/build.gradle | 4 ++--
 .../example/android/app/src/main/AndroidManifest.xml          | 1 +
 packages/stream_chat_flutter/example/android/build.gradle     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/example/android/app/build.gradle b/packages/stream_chat_flutter/example/android/app/build.gradle
index fbd6268e..3974f949 100644
--- a/packages/stream_chat_flutter/example/android/app/build.gradle
+++ b/packages/stream_chat_flutter/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -41,7 +41,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.example"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/packages/stream_chat_flutter/example/android/app/src/main/AndroidManifest.xml b/packages/stream_chat_flutter/example/android/app/src/main/AndroidManifest.xml
index 42c5fa1e..5e2f5ec0 100644
--- a/packages/stream_chat_flutter/example/android/app/src/main/AndroidManifest.xml
+++ b/packages/stream_chat_flutter/example/android/app/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/packages/stream_chat_flutter/example/android/build.gradle b/packages/stream_chat_flutter/example/android/build.gradle
index 3e0873de..ba8a52ec 100644
--- a/packages/stream_chat_flutter/example/android/build.gradle
+++ b/packages/stream_chat_flutter/example/android/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.6.0'
     repositories {
         google()
         jcenter()

From e9626dc348ae9ecefe8df29b3667bf95de69de57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Stolin=CC=81ski?= <b.stolinski@fivedottwelve.com>
Date: Tue, 22 Feb 2022 09:42:21 +0100
Subject: [PATCH 06/14] fix removing message from thread

---
 packages/stream_chat/CHANGELOG.md              |  2 ++
 .../stream_chat/lib/src/client/channel.dart    | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 82225b27..59feb777 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -10,6 +10,8 @@
 - [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890) Fixed Reactions not updating on thread messages.
   Thanks [bstolinski](https://github.com/bstolinski).
 - [[#897]](https://github.com/GetStream/stream-chat-flutter/issues/897) Fixed error type mis-match in `AuthInterceptor`.
+- [[#891]](https://github.com/GetStream/stream-chat-flutter/pull/891). Fixed reply counter for parent message not 
+  updating correctly after deleting thread message.
 
 ## 3.4.0
 
diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index c27f3634..2b311061 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1826,11 +1826,19 @@ class ChannelClientState {
     final parentId = message.parentId;
     // i.e. it's a thread message, Remove it
     if (parentId != null) {
-      final threadMessages = [...threads[parentId]!];
-      return updateThreadInfo(
-        parentId,
-        threadMessages..removeWhere((e) => e.id == message.id),
-      );
+      if (!threads.containsKey(parentId)) {
+        return;
+      }
+
+      final newThreads = Map<String, List<Message>>.from(threads);
+
+      newThreads[parentId] = [
+        ...newThreads[parentId]!
+          ..removeWhere((e) => e.id == message.id),
+      ];
+
+      _threads = newThreads;
+      return;
     }
 
     // Remove regular message

From 52b035cb5fc226c63771bac75b44760116e11b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Stolin=CC=81ski?= <b.stolinski@fivedottwelve.com>
Date: Tue, 22 Feb 2022 09:49:18 +0100
Subject: [PATCH 07/14] fix formatting

---
 packages/stream_chat/CHANGELOG.md                | 2 +-
 packages/stream_chat/lib/src/client/channel.dart | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 59feb777..6bbc3b16 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -10,7 +10,7 @@
 - [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890) Fixed Reactions not updating on thread messages.
   Thanks [bstolinski](https://github.com/bstolinski).
 - [[#897]](https://github.com/GetStream/stream-chat-flutter/issues/897) Fixed error type mis-match in `AuthInterceptor`.
-- [[#891]](https://github.com/GetStream/stream-chat-flutter/pull/891). Fixed reply counter for parent message not 
+- [[#891]](https://github.com/GetStream/stream-chat-flutter/pull/891) Fixed reply counter for parent message not 
   updating correctly after deleting thread message.
 
 ## 3.4.0
diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 2b311061..072bb150 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1833,8 +1833,7 @@ class ChannelClientState {
       final newThreads = Map<String, List<Message>>.from(threads);
 
       newThreads[parentId] = [
-        ...newThreads[parentId]!
-          ..removeWhere((e) => e.id == message.id),
+        ...newThreads[parentId]!..removeWhere((e) => e.id == message.id),
       ];
 
       _threads = newThreads;

From a361e89abad9cc5e70980cf86067518a3392ce3f Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 23 Feb 2022 17:55:34 +0530
Subject: [PATCH 08/14] fix(llc): fix `pinnedMessage` inconsistencies.

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 .../stream_chat/lib/src/client/channel.dart   | 38 +++++++++++--------
 .../lib/src/core/models/channel_state.dart    |  9 ++---
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 76fbab7a..dd6fcff1 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1744,15 +1744,6 @@ class ChannelClientState {
         ownReactions: oldMessage?.ownReactions,
       );
       addMessage(message);
-
-      if (message.pinned) {
-        _channelState = _channelState.copyWith(
-          pinnedMessages: [
-            ..._channelState.pinnedMessages,
-            message,
-          ],
-        );
-      }
     }));
   }
 
@@ -1804,8 +1795,24 @@ class ChannelClientState {
         newMessages.add(message);
       }
 
+      final newPinnedMessages = [...pinnedMessages];
+      final oldPinnedIndex =
+          newPinnedMessages.indexWhere((m) => m.id == message.id);
+
+      // Handle pinned messages
+      if (message.pinned) {
+        if (oldPinnedIndex != -1) {
+          newPinnedMessages[oldPinnedIndex] = message;
+        } else {
+          newPinnedMessages.add(message);
+        }
+      } else {
+        newPinnedMessages.removeWhere((m) => m.id == message.id);
+      }
+
       _channelState = _channelState.copyWith(
         messages: newMessages..sort(_sortByCreatedAt),
+        pinnedMessages: newPinnedMessages,
         channel: _channelState.channel?.copyWith(
           lastMessageAt: message.createdAt,
         ),
@@ -1898,11 +1905,12 @@ class ChannelClientState {
       .distinct(const ListEquality().equals);
 
   /// Channel pinned message list.
-  List<Message> get pinnedMessages => _channelState.pinnedMessages.toList();
+  List<Message> get pinnedMessages => _channelState.pinnedMessages;
 
   /// Channel pinned message list as a stream.
-  Stream<List<Message>> get pinnedMessagesStream =>
-      channelStateStream.map((cs) => cs.pinnedMessages.toList());
+  Stream<List<Message>> get pinnedMessagesStream => channelStateStream
+      .map((cs) => cs.pinnedMessages)
+      .distinct(const ListEquality().equals);
 
   /// Get channel last message.
   Message? get lastMessage =>
@@ -2213,7 +2221,7 @@ class ChannelClientState {
             .toList();
 
         updateChannelState(_channelState.copyWith(
-          pinnedMessages: pinnedMessages.where(_pinIsValid()).toList(),
+          pinnedMessages: pinnedMessages.where(_pinIsValid).toList(),
           messages: expiredMessages,
         ));
       }
@@ -2250,7 +2258,7 @@ class ChannelClientState {
   }
 }
 
-bool Function(Message) _pinIsValid() {
+bool _pinIsValid(Message message) {
   final now = DateTime.now();
-  return (Message m) => m.pinExpires!.isAfter(now);
+  return message.pinExpires!.isAfter(now);
 }
diff --git a/packages/stream_chat/lib/src/core/models/channel_state.dart b/packages/stream_chat/lib/src/core/models/channel_state.dart
index 8b500d18..17439dc0 100644
--- a/packages/stream_chat/lib/src/core/models/channel_state.dart
+++ b/packages/stream_chat/lib/src/core/models/channel_state.dart
@@ -56,7 +56,7 @@ class ChannelState {
     ChannelModel? channel,
     List<Message>? messages,
     List<Member>? members,
-    List<Message>? pinnedMessages,
+    List<Message> pinnedMessages = _emptyPinnedMessages,
     int? watcherCount,
     List<User>? watchers,
     List<Read>? read,
@@ -67,10 +67,9 @@ class ChannelState {
         members: members ?? this.members,
         // Hack to avoid using the default value in case nothing is provided.
         // FIXME: Use non-nullable by default instead of empty list.
-        pinnedMessages:
-            pinnedMessages == null || pinnedMessages == _emptyPinnedMessages
-                ? this.pinnedMessages
-                : pinnedMessages,
+        pinnedMessages: pinnedMessages == _emptyPinnedMessages
+            ? this.pinnedMessages
+            : pinnedMessages,
         watcherCount: watcherCount ?? this.watcherCount,
         watchers: watchers ?? this.watchers,
         read: read ?? this.read,

From 655da0ba33855a667108391fdd89a8f6d2ccfd6e Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 1 Mar 2022 14:19:20 +0530
Subject: [PATCH 09/14] fix(llc): Remove regular message in case
 `showInChannel` is true. (#3)

* fix(llc): also remove regular message in case `showInChannel` is true.

* fix(llc): use `hard` param while removing message in channel state.
---
 .../stream_chat/lib/src/client/channel.dart   | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 072bb150..b0f1bdd0 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -643,13 +643,18 @@ class Channel {
 
   /// Deletes the [message] from the channel.
   Future<EmptyResponse> deleteMessage(Message message, {bool? hard}) async {
+    final hardDelete = hard ?? false;
+
     // Directly deleting the local messages which are not yet sent to server
     if (message.status == MessageSendingStatus.sending ||
         message.status == MessageSendingStatus.failed) {
-      state!.updateMessage(message.copyWith(
-        type: 'deleted',
-        status: MessageSendingStatus.sent,
-      ));
+      state!.deleteMessage(
+        message.copyWith(
+          type: 'deleted',
+          status: MessageSendingStatus.sent,
+        ),
+        hardDelete: hardDelete,
+      );
 
       // Removing the attachments upload completer to stop the `sendMessage`
       // waiting for attachments to complete.
@@ -667,11 +672,14 @@ class Channel {
         deletedAt: message.deletedAt ?? DateTime.now(),
       );
 
-      state?.updateMessage(message);
+      state?.deleteMessage(message, hardDelete: hardDelete);
 
       final response = await _client.deleteMessage(message.id, hard: hard);
 
-      state?.updateMessage(message.copyWith(status: MessageSendingStatus.sent));
+      state?.deleteMessage(
+        message.copyWith(status: MessageSendingStatus.sent),
+        hardDelete: hardDelete,
+      );
 
       return response;
     } catch (e) {
@@ -1826,27 +1834,33 @@ class ChannelClientState {
     final parentId = message.parentId;
     // i.e. it's a thread message, Remove it
     if (parentId != null) {
-      if (!threads.containsKey(parentId)) {
-        return;
-      }
+      final newThreads = {...threads};
+      // Early return in case the thread is not available
+      if (!newThreads.containsKey(parentId)) return;
 
-      final newThreads = Map<String, List<Message>>.from(threads);
+      _threads = newThreads
+        ..update(
+          parentId,
+          (messages) => messages..removeWhere((e) => e.id == message.id),
+        );
 
-      newThreads[parentId] = [
-        ...newThreads[parentId]!..removeWhere((e) => e.id == message.id),
-      ];
-
-      _threads = newThreads;
-      return;
+      // Early return if the thread message is not shown in channel.
+      if (message.showInChannel == false) return;
     }
 
-    // Remove regular message
+    // Remove regular message, thread message shown in channel
     final allMessages = [...messages];
     _channelState = _channelState.copyWith(
       messages: allMessages..removeWhere((e) => e.id == message.id),
     );
   }
 
+  /// Removes/Updates the [message] based on the [hardDelete] value.
+  void deleteMessage(Message message, {bool hardDelete = false}) {
+    if (hardDelete) return removeMessage(message);
+    return updateMessage(message);
+  }
+
   void _listenReadEvents() {
     if (_channelState.channel?.config.readEvents == false) {
       return;

From 98dbe30ffbf77f75d98be6b854d8c1e4aa454790 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 1 Mar 2022 18:09:25 +0530
Subject: [PATCH 10/14] chore(llc, core, ui): bump versions to 3.5.0

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/CHANGELOG.md              | 2 +-
 packages/stream_chat/pubspec.yaml              | 2 +-
 packages/stream_chat_flutter/CHANGELOG.md      | 2 +-
 packages/stream_chat_flutter/pubspec.yaml      | 4 ++--
 packages/stream_chat_flutter_core/CHANGELOG.md | 4 ++++
 packages/stream_chat_flutter_core/pubspec.yaml | 4 ++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index 144cfacc..f8a5bee7 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 3.5.0
 
 ✅ Added
 
diff --git a/packages/stream_chat/pubspec.yaml b/packages/stream_chat/pubspec.yaml
index e07d416b..6e6893c1 100644
--- a/packages/stream_chat/pubspec.yaml
+++ b/packages/stream_chat/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat
 homepage: https://getstream.io/
 description: The official Dart client for Stream Chat, a service for building chat applications.
-version: 3.4.0
+version: 3.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index d4a64c1a..8aa64cd9 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Upcoming
+## 3.5.0
 
 🐞 Fixed
 
diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml
index 348b8205..c2d90eb0 100644
--- a/packages/stream_chat_flutter/pubspec.yaml
+++ b/packages/stream_chat_flutter/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 3.4.0
+version: 3.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -36,7 +36,7 @@ dependencies:
   rxdart: ^0.27.0
   share_plus: ^3.0.4
   shimmer: ^2.0.0
-  stream_chat_flutter_core: ^3.4.0
+  stream_chat_flutter_core: ^3.5.0
   substring_highlight: ^1.0.26
   synchronized: ^3.0.0
   url_launcher: ^6.0.3
diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index d75d17bd..b90d4e56 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.5.1
+
+- Updated `stream_chat` dependency to [`3.5.0`](https://pub.dev/packages/stream_chat/changelog).
+
 ## 3.4.0
 - Updated `stream_chat` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat/changelog).
 
diff --git a/packages/stream_chat_flutter_core/pubspec.yaml b/packages/stream_chat_flutter_core/pubspec.yaml
index 24814e97..b9d8e440 100644
--- a/packages/stream_chat_flutter_core/pubspec.yaml
+++ b/packages/stream_chat_flutter_core/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter_core
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK Core. Build your own chat experience using Dart and Flutter.
-version: 3.4.0
+version: 3.5.0
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues
 
@@ -16,7 +16,7 @@ dependencies:
     sdk: flutter
   meta: ^1.3.0
   rxdart: ^0.27.0
-  stream_chat: ^3.4.0
+  stream_chat: ^3.5.0
 
 dev_dependencies:
   dart_code_metrics: ^4.4.0

From 1f0bf3bd6b821a8c90a9b9ab50b4cee94ab18cd7 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 1 Mar 2022 19:55:03 +0530
Subject: [PATCH 11/14] Update packages/stream_chat_flutter_core/CHANGELOG.md

---
 packages/stream_chat_flutter_core/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat_flutter_core/CHANGELOG.md b/packages/stream_chat_flutter_core/CHANGELOG.md
index b90d4e56..1fa60708 100644
--- a/packages/stream_chat_flutter_core/CHANGELOG.md
+++ b/packages/stream_chat_flutter_core/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.5.1
+## 3.5.0
 
 - Updated `stream_chat` dependency to [`3.5.0`](https://pub.dev/packages/stream_chat/changelog).
 

From 7432ae69c03d6133e18f40f533c999648b555192 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Tue, 1 Mar 2022 20:01:13 +0530
Subject: [PATCH 12/14] chore(llc): update version.dart to 3.5.0

Signed-off-by: xsahil03x <xdsahil@gmail.com>
---
 packages/stream_chat/lib/version.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat/lib/version.dart b/packages/stream_chat/lib/version.dart
index 8ec6b487..0ae6a20a 100644
--- a/packages/stream_chat/lib/version.dart
+++ b/packages/stream_chat/lib/version.dart
@@ -3,4 +3,4 @@ import 'package:stream_chat/src/client/client.dart';
 /// Current package version
 /// Used in [StreamChatClient] to build the `x-stream-client` header
 // ignore: constant_identifier_names
-const PACKAGE_VERSION = '3.4.0';
+const PACKAGE_VERSION = '3.5.0';

From 3583b79789ecd43990be2bcce410b442fde540d5 Mon Sep 17 00:00:00 2001
From: geweald <misieekq@gmail.com>
Date: Wed, 2 Mar 2022 13:31:41 +0100
Subject: [PATCH 13/14] fix(ui): overflow of mentions overlay & input focus
 node

---
 packages/stream_chat_flutter/CHANGELOG.md     |  6 +++
 .../lib/src/message_input.dart                | 54 +++++++++++--------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index 8aa64cd9..15aea4b1 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Upcoming
+
+🐞 Fixed
+
+- Mentions overlay now doesn't overflow when not enough height available
+
 ## 3.5.0
 
 🐞 Fixed
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index d1a45786..bc08ebcd 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -344,6 +344,7 @@ class MessageInputState extends State<MessageInput> {
 
   final _imagePicker = ImagePicker();
   late final _focusNode = widget.focusNode ?? FocusNode();
+  late final _isInternalFocusNode = widget.focusNode == null;
   bool _inputEnabled = true;
   bool _commandEnabled = false;
   bool _showCommandsOverlay = false;
@@ -1191,30 +1192,36 @@ class MessageInputState extends State<MessageInput> {
       };
     }
 
-    return UserMentionsOverlay(
-      query: query,
-      mentionAllAppUsers: widget.mentionAllAppUsers,
-      client: StreamChat.of(context).client,
-      channel: channel,
-      size: Size(renderObject.size.width - 16, 400),
-      mentionsTileBuilder: tileBuilder,
-      onMentionUserTap: (user) {
-        _mentionedUsers.add(user);
-        splits[splits.length - 1] = user.name;
-        final rejoin = splits.join('@');
+    return LayoutBuilder(
+      builder: (context, snapshot) => UserMentionsOverlay(
+        query: query,
+        mentionAllAppUsers: widget.mentionAllAppUsers,
+        client: StreamChat.of(context).client,
+        channel: channel,
+        size: Size(
+          renderObject.size.width - 16,
+          min(400, (snapshot.maxHeight - renderObject.size.height - 16).abs()),
+        ),
+        mentionsTileBuilder: tileBuilder,
+        onMentionUserTap: (user) {
+          _mentionedUsers.add(user);
+          splits[splits.length - 1] = user.name;
+          final rejoin = splits.join('@');
 
-        textEditingController.value = TextEditingValue(
-          text: rejoin +
-              textEditingController.text.substring(
-                textEditingController.selection.start,
-              ),
-          selection: TextSelection.collapsed(
-            offset: rejoin.length,
-          ),
-        );
-        _onChangedDebounced.cancel();
-        setState(() => _showMentionsOverlay = false);
-      },
+          textEditingController.value = TextEditingValue(
+            text: rejoin +
+                textEditingController.text.substring(
+                  textEditingController.selection.start,
+                ),
+            selection: TextSelection.collapsed(
+              offset: rejoin.length,
+            ),
+          );
+          _onChangedDebounced.cancel();
+
+          setState(() => _showMentionsOverlay = false);
+        },
+      ),
     );
   }
 
@@ -1925,6 +1932,7 @@ class MessageInputState extends State<MessageInput> {
   void dispose() {
     textEditingController.dispose();
     _focusNode.removeListener(_focusNodeListener);
+    if (_isInternalFocusNode) _focusNode.dispose();
     _stopSlowMode();
     _onChangedDebounced.cancel();
     super.dispose();

From 86d181d77b9303b4ccd60f7ebd711006ec983583 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 7 Mar 2022 10:07:42 +0100
Subject: [PATCH 14/14] refactor(repo): use local path dependencies

---
 packages/stream_chat_flutter/example/pubspec.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat_flutter/example/pubspec.yaml b/packages/stream_chat_flutter/example/pubspec.yaml
index 75aba62c..bd785a29 100644
--- a/packages/stream_chat_flutter/example/pubspec.yaml
+++ b/packages/stream_chat_flutter/example/pubspec.yaml
@@ -27,9 +27,12 @@ dependencies:
   cupertino_icons: ^1.0.3
   flutter:
     sdk: flutter
-  stream_chat_flutter: ^3.4.0
-  stream_chat_localizations: ^2.1.0
-  stream_chat_persistence: ^3.1.0
+  stream_chat_flutter: 
+    path: ../
+  stream_chat_localizations: 
+    path: ../../stream_chat_localizations
+  stream_chat_persistence: 
+    path: ../../stream_chat_persistence
 
 dev_dependencies:
   flutter_test: