diff --git a/lib/screens/channel_chat_screen.dart b/lib/screens/channel_chat_screen.dart
index 8bb004e4..9b9de350 100644
--- a/lib/screens/channel_chat_screen.dart
+++ b/lib/screens/channel_chat_screen.dart
@@ -367,17 +367,24 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                                     shape: BoxShape.circle,
                                   ),
                                   child: Icon(
-                                    (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty)
+                                    (message.status ==
+                                                ChannelMessageStatus.sent &&
+                                            displayPath.isNotEmpty)
                                         ? Icons.check_circle
-                                        : message.status == ChannelMessageStatus.failed
-                                            ? Icons.cancel
-                                            : Icons.cloud,
+                                        : message.status ==
+                                              ChannelMessageStatus.failed
+                                        ? Icons.cancel
+                                        : Icons.cloud,
                                     size: 14,
-                                    color: (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty)
+                                    color:
+                                        (message.status ==
+                                                ChannelMessageStatus.sent &&
+                                            displayPath.isNotEmpty)
                                         ? Colors.green
-                                        : message.status == ChannelMessageStatus.failed
-                                            ? Colors.red
-                                            : Colors.white70,
+                                        : message.status ==
+                                              ChannelMessageStatus.failed
+                                        ? Colors.red
+                                        : Colors.white70,
                                   ),
                                 ),
                               ),
@@ -402,8 +409,10 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                                   defaultToHttps: false,
                                 ),
                                 linkifiers: const [UrlLinkifier()],
-                                onOpen: (link) =>
-                                    LinkHandler.handleLinkTap(context, link.url),
+                                onOpen: (link) => LinkHandler.handleLinkTap(
+                                  context,
+                                  link.url,
+                                ),
                               ),
                             ),
                             if (!enableTracing && isOutgoing) ...[
@@ -411,17 +420,24 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
                               Padding(
                                 padding: const EdgeInsets.only(bottom: 2),
                                 child: Icon(
-                                  (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty)
+                                  (message.status ==
+                                              ChannelMessageStatus.sent &&
+                                          displayPath.isNotEmpty)
                                       ? Icons.check_circle
-                                      : message.status == ChannelMessageStatus.failed
-                                          ? Icons.cancel
-                                          : Icons.cloud,
+                                      : message.status ==
+                                            ChannelMessageStatus.failed
+                                      ? Icons.cancel
+                                      : Icons.cloud,
                                   size: 14,
-                                  color: (message.status == ChannelMessageStatus.sent && displayPath.isNotEmpty)
+                                  color:
+                                      (message.status ==
+                                              ChannelMessageStatus.sent &&
+                                          displayPath.isNotEmpty)
                                       ? Colors.green
-                                      : message.status == ChannelMessageStatus.failed
-                                          ? Colors.red
-                                          : Colors.grey,
+                                      : message.status ==
+                                            ChannelMessageStatus.failed
+                                      ? Colors.red
+                                      : Colors.grey,
                                 ),
                               ),
                             ],
diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart
index f97d4bb8..32a7882b 100644
--- a/lib/screens/chat_screen.dart
+++ b/lib/screens/chat_screen.dart
@@ -1274,21 +1274,30 @@ class _MessageBubble extends StatelessWidget {
                                   child: Container(
                                     padding: const EdgeInsets.all(2),
                                     decoration: BoxDecoration(
-                                      color: Colors.black.withValues(alpha: 0.3),
+                                      color: Colors.black.withValues(
+                                        alpha: 0.3,
+                                      ),
                                       shape: BoxShape.circle,
                                     ),
                                     child: Icon(
-                                      (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty)
+                                      (message.status ==
+                                                  MessageStatus.delivered &&
+                                              message.pathBytes.isNotEmpty)
                                           ? Icons.check_circle
-                                          : message.status == MessageStatus.failed
-                                              ? Icons.cancel
-                                              : Icons.cloud,
+                                          : message.status ==
+                                                MessageStatus.failed
+                                          ? Icons.cancel
+                                          : Icons.cloud,
                                       size: 14,
-                                      color: (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty)
+                                      color:
+                                          (message.status ==
+                                                  MessageStatus.delivered &&
+                                              message.pathBytes.isNotEmpty)
                                           ? Colors.green
-                                          : message.status == MessageStatus.failed
-                                              ? Colors.red
-                                              : Colors.white70,
+                                          : message.status ==
+                                                MessageStatus.failed
+                                          ? Colors.red
+                                          : Colors.white70,
                                     ),
                                   ),
                                 ),
@@ -1312,8 +1321,10 @@ class _MessageBubble extends StatelessWidget {
                                     defaultToHttps: false,
                                   ),
                                   linkifiers: const [UrlLinkifier()],
-                                  onOpen: (link) =>
-                                      LinkHandler.handleLinkTap(context, link.url),
+                                  onOpen: (link) => LinkHandler.handleLinkTap(
+                                    context,
+                                    link.url,
+                                  ),
                                 ),
                               ),
                               if (!enableTracing && isOutgoing) ...[
@@ -1321,17 +1332,22 @@ class _MessageBubble extends StatelessWidget {
                                 Padding(
                                   padding: const EdgeInsets.only(bottom: 2),
                                   child: Icon(
-                                    (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty)
+                                    (message.status ==
+                                                MessageStatus.delivered &&
+                                            message.pathBytes.isNotEmpty)
                                         ? Icons.check_circle
                                         : message.status == MessageStatus.failed
-                                            ? Icons.cancel
-                                            : Icons.cloud,
+                                        ? Icons.cancel
+                                        : Icons.cloud,
                                     size: 14,
-                                    color: (message.status == MessageStatus.delivered && message.pathBytes.isNotEmpty)
+                                    color:
+                                        (message.status ==
+                                                MessageStatus.delivered &&
+                                            message.pathBytes.isNotEmpty)
                                         ? Colors.green
                                         : message.status == MessageStatus.failed
-                                            ? Colors.red
-                                            : Colors.grey,
+                                        ? Colors.red
+                                        : Colors.grey,
                                   ),
                                 ),
                               ],