From e2e465cbf022ac214dd259b248e5e5fb123ccbc9 Mon Sep 17 00:00:00 2001
From: Yash Rajpal <58601732+yash-rajpal@users.noreply.github.com>
Date: Tue, 8 Nov 2022 18:27:48 +0530
Subject: [PATCH] [FIX] Always parse encrypted messages on client (#27092)

---
 apps/meteor/app/e2e/client/rocketchat.e2e.ts      |  3 ---
 .../lib/parseMessageTextToAstMarkdown.ts          | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index 82e6e4f685e..c770c4a23eb 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -412,10 +412,7 @@ class E2E extends Emitter {
 			e2e: 'done',
 		};
 
-		console.log('before quote', decryptedMessage);
-
 		const decryptedMessageWithQuote = await this.parseQuoteAttachment(decryptedMessage);
-		console.log('after quote', decryptedMessageWithQuote);
 
 		return decryptedMessageWithQuote;
 	}
diff --git a/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts b/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
index 6fc56660fbc..d97a65bbca6 100644
--- a/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/parseMessageTextToAstMarkdown.ts
@@ -1,4 +1,12 @@
-import { IMessage, isQuoteAttachment, isTranslatedMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
+import {
+	IMessage,
+	isE2EEMessage,
+	isOTRMessage,
+	isQuoteAttachment,
+	isTranslatedMessage,
+	MessageAttachment,
+	MessageQuoteAttachment,
+} from '@rocket.chat/core-typings';
 import { Options, parse, Root } from '@rocket.chat/message-parser';
 
 import { isParsedMessage } from './isParsedMessage';
@@ -34,7 +42,10 @@ export const parseMessageTextToAstMarkdown = (
 
 	return {
 		...msg,
-		md: msg.md ?? textToMessageToken(text, parseOptions),
+		md:
+			isE2EEMessage(message) || isOTRMessage(message)
+				? textToMessageToken(text, parseOptions)
+				: msg.md ?? textToMessageToken(text, parseOptions),
 		...(msg.attachments && { attachments: parseMessageAttachments(msg.attachments, parseOptions) }),
 	};
 };