Files
ThreadNet-Web/packages
Thore Cimbal 9622bd3c3a 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.
2026-08-19 12:00:00 +00:00
..