From faed6279e40c55bc82295b7e4abc59ba8b4f5db0 Mon Sep 17 00:00:00 2001
From: Felicio Mununga <felicio@users.noreply.github.com>
Date: Thu, 14 Sep 2023 21:25:18 +0200
Subject: [PATCH] f

---
 .../src/context-tag/context-tag.tsx           | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/components/src/context-tag/context-tag.tsx b/packages/components/src/context-tag/context-tag.tsx
index e0ef2ae55..0e4d045c7 100644
--- a/packages/components/src/context-tag/context-tag.tsx
+++ b/packages/components/src/context-tag/context-tag.tsx
@@ -10,6 +10,7 @@ import { Text } from '../text'
 import type { AvatarProps } from '../avatar'
 import type { TextProps } from '../text'
 import type { IconProps } from '@status-im/icons'
+import type { ComponentProps } from 'react'
 
 type Props = { blur?: boolean; outline?: boolean } & (
   | {
@@ -74,6 +75,15 @@ const iconSizes: Record<NonNullable<Props['size']>, IconProps['size']> = {
   '20': 12,
 }
 
+const chevronIconSize: Record<
+  NonNullable<Props['size']>,
+  ComponentProps<typeof ChevronRightIcon>['size']
+> = {
+  '32': 20,
+  '24': 16,
+  '20': 12,
+}
+
 const Label = (props: {
   children: string
   size: 13 | 15
@@ -95,8 +105,10 @@ const ContextTag = (props: Props) => {
   const hasAvatar = type !== 'address' && type !== 'icon' && type !== 'label'
 
   let textSize: Extract<TextProps['size'], 13 | 15>
+  let paddingHorizontal: number | undefined
   if (size === 24) {
     textSize = 'textSize' in props ? props.textSize : 13 // default if props.size not set but fallbacked to 24
+    paddingHorizontal = textSize === 13 ? 8 : 6
   } else {
     textSize = textSizes[size]
   }
@@ -140,7 +152,10 @@ const ContextTag = (props: Props) => {
             />
             <Stack flexDirection="row" gap="$0" alignItems="center">
               <Label size={textSize}>{props.channel.communityName}</Label>
-              <ChevronRightIcon color="$neutral-50" size={20} />
+              <ChevronRightIcon
+                color="$neutral-50"
+                size={chevronIconSize[size]}
+              />
               <Label size={textSize}>{`# ` + props.channel.name}</Label>
             </Stack>
           </>
@@ -256,8 +271,9 @@ const ContextTag = (props: Props) => {
       blur={blur}
       borderRadius={rounded ? '$8' : '$full'}
       size={size}
-      textSize={textSize}
-      {...(hasAvatar && { paddingLeft: 1 })}
+      {...(paddingHorizontal && { paddingHorizontal })}
+      {...(hasAvatar && { paddingLeft: 2 })}
+      {...(hasAvatar && outline && { paddingLeft: 1 })}
     >
       {renderContent()}
     </Base>
@@ -272,17 +288,13 @@ const Base = styled(View, {
   display: 'inline-flex',
   flexDirection: 'row',
   alignItems: 'center',
-  borderWidth: '1px',
-  borderStyle: 'solid',
-  borderColor: 'transparent',
 
   variants: {
     outline: {
       true: {
+        borderWidth: '1px',
         borderColor: '$primary-50',
-      },
-      false: {
-        borderColor: 'transparent',
+        borderStyle: 'solid',
       },
     },
     blur: {
@@ -309,13 +321,5 @@ const Base = styled(View, {
         paddingHorizontal: 12,
       },
     },
-    textSize: {
-      13: {
-        paddingHorizontal: 8,
-      },
-      15: {
-        paddingHorizontal: 6,
-      },
-    },
   } as const,
 })