From f2e7cf4e5c7a18c45d1308ca2f24aebbcf98f706 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Tue, 22 Nov 2022 08:23:14 -0500
Subject: [PATCH] Remove avatar from chat messages

---
 .../chats/components/chat-message-list.tsx    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/features/chats/components/chat-message-list.tsx b/app/soapbox/features/chats/components/chat-message-list.tsx
index 18759e38a4..f281a5e131 100644
--- a/app/soapbox/features/chats/components/chat-message-list.tsx
+++ b/app/soapbox/features/chats/components/chat-message-list.tsx
@@ -311,8 +311,8 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
                 className={
                   classNames({
                     'text-ellipsis break-all relative rounded-md p-2 max-w-full': true,
-                    'bg-primary-500 text-white mr-2': isMyMessage,
-                    'bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100 order-2 ml-2': !isMyMessage,
+                    'bg-primary-500 text-white': isMyMessage,
+                    'bg-gray-200 dark:bg-gray-800 text-gray-900 dark:text-gray-100': !isMyMessage,
                     '!bg-transparent !p-0 emoji-lg': isOnlyEmoji,
                   })
                 }
@@ -320,11 +320,12 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
                 tabIndex={0}
               >
                 {maybeRenderMedia(chatMessage)}
-                <Text size='sm' theme='inherit' className='break-word-nested' dangerouslySetInnerHTML={{ __html: content }} />
-              </div>
-
-              <div className={classNames({ 'order-1': !isMyMessage })}>
-                <Avatar src={isMyMessage ? account?.avatar as string : chat.account.avatar as string} size={34} />
+                <Text
+                  size='sm'
+                  theme='inherit'
+                  className='break-word-nested'
+                  dangerouslySetInnerHTML={{ __html: content }}
+                />
               </div>
             </HStack>
           </HStack>
@@ -365,10 +366,6 @@ const ChatMessageList: React.FC<IChatMessageList> = ({ chat }) => {
                 ) : null}
               </span>
             </div>
-
-            <div className={classNames({ 'order-1': !isMyMessage })}>
-              <div className='w-[34px]' />
-            </div>
           </HStack>
         </Stack>
       </div>