From 28f48340e816df8a3001c07db0d2b488226b2676 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Wed, 12 Jun 2024 18:10:59 +0200
Subject: [PATCH] Message: Render forward avatar (#4642)

---
 src/components/middle/message/Message.tsx           | 8 ++++++++
 src/components/middle/message/_message-content.scss | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 2c542e361..48f309fe6 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -1295,6 +1295,7 @@ const Message: FC<OwnProps & StateProps> = ({
     const senderEmojiStatus = senderPeer && 'emojiStatus' in senderPeer && senderPeer.emojiStatus;
     const senderIsPremium = senderPeer && 'isPremium' in senderPeer && senderPeer.isPremium;
 
+    const shouldRenderForwardAvatar = asForwarded && senderPeer;
     return (
       <div className="message-title" dir="ltr">
         {(senderTitle || asForwarded) ? (
@@ -1311,6 +1312,13 @@ const Message: FC<OwnProps & StateProps> = ({
               <Icon name={forwardInfo?.hiddenUserName ? 'forward' : 'share-filled'} />
             )}
             {storyData && <Icon name="play-story" />}
+            {shouldRenderForwardAvatar && (
+              <Avatar
+                className="forward-avatar"
+                peer={senderPeer}
+                size="micro"
+              />
+            )}
             {senderTitle ? renderText(senderTitle) : (asForwarded ? NBSP : undefined)}
             {!asForwarded && senderEmojiStatus && (
               <CustomEmoji
diff --git a/src/components/middle/message/_message-content.scss b/src/components/middle/message/_message-content.scss
index 90b334bdc..f40d6d45d 100644
--- a/src/components/middle/message/_message-content.scss
+++ b/src/components/middle/message/_message-content.scss
@@ -281,6 +281,10 @@
       align-items: center;
     }
 
+    .forward-avatar {
+      margin-right: 0.25rem;
+    }
+
     & > .interactive {
       overflow: hidden;
       text-overflow: ellipsis;