From e125979b7aa054c2b46baad007f510d12efb0d36 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 29 Aug 2022 15:19:41 +1000
Subject: [PATCH] fix: disable having some corner large and small for message
 bubbles

---
 .../message-content/MessageContent.tsx        | 33 ++-----------------
 ts/state/selectors/conversations.ts           |  2 --
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/ts/components/conversation/message/message-content/MessageContent.tsx b/ts/components/conversation/message/message-content/MessageContent.tsx
index e1fbaeb03..c38e67786 100644
--- a/ts/components/conversation/message/message-content/MessageContent.tsx
+++ b/ts/components/conversation/message/message-content/MessageContent.tsx
@@ -32,15 +32,7 @@ import styled from 'styled-components';
 
 export type MessageContentSelectorProps = Pick<
   MessageRenderingProps,
-  | 'text'
-  | 'direction'
-  | 'timestamp'
-  | 'serverTimestamp'
-  | 'firstMessageOfSeries'
-  | 'lastMessageOfSeries'
-  | 'previews'
-  | 'quote'
-  | 'attachments'
+  'text' | 'direction' | 'timestamp' | 'serverTimestamp' | 'previews' | 'quote' | 'attachments'
 >;
 
 type Props = {
@@ -96,22 +88,8 @@ function onClickOnMessageInnerContainer(event: React.MouseEvent<HTMLDivElement>)
   }
 }
 
-const radiusLg = '18px';
-const radiusSm = '4px';
-
-const StyledMessageContent = styled.div<{
-  isOutgoing: boolean;
-  firstOfSeries: boolean;
-  lastOfSeries: boolean;
-}>`
-  border-top-right-radius: ${props =>
-    props.isOutgoing ? (props.firstOfSeries ? `${radiusLg}` : `${radiusSm}`) : `${radiusLg}`};
-  border-bottom-right-radius: ${props =>
-    props.isOutgoing ? (props.lastOfSeries ? `${radiusLg}` : `${radiusSm}`) : `${radiusLg}`};
-  border-top-left-radius: ${props =>
-    !props.isOutgoing ? (props.firstOfSeries ? `${radiusLg}` : `${radiusSm}`) : `${radiusLg}`};
-  border-bottom-left-radius: ${props =>
-    !props.isOutgoing ? (props.lastOfSeries ? `${radiusLg}` : `${radiusSm}`) : `${radiusLg}`};
+const StyledMessageContent = styled.div`
+  border-radius: 18px;
 `;
 
 export const IsMessageVisibleContext = createContext(false);
@@ -178,8 +156,6 @@ export const MessageContent = (props: Props) => {
     text,
     timestamp,
     serverTimestamp,
-    firstMessageOfSeries,
-    lastMessageOfSeries,
     previews,
     quote,
     attachments,
@@ -216,9 +192,6 @@ export const MessageContent = (props: Props) => {
       style={{
         width: isShowingImage ? width : undefined,
       }}
-      firstOfSeries={Boolean(firstMessageOfSeries || props.isDetailView)}
-      lastOfSeries={Boolean(lastMessageOfSeries || props.isDetailView)}
-      isOutgoing={direction === 'outgoing'}
       role="button"
       onClick={onClickOnMessageInnerContainer}
       title={toolTipTitle}
diff --git a/ts/state/selectors/conversations.ts b/ts/state/selectors/conversations.ts
index 5bf3108c0..73922ef10 100644
--- a/ts/state/selectors/conversations.ts
+++ b/ts/state/selectors/conversations.ts
@@ -1089,8 +1089,6 @@ export const getMessageContentSelectorProps = createSelector(getMessagePropsByMe
   }
 
   const msgProps: MessageContentSelectorProps = {
-    firstMessageOfSeries: props.firstMessageOfSeries,
-    lastMessageOfSeries: props.lastMessageOfSeries,
     ...pick(props.propsForMessage, [
       'direction',
       'serverTimestamp',