diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart
index fee3c8ee..fe896058 100644
--- a/packages/stream_chat_flutter/lib/src/message_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart
@@ -530,7 +530,8 @@ class _MessageListViewState extends State<MessageListView> {
                     },
                     itemBuilder: (context, i) {
                       if (i == itemCount - 1) {
-                        if (widget.parentMessage == null) return const Offstage();
+                        if (widget.parentMessage == null)
+                          return const Offstage();
                         return buildParentMessage(widget.parentMessage!);
                       }
 
@@ -558,7 +559,8 @@ class _MessageListViewState extends State<MessageListView> {
                             const Offstage();
                       }
 
-                      const bottomMessageIndex = 2; // 1 -> loader // 0 -> footer
+                      const bottomMessageIndex =
+                          2; // 1 -> loader // 0 -> footer
 
                       final message = messages[i - 2];
                       Widget messageWidget;
diff --git a/packages/stream_chat_flutter/lib/src/message_search_list_view.dart b/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
index 0a1c388b..93488ba4 100644
--- a/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
@@ -145,8 +145,8 @@ class _MessageSearchListViewState extends State<MessageSearchListView> {
 
   @override
   Widget build(BuildContext context) => ColoredBox(
-    color: MessageSearchListViewTheme.of(context).backgroundColor!,
-    child: MessageSearchListCore(
+        color: MessageSearchListViewTheme.of(context).backgroundColor!,
+        child: MessageSearchListCore(
           filters: widget.filters,
           sortOptions: widget.sortOptions,
           messageQuery: widget.messageQuery,
@@ -198,7 +198,7 @@ class _MessageSearchListViewState extends State<MessageSearchListView> {
                   ),
           childBuilder: widget.childBuilder ?? _buildListView,
         ),
-  );
+      );
 
   Widget _separatorBuilder(BuildContext context, int index) => Container(
         height: 1,
diff --git a/packages/stream_chat_flutter/lib/src/user_list_view.dart b/packages/stream_chat_flutter/lib/src/user_list_view.dart
index 0be283bd..ad5abb24 100644
--- a/packages/stream_chat_flutter/lib/src/user_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/user_list_view.dart
@@ -164,12 +164,12 @@ class _UserListViewState extends State<UserListView>
       color: UserListViewTheme.of(context).backgroundColor!,
       child: UserListCore(
         errorBuilder: widget.errorBuilder ??
-                (BuildContext context, Object err) => _buildError(err),
+            (BuildContext context, Object err) => _buildError(err),
         emptyBuilder: widget.emptyBuilder ?? (context) => _buildEmpty(),
         loadingBuilder: widget.loadingBuilder ??
-                (context) => LayoutBuilder(
-              builder: (context, viewportConstraints) =>
-                  SingleChildScrollView(
+            (context) => LayoutBuilder(
+                  builder: (context, viewportConstraints) =>
+                      SingleChildScrollView(
                     physics: const AlwaysScrollableScrollPhysics(),
                     child: ConstrainedBox(
                       constraints: BoxConstraints(
@@ -180,9 +180,9 @@ class _UserListViewState extends State<UserListView>
                       ),
                     ),
                   ),
-            ),
+                ),
         listBuilder:
-        widget.listBuilder ?? (context, list) => _buildListView(list),
+            widget.listBuilder ?? (context, list) => _buildListView(list),
         pagination: widget.pagination,
         sort: widget.sort,
         filter: widget.filter,
diff --git a/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart b/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart
index 666affd8..e9b7985a 100644
--- a/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart
+++ b/packages/stream_chat_flutter/test/src/user_list_view_theme_test.dart
@@ -73,32 +73,32 @@ void main() {
 
   testWidgets(
       'Passing no ChannelListViewThemeData returns default dark theme values',
-          (WidgetTester tester) async {
-        late BuildContext _context;
-        await tester.pumpWidget(
-          MaterialApp(
-            builder: (context, child) => StreamChat(
-              client: MockClient(),
-              streamChatThemeData: StreamChatThemeData.dark(),
-              child: child,
-            ),
-            home: Builder(
-              builder: (BuildContext context) {
-                _context = context;
-                return const Scaffold(
-                  body: UsersBloc(
-                    child: UserListView(),
-                  ),
-                );
-              },
-            ),
-          ),
-        );
+      (WidgetTester tester) async {
+    late BuildContext _context;
+    await tester.pumpWidget(
+      MaterialApp(
+        builder: (context, child) => StreamChat(
+          client: MockClient(),
+          streamChatThemeData: StreamChatThemeData.dark(),
+          child: child,
+        ),
+        home: Builder(
+          builder: (BuildContext context) {
+            _context = context;
+            return const Scaffold(
+              body: UsersBloc(
+                child: UserListView(),
+              ),
+            );
+          },
+        ),
+      ),
+    );
 
-        final userListViewTheme = UserListViewTheme.of(_context);
-        expect(userListViewTheme.backgroundColor,
-            _userListViewThemeDataControlDark.backgroundColor);
-      });
+    final userListViewTheme = UserListViewTheme.of(_context);
+    expect(userListViewTheme.backgroundColor,
+        _userListViewThemeDataControlDark.backgroundColor);
+  });
 }
 
 final _userListViewThemeDataControl = UserListViewThemeData(