From 9622bd3c3ae92ccc276dafae9f45d956718d9596 Mon Sep 17 00:00:00 2001
From: Thore Cimbal <cfx@riot.8shield.net>
Date: Wed, 19 Aug 2026 12:00:00 +0000
Subject: [PATCH] fix(merge): three defects my conflict resolution introduced,
 all caught by the build

The CSS conflict boundary ran through the middle of a rule, so concatenating both
sides swallowed the closing brace of .userStatusEmoji - 27 opening braces against 26
closing ones. Restored.

The JSX was worse. Our block is a ternary: show call participants instead of the
message preview. Moving it into upstream's new RoomListItemContent carried the preview
branch along while upstream's own preview block stayed behind it, leaving a duplicated
preview and an unbalanced </div>. Removed the duplicate.

getInitials stayed behind unused in RoomListItemView after moving to
RoomListItemContent, which the compiler flagged. Removed.

None of this was visible by reading the diff; the build found all three. Both packages
compile now, and the artifact carries the dfn3 model, so the noise suppression from
#0054 came through the merge intact.
---
 .../RoomListItemView/RoomListItemContent.tsx              | 7 -------
 .../RoomListItemView/RoomListItemView.module.css          | 2 ++
 .../RoomListItemView/RoomListItemView.tsx                 | 8 --------
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemContent.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemContent.tsx
index 86eb92da46..d60d3e2f5a 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemContent.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemContent.tsx
@@ -105,13 +105,6 @@ export const RoomListItemContent = memo(function RoomListItemContent({
                         vm={vm}
                     />
                 )}
-
-                    {item.messagePreview && (
-                        <Text as="div" size="sm" className={styles.ellipsis} title={item.messagePreview}>
-                            {item.messagePreview}
-                        </Text>
-                    )}
-                </div>
                 {!isDragging && (item.showMoreOptionsMenu || item.showNotificationMenu) && (
                     <RoomListItemHoverMenu
                         showMoreOptionsMenu={item.showMoreOptionsMenu}
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.module.css b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.module.css
index 0118637248..fe21d6ed72 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.module.css
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.module.css
@@ -106,6 +106,8 @@
 
 .userStatusEmoji {
     padding-left: var(--cpd-space-1-5x);
+}
+
 .callParticipants {
     display: flex;
     flex-direction: column;
diff --git a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.tsx b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.tsx
index 277f280647..64878d374b 100644
--- a/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.tsx
+++ b/packages/shared-components/src/room-list/VirtualizedRoomListView/RoomListItemWrapper/RoomListItemView/RoomListItemView.tsx
@@ -175,14 +175,6 @@ export interface RoomListItemViewProps extends Omit<React.HTMLAttributes<HTMLBut
  * A presentational room list item component.
  * Displays room name, avatar, message preview, and notifications.
  */
-function getInitials(displayName: string): string {
-    return displayName
-        .trim()
-        .split(/\s+/)
-        .slice(0, 2)
-        .map((word) => word.charAt(0).toUpperCase())
-        .join("");
-}
 
 export const RoomListItemView = memo(function RoomListItemView({
     vm,