align with latest stable

packages/stream_chat_v1/lib/channel_page.dart

@@ -113,12 +113,9 @@ class _ChannelPageState extends State<ChannelPage> {
                   initialAlignment: widget.initialAlignment,
                   highlightInitialMessage: widget.highlightInitialMessage,
                   onMessageSwiped: _reply,
+                  messageBuilder: (context, details, messages, defaultMessage) {
+                    return defaultMessage.copyWith(
                       onReplyTap: _reply,
-                  threadBuilder: (_, parentMessage) {
-                    return ThreadPage(
-                      parent: parentMessage,
-                    );
-                  },
                       onShowMessage: (m, c) async {
                         final client = StreamChat.of(context).client;
                         final message = m;
@@ -138,6 +135,13 @@ class _ChannelPageState extends State<ChannelPage> {
                           ),
                         );
                       },
+                    );
+                  },
+                  threadBuilder: (_, parentMessage) {
+                    return ThreadPage(
+                      parent: parentMessage,
+                    );
+                  },
                   pinPermissions: ['owner', 'admin', 'member'],
                 ),
                 Positioned(

packages/stream_chat_v1/lib/chat_info_screen.dart

@@ -635,7 +635,7 @@ class __SharedGroupsScreenState extends State<_SharedGroupsScreen> {
                 children: [
                   Padding(
                     padding: const EdgeInsets.all(8.0),
-                    child: ChannelImage(
+                    child: ChannelAvatar(
                       channel: channel,
                       constraints:
                           BoxConstraints(maxWidth: 40.0, maxHeight: 40.0),

packages/stream_chat_v1/lib/choose_user_page.dart

@@ -7,7 +7,6 @@ import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 
-import 'main.dart';
 import 'routes/routes.dart';
 
 const kStreamApiKey = 'STREAM_API_KEY';

packages/stream_chat_v1/lib/thread_page.dart

@@ -49,7 +49,11 @@ class _ThreadPageState extends State<ThreadPage> {
               initialScrollIndex: widget.initialScrollIndex,
               initialAlignment: widget.initialAlignment,
               onMessageSwiped: _reply,
+              messageBuilder: (context, details, messages, defaultMessage) {
+                return defaultMessage.copyWith(
                   onReplyTap: _reply,
+                );
+              },
               pinPermissions: ['owner', 'admin', 'member'],
             ),
           ),