From 5f1e8eec3b16759e17470b6391f020270f33bcfb Mon Sep 17 00:00:00 2001
From: Huy Quang Nguyen <quanghnguyen@linagora.com>
Date: Thu, 12 Dec 2024 11:10:28 +0700
Subject: [PATCH] TW-1862: Fix can't display message in chat (#2095)

---
 lib/pages/chat/chat.dart | 21 +++++++++++++++++++--
 pubspec.lock             |  6 +++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index bb40972b9..e4a8c8392 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -354,12 +354,14 @@ class ChatController extends State<Chat>
 
   Future<void> requestHistory({
     int? historyCount,
+    StateFilter? filter,
   }) async {
     if (!timeline!.canRequestHistory) return;
     Logs().v('Chat::requestHistory(): Requesting history...');
     try {
       return timeline!.requestHistory(
         historyCount: historyCount ?? _loadHistoryCount,
+        filter: filter,
       );
     } catch (err) {
       ScaffoldMessenger.of(context).showSnackBar(
@@ -1732,6 +1734,12 @@ class ChatController extends State<Chat>
     _currentChatScrollState = ChatScrollState.scrolling;
   }
 
+  List<String> get getEventTypeToFilterUnnecessaryEvent => [
+        EventTypes.Message,
+        EventTypes.Encrypted,
+        EventTypes.Sticker,
+      ];
+
   Future<void> _tryRequestHistory() async {
     if (timeline == null) return;
 
@@ -1748,10 +1756,19 @@ class ChatController extends State<Chat>
     if (allMembershipEvents || canRequestHistory) {
       try {
         await requestHistory(historyCount: _defaultEventCountDisplay)
-            .then((response) {
-          Logs().d(
+            .then((response) async {
+          Logs().v(
             'Chat::_tryRequestHistory():: Try request history success',
           );
+          if (allMembershipEvents) {
+            await requestHistory(
+              historyCount: _defaultEventCountDisplay,
+              filter: StateFilter(
+                lazyLoadMembers: true,
+                types: getEventTypeToFilterUnnecessaryEvent,
+              ),
+            );
+          }
         });
       } catch (e) {
         Logs().e(
diff --git a/pubspec.lock b/pubspec.lock
index 1aefb5273..4ef743147 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1877,7 +1877,7 @@ packages:
     description:
       path: "."
       ref: "twake-supported-0.22.6"
-      resolved-ref: "345aab06d195035c48784b23c849825a61c5a79a"
+      resolved-ref: "04ec6f3b9ece8e64e031cbe5c6e8164dc2ec7f2d"
       url: "git@github.com:linagora/matrix-dart-sdk.git"
     source: git
     version: "0.22.6"
@@ -3007,10 +3007,10 @@ packages:
     dependency: "direct main"
     description:
       name: url_launcher
-      sha256: "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603"
+      sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.1"
+    version: "6.2.6"
   url_launcher_android:
     dependency: transitive
     description: