fix review

packages/stream_chat_flutter/lib/src/channel_image.dart

@@ -86,11 +86,11 @@ class ChannelImage extends StatelessWidget {
     return BetterStreamBuilder<Map<String, dynamic>>(
       stream: channel.extraDataStream,
       initialData: channel.extraData,
-      builder: (context, snapshot) {
+      builder: (context, data) {
         String? image;
         final chatThemeData = StreamChatTheme.of(context);
-        if (snapshot.containsKey('image') == true) {
+        if (data.containsKey('image') == true) {
-          image = snapshot['image'];
+          image = data['image'];
         } else if (channel.state?.members.length == 2) {
           final otherMember = channel.state?.members
               .firstWhere((member) => member.user?.id != streamChat.user?.id);
@@ -100,11 +100,11 @@ class ChannelImage extends StatelessWidget {
                       users[otherMember?.userId] ?? otherMember!.user!)
                   .distinct(),
               initialData: otherMember!.user,
-              builder: (context, snapshot) => UserAvatar(
+              builder: (context, user) => UserAvatar(
                     borderRadius: borderRadius ??
                         chatThemeData
                             .channelPreviewTheme.avatarTheme?.borderRadius,
-                    user: snapshot ?? otherMember.user!,
+                    user: user ?? otherMember.user!,
                     constraints: constraints ??
                         chatThemeData
                             .channelPreviewTheme.avatarTheme?.constraints,
@@ -155,7 +155,7 @@ class ChannelImage extends StatelessWidget {
                     imageUrl: image,
                     errorWidget: (_, __, ___) => Center(
                       child: Text(
-                        snapshot.containsKey('name') ? snapshot['name'][0] : '',
+                        data.containsKey('name') ? data['name'][0] : '',
                         style: TextStyle(
                           color: chatThemeData.colorTheme.white,
                           fontWeight: FontWeight.bold,

packages/stream_chat_flutter/lib/src/channel_info.dart

@@ -28,11 +28,11 @@ class ChannelInfo extends StatelessWidget {
     return BetterStreamBuilder<List<Member>>(
       stream: channel.state!.membersStream,
       initialData: channel.state!.members,
-      builder: (context, snapshot) => ConnectionStatusBuilder(
+      builder: (context, data) => ConnectionStatusBuilder(
         statusBuilder: (context, status) {
           switch (status) {
             case ConnectionStatus.connected:
-              return _buildConnectedTitleState(context, snapshot);
+              return _buildConnectedTitleState(context, data);
             case ConnectionStatus.connecting:
               return _buildConnectingTitleState(context);
             case ConnectionStatus.disconnected:

packages/stream_chat_flutter/lib/src/channel_list_view.dart

@@ -648,7 +648,7 @@ class _ChannelListViewState extends State<ChannelListView> {
                   ),
                 ),
               ),
-          builder: (context, snapshot) => snapshot
+          builder: (context, data) => data
               ? const Center(
                   child: Padding(
                     padding: EdgeInsets.all(16),

packages/stream_chat_flutter/lib/src/channel_name.dart

@@ -29,8 +29,8 @@ class ChannelName extends StatelessWidget {
     return BetterStreamBuilder<Map<String, Object?>>(
       stream: channel.extraDataStream,
       initialData: channel.extraData,
-      builder: (context, snapshot) => _buildName(
+      builder: (context, data) => _buildName(
-        snapshot,
+        data,
         channel.state?.members,
         client,
       ),

packages/stream_chat_flutter/lib/src/channel_preview.dart

@@ -73,8 +73,8 @@ class ChannelPreview extends StatelessWidget {
     return BetterStreamBuilder<bool>(
         stream: channel.isMutedStream,
         initialData: channel.isMuted,
-        builder: (context, snapshot) => AnimatedOpacity(
+        builder: (context, data) => AnimatedOpacity(
-              opacity: snapshot ? 0.5 : 1,
+              opacity: data ? 0.5 : 1,
               duration: const Duration(milliseconds: 300),
               child: ListTile(
                 visualDensity: VisualDensity.compact,
@@ -108,9 +108,9 @@ class ChannelPreview extends StatelessWidget {
                       stream: channel.state?.membersStream,
                       initialData: channel.state?.members,
                       comparator: const ListEquality().equals,
-                      builder: (context, snapshot) {
+                      builder: (context, members) {
-                        if (snapshot?.isEmpty == true ||
+                        if (members?.isEmpty == true ||
-                            snapshot?.any((Member e) =>
+                            members?.any((Member e) =>
                                     e.user!.id ==
                                     channel.client.state.user?.id) !=
                                 true) {
@@ -165,11 +165,11 @@ class ChannelPreview extends StatelessWidget {
   Widget _buildDate(BuildContext context) => BetterStreamBuilder<DateTime?>(
         stream: channel.lastMessageAtStream,
         initialData: channel.lastMessageAt,
-        builder: (context, snapshot) {
+        builder: (context, data) {
-          if (snapshot == null) {
+          if (data == null) {
             return const Offstage();
           }
-          final lastMessageAt = snapshot.toLocal();
+          final lastMessageAt = data.toLocal();
 
           String stringDate;
           final now = DateTime.now();
@@ -225,9 +225,9 @@ class ChannelPreview extends StatelessWidget {
       BetterStreamBuilder<List<Message>?>(
         stream: channel.state!.messagesStream,
         initialData: channel.state!.messages,
-        builder: (context, snapshot) {
+        builder: (context, data) {
-          final lastMessage = snapshot
+          final lastMessage =
-              ?.lastWhereOrNull((m) => m.shadowed != true && !m.isDeleted);
+              data?.lastWhereOrNull((m) => m.shadowed != true && !m.isDeleted);
           if (lastMessage == null) {
             return const SizedBox();
           }

packages/stream_chat_flutter/lib/src/connection_status_builder.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:stream_chat_flutter/stream_chat_flutter.dart';
 import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
@@ -8,20 +7,16 @@ import 'package:stream_chat_flutter_core/stream_chat_flutter_core.dart';
 ///
 /// The widget will use the closest [StreamChatClient.wsConnectionStatusStream]
 /// in case no stream is provided.
-class ConnectionStatusBuilder extends StatefulWidget {
+class ConnectionStatusBuilder extends StatelessWidget {
   /// Creates a new ConnectionStatusBuilder
   const ConnectionStatusBuilder({
     Key? key,
     required this.statusBuilder,
-    this.initialStatus,
     this.connectionStatusStream,
     this.errorBuilder,
     this.loadingBuilder,
   }) : super(key: key);
 
-  /// The connection status that will be used to create the initial snapshot.
-  final ConnectionStatus? initialStatus;
-
   /// The asynchronous computation to which this builder is currently connected.
   final Stream<ConnectionStatus>? connectionStatusStream;
 
@@ -36,32 +31,21 @@ class ConnectionStatusBuilder extends StatefulWidget {
       statusBuilder;
 
   @override
-  _ConnectionStatusBuilderState createState() =>
+  Widget build(BuildContext context) {
-      _ConnectionStatusBuilderState();
+    final stream = connectionStatusStream ??
-}
+        StreamChat.of(context).client.wsConnectionStatusStream;
-
+    final client = StreamChat.of(context).client;
-class _ConnectionStatusBuilderState extends State<ConnectionStatusBuilder> {
+    return BetterStreamBuilder<ConnectionStatus>(
-  late StreamChatClient client;
+      initialData: client.wsConnectionStatus,
-  late Stream<ConnectionStatus> stream;
+      stream: stream,
-
+      loadingBuilder: loadingBuilder,
-  @override
+      errorBuilder: (context, error) {
-  Widget build(BuildContext context) => BetterStreamBuilder<ConnectionStatus>(
+        if (errorBuilder != null) {
-        initialData: widget.initialStatus ?? client.wsConnectionStatus,
+          return errorBuilder!(context, error);
-        stream: stream,
+        }
-        loadingBuilder: widget.loadingBuilder,
+        return const Offstage();
-        errorBuilder: (context, error) {
+      },
-          if (widget.errorBuilder != null) {
+      builder: statusBuilder,
-            return widget.errorBuilder!(context, error);
+    );
-          }
-          return const Offstage();
-        },
-        builder: widget.statusBuilder,
-      );
-
-  @override
-  void didChangeDependencies() {
-    client = StreamChat.of(context).client;
-    stream = widget.connectionStatusStream ?? client.wsConnectionStatusStream;
-    super.didChangeDependencies();
   }
 }

packages/stream_chat_flutter/lib/src/info_tile.dart

@@ -40,9 +40,6 @@ class InfoTile extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final chatThemeData = StreamChatTheme.of(context);
-    if (!showMessage) {
-      return child;
-    }
     return PortalEntry(
       visible: showMessage,
       portalAnchor: tileAnchor ?? Alignment.topCenter,

packages/stream_chat_flutter/lib/src/message_list_view.dart

@@ -1170,9 +1170,9 @@ class _MessageListViewState extends State<MessageListView> {
                   (messages) =>
                       messages!.firstWhere((m) => m.id == message.id)),
               initialData: message,
-              builder: (_, snapshot) => StreamChannel(
+              builder: (_, data) => StreamChannel(
                 channel: streamChannel!.channel,
-                child: widget.threadBuilder!(context, snapshot),
+                child: widget.threadBuilder!(context, data),
               ),
             ),
           ),
@@ -1220,8 +1220,8 @@ class _LoadingIndicator extends StatelessWidget {
           child: Text('Error loading messages'),
         ),
       ),
-      builder: (context, snapshot) {
+      builder: (context, data) {
-        if (!snapshot) {
+        if (!data) {
           if (!isThreadConversation && direction == QueryDirection.top) {
             return const SizedBox(
               height: 52,

packages/stream_chat_flutter/lib/src/typing_indicator.dart

@@ -49,9 +49,9 @@ class _TypingIndicatorState extends State<TypingIndicator> {
     return BetterStreamBuilder<List<User>>(
       initialData: channelState.typingEvents,
       stream: channelState.typingEventsStream,
-      builder: (context, snapshot) => AnimatedSwitcher(
+      builder: (context, data) => AnimatedSwitcher(
         duration: const Duration(milliseconds: 300),
-        child: snapshot.isNotEmpty == true
+        child: data.isNotEmpty == true
             ? Padding(
                 key: const Key('main'),
                 padding: widget.padding,
@@ -68,7 +68,7 @@ class _TypingIndicatorState extends State<TypingIndicator> {
                       ),
                       Text(
                         // ignore: lines_longer_than_80_chars
-                        '  ${snapshot[0].name}${snapshot.length == 1 ? '' : ' and ${snapshot.length - 1} more'} ${snapshot.length == 1 ? 'is' : 'are'} typing',
+                        '  ${data[0].name}${data.length == 1 ? '' : ' and ${data.length - 1} more'} ${data.length == 1 ? 'is' : 'are'} typing',
                         maxLines: 1,
                         style: widget.style,
                       ),

packages/stream_chat_flutter/lib/src/unread_indicator.dart

@@ -24,8 +24,8 @@ class UnreadIndicator extends StatelessWidget {
         initialData: cid != null
             ? client.state.channels[cid]?.state?.unreadCount
             : client.state.totalUnreadCount,
-        builder: (context, snapshot) {
+        builder: (context, data) {
-          if (snapshot == null || snapshot == 0) {
+          if (data == null || data == 0) {
             return const Offstage();
           }
           return Material(
@@ -42,7 +42,7 @@ class UnreadIndicator extends StatelessWidget {
               ),
               child: Center(
                 child: Text(
-                  '${snapshot > 99 ? '99+' : snapshot}',
+                  '${data > 99 ? '99+' : data}',
                   style: const TextStyle(
                     fontSize: 11,
                     color: Colors.white,

packages/stream_chat_flutter_core/lib/src/message_list_core.dart

@@ -151,8 +151,8 @@ class MessageListCoreState extends State<MessageListCore> {
       ),
       errorBuilder: widget.errorWidgetBuilder,
       loadingBuilder: widget.loadingBuilder,
-      builder: (context, snapshot) {
+      builder: (context, data) {
-        final messageList = snapshot?.reversed.toList(growable: false) ?? [];
+        final messageList = data?.reversed.toList(growable: false) ?? [];
         if (messageList.isEmpty && !_isThreadConversation) {
           if (_upToDate) {
             return widget.emptyBuilder(context);