diff --git a/packages/stream_chat_flutter/lib/src/theme/color_theme.dart b/packages/stream_chat_flutter/lib/src/theme/color_theme.dart
index 567c7b3e..b32c023f 100644
--- a/packages/stream_chat_flutter/lib/src/theme/color_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/theme/color_theme.dart
@@ -39,9 +39,19 @@ class ColorTheme {
       alpha: 0.08,
     ),
     this.shadowIconButton = const Effect(
-        sigmaX: 0, sigmaY: 2, color: Color(0xff000000), alpha: 0.5, blur: 4,),
+      sigmaX: 0,
+      sigmaY: 2,
+      color: Color(0xff000000),
+      alpha: 0.5,
+      blur: 4,
+    ),
     this.modalShadow = const Effect(
-        sigmaX: 0, sigmaY: 0, color: Color(0xff000000), alpha: 1, blur: 8,),
+      sigmaX: 0,
+      sigmaY: 0,
+      color: Color(0xff000000),
+      alpha: 1,
+      blur: 8,
+    ),
   }) : brightness = Brightness.light;
 
   /// Initialise with dark theme
diff --git a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart
index 334f4850..0a5330f0 100644
--- a/packages/stream_chat_flutter/lib/src/theme/message_theme.dart
+++ b/packages/stream_chat_flutter/lib/src/theme/message_theme.dart
@@ -100,7 +100,10 @@ class MessageThemeData with Diagnosticable {
         messageTextStyle:
             TextStyle.lerp(a.messageTextStyle, b.messageTextStyle, t),
         reactionsBackgroundColor: Color.lerp(
-            a.reactionsBackgroundColor, b.reactionsBackgroundColor, t,),
+          a.reactionsBackgroundColor,
+          b.reactionsBackgroundColor,
+          t,
+        ),
         reactionsBorderColor:
             Color.lerp(a.messageBorderColor, b.reactionsBorderColor, t),
         reactionsMaskColor:
diff --git a/packages/stream_chat_flutter/lib/src/user_avatar.dart b/packages/stream_chat_flutter/lib/src/user_avatar.dart
index a923011c..86b34ea7 100644
--- a/packages/stream_chat_flutter/lib/src/user_avatar.dart
+++ b/packages/stream_chat_flutter/lib/src/user_avatar.dart
@@ -92,7 +92,9 @@ class UserAvatar extends StatelessWidget {
                         streamChatTheme
                             .ownMessageTheme.avatarTheme?.borderRadius,
                     image: DecorationImage(
-                        image: imageProvider, fit: BoxFit.cover),
+                      image: imageProvider,
+                      fit: BoxFit.cover,
+                    ),
                   ),
                 ),
               )
diff --git a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
index 6477dfcd..e247a1cf 100644
--- a/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/message_search_bloc.dart
@@ -90,8 +90,7 @@ class MessageSearchBlocState extends State<MessageSearchBloc>
       _paginationEnded = false;
     }
 
-    if ((!clear && _paginationEnded) ||
-        _queryMessagesLoadingController.value == true) {
+    if ((!clear && _paginationEnded) || _queryMessagesLoadingController.value) {
       return;
     }
 
diff --git a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
index d112961d..fc791cd8 100644
--- a/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
+++ b/packages/stream_chat_flutter_core/lib/src/users_bloc.dart
@@ -77,8 +77,7 @@ class UsersBlocState extends State<UsersBloc>
       _paginationEnded = false;
     }
 
-    if ((!clear && _paginationEnded) ||
-        _queryUsersLoadingController.value == true) {
+    if ((!clear && _paginationEnded) || _queryUsersLoadingController.value) {
       return;
     }
 
diff --git a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
index 23f63d72..35befbc1 100644
--- a/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
+++ b/packages/stream_chat_persistence/lib/src/db/moor_chat_database.dart
@@ -15,7 +15,8 @@ part 'moor_chat_database.g.dart';
     Channels,
     Messages,
     PinnedMessages,
-    PinnedMessageReactions,Reactions,
+    PinnedMessageReactions,
+    Reactions,
     Users,
     Members,
     Reads,
@@ -26,7 +27,8 @@ part 'moor_chat_database.g.dart';
     UserDao,
     ChannelDao,
     MessageDao,
-    PinnedMessageDao,PinnedMessageReactionDao,
+    PinnedMessageDao,
+    PinnedMessageReactionDao,
     MemberDao,
     ReactionDao,
     ReadDao,