From b407960fd7d3f1819aa19c9cd75c34cac1defdb5 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 6 Sep 2024 15:43:28 +0200 Subject: [PATCH] Reply: Fix sender drawing (#4941) --- src/components/middle/message/Message.tsx | 3 +-- src/global/selectors/messages.ts | 11 ----------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/components/middle/message/Message.tsx b/src/components/middle/message/Message.tsx index 025137d9f..021b904a5 100644 --- a/src/components/middle/message/Message.tsx +++ b/src/components/middle/message/Message.tsx @@ -88,7 +88,6 @@ import { selectPeer, selectPeerStory, selectPerformanceSettingsValue, - selectReplySender, selectRequestedChatTranslationLanguage, selectRequestedMessageTranslationLanguage, selectSender, @@ -1713,7 +1712,7 @@ export default memo(withGlobal( const shouldHideReply = replyToMsgId && replyToMsgId === threadId; const replyMessage = replyToMsgId ? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId) : undefined; const forwardHeader = forwardInfo || replyFrom; - const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage) + const replyMessageSender = replyMessage ? selectSender(global, replyMessage) : forwardHeader && !isRepliesChat && !isAnonymousForwards ? selectSenderFromHeader(global, forwardHeader) : undefined; const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage); diff --git a/src/global/selectors/messages.ts b/src/global/selectors/messages.ts index efab30444..27e1c8a54 100644 --- a/src/global/selectors/messages.ts +++ b/src/global/selectors/messages.ts @@ -456,17 +456,6 @@ export function selectSenderFromMessage( return selectPeer(global, message.senderId); } -export function selectReplySender( - global: T, message: ApiMessage, -) { - const { senderId } = message; - if (!senderId) { - return undefined; - } - - return selectPeer(global, senderId); -} - export function selectSenderFromHeader( global: T, header: ApiMessageForwardInfo,