From 7f74b8cd99486cbbefcd0c8f37401b4c76dc268d Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Thu, 13 Jan 2022 01:11:45 +0100
Subject: [PATCH] Message: Fix redundant focusing to message from sender name

---
 src/components/middle/message/Message.tsx               | 3 ++-
 src/components/middle/message/hooks/useInnerHandlers.ts | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index 8fbb71fcb..e20602b47 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -357,7 +357,8 @@ const Message: FC<OwnProps & StateProps> = ({
     chatId,
     threadId,
     isInDocumentGroup,
-    Boolean(isScheduled),
+    asForwarded,
+    isScheduled,
     isRepliesChat,
     album,
     avatarPeer,
diff --git a/src/components/middle/message/hooks/useInnerHandlers.ts b/src/components/middle/message/hooks/useInnerHandlers.ts
index 31d9b7562..8016a77cf 100644
--- a/src/components/middle/message/hooks/useInnerHandlers.ts
+++ b/src/components/middle/message/hooks/useInnerHandlers.ts
@@ -15,6 +15,7 @@ export default function useInnerHandlers(
   chatId: string,
   threadId: number,
   isInDocumentGroup: boolean,
+  asForwarded?: boolean,
   isScheduled?: boolean,
   isChatWithRepliesBot?: boolean,
   album?: IAlbum,
@@ -50,14 +51,16 @@ export default function useInnerHandlers(
       return;
     }
 
-    if (forwardInfo?.channelPostId) {
+    if (asForwarded && forwardInfo?.channelPostId) {
       focusMessage({ chatId: senderPeer.id, messageId: forwardInfo.channelPostId });
     } else if (isUserId(senderPeer.id)) {
       openUserInfo({ id: senderPeer.id });
     } else {
       openChat({ id: senderPeer.id });
     }
-  }, [focusMessage, forwardInfo?.channelPostId, lang, openChat, openUserInfo, senderPeer, showNotification]);
+  }, [
+    asForwarded, focusMessage, forwardInfo, lang, openChat, openUserInfo, senderPeer, showNotification,
+  ]);
 
   const handleViaBotClick = useCallback(() => {
     if (!botSender) {