Merge pull request #5927 from vector-im/feature/aris/threads_improve_…

…rendering_issue_5151 Feature/aris/threads improve rendering issue 5151
element-hq · May 6, 2022 · 3c9b5d2 · 3c9b5d2
2 parents 9f9c6fb + 5c645c1
commit 3c9b5d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/changelog.d/5151.misc b/changelog.d/5151.misc
@@ -0,0 +1 @@
+Improve threads rendering in the main timeline
diff --git a/...va/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt b/...va/im/vector/app/features/home/room/detail/timeline/style/TimelineMessageLayoutFactory.kt
@@ -95,6 +95,7 @@ class TimelineMessageLayoutFactory @Inject constructor(private val session: Sess
                 nextDisplayableEvent.root.getClearType() !in listOf(EventType.MESSAGE, EventType.STICKER, EventType.ENCRYPTED) ||
                 isNextMessageReceivedMoreThanOneHourAgo ||
                 isTileTypeMessage(nextDisplayableEvent) ||
+                nextDisplayableEvent.isRootThread() ||
                 event.isRootThread() ||
                 nextDisplayableEvent.isEdition()