Merge branches 'feature/new-ui' and 'qa3-fixes' of github.com:GetStream/stream-chat-flutter into qa3-fixes

 Conflicts:

	lib/src/message_list_view.dart

lib/src/message_widget.dart

@@ -132,6 +132,7 @@ class MessageWidget extends StatefulWidget {
   final bool showDeleteMessage;
   final bool showResendMessage;
 
+  final bool showFlagButton;
   final Map<String, AttachmentBuilder> attachmentBuilders;
 
   /// Center user avatar with bottom of the message
@@ -170,6 +171,7 @@ class MessageWidget extends StatefulWidget {
     this.showThreadReplyMessage = true,
     this.showResendMessage = true,
     this.showCopyMessage = true,
+    this.showFlagButton = true,
     this.onUserAvatarTap,
     this.onLinkTap,
     this.onMessageActions,
@@ -686,6 +688,7 @@ class _MessageWidgetState extends State<MessageWidget> {
 
   void _showMessageActionModalBottomSheet(BuildContext context) {
     final channel = StreamChannel.of(context).channel;
+
     showDialog(
         context: context,
         barrierColor: StreamChatTheme.of(context).colorTheme.overlay,
@@ -722,6 +725,7 @@ class _MessageWidgetState extends State<MessageWidget> {
               showThreadReplyMessage: widget.showThreadReplyMessage &&
                   !isFailedState &&
                   widget.onThreadTap != null,
+              showFlagButton: widget.showFlagButton,
             ),
           );
         });