diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap index 831f2b7e8..34962552e 100644 --- a/__tests__/__snapshots__/Storyshots.test.js.snap +++ b/__tests__/__snapshots__/Storyshots.test.js.snap @@ -209,29 +209,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -435,29 +437,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + @@ -661,29 +665,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - ... + + + ... + @@ -869,29 +875,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Different user + + + Different user + @@ -959,29 +967,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is the third message + + + This is the third message + @@ -1049,29 +1059,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is the second message + + + This is the second message + @@ -1257,29 +1269,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is the first message + + + This is the first message + @@ -1365,29 +1379,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -1605,29 +1621,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -1827,29 +1845,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -2053,29 +2073,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -2304,30 +2326,32 @@ exports[`Storyshots Message list 1`] = ` } } > - - Testing block quote + + + Testing block quote + @@ -2540,30 +2564,32 @@ exports[`Storyshots Message list 1`] = ` } } > - - Testing block quote + + + Testing block quote + @@ -2577,29 +2603,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Testing block quote + + + Testing block quote + @@ -2835,31 +2863,33 @@ exports[`Storyshots Message list 1`] = ` } } > - - Dogs + + + Dogs + - - cats + + + cats + @@ -2975,33 +3007,35 @@ exports[`Storyshots Message list 1`] = ` } } > - - cats + + + cats + @@ -3241,31 +3275,33 @@ exports[`Storyshots Message list 1`] = ` } } > - - Dogs + + + Dogs + @@ -3311,31 +3347,33 @@ exports[`Storyshots Message list 1`] = ` } } > - - Cats + + + Cats + @@ -3573,31 +3611,33 @@ exports[`Storyshots Message list 1`] = ` } } > - - Dogs + + + Dogs + @@ -3699,31 +3739,33 @@ exports[`Storyshots Message list 1`] = ` } } > - - Cats + + + Cats + @@ -3929,29 +3971,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -4155,29 +4199,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -4381,176 +4427,178 @@ exports[`Storyshots Message list 1`] = ` } } > - - @rocket.cat - - + - - - - @diego.mello - - + @rocket.cat + + + + + - - - - @all - - + @diego.mello + + + + + - - - - @here - - + @all + + + + + - - - - #general + > + @here + + + + + + #general + @@ -4754,29 +4802,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - 👊🤙👏 + + + 👊🤙👏 + @@ -4980,29 +5030,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - 👏 + + + 👏 + @@ -5206,93 +5258,152 @@ exports[`Storyshots Message list 1`] = ` } } > - + + + + - - + > + + + + + + + + + + + - - - - - @@ -5495,19 +5606,40 @@ exports[`Storyshots Message list 1`] = ` } } > - + + > + + + @@ -5710,43 +5842,64 @@ exports[`Storyshots Message list 1`] = ` } } > - - 🤙 + + + 🤙 + + + + - @@ -5949,66 +6102,87 @@ exports[`Storyshots Message list 1`] = ` } } > - - 🤙 - - + + 🤙 + + - - 🤙🤙 + > + + + + 🤙🤙 + @@ -6212,29 +6386,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Testing + + + Testing + @@ -6438,29 +6614,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Reactions + + + Reactions + @@ -6592,20 +6770,39 @@ exports[`Storyshots Message list 1`] = ` ] } > - + > + + - - Multiple Reactions + + + Multiple Reactions + @@ -7045,20 +7244,39 @@ exports[`Storyshots Message list 1`] = ` ] } > - + > + + - + > + + - + > + + - - Fourth message + + + Fourth message + @@ -8071,29 +8329,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Third message + + + Third message + @@ -8279,29 +8539,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Second message + + + Second message + @@ -8487,29 +8749,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - First message + + + First message + @@ -8713,29 +8977,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Fourth message + + + Fourth message + @@ -8986,29 +9252,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Third message + + + Third message + @@ -9123,29 +9391,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Second message + + + Second message + @@ -9331,29 +9601,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Second message + + + Second message + @@ -9578,29 +9850,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - First message + + + First message + @@ -9859,28 +10133,30 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is a description + + + This is a description + @@ -10122,42 +10398,63 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is a description + + + This is a description + + + + - @@ -10408,42 +10705,63 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is a description + + + This is a description + + + + - @@ -11061,42 +11379,63 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is a description + + + This is a description + + + + - @@ -11162,29 +11501,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - First message + + + First message + @@ -11448,28 +11789,30 @@ exports[`Storyshots Message list 1`] = ` } } > - - This is a description + + + This is a description + @@ -12174,77 +12517,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -12331,28 +12676,30 @@ exports[`Storyshots Message list 1`] = ` } } > - - How are you? + + + How are you? + @@ -12539,77 +12886,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -12696,42 +13045,63 @@ exports[`Storyshots Message list 1`] = ` } } > - - How are you? + + + How are you? + + + + - @@ -12935,77 +13305,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -13073,77 +13445,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -13329,77 +13703,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -13489,77 +13865,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -13785,29 +14163,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - How are you? + + + How are you? + @@ -14074,29 +14454,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - How are you? + + + How are you? + @@ -14393,77 +14775,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -14679,77 +15063,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -14965,77 +15351,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -15251,77 +15639,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -15537,29 +15927,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + @@ -15775,29 +16167,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + @@ -16218,29 +16612,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - How are you? + + + How are you? + @@ -16462,77 +16858,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -16673,29 +17071,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + @@ -17071,77 +17471,79 @@ exports[`Storyshots Message list 1`] = ` } } > - - I - - - 'm fine - - - ! + + + I + + + 'm fine + + + ! + @@ -17282,53 +17684,55 @@ exports[`Storyshots Message list 1`] = ` } } > - - Cool - - - ! + + + Cool + + + ! + @@ -17469,29 +17873,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. + @@ -19365,43 +19771,64 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + + + + - - - Message + + + Message + @@ -19898,28 +20327,30 @@ exports[`Storyshots Message list 1`] = ` } } > - - Custom fields + + + Custom fields + - - Message + + + Message + @@ -20443,28 +20876,30 @@ exports[`Storyshots Message list 1`] = ` } } > - - Custom fields + + + Custom fields + - - Custom fields 2 + + + Custom fields 2 + - - Broadcasted message + + + Broadcasted message + @@ -21263,29 +21702,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This message is inside an archived room + + + This message is inside an archived room + @@ -21520,29 +21961,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This message has error + + + This message has error + @@ -21690,29 +22133,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - This message has error too + + + This message has error too + @@ -21921,29 +22366,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Temp message + + + Temp message + @@ -22147,29 +22594,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message being edited + + + Message being edited + @@ -24763,29 +25212,31 @@ exports[`Storyshots Message list 1`] = ` } } > - - Message + + + Message + @@ -24989,314 +25440,316 @@ exports[`Storyshots Message list 1`] = ` } } > - - Italic with single - - - underscore - - - or double - - - underscores - - - . Bold with single - - - asterisk - - - or double - - - asterisks - - - . Strikethrough with single - - - Strikethrough - - - or double - - - Strikethrough + + + Italic with single + + + underscore + + + or double + + + underscores + + + . Bold with single + + + asterisk + + + or double + + + asterisks + + + . Strikethrough with single + + + Strikethrough + + + or double + + + Strikethrough + @@ -25836,42 +26289,75 @@ exports[`Storyshots Message list 1`] = ` } } > - + + Support + + - Support - - + > + + Google + + - Google + - - - - - - - I + + I + + + \` + + + m an inline-style link + - \` + - m an inline-style link - - - - - - - - https://google.com + + https://google.com + @@ -26304,20 +26759,22 @@ exports[`Storyshots Message list 1`] = ` } } > - + + /> + @@ -26520,103 +26977,105 @@ exports[`Storyshots Message list 1`] = ` } } > - - Inline - - + - code - - + Inline + + - has - - - back-ticks around - - + code + + + has + + - it. + } + } + > + back-ticks around + + + it. + - - Quote + + + Quote + diff --git a/app/containers/EmojiPicker/CustomEmoji.js b/app/containers/EmojiPicker/CustomEmoji.js index ebd336c93..03df9f616 100644 --- a/app/containers/EmojiPicker/CustomEmoji.js +++ b/app/containers/EmojiPicker/CustomEmoji.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Image } from 'react-native'; +import FastImage from 'react-native-fast-image'; import PropTypes from 'prop-types'; export default class CustomEmoji extends React.Component { @@ -16,9 +16,13 @@ export default class CustomEmoji extends React.Component { render() { const { baseUrl, emoji, style } = this.props; return ( - ); } diff --git a/app/containers/markdown/index.js b/app/containers/markdown/index.js index 7a1d3973c..1ccd8692b 100644 --- a/app/containers/markdown/index.js +++ b/app/containers/markdown/index.js @@ -162,7 +162,9 @@ export default class Markdown extends PureComponent { } return ( - {children} + + {children} + ); };