From c49f8374320b3cd94ac0f25e5f83ff5e543c435d Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Thu, 18 Mar 2021 11:45:00 -0300
Subject: [PATCH] Revert "[FIX] Attachment not rendering markdown (#2924)"

This reverts commit 2ea7e9d3f9bc21fef14d13473c3dd5e2cb205c03.
---
 .../__snapshots__/Storyshots.test.js.snap     | 306 ++----------------
 app/containers/message/Reply.js               |  21 +-
 storybook/stories/Message.js                  |   6 +-
 3 files changed, 26 insertions(+), 307 deletions(-)

diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap
index 84c23537a6..be964795e3 100644
--- a/__tests__/__snapshots__/Storyshots.test.js.snap
+++ b/__tests__/__snapshots__/Storyshots.test.js.snap
@@ -39301,44 +39301,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 1"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 1
-                        </Text>
+                        Value 1
                       </Text>
                     </View>
                     <View
@@ -39378,44 +39351,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 2"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 2
-                        </Text>
+                        Value 2
                       </Text>
                     </View>
                     <View
@@ -39455,44 +39401,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 3"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 3
-                        </Text>
+                        Value 3
                       </Text>
                     </View>
                     <View
@@ -39532,44 +39451,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 4"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 4
-                        </Text>
+                        Value 4
                       </Text>
                     </View>
                     <View
@@ -39609,44 +39501,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 5"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 5
-                        </Text>
+                        Value 5
                       </Text>
                     </View>
                   </View>
@@ -39676,7 +39541,7 @@ exports[`Storyshots Message list message 1`] = `
         ]
       }
     >
-      Two short custom fields with markdown
+      Two short custom fields
     </Text>
     <View
       accessible={true}
@@ -40086,44 +39951,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 1"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 1
-                        </Text>
+                        Value 1
                       </Text>
                     </View>
                     <View
@@ -40163,66 +40001,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          onLongPress={[Function]}
-                          onPress={[Function]}
-                          style={
-                            Object {
-                              "backgroundColor": "transparent",
-                              "color": "#1d74f5",
-                              "fontFamily": "System",
-                              "fontSize": 16,
-                              "fontWeight": "400",
-                              "textAlign": "left",
-                            }
-                          }
-                        >
-                          <Text
-                            accessibilityLabel="Value 2"
-                            style={
-                              Array [
-                                Object {
-                                  "backgroundColor": "transparent",
-                                  "fontFamily": "System",
-                                  "fontSize": 16,
-                                  "fontWeight": "400",
-                                  "textAlign": "left",
-                                },
-                                Array [
-                                  Object {},
-                                  Object {
-                                    "alignItems": "flex-start",
-                                    "flexDirection": "row",
-                                    "flexWrap": "wrap",
-                                    "justifyContent": "flex-start",
-                                    "marginBottom": 0,
-                                    "marginTop": 0,
-                                  },
-                                  Object {
-                                    "backgroundColor": "transparent",
-                                    "fontFamily": "System",
-                                    "fontSize": 16,
-                                    "fontWeight": "400",
-                                    "textAlign": "left",
-                                  },
-                                ],
-                              ]
-                            }
-                          >
-                            Value 2
-                          </Text>
-                        </Text>
+                        Value 2
                       </Text>
                     </View>
                   </View>
@@ -40402,44 +40191,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 1"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 1
-                        </Text>
+                        Value 1
                       </Text>
                     </View>
                     <View
@@ -40479,47 +40241,17 @@ exports[`Storyshots Message list message 1`] = `
                             Object {
                               "backgroundColor": "transparent",
                               "fontFamily": "System",
-                              "fontSize": 16,
+                              "fontSize": 14,
                               "fontWeight": "400",
                               "textAlign": "left",
                             },
-                            undefined,
                             Object {
                               "color": "#2f343d",
                             },
                           ]
                         }
                       >
-                        <Text
-                          accessibilityLabel="Value 2"
-                          style={
-                            Array [
-                              Object {
-                                "backgroundColor": "transparent",
-                                "fontFamily": "System",
-                                "fontSize": 16,
-                                "fontWeight": "400",
-                                "textAlign": "left",
-                              },
-                              Array [
-                                Object {},
-                                Object {
-                                  "alignItems": "flex-start",
-                                  "flexDirection": "row",
-                                  "flexWrap": "wrap",
-                                  "justifyContent": "flex-start",
-                                  "marginBottom": 0,
-                                  "marginTop": 0,
-                                },
-                                Object {
-                                  "fontWeight": "bold",
-                                },
-                              ],
-                            ]
-                          }
-                        >
-                          Value 2
-                        </Text>
+                        Value 2
                       </Text>
                     </View>
                   </View>
diff --git a/app/containers/message/Reply.js b/app/containers/message/Reply.js
index caa80039a7..d05668ddbd 100644
--- a/app/containers/message/Reply.js
+++ b/app/containers/message/Reply.js
@@ -112,24 +112,16 @@ const Description = React.memo(({
 	return true;
 });
 
-const Fields = React.memo(({ attachment, theme, getCustomEmoji }) => {
+const Fields = React.memo(({ attachment, theme }) => {
 	if (!attachment.fields) {
 		return null;
 	}
-
-	const { baseUrl, user } = useContext(MessageContext);
 	return (
 		<View style={styles.fieldsContainer}>
 			{attachment.fields.map(field => (
 				<View key={field.title} style={[styles.fieldContainer, { width: field.short ? '50%' : '100%' }]}>
 					<Text style={[styles.fieldTitle, { color: themes[theme].bodyText }]}>{field.title}</Text>
-					<Markdown
-						msg={field.value}
-						baseUrl={baseUrl}
-						username={user.username}
-						getCustomEmoji={getCustomEmoji}
-						theme={theme}
-					/>
+					<Text style={[styles.fieldValue, { color: themes[theme].bodyText }]}>{field.value}</Text>
 				</View>
 			))}
 		</View>
@@ -184,11 +176,7 @@ const Reply = React.memo(({
 						getCustomEmoji={getCustomEmoji}
 						theme={theme}
 					/>
-					<Fields
-						attachment={attachment}
-						getCustomEmoji={getCustomEmoji}
-						theme={theme}
-					/>
+					<Fields attachment={attachment} theme={theme} />
 				</View>
 			</Touchable>
 			<Markdown
@@ -227,8 +215,7 @@ Description.displayName = 'MessageReplyDescription';
 
 Fields.propTypes = {
 	attachment: PropTypes.object,
-	theme: PropTypes.string,
-	getCustomEmoji: PropTypes.func
+	theme: PropTypes.string
 };
 Fields.displayName = 'MessageReplyFields';
 
diff --git a/storybook/stories/Message.js b/storybook/stories/Message.js
index ac5181d8c8..da1517a996 100644
--- a/storybook/stories/Message.js
+++ b/storybook/stories/Message.js
@@ -706,7 +706,7 @@ export default ({ theme }) => {
 				}]}
 			/>
 
-			<Separator title='Two short custom fields with markdown' theme={theme} />
+			<Separator title='Two short custom fields' theme={theme} />
 			<Message
 				msg='Message'
 				attachments={[{
@@ -720,7 +720,7 @@ export default ({ theme }) => {
 						short: true
 					}, {
 						title: 'Field 2',
-						value: '[Value 2](https://google.com/)',
+						value: 'Value 2',
 						short: true
 					}]
 				}, {
@@ -734,7 +734,7 @@ export default ({ theme }) => {
 						short: true
 					}, {
 						title: 'Field 2',
-						value: '**Value 2**',
+						value: 'Value 2',
 						short: true
 					}]
 				}]}