From cfb41dd62943253074bedad47c95f91fc3cfa4aa Mon Sep 17 00:00:00 2001
From: Gordon Hayes <pggordonhayes@gmail.com>
Date: Fri, 18 Feb 2022 15:26:44 +0100
Subject: [PATCH] fix: scrollToBottom not respecting false value

---
 packages/stream_chat_flutter/CHANGELOG.md     |  1 +
 .../lib/src/message_list_view.dart            | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md
index d68549e1e..116d1624d 100644
--- a/packages/stream_chat_flutter/CHANGELOG.md
+++ b/packages/stream_chat_flutter/CHANGELOG.md
@@ -3,6 +3,7 @@
 🐞 Fixed
 
 - [[#888]](https://github.com/GetStream/stream-chat-flutter/issues/888) Fix `unban` command not working in `MessageInput`.
+- Fix `showScrollToBottom` in `MessageListView` not respecting false value.
 
 ## 3.4.0
 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).
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 edd9c6015..c6e269b99 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -712,20 +712,21 @@ class _MessageListViewState extends State<MessageListView> {
             );
           },
         ),
-        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.showScrollToBottom)
+          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),
       ],