From ca6463da024f9a0b1c3b7e23b6e24887439c2824 Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 17 May 2023 12:11:08 +1000 Subject: [PATCH] fix: make sure to show the quoted message above quotes that only have attachments and no text --- .../conversation/message/message-content/MessageContent.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx index b3dda4912..02fc6a98f 100644 --- a/ts/components/conversation/message/message-content/MessageContent.tsx +++ b/ts/components/conversation/message/message-content/MessageContent.tsx @@ -145,7 +145,7 @@ export const MessageContent = (props: Props) => { return null; } - const { direction, text, timestamp, serverTimestamp, previews } = contentProps; + const { direction, text, timestamp, serverTimestamp, previews, quote } = contentProps; const selectedMsg = useSelector(state => getMessageTextProps(state as any, props.messageId)); @@ -154,7 +154,7 @@ export const MessageContent = (props: Props) => { isDeleted = selectedMsg.isDeleted; } - const hasContentAfterAttachmentAndQuote = !isEmpty(previews) || !isEmpty(text); + const hasContentBeforeAttachment = !isEmpty(previews) || !isEmpty(quote) || !isEmpty(text); const toolTipTitle = moment(serverTimestamp || timestamp).format('llll'); @@ -178,7 +178,7 @@ export const MessageContent = (props: Props) => { }} > - {hasContentAfterAttachmentAndQuote && ( + {hasContentBeforeAttachment && ( {!isDeleted && ( <>