From c46236bb6cf69059bc7635d2287b8d8554d91ad0 Mon Sep 17 00:00:00 2001
From: Kelrap <kel.raphael3@outlook.com>
Date: Wed, 2 Jul 2025 13:54:11 -0400
Subject: [PATCH 1/2] Limit space taken up by chat search result's sender name

---
 .../chat_search/chat_search_message_tab.dart  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/lib/pages/chat_search/chat_search_message_tab.dart b/lib/pages/chat_search/chat_search_message_tab.dart
index abf36f0a3..70fa9da95 100644
--- a/lib/pages/chat_search/chat_search_message_tab.dart
+++ b/lib/pages/chat_search/chat_search_message_tab.dart
@@ -143,15 +143,26 @@ class _MessageSearchResultListTile extends StatelessWidget {
             size: 16,
           ),
           const SizedBox(width: 8),
-          Text(
-            displayname,
-          ),
-          Expanded(
-            child: Text(
-              ' | ${event.originServerTs.localizedTimeShort(context)}',
-              style: const TextStyle(fontSize: 12),
+          // #Pangea
+          Flexible(
+            child:
+                // Pangea#
+                Text(
+              displayname,
+              // #Pangea
+              maxLines: 1,
+              overflow: TextOverflow.ellipsis,
+              // Pangea#
             ),
           ),
+          // #Pangea
+          // Expanded(
+          //   child:
+          // Pangea#
+          Text(
+            ' | ${event.originServerTs.localizedTimeShort(context)}',
+            style: const TextStyle(fontSize: 12),
+          ),
         ],
       ),
       subtitle: Linkify(

From 8520e3d59ec098a4dfda340fbf5648d64166d692 Mon Sep 17 00:00:00 2001
From: ggurdin <ggurdin@gmail.com>
Date: Wed, 2 Jul 2025 14:47:28 -0400
Subject: [PATCH 2/2] chore: simplify pangea comments

---
 .../chat_search/chat_search_message_tab.dart  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/pages/chat_search/chat_search_message_tab.dart b/lib/pages/chat_search/chat_search_message_tab.dart
index 70fa9da95..5305244c3 100644
--- a/lib/pages/chat_search/chat_search_message_tab.dart
+++ b/lib/pages/chat_search/chat_search_message_tab.dart
@@ -144,25 +144,27 @@ class _MessageSearchResultListTile extends StatelessWidget {
           ),
           const SizedBox(width: 8),
           // #Pangea
+          // Text(
+          //   displayname,
+          // ),
+          // Expanded(
+          //   child: Text(
+          //     ' | ${event.originServerTs.localizedTimeShort(context)}',
+          //     style: const TextStyle(fontSize: 12),
+          //   ),
+          // ),
           Flexible(
-            child:
-                // Pangea#
-                Text(
+            child: Text(
               displayname,
-              // #Pangea
               maxLines: 1,
               overflow: TextOverflow.ellipsis,
-              // Pangea#
             ),
           ),
-          // #Pangea
-          // Expanded(
-          //   child:
-          // Pangea#
           Text(
             ' | ${event.originServerTs.localizedTimeShort(context)}',
             style: const TextStyle(fontSize: 12),
           ),
+          // Pangea#
         ],
       ),
       subtitle: Linkify(