Skip to content

Commit

Permalink
[FIX] Missing placeholders from encrypted channel preview messages no…
Browse files Browse the repository at this point in the history
…w with expected behavior (#27699)
  • Loading branch information
Educg550 committed Jan 13, 2023
1 parent 92a914a commit 28dc859
Showing 1 changed file with 19 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import type { IMessage } from '@rocket.chat/core-typings';
import { isE2EEMessage } from '@rocket.chat/core-typings';
import { PreviewMarkup } from '@rocket.chat/gazzodown';
import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';

Expand All @@ -9,10 +11,25 @@ type ThreadMessagePreviewBodyProps = {
message: IMessage;
};

const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement | null => {
const ThreadMessagePreviewBody = ({ message }: ThreadMessagePreviewBodyProps): ReactElement => {
const t = useTranslation();
const isEncryptedMessage = isE2EEMessage(message);

const parsedMessage = parseMessageTextToAstMarkdown(message, { colors: true, emoticons: true });

return parsedMessage.md ? <PreviewMarkup tokens={parsedMessage.md} /> : null;
const getMessage = () => {
if (!isEncryptedMessage || message.e2e === 'done') {
return parsedMessage.md ? <PreviewMarkup tokens={parsedMessage.md} /> : <>{parsedMessage.msg}</>;
}

if (isEncryptedMessage && message.e2e === 'pending') {
return <>{t('E2E_message_encrypted_placeholder')}</>;
}

return <>{parsedMessage.msg}</>;
};

return getMessage();
};

export default ThreadMessagePreviewBody;

0 comments on commit 28dc859

Please sign in to comment.