Merge pull request #7402 from vector-im/alfogrillo/fix_poll_bubbles

Fix poll ended event rendering (PSG-1177)
element-hq · Mar 3, 2023 · 47d50d7 · 47d50d7
2 parents 9441f69 + a0dbd97
commit 47d50d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -1072,6 +1072,15 @@ - (BOOL)hasSameSenderAsBubbleCellData:(id<MXKRoomBubbleCellDataStoring>)bubbleCe
         // We do not want to merge room create event cells with other cell types
         return NO;
     }
+
+    if (self.tag == RoomBubbleCellDataTagPoll) {
+        MXEvent* event = self.events.firstObject;
+
+        if (event) {
+            // m.poll.ended events should always show the sender information
+            return event.eventType != MXEventTypePollEnd;
+        }
+    }
 
     if (self.hasThreadRoot || bubbleCellData.hasThreadRoot)
     {

diff --git a/changelog.d/pr-7402.bugfix b/changelog.d/pr-7402.bugfix
@@ -0,0 +1 @@
+Polls: improve rendering of poll ended events.