From 06b713bc8c5c6dc250fdba9c9737a7b1962ef704 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 27 Oct 2021 09:51:22 -0300
Subject: [PATCH 1/2] Use older preview logic

---
 app/containers/markdown/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/containers/markdown/index.tsx b/app/containers/markdown/index.tsx
index d84dc7dc82f..f4800579b3e 100644
--- a/app/containers/markdown/index.tsx
+++ b/app/containers/markdown/index.tsx
@@ -369,7 +369,7 @@ class Markdown extends PureComponent<IMarkdownProps, any> {
 			return null;
 		}
 
-		if (this.isNewMarkdown) {
+		if (this.isNewMarkdown && !preview) {
 			return (
 				<NewMarkdown
 					username={username}

From 56d53e39f927cdae6b9ad6e64a64e282b8b9132c Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Wed, 27 Oct 2021 09:59:34 -0300
Subject: [PATCH 2/2] Stories

---
 .../__snapshots__/Storyshots.test.js.snap     | 20 +++++++++++++++++++
 storybook/stories/Markdown.js                 | 18 +++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap
index 3b283ab56d2..57d7e5aea0a 100644
--- a/__tests__/__snapshots__/Storyshots.test.js.snap
+++ b/__tests__/__snapshots__/Storyshots.test.js.snap
@@ -18121,6 +18121,26 @@ exports[`Storyshots Markdown Preview 1`] = `
   >
     Testing: 😃 👍 :marioparty:
   </Text>
+  <Text
+    accessibilityLabel="Fallback from new md to old"
+    numberOfLines={1}
+    style={
+      Array [
+        Object {
+          "backgroundColor": "transparent",
+          "fontFamily": "System",
+          "fontSize": 16,
+          "fontWeight": "400",
+          "textAlign": "left",
+        },
+        Object {
+          "color": "#2f343d",
+        },
+      ]
+    }
+  >
+    Fallback from new md to old
+  </Text>
 </View>
 `;
 
diff --git a/storybook/stories/Markdown.js b/storybook/stories/Markdown.js
index 4f4cb2955cb..c00aaa78c94 100644
--- a/storybook/stories/Markdown.js
+++ b/storybook/stories/Markdown.js
@@ -80,6 +80,24 @@ stories.add('Preview', () => (
 			username='rocket.cat'
 		/>
 		<Markdown msg='Testing: 😃 :+1: :marioparty:' getCustomEmoji={getCustomEmoji} theme={theme} numberOfLines={1} preview />
+		<Markdown
+			msg='Fallback from new md to old'
+			getCustomEmoji={getCustomEmoji}
+			theme={theme}
+			numberOfLines={1}
+			preview
+			md={[
+				{
+					type: 'PARAGRAPH',
+					value: [
+						{
+							type: 'PLAIN_TEXT',
+							value: 'This is Rocket.Chat'
+						}
+					]
+				}
+			]}
+		/>
 	</View>
 ));