diff --git a/src/app/components/message/layout/Compact.tsx b/src/app/components/message/layout/Compact.tsx index a5422bb0d8..e123d6cdfc 100644 --- a/src/app/components/message/layout/Compact.tsx +++ b/src/app/components/message/layout/Compact.tsx @@ -4,13 +4,15 @@ import * as css from './layout.css'; type CompactLayoutProps = { before?: ReactNode; + avatar?: ReactNode; }; export const CompactLayout = as<'div', CompactLayoutProps>( - ({ before, children, ...props }, ref) => ( + ({ before, avatar, children, ...props }, ref) => ( {before} + {avatar} {children} diff --git a/src/app/features/room/message/Message.tsx b/src/app/features/room/message/Message.tsx index cf9b7a9376..6cd0d25073 100644 --- a/src/app/features/room/message/Message.tsx +++ b/src/app/features/room/message/Message.tsx @@ -282,7 +282,9 @@ function WrappedMessage({ onEdit={handleSwipeEdit} onActionModeChange={handleSwipeActionChange} > - {msgContentJSX} + + {msgContentJSX} + ); if (messageLayout === MessageLayout.Bubble) @@ -598,13 +600,13 @@ function MessageInternal( {cleanedDisplayName} - {showPronouns && ( + {showPronouns && messageLayout !== MessageLayout.Compact && ( )} - {showPmPInfo && ( + {showPmPInfo && messageLayout !== MessageLayout.Compact && ( { - if (!collapsed && messageLayout !== MessageLayout.Compact) + if (!collapsed) return (