Reply: Fix sender drawing (#4941)
This commit is contained in:
parent
458f71a555
commit
b407960fd7
@ -88,7 +88,6 @@ import {
|
|||||||
selectPeer,
|
selectPeer,
|
||||||
selectPeerStory,
|
selectPeerStory,
|
||||||
selectPerformanceSettingsValue,
|
selectPerformanceSettingsValue,
|
||||||
selectReplySender,
|
|
||||||
selectRequestedChatTranslationLanguage,
|
selectRequestedChatTranslationLanguage,
|
||||||
selectRequestedMessageTranslationLanguage,
|
selectRequestedMessageTranslationLanguage,
|
||||||
selectSender,
|
selectSender,
|
||||||
@ -1713,7 +1712,7 @@ export default memo(withGlobal<OwnProps>(
|
|||||||
const shouldHideReply = replyToMsgId && replyToMsgId === threadId;
|
const shouldHideReply = replyToMsgId && replyToMsgId === threadId;
|
||||||
const replyMessage = replyToMsgId ? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId) : undefined;
|
const replyMessage = replyToMsgId ? selectChatMessage(global, replyToPeerId || chatId, replyToMsgId) : undefined;
|
||||||
const forwardHeader = forwardInfo || replyFrom;
|
const forwardHeader = forwardInfo || replyFrom;
|
||||||
const replyMessageSender = replyMessage ? selectReplySender(global, replyMessage)
|
const replyMessageSender = replyMessage ? selectSender(global, replyMessage)
|
||||||
: forwardHeader && !isRepliesChat && !isAnonymousForwards
|
: forwardHeader && !isRepliesChat && !isAnonymousForwards
|
||||||
? selectSenderFromHeader(global, forwardHeader) : undefined;
|
? selectSenderFromHeader(global, forwardHeader) : undefined;
|
||||||
const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage);
|
const replyMessageForwardSender = replyMessage && selectForwardedSender(global, replyMessage);
|
||||||
|
|||||||
@ -456,17 +456,6 @@ export function selectSenderFromMessage<T extends GlobalState>(
|
|||||||
return selectPeer(global, message.senderId);
|
return selectPeer(global, message.senderId);
|
||||||
}
|
}
|
||||||
|
|
||||||
export function selectReplySender<T extends GlobalState>(
|
|
||||||
global: T, message: ApiMessage,
|
|
||||||
) {
|
|
||||||
const { senderId } = message;
|
|
||||||
if (!senderId) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
return selectPeer(global, senderId);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function selectSenderFromHeader<T extends GlobalState>(
|
export function selectSenderFromHeader<T extends GlobalState>(
|
||||||
global: T,
|
global: T,
|
||||||
header: ApiMessageForwardInfo,
|
header: ApiMessageForwardInfo,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user