From a06b3e6a9e52aca9f798452e5a47c11261234b48 Mon Sep 17 00:00:00 2001
From: krille-chan <krille-chan@posteo.de>
Date: Sun, 16 Jul 2023 15:06:20 +0900
Subject: [PATCH] fix: Username not visible after edit events

---
 lib/pages/chat/events/message.dart | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index d3e2ef0e..50a3e63d 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -77,13 +77,14 @@ class Message extends StatelessWidget {
         nextEvent == null ||
         !event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
     final sameSender = nextEvent != null &&
-            [
-              EventTypes.Message,
-              EventTypes.Sticker,
-              EventTypes.Encrypted,
-            ].contains(nextEvent!.type)
-        ? nextEvent!.senderId == event.senderId && !displayTime
-        : false;
+        [
+          EventTypes.Message,
+          EventTypes.Sticker,
+          EventTypes.Encrypted,
+        ].contains(nextEvent!.type) &&
+        nextEvent?.relationshipType == null &&
+        nextEvent!.senderId == event.senderId &&
+        !displayTime;
     final textColor = ownMessage
         ? Theme.of(context).colorScheme.onPrimary
         : Theme.of(context).colorScheme.onBackground;