From 8b4ff142bab22c8f214a16a22a03c8de318f4fed Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 16 Dec 2020 17:06:09 +0530
Subject: [PATCH] Merge conflicts

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 lib/src/message_input.dart | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index 447d49d9..dd7d90ca 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -21,7 +21,6 @@ import 'package:stream_chat_flutter/src/stream_svg_icon.dart';
 import 'package:stream_chat_flutter/src/user_avatar.dart';
 import 'package:substring_highlight/substring_highlight.dart';
 import 'package:video_compress/video_compress.dart';
-import 'package:photo_manager/photo_manager.dart';
 
 import '../stream_chat_flutter.dart';
 import 'stream_channel.dart';
@@ -462,6 +461,7 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Timer _debounce;
+
   void _onChanged(BuildContext context, String s) {
     if (_debounce?.isActive == true) _debounce.cancel();
     _debounce = Timer(
@@ -1956,7 +1956,11 @@ class MessageInputState extends State<MessageInput> {
       message = await widget.preMessageSending(message);
     }
 
-    final channel = StreamChannel.of(context).channel;
+    final streamChannel = StreamChannel.of(context);
+    final channel = streamChannel.channel;
+    if (!channel.state.isUpToDate) {
+      await streamChannel.reloadChannel();
+    }
 
     if (widget.editMessage == null ||
         widget.editMessage.status == MessageSendingStatus.FAILED) {
@@ -2043,6 +2047,7 @@ class MessageInputState extends State<MessageInput> {
   }
 
   bool _initialized = false;
+
   @override
   void didChangeDependencies() {
     if (widget.editMessage != null && !_initialized) {