From 3bd545e5041c608988b31ec5d41c9fdff238a0a4 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 29 Nov 2021 16:29:22 +0100
Subject: [PATCH] minor fixes

---
 packages/stream_chat/lib/src/client/channel.dart        | 2 +-
 packages/stream_chat_flutter/lib/src/message_input.dart | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index b4a29ca4..1bba9c84 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1603,7 +1603,7 @@ class ChannelClientState {
                   message.createdAt.isBefore(
                     DateTime.now().subtract(
                       const Duration(
-                        seconds: 1,
+                        seconds: 5,
                       ),
                     ),
                   ),
diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart
index 022963e9..de2b9d09 100644
--- a/packages/stream_chat_flutter/lib/src/message_input.dart
+++ b/packages/stream_chat_flutter/lib/src/message_input.dart
@@ -1168,7 +1168,9 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildMentionsOverlayEntry() {
-    if (textEditingController.value.selection.start < 0) {
+    final channel = StreamChannel.of(context).channel;
+    if (textEditingController.value.selection.start < 0 ||
+        channel.state == null) {
       return const Offstage();
     }
 
@@ -1197,7 +1199,7 @@ class MessageInputState extends State<MessageInput> {
       query: query,
       mentionAllAppUsers: widget.mentionAllAppUsers,
       client: StreamChat.of(context).client,
-      channel: StreamChannel.of(context).channel,
+      channel: channel,
       size: Size(renderObject.size.width - 16, 400),
       mentionsTileBuilder: tileBuilder,
       onMentionUserTap: (user) {