From 712259ddefaf4bf5579476053caad923b0c9f5b3 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 9 Jun 2023 13:54:03 +1000
Subject: [PATCH] fix: resolved incoming message alignemnt in 1o1 conversations

there is never an avatar so we should never render it
---
 .../message/message-content/MessageAvatar.tsx            | 9 ++++++---
 .../message/message-content/MessageContentWithStatus.tsx | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 37fb956a4..8aea9c39d 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -35,10 +35,10 @@ export type MessageAvatarSelectorProps = Pick<
   | 'lastMessageOfSeries'
 >;
 
-type Props = { messageId: string; hideAvatar: boolean };
+type Props = { messageId: string; hideAvatar: boolean; isPrivate: boolean };
 
 export const MessageAvatar = (props: Props) => {
-  const { messageId, hideAvatar } = props;
+  const { messageId, hideAvatar, isPrivate } = props;
 
   const dispatch = useDispatch();
   const avatarProps = useSelector(state => getMessageAvatarProps(state as any, messageId));
@@ -126,7 +126,10 @@ export const MessageAvatar = (props: Props) => {
   return (
     <StyledAvatar
       key={`msg-avatar-${sender}`}
-      style={{ visibility: hideAvatar ? 'hidden' : undefined }}
+      style={{
+        visibility: hideAvatar ? 'hidden' : undefined,
+        display: isPrivate && hideAvatar ? 'none' : undefined,
+      }}
     >
       <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
       {isSenderAdmin && <CrownIcon />}
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index 0c9f54fc3..d83616b02 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -94,7 +94,9 @@ export const MessageContentWithStatuses = (props: Props) => {
   }
   const { conversationType, direction, isDeleted } = contentProps;
   const isIncoming = direction === 'incoming';
-  const hideAvatar = conversationType !== 'group' || direction === 'outgoing';
+
+  const isPrivate = conversationType === 'private';
+  const hideAvatar = isPrivate || direction === 'outgoing';
 
   const [popupReaction, setPopupReaction] = useState('');
 
@@ -120,7 +122,7 @@ export const MessageContentWithStatuses = (props: Props) => {
         onDoubleClickCapture={onDoubleClickReplyToMessage}
         data-testid={dataTestId}
       >
-        <MessageAvatar messageId={messageId} hideAvatar={hideAvatar} />
+        <MessageAvatar messageId={messageId} hideAvatar={hideAvatar} isPrivate={isPrivate} />
         <MessageStatus
           dataTestId="msg-status-incoming"
           messageId={messageId}