From 12b0cfb40f3e14a235d4ddb5495824bf8c5b48d6 Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Mon, 24 Jul 2023 18:13:46 +0100
Subject: [PATCH 1/6] fix: fix reply border

---
 .../Message/MessageSimple/MessageReplies.tsx  | 25 ++++++-------------
 .../MessageSimple/MessageRepliesAvatars.tsx   |  4 ++-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/package/src/components/Message/MessageSimple/MessageReplies.tsx b/package/src/components/Message/MessageSimple/MessageReplies.tsx
index ea0427b87..8ebaca98c 100644
--- a/package/src/components/Message/MessageSimple/MessageReplies.tsx
+++ b/package/src/components/Message/MessageSimple/MessageReplies.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ColorValue, Platform, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
+import { ColorValue, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
 
 import {
   MessageContextValue,
@@ -22,21 +22,16 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     flexDirection: 'row',
     marginTop: 8,
+    paddingBottom: 5,
   },
   curveContainer: {
     flexDirection: 'row',
   },
   leftMessageRepliesCurve: {
     borderBottomLeftRadius: 16,
-    borderRightColor: 'transparent',
-    ...Platform.select({
-      android: {
-        borderRightWidth: 0,
-      },
-    }),
+    borderRightWidth: 0,
   },
   messageRepliesCurve: {
-    borderTopColor: 'transparent',
     borderTopWidth: 0,
     borderWidth: 1,
     height: 16,
@@ -45,17 +40,11 @@ const styles = StyleSheet.create({
   messageRepliesText: {
     fontSize: 12,
     fontWeight: '700',
-    paddingBottom: 5,
-    paddingLeft: 8,
+    paddingHorizontal: 8,
   },
   rightMessageRepliesCurve: {
     borderBottomRightRadius: 16,
-    borderLeftColor: 'transparent',
-    ...Platform.select({
-      android: {
-        borderLeftWidth: 0,
-      },
-    }),
+    borderLeftWidth: 0,
   },
 });
 
@@ -123,7 +112,6 @@ const MessageRepliesWithContext = <
               ]}
             />
           )}
-          <MessageRepliesAvatars alignment={alignment} message={message} />
         </View>
       )}
       <TouchableOpacity
@@ -157,6 +145,7 @@ const MessageRepliesWithContext = <
         style={[styles.container, container]}
         testID='message-replies'
       >
+        {alignment === 'left' && <MessageRepliesAvatars alignment={alignment} message={message} />}
         <Text style={[styles.messageRepliesText, { color: accent_blue }, messageRepliesText]}>
           {message.reply_count === 1
             ? t('1 Thread Reply')
@@ -164,10 +153,10 @@ const MessageRepliesWithContext = <
                 replyCount: message.reply_count,
               })}
         </Text>
+        {alignment === 'right' && <MessageRepliesAvatars alignment={alignment} message={message} />}
       </TouchableOpacity>
       {alignment === 'right' && (
         <View testID='message-replies-right'>
-          <MessageRepliesAvatars alignment={alignment} message={message} />
           {!noBorder && (
             <View
               style={[
diff --git a/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx b/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
index c0ffe836f..85bf1755c 100644
--- a/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
+++ b/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
@@ -54,7 +54,9 @@ export const MessageRepliesAvatarsWithContext = <
     <View
       style={[
         styles.avatarContainer,
-        alignment === 'right' ? { marginLeft: 8, ...rightAvatarsContainer } : leftAvatarsContainer,
+        alignment === 'right'
+          ? { marginRight: 8, ...rightAvatarsContainer }
+          : { marginLeft: 8, ...leftAvatarsContainer },
       ]}
     >
       {avatars.map((user, i) => (

From 8c9ca8d77728657e52131fce0f63fe6e271bf3b2 Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Mon, 24 Jul 2023 18:30:31 +0100
Subject: [PATCH 2/6] chore: revert move of MessageRepliesAvatars

---
 .../components/Message/MessageSimple/MessageReplies.tsx   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/src/components/Message/MessageSimple/MessageReplies.tsx b/package/src/components/Message/MessageSimple/MessageReplies.tsx
index 8ebaca98c..fe12728b1 100644
--- a/package/src/components/Message/MessageSimple/MessageReplies.tsx
+++ b/package/src/components/Message/MessageSimple/MessageReplies.tsx
@@ -101,7 +101,7 @@ const MessageRepliesWithContext = <
   return (
     <View style={styles.curveContainer}>
       {alignment === 'left' && (
-        <View testID='message-replies-left'>
+        <View style={styles.curveContainer} testID='message-replies-left'>
           {!noBorder && (
             <View
               style={[
@@ -112,6 +112,7 @@ const MessageRepliesWithContext = <
               ]}
             />
           )}
+          <MessageRepliesAvatars alignment={alignment} message={message} />
         </View>
       )}
       <TouchableOpacity
@@ -145,7 +146,6 @@ const MessageRepliesWithContext = <
         style={[styles.container, container]}
         testID='message-replies'
       >
-        {alignment === 'left' && <MessageRepliesAvatars alignment={alignment} message={message} />}
         <Text style={[styles.messageRepliesText, { color: accent_blue }, messageRepliesText]}>
           {message.reply_count === 1
             ? t('1 Thread Reply')
@@ -153,10 +153,10 @@ const MessageRepliesWithContext = <
                 replyCount: message.reply_count,
               })}
         </Text>
-        {alignment === 'right' && <MessageRepliesAvatars alignment={alignment} message={message} />}
       </TouchableOpacity>
       {alignment === 'right' && (
-        <View testID='message-replies-right'>
+        <View style={styles.curveContainer} testID='message-replies-right'>
+          <MessageRepliesAvatars alignment={alignment} message={message} />
           {!noBorder && (
             <View
               style={[

From fc184262414c2704aaf0a49039ea75827479ae0e Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Mon, 24 Jul 2023 18:32:14 +0100
Subject: [PATCH 3/6] chore: revert styling

---
 package/src/components/Message/MessageSimple/MessageReplies.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/src/components/Message/MessageSimple/MessageReplies.tsx b/package/src/components/Message/MessageSimple/MessageReplies.tsx
index fe12728b1..76b8de48b 100644
--- a/package/src/components/Message/MessageSimple/MessageReplies.tsx
+++ b/package/src/components/Message/MessageSimple/MessageReplies.tsx
@@ -22,7 +22,6 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     flexDirection: 'row',
     marginTop: 8,
-    paddingBottom: 5,
   },
   curveContainer: {
     flexDirection: 'row',
@@ -40,6 +39,7 @@ const styles = StyleSheet.create({
   messageRepliesText: {
     fontSize: 12,
     fontWeight: '700',
+    paddingBottom: 5,
     paddingHorizontal: 8,
   },
   rightMessageRepliesCurve: {

From a0251500f615ccb4e1d6f8eb71cf2c913863bf06 Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Mon, 24 Jul 2023 18:57:28 +0100
Subject: [PATCH 4/6] chore: update snapshot

---
 .../__snapshots__/MessageReplies.test.js.snap      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
index e59d9694a..f4d44bf5b 100644
--- a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
+++ b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
@@ -9,6 +9,11 @@ exports[`MessageReplies should render message replies 1`] = `
   }
 >
   <View
+    style={
+      Object {
+        "flexDirection": "row",
+      }
+    }
     testID="message-replies-left"
   >
     <View
@@ -18,7 +23,6 @@ exports[`MessageReplies should render message replies 1`] = `
             "borderColor": undefined,
           },
           Object {
-            "borderTopColor": "transparent",
             "borderTopWidth": 0,
             "borderWidth": 1,
             "height": 16,
@@ -26,7 +30,7 @@ exports[`MessageReplies should render message replies 1`] = `
           },
           Object {
             "borderBottomLeftRadius": 16,
-            "borderRightColor": "transparent",
+            "borderRightWidth": 0,
           },
           Object {},
         ]
@@ -40,7 +44,9 @@ exports[`MessageReplies should render message replies 1`] = `
             "flexDirection": "row",
             "paddingTop": 2,
           },
-          Object {},
+          Object {
+            "marginLeft": 8,
+          },
         ]
       }
     />
@@ -73,7 +79,7 @@ exports[`MessageReplies should render message replies 1`] = `
             "fontSize": 12,
             "fontWeight": "700",
             "paddingBottom": 5,
-            "paddingLeft": 8,
+            "paddingHorizontal": 8,
           },
           Object {
             "color": "#005FFF",

From 20190655245e8d6ff1969340dc679d2b0303ddc8 Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Sun, 3 Sep 2023 19:23:34 +0100
Subject: [PATCH 5/6] chore: remove margin

---
 .../Message/MessageSimple/MessageRepliesAvatars.tsx           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx b/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
index 85bf1755c..5485d9a42 100644
--- a/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
+++ b/package/src/components/Message/MessageSimple/MessageRepliesAvatars.tsx
@@ -54,9 +54,7 @@ export const MessageRepliesAvatarsWithContext = <
     <View
       style={[
         styles.avatarContainer,
-        alignment === 'right'
-          ? { marginRight: 8, ...rightAvatarsContainer }
-          : { marginLeft: 8, ...leftAvatarsContainer },
+        alignment === 'right' ? rightAvatarsContainer : leftAvatarsContainer,
       ]}
     >
       {avatars.map((user, i) => (

From 5b03fe7f778567f27a0547bb7cee1e92047dfbde Mon Sep 17 00:00:00 2001
From: aharwood9 <harwood.adam2@gmail.com>
Date: Sun, 3 Sep 2023 19:35:55 +0100
Subject: [PATCH 6/6] chore: update snapshot

---
 .../__tests__/__snapshots__/MessageReplies.test.js.snap       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
index f4d44bf5b..7a3c134a1 100644
--- a/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
+++ b/package/src/components/Message/MessageSimple/__tests__/__snapshots__/MessageReplies.test.js.snap
@@ -44,9 +44,7 @@ exports[`MessageReplies should render message replies 1`] = `
             "flexDirection": "row",
             "paddingTop": 2,
           },
-          Object {
-            "marginLeft": 8,
-          },
+          Object {},
         ]
       }
     />