From e65843963e97b504caced5989166d75c5ee2269c Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Wed, 27 Oct 2021 16:29:34 +0200
Subject: [PATCH] fix(ui): use isUpToDateStream

---
 .../lib/src/message_list_view.dart            | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index 7e34253c..9ff158b1 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -647,15 +647,19 @@ class _MessageListViewState extends State<MessageListView> {
             );
           },
         ),
-        ValueListenableBuilder<bool>(
-          valueListenable: _showScrollToBottom,
-          child: _buildScrollToBottom(),
-          builder: (context, value, child) {
-            if (!streamChannel!.channel.state!.isUpToDate || value) {
-              return child!;
-            }
-            return const Offstage();
-          },
+        BetterStreamBuilder<bool>(
+          stream: streamChannel!.channel.state!.isUpToDateStream,
+          initialData: streamChannel!.channel.state!.isUpToDate,
+          builder: (context, snapshot) => ValueListenableBuilder<bool>(
+            valueListenable: _showScrollToBottom,
+            child: _buildScrollToBottom(),
+            builder: (context, value, child) {
+              if (!snapshot || value) {
+                return child!;
+              }
+              return const Offstage();
+            },
+          ),
         ),
         if (widget.showFloatingDateDivider)
           _buildFloatingDateDivider(itemCount),