From d632c3ec2cb9ab9b760875bfa25c3e5cfd69bf46 Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Sat, 7 Aug 2021 17:04:50 +0300
Subject: [PATCH] Message: Fix jumping width when selecting (#1367)

---
 src/components/middle/message/Message.tsx | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx
index d4830fde7..4b31a4aa0 100644
--- a/src/components/middle/message/Message.tsx
+++ b/src/components/middle/message/Message.tsx
@@ -294,11 +294,9 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
     !(isContextMenuShown || isInSelectMode || isForwarding)
     && (!isInDocumentGroup || isLastInDocumentGroup)
   );
-  const canForward = canShowActionButton && isChannel && !isScheduled;
-  const canFocus = Boolean(canShowActionButton && (
-    (forwardInfo && (forwardInfo.isChannelPost || (isChatWithSelf && !isOwn)) && forwardInfo.fromMessageId)
-    || isPinnedList
-  ));
+  const canForward = isChannel && !isScheduled;
+  const canFocus = Boolean(isPinnedList
+    || (forwardInfo && (forwardInfo.isChannelPost || (isChatWithSelf && !isOwn)) && forwardInfo.fromMessageId));
   const avatarPeer = forwardInfo && (isChatWithSelf || !sender) ? originSender : sender;
   const senderPeer = forwardInfo ? originSender : sender;
 
@@ -841,7 +839,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
               onClick={handleMessageSelect}
             />
           )}
-          {canForward ? (
+          {canShowActionButton && canForward ? (
             <Button
               className="message-action-button"
               color="translucent-white"
@@ -852,7 +850,7 @@ const Message: FC<OwnProps & StateProps & DispatchProps> = ({
             >
               <i className="icon-share-filled" />
             </Button>
-          ) : canFocus ? (
+          ) : canShowActionButton && canFocus ? (
             <Button
               className="message-action-button"
               color="translucent-white"