Add missing changes

RocketChat · Apr 29, 2022 · ae1fd33 · ae1fd33
1 parent 74e98b2
commit ae1fd33
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/apps/meteor/client/components/Message/MessageBodyRender/BigEmoji.tsx b/apps/meteor/client/components/Message/MessageBodyRender/BigEmoji.tsx
@@ -1,5 +1,5 @@
 import { BigEmoji as ASTBigEmoji } from '@rocket.chat/message-parser';
-import React, { FC } from 'react';
+import React, { ReactElement } from 'react';
 
 import MessageEmoji from '../MessageEmoji';
 
@@ -8,7 +8,7 @@ type BigEmojiProps = {
 	isThreadPreview?: boolean;
 };
 
-const BigEmoji: FC<BigEmojiProps> = ({ value, isThreadPreview }) => (
+const BigEmoji = ({ value, isThreadPreview }: BigEmojiProps): ReactElement => (
 	<>
 		{value.map((block, index) => (
 			<MessageEmoji isThreadPreview={isThreadPreview} big emojiHandle={`:${block.value.value}:`} key={index} />

diff --git a/apps/meteor/client/components/Message/MessageEmoji.tsx b/apps/meteor/client/components/Message/MessageEmoji.tsx
@@ -12,9 +12,14 @@ type MessageEmojiProps = {
 function MessageEmoji({ emojiHandle, big, isThreadPreview }: MessageEmojiProps): ReactElement {
 	const emojiProps = getEmojiClassNameAndDataTitle(emojiHandle);
 
+	if (!emojiProps.className && !emojiProps.name) {
+		return <>{emojiHandle}</>;
+	}
+
 	if (isThreadPreview) {
 		return <ThreadMessageEmoji {...emojiProps}>{emojiHandle}</ThreadMessageEmoji>;
 	}
+
 	return (
 		<MessageEmojiBase big={big} {...emojiProps}>
 			{emojiHandle}

diff --git a/apps/meteor/client/views/room/MessageList/components/MessageRender.tsx b/apps/meteor/client/views/room/MessageList/components/MessageRender.tsx
@@ -7,7 +7,7 @@ import MessageBodyRender from '../../../../components/Message/MessageBodyRender'
 import { useMessageActions } from '../../contexts/MessageContext';
 import EncryptedMessageRender from './EncryptedMessageRender';
 
-const MessageRender: FC<{ message: IMessage }> = ({ message }) => {
+const MessageRender: FC<{ message: IMessage; isThreadPreview?: boolean }> = ({ message, isThreadPreview }) => {
 	const {
 		actions: { openRoom, openUserCard },
 	} = useMessageActions();
@@ -23,6 +23,7 @@ const MessageRender: FC<{ message: IMessage }> = ({ message }) => {
 					mentions={message?.mentions || []}
 					channels={message?.channels || []}
 					tokens={message.md}
+					isThreadPreview={isThreadPreview}
 				/>
 			)}
 

diff --git a/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx b/apps/meteor/client/views/room/MessageList/components/ThreadMessagePreview.tsx
@@ -59,7 +59,9 @@ export const ThreadMessagePreview: FC<{ message: IThreadMessage; sequential: boo
 					{isSelecting && <CheckBox checked={isSelected} onChange={toggleSelected} />}
 				</ThreadMessageLeftContainer>
 				<ThreadMessageContainer>
-					<ThreadMessageBody>{message.ignored ? t('Message_Ignored') : <MessageRender message={message} />}</ThreadMessageBody>
+					<ThreadMessageBody>
+						{message.ignored ? t('Message_Ignored') : <MessageRender isThreadPreview message={message} />}
+					</ThreadMessageBody>
 				</ThreadMessageContainer>
 			</ThreadMessageRow>
 		</ThreadMessageTemplate>