From 1d797bc3bab9ebb23aaf0a4e2a0d7209928988c7 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Fri, 25 Mar 2022 13:14:58 +0100
Subject: [PATCH] Message: Show correct message sender when forwarding (#1784)

---
 src/components/common/EmbeddedMessage.tsx                | 2 +-
 .../middle/composer/ComposerEmbeddedMessage.tsx          | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/common/EmbeddedMessage.tsx b/src/components/common/EmbeddedMessage.tsx
index e168182dc..b0931d43f 100644
--- a/src/components/common/EmbeddedMessage.tsx
+++ b/src/components/common/EmbeddedMessage.tsx
@@ -54,7 +54,7 @@ const EmbeddedMessage: FC<OwnProps> = ({
 
   const lang = useLang();
 
-  const senderTitle = sender && getSenderTitle(lang, sender);
+  const senderTitle = message?.forwardInfo?.hiddenUserName || (sender && getSenderTitle(lang, sender));
 
   return (
     <div
diff --git a/src/components/middle/composer/ComposerEmbeddedMessage.tsx b/src/components/middle/composer/ComposerEmbeddedMessage.tsx
index 1b0477b36..9a898b742 100644
--- a/src/components/middle/composer/ComposerEmbeddedMessage.tsx
+++ b/src/components/middle/composer/ComposerEmbeddedMessage.tsx
@@ -148,10 +148,9 @@ export default memo(withGlobal<OwnProps>(
     }
 
     let sender: ApiChat | ApiUser | undefined;
-    if (replyingToId && message) {
+    if ((isForwarding || replyingToId) && message) {
       const { forwardInfo } = message;
       const isChatWithSelf = chatId === currentUserId;
-
       if (forwardInfo && (forwardInfo.isChannelPost || isChatWithSelf)) {
         sender = selectForwardedSender(global, message);
       }
@@ -159,8 +158,10 @@ export default memo(withGlobal<OwnProps>(
       if (!sender) {
         sender = selectSender(global, message);
       }
-    } else if (isForwarding) {
-      sender = isUserId(fromChatId!) ? selectUser(global, fromChatId!) : selectChat(global, fromChatId!);
+
+      if (!sender) {
+        sender = isUserId(fromChatId!) ? selectUser(global, fromChatId!) : selectChat(global, fromChatId!);
+      }
     }
 
     return {