From 0ca9aa1291f93096fb1de35480770f715d1a36e0 Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Tue, 1 Nov 2022 15:49:24 -0300
Subject: [PATCH 1/4] Hide block when AST is empty

---
 .../client/views/room/MessageList/components/MessageContent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
index 14790de47492c..3d0d04d0f8c2c 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
@@ -54,7 +54,7 @@ const MessageContent: FC<{
 
 	return (
 		<>
-			{!message.blocks?.length && message.md && (
+			{!message.blocks?.length && !!message.md?.length && (
 				<MessageBody data-qa-type='message-body'>
 					{!isEncryptedMessage && <MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />}
 					{isEncryptedMessage && message.e2e === 'done' && (

From 88377dbf2b3b34f15c08a14baedd0f2be58d0376 Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Tue, 1 Nov 2022 15:58:13 -0300
Subject: [PATCH 2/4] Fix body inside body

---
 .../components/MessageContentBody.tsx         | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
index 616bfd1746a97..30a5ea5dd90e8 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
@@ -1,5 +1,5 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, MessageBody, Palette } from '@rocket.chat/fuselage';
+import { Box, Palette } from '@rocket.chat/fuselage';
 import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
@@ -126,23 +126,21 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
 	const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);
 
 	return (
-		<MessageBody>
-			<Box className={messageBodyAdditionalStyles}>
-				<MarkupInteractionContext.Provider
-					value={{
-						detectEmoji,
-						highlightRegex,
-						resolveUserMention,
-						onUserMentionClick,
-						resolveChannelMention,
-						onChannelMentionClick,
-						convertAsciiToEmoji,
-					}}
-				>
-					<Markup tokens={md} />
-				</MarkupInteractionContext.Provider>
-			</Box>
-		</MessageBody>
+		<Box className={messageBodyAdditionalStyles}>
+			<MarkupInteractionContext.Provider
+				value={{
+					detectEmoji,
+					highlightRegex,
+					resolveUserMention,
+					onUserMentionClick,
+					resolveChannelMention,
+					onChannelMentionClick,
+					convertAsciiToEmoji,
+				}}
+			>
+				<Markup tokens={md} />
+			</MarkupInteractionContext.Provider>
+		</Box>
 	);
 };
 

From fd29d5de9a91a7bd5bf200ac0026fe6a35432cab Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Tue, 1 Nov 2022 18:35:37 -0300
Subject: [PATCH 3/4] Move MessageBody again

---
 .../MessageList/components/MessageContent.tsx | 11 +++---
 .../components/MessageContentBody.tsx         | 34 ++++++++++---------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
index 3d0d04d0f8c2c..445dbc717caa5 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable complexity */
 import { IMessage, isDiscussionMessage, isThreadMainMessage, ISubscription, isE2EEMessage } from '@rocket.chat/core-typings';
-import { MessageBody, MessageBlock } from '@rocket.chat/fuselage';
+import { MessageBlock } from '@rocket.chat/fuselage';
 import { useTranslation, useUserId, TranslationKey } from '@rocket.chat/ui-contexts';
 import React, { FC, memo } from 'react';
 
@@ -54,14 +54,13 @@ const MessageContent: FC<{
 
 	return (
 		<>
-			{!message.blocks?.length && !!message.md?.length && (
-				<MessageBody data-qa-type='message-body'>
-					{!isEncryptedMessage && <MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />}
-					{isEncryptedMessage && message.e2e === 'done' && (
+			{!message.blocks?.length && message.md?.length && (
+				<>
+					{(!isEncryptedMessage || message.e2e === 'done') && (
 						<MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />
 					)}
 					{isEncryptedMessage && message.e2e === 'pending' && t('E2E_message_encrypted_placeholder')}
-				</MessageBody>
+				</>
 			)}
 
 			{message.blocks && (
diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
index 30a5ea5dd90e8..0999bb2d11ca1 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContentBody.tsx
@@ -1,5 +1,5 @@
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Palette } from '@rocket.chat/fuselage';
+import { MessageBody, Box, Palette } from '@rocket.chat/fuselage';
 import { MarkupInteractionContext, Markup, UserMention, ChannelMention } from '@rocket.chat/gazzodown';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
@@ -126,21 +126,23 @@ const MessageContentBody = ({ mentions, channels, md }: MessageContentBodyProps)
 	const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);
 
 	return (
-		<Box className={messageBodyAdditionalStyles}>
-			<MarkupInteractionContext.Provider
-				value={{
-					detectEmoji,
-					highlightRegex,
-					resolveUserMention,
-					onUserMentionClick,
-					resolveChannelMention,
-					onChannelMentionClick,
-					convertAsciiToEmoji,
-				}}
-			>
-				<Markup tokens={md} />
-			</MarkupInteractionContext.Provider>
-		</Box>
+		<MessageBody data-qa-type='message-body'>
+			<Box className={messageBodyAdditionalStyles}>
+				<MarkupInteractionContext.Provider
+					value={{
+						detectEmoji,
+						highlightRegex,
+						resolveUserMention,
+						onUserMentionClick,
+						resolveChannelMention,
+						onChannelMentionClick,
+						convertAsciiToEmoji,
+					}}
+				>
+					<Markup tokens={md} />
+				</MarkupInteractionContext.Provider>
+			</Box>
+		</MessageBody>
 	);
 };
 

From f040ba3e5e58f319b2ae77a5c6c94b703cfa1ccc Mon Sep 17 00:00:00 2001
From: gabriellsh <gabriel.henriques@rocket.chat>
Date: Tue, 1 Nov 2022 18:37:01 -0300
Subject: [PATCH 4/4] Oops

---
 .../client/views/room/MessageList/components/MessageContent.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
index 445dbc717caa5..161ba24e812c8 100644
--- a/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
+++ b/apps/meteor/client/views/room/MessageList/components/MessageContent.tsx
@@ -54,7 +54,7 @@ const MessageContent: FC<{
 
 	return (
 		<>
-			{!message.blocks?.length && message.md?.length && (
+			{!message.blocks?.length && !!message.md?.length && (
 				<>
 					{(!isEncryptedMessage || message.e2e === 'done') && (
 						<MessageContentBody md={message.md} mentions={message.mentions} channels={message.channels} />