diff --git a/__tests__/__snapshots__/Storyshots.test.js.snap b/__tests__/__snapshots__/Storyshots.test.js.snap index 67f5c84e2..c2c7e00df 100644 --- a/__tests__/__snapshots__/Storyshots.test.js.snap +++ b/__tests__/__snapshots__/Storyshots.test.js.snap @@ -58,7 +58,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -180,38 +179,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -262,7 +263,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -384,38 +384,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - 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. + - + @@ -466,7 +468,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -588,38 +589,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - … + + + … + - + @@ -652,7 +655,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -774,38 +776,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Different user + + + Different user + - + @@ -838,7 +842,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -860,38 +863,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - This is the third message + + + This is the third message + - + @@ -924,7 +929,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -946,38 +950,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - This is the second message + + + This is the second message + - + @@ -1010,7 +1016,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -1132,38 +1137,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - This is the first message + + + This is the first message + - + @@ -1214,7 +1221,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -1236,38 +1242,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - Message + + + Message + - + @@ -1318,7 +1326,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -1454,38 +1461,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -1518,7 +1527,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -1654,38 +1662,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -1736,7 +1746,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -1858,38 +1867,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -1940,7 +1951,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -2062,38 +2072,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -2144,7 +2156,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -2266,38 +2277,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -2348,7 +2361,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -2470,122 +2482,124 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + -   - rocket.cat -   - - - - - -   - diego.mello -   - - - - - +   + rocket.cat +   + + + + + -   - all -   - - - - - +   + diego.mello +   + + + + + -   - here -   - - - - - +   + all +   + + + + + -  # - general -   + > +   + here +   + + + + + +  # + general +   + - + @@ -2636,7 +2650,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -2758,38 +2771,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - 👊🤙👏 + + + 👊🤙👏 + - + @@ -2840,7 +2855,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -2962,38 +2976,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - 👏 + + + 👏 + - + @@ -3044,7 +3060,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -3166,80 +3181,82 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - - + > + + + + + + + + + - - - - - - + @@ -3290,7 +3307,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -3412,48 +3428,50 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - + > + + - + @@ -3504,7 +3522,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -3626,51 +3643,53 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - 🤙 - - + > + + 🤙 + + + - + @@ -3721,7 +3740,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -3843,54 +3861,56 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - 🤙 - - - - 🤙🤙 + > + + 🤙 + + + + 🤙🤙 + - + @@ -3941,7 +3961,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -4063,38 +4082,40 @@ exports[`Storyshots Message list 1`] = ` 10 November 2017 - - + - - Testing + + + Testing + - + @@ -4145,7 +4166,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -4267,38 +4287,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Reactions + + + Reactions + - + @@ -4763,38 +4784,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Multiple Reactions + + + Multiple Reactions + - + @@ -5622,38 +5644,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Fourth message + + + Fourth message + - + @@ -5686,7 +5710,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -5808,38 +5831,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Third message + + + Third message + - + @@ -5872,7 +5897,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -5994,38 +6018,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Second message + + + Second message + - + @@ -6058,7 +6084,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -6180,38 +6205,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - First message + + + First message + - + @@ -6262,7 +6289,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -6384,38 +6410,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Fourth message + + + Fourth message + - + @@ -6513,7 +6541,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -6635,38 +6662,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Third message + + + Third message + - + @@ -6746,7 +6775,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -6768,38 +6796,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - Second message + + + Second message + - + @@ -6832,7 +6862,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -6954,38 +6983,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Second message + + + Second message + - + @@ -7057,7 +7088,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -7179,38 +7209,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - First message + + + First message + - + @@ -7261,7 +7293,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -7383,6 +7414,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -7623,6 +7654,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -7894,6 +7925,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -8137,6 +8168,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -8353,6 +8384,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -8645,38 +8676,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - First message + + + First message + - + @@ -8709,7 +8742,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -8731,6 +8763,7 @@ exports[`Storyshots Message list 1`] = ` ] } > + @@ -9010,6 +9042,7 @@ exports[`Storyshots Message list 1`] = ` ] } > + @@ -9257,6 +9289,7 @@ exports[`Storyshots Message list 1`] = ` ] } > + @@ -9622,38 +9654,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - I’m fine! + + + I’m fine! + - + @@ -9914,38 +9947,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - I’m fine! + + + I’m fine! + - + @@ -10237,38 +10271,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - I’m fine! + + + I’m fine! + - + @@ -10301,7 +10337,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -10323,38 +10358,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -10387,7 +10424,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -10509,38 +10545,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - I’m fine! + + + I’m fine! + - + @@ -10617,38 +10654,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -10843,38 +10881,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - How are you? + + + How are you? + - + @@ -11110,38 +11149,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - How are you? + + + How are you? + - + @@ -11407,38 +11447,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -11471,7 +11513,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -11623,38 +11664,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -11687,7 +11730,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -11839,38 +11881,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -11903,7 +11947,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -12055,38 +12098,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -12119,7 +12164,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -12271,38 +12315,40 @@ 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. + - + @@ -12335,7 +12381,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -12487,38 +12532,40 @@ 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. + - + @@ -12551,7 +12598,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -12703,19 +12749,21 @@ exports[`Storyshots Message list 1`] = ` ] } > - + - Sent an attachment - + > + Sent an attachment + + @@ -12765,7 +12813,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -12887,38 +12934,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - How are you? + + + How are you? + - + @@ -13109,38 +13157,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -13173,7 +13223,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -13250,38 +13299,40 @@ 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. + - + @@ -13314,7 +13365,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -13391,19 +13441,21 @@ exports[`Storyshots Message list 1`] = ` ] } > - + - Sent an attachment - + > + Sent an attachment + + @@ -13453,7 +13505,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -13605,38 +13656,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - I’m fine! + + + I’m fine! + - + @@ -13669,7 +13722,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -13746,38 +13798,40 @@ exports[`Storyshots Message list 1`] = ` ] } > - - + - - Cool! + + + Cool! + - + @@ -13810,7 +13864,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -13887,38 +13940,40 @@ 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. + - + @@ -13951,7 +14006,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -14028,19 +14082,21 @@ exports[`Storyshots Message list 1`] = ` ] } > - + - Sent an attachment - + > + Sent an attachment + + @@ -14090,7 +14146,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -14361,7 +14416,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -14634,7 +14688,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -14907,7 +14960,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -15198,7 +15250,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -15320,6 +15371,7 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM + @@ -15632,51 +15683,53 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message - - + > + + Message + + + - + @@ -15794,6 +15846,7 @@ exports[`Storyshots Message list 1`] = ` ] } > + @@ -16028,38 +16080,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -16548,38 +16601,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -17144,38 +17198,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Broadcasted message + + + Broadcasted message + - + @@ -17425,38 +17480,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - This message is inside an archived room + + + This message is inside an archived room + - + @@ -17481,51 +17538,7 @@ exports[`Storyshots Message list 1`] = ` > Error - - - -  - - + @@ -17657,89 +17669,93 @@ exports[`Storyshots Message list 1`] = ` > 10:00 AM - - - +  + + + + + + - - This message has error + + + This message has error + - + - - - -  - - + @@ -17773,37 +17788,135 @@ exports[`Storyshots Message list 1`] = ` } > - - - This message has error too + diego.mello + + + + 10:00 AM + + + +  + + + + + + + + + This message has error too + - + @@ -17853,9 +17966,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - Object { - "opacity": 0.3, - }, ] } > @@ -17978,37 +18088,45 @@ exports[`Storyshots Message list 1`] = ` - + - - Temp message + + + Temp message + - + @@ -18059,7 +18177,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18181,38 +18298,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message being edited + + + Message being edited + - + @@ -18263,7 +18382,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18403,7 +18521,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18543,7 +18660,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18683,7 +18799,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18823,7 +18938,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -18963,7 +19077,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19103,7 +19216,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19243,7 +19355,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19383,7 +19494,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19523,7 +19633,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19663,7 +19772,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19803,7 +19911,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -19943,7 +20050,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -20083,7 +20189,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -20223,7 +20328,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -20368,7 +20472,6 @@ exports[`Storyshots Message list 1`] = ` "backgroundColor": "#ddd", }, ], - undefined, ] } > @@ -20490,38 +20593,40 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Message + + + Message + - + @@ -20572,7 +20677,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -20694,105 +20798,107 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Italic with - - asterisks + Italic with - - - or - - - - underscores + > + + asterisks + - - - . Bold with - - - asterisks + or - - - or - - - - underscores + > + + underscores + - - - . - - - Strikethrough + . Bold with + + + + asterisks + + + + or + + + + underscores + + + + . + + + + Strikethrough + - + @@ -20843,7 +20949,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -20965,182 +21070,184 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - + - - - H1 + + + H1 + - - - - + - - H2 + + + H2 + - - - - + - - H3 + + + H3 + - - - - + - - H4 + + + H4 + - - - - + - - H5 + + + H5 + - - - - + - - H6 + + + H6 + - + @@ -21192,7 +21299,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -21314,74 +21420,76 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Support - - Google + Support - - - - - - - I\`m an inline-style link + > + + Google + + + + + + + + I\`m an inline-style link + + + + https://google.com - - - https://google.com - + @@ -21432,7 +21540,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -21554,37 +21661,39 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - + > + + + @@ -21635,7 +21744,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -21757,86 +21865,88 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - - + - - Inline - - code - - - has - - + Inline + + - back-ticks around - - - it. + > + code + + + has + + + back-ticks around + + + it. + - - - Code block + > + Code block - + + @@ -21887,7 +21997,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -22009,48 +22118,50 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - + - - - Quote + + + Quote + - + @@ -22102,7 +22213,6 @@ exports[`Storyshots Message list 1`] = ` "width": "100%", }, undefined, - undefined, ] } > @@ -22224,35 +22334,25 @@ exports[`Storyshots Message list 1`] = ` 10:00 AM - + @@ -22260,183 +22360,195 @@ exports[`Storyshots Message list 1`] = ` style={ Array [ Object { - "flex": 1, - "padding": 5, + "borderBottomWidth": 1, + "borderColor": "#000000", + "flexDirection": "row", }, ] } > - - - First Header - - - - - + + First Header + + + + - - Second Header + + + Second Header + - + - - - + - - - Content from cell 1 + + + Content from cell 1 + - + + + + + Content from cell 2 + + + - - - Content from cell 2 - - - - - - - + + Content in the first column + + + + - - Content in the first column - - - - - - - Content in the second column + > + + Content in the second column + - + diff --git a/app/containers/message/Content.js b/app/containers/message/Content.js index 81a191c48..e2b3e298a 100644 --- a/app/containers/message/Content.js +++ b/app/containers/message/Content.js @@ -1,5 +1,5 @@ import React from 'react'; -import { Text } from 'react-native'; +import { Text, View } from 'react-native'; import PropTypes from 'prop-types'; import I18n from '../../i18n'; @@ -12,26 +12,35 @@ const Content = React.memo((props) => { return {getInfoMessage({ ...props })}; } + let content = null; + if (props.tmid && !props.msg) { - return {I18n.t('Sent_an_attachment')}; + content = {I18n.t('Sent_an_attachment')}; + } else { + content = ( + + ); } return ( - + + {content} + ); -}, (prevProps, nextProps) => prevProps.msg === nextProps.msg); +}, (prevProps, nextProps) => prevProps.isTemp === nextProps.isTemp && prevProps.msg === nextProps.msg); Content.propTypes = { + isTemp: PropTypes.bool, isInfo: PropTypes.bool, isEdited: PropTypes.bool, useMarkdown: PropTypes.bool, diff --git a/app/containers/message/Message.js b/app/containers/message/Message.js index d10a5262f..b1adde4df 100644 --- a/app/containers/message/Message.js +++ b/app/containers/message/Message.js @@ -4,7 +4,6 @@ import { View } from 'react-native'; import Touchable from 'react-native-platform-touchable'; import User from './User'; -import MessageError from './MessageError'; import styles from './styles'; import sharedStyles from '../../views/Styles'; import RepliedThread from './RepliedThread'; @@ -45,7 +44,7 @@ const Message = React.memo((props) => { if (props.isThreadReply || props.isThreadSequential || props.isInfo) { const thread = props.isThreadReply ? : null; return ( - + {thread} @@ -62,7 +61,7 @@ const Message = React.memo((props) => { ); } return ( - + { if (props.hasError) { return ( - - + ); diff --git a/app/containers/message/MessageError.js b/app/containers/message/MessageError.js index d53b38214..0392e6443 100644 --- a/app/containers/message/MessageError.js +++ b/app/containers/message/MessageError.js @@ -5,14 +5,15 @@ import PropTypes from 'prop-types'; import { CustomIcon } from '../../lib/Icons'; import { COLOR_DANGER } from '../../constants/colors'; import styles from './styles'; +import { BUTTON_HIT_SLOP } from './utils'; const MessageError = React.memo(({ hasError, onErrorPress }) => { if (!hasError) { return null; } return ( - - + + ); }, (prevProps, nextProps) => prevProps.hasError === nextProps.hasError); diff --git a/app/containers/message/User.js b/app/containers/message/User.js index fad7825ef..54634f08e 100644 --- a/app/containers/message/User.js +++ b/app/containers/message/User.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types'; import { View, Text, StyleSheet } from 'react-native'; import moment from 'moment'; +import MessageError from './MessageError'; import sharedStyles from '../../views/Styles'; import messageStyles from './styles'; @@ -31,9 +32,9 @@ const styles = StyleSheet.create({ }); const User = React.memo(({ - isHeader, useRealName, author, alias, ts, timeFormat + isHeader, useRealName, author, alias, ts, timeFormat, hasError, ...props }) => { - if (isHeader) { + if (isHeader || hasError) { const username = (useRealName && author.name) || author.username; const aliasUsername = alias ? ( @{username}) : null; const time = moment(ts).format(timeFormat); @@ -47,6 +48,7 @@ const User = React.memo(({ {time} + { hasError && } ); } @@ -55,6 +57,7 @@ const User = React.memo(({ User.propTypes = { isHeader: PropTypes.bool, + hasError: PropTypes.bool, useRealName: PropTypes.bool, author: PropTypes.object, alias: PropTypes.string, diff --git a/app/containers/message/index.js b/app/containers/message/index.js index de62fe758..7adf26dc8 100644 --- a/app/containers/message/index.js +++ b/app/containers/message/index.js @@ -128,6 +128,9 @@ export default class MessageContainer extends React.Component { const { item, previousItem, broadcast, Message_GroupingPeriod } = this.props; + if (this.hasError || (previousItem && previousItem.status === messagesStatus.ERROR)) { + return true; + } if (previousItem && ( (previousItem.ts.toDateString() === item.ts.toDateString()) && (previousItem.u.username === item.u.username) diff --git a/app/containers/message/styles.js b/app/containers/message/styles.js index d193b76c0..605bc5c2e 100644 --- a/app/containers/message/styles.js +++ b/app/containers/message/styles.js @@ -114,7 +114,7 @@ export default StyleSheet.create({ color: COLOR_PRIMARY }, errorButton: { - paddingHorizontal: 15, + paddingLeft: 10, paddingVertical: 5 }, buttonContainer: {