From 21bf80dedd544577d6c022176ef7ca7876ad0eff Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Mon, 26 Jun 2023 20:58:38 -0300
Subject: [PATCH 1/6] fix: solve missing avatar workspace logo issue

---
 src/components/Avatar.js          | 16 +++++++++-------
 src/components/SubscriptAvatar.js |  1 -
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index 66a1b60c3cef..fa7d17d22535 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -73,9 +73,9 @@ function Avatar(props) {
     const isWorkspace = props.type === CONST.ICON_TYPE_WORKSPACE;
     const iconSize = StyleUtils.getAvatarSize(props.size);
 
-    const imageStyle = props.imageStyles ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : undefined;
+    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), StyleUtils.getAvatarBorderRadius(props.size, props.type)];
 
-    const iconStyle = props.imageStyles ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
+    const iconStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
     const iconFillColor = isWorkspace ? StyleUtils.getDefaultWorkspaceAvatarColor(props.name).fill : props.fill;
     const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(props.name) : props.fallbackIcon;
@@ -101,11 +101,13 @@ function Avatar(props) {
                     />
                 </View>
             ) : (
-                <Image
-                    source={{uri: props.source}}
-                    style={imageStyle}
-                    onError={() => setImageError(true)}
-                />
+                <View style={[iconStyle, ...props.iconAdditionalStyles]}>
+                    <Image
+                        source={{uri: props.source}}
+                        style={imageStyle}
+                        onError={() => setImageError(true)}
+                    />
+                </View>
             )}
         </View>
     );
diff --git a/src/components/SubscriptAvatar.js b/src/components/SubscriptAvatar.js
index b94bf4dffd25..454d5204d3a4 100644
--- a/src/components/SubscriptAvatar.js
+++ b/src/components/SubscriptAvatar.js
@@ -68,7 +68,6 @@ function SubscriptAvatar(props) {
             <Tooltip text={props.secondaryTooltip}>
                 <View>
                     <Avatar
-                        imageStyles={null}
                         containerStyles={[props.size === CONST.AVATAR_SIZE.SMALL ? styles.secondAvatarSubscriptCompact : styles.secondAvatarSubscript]}
                         iconAdditionalStyles={[
                             StyleUtils.getAvatarBorderWidth(props.size === CONST.AVATAR_SIZE.SMALL ? CONST.AVATAR_SIZE.SMALL_SUBSCRIPT : CONST.AVATAR_SIZE.SUBSCRIPT),

From b6b43c62e374a4e529fdde927889ebccfcca2c25 Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Sat, 1 Jul 2023 20:57:35 -0300
Subject: [PATCH 2/6] fix: change subscript avatar border styles

---
 src/components/Avatar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index fa7d17d22535..48d24744438f 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -73,7 +73,7 @@ function Avatar(props) {
     const isWorkspace = props.type === CONST.ICON_TYPE_WORKSPACE;
     const iconSize = StyleUtils.getAvatarSize(props.size);
 
-    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), StyleUtils.getAvatarBorderRadius(props.size, props.type)];
+    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), { borderRadius: 0 }];
 
     const iconStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
@@ -101,7 +101,7 @@ function Avatar(props) {
                     />
                 </View>
             ) : (
-                <View style={[iconStyle, ...props.iconAdditionalStyles]}>
+                <View style={[iconStyle, StyleUtils.getAvatarBorderStyle(props.size, props.type), ...props.iconAdditionalStyles]}>
                     <Image
                         source={{uri: props.source}}
                         style={imageStyle}

From 0d4d893ee2ec84af55394e6a0f57685739b441b6 Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Sun, 2 Jul 2023 11:29:37 -0300
Subject: [PATCH 3/6] fix: remove inline styles

---
 src/components/Avatar.js | 2 +-
 src/styles/styles.js     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index 48d24744438f..3bec55586444 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -73,7 +73,7 @@ function Avatar(props) {
     const isWorkspace = props.type === CONST.ICON_TYPE_WORKSPACE;
     const iconSize = StyleUtils.getAvatarSize(props.size);
 
-    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), { borderRadius: 0 }];
+    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), styles.br0];
 
     const iconStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 74066af5e20a..2c9928bd1a6f 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -742,6 +742,10 @@ const styles = {
         borderColor: themeColors.border,
     },
 
+    br0: {
+        borderRadius: 0,
+    },
+
     borderColorFocus: {
         borderColor: themeColors.borderFocus,
     },

From e9040559e7f35f12ca26d4cacd8cb40ca237e42e Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Mon, 3 Jul 2023 14:39:43 -0300
Subject: [PATCH 4/6] fix(lint): add prettier changes

---
 src/components/Avatar.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index 3bec55586444..740e21bf5cce 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -73,7 +73,10 @@ function Avatar(props) {
     const isWorkspace = props.type === CONST.ICON_TYPE_WORKSPACE;
     const iconSize = StyleUtils.getAvatarSize(props.size);
 
-    const imageStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)] : [StyleUtils.getAvatarStyle(props.size), styles.br0];
+    const imageStyle =
+        props.imageStyles && props.imageStyles.length > 0
+            ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)]
+            : [StyleUtils.getAvatarStyle(props.size), styles.br0];
 
     const iconStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 

From e835c839affb69ac36c614c61b2663339c6ac07c Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Mon, 3 Jul 2023 14:41:34 -0300
Subject: [PATCH 5/6] fix: remove greater than zero comparison

---
 src/components/Avatar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index 740e21bf5cce..941b6365f206 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -74,11 +74,11 @@ function Avatar(props) {
     const iconSize = StyleUtils.getAvatarSize(props.size);
 
     const imageStyle =
-        props.imageStyles && props.imageStyles.length > 0
+        props.imageStyles && props.imageStyles.length
             ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)]
             : [StyleUtils.getAvatarStyle(props.size), styles.br0];
 
-    const iconStyle = props.imageStyles && props.imageStyles.length > 0 ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
+    const iconStyle = props.imageStyles && props.imageStyles.length ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
     const iconFillColor = isWorkspace ? StyleUtils.getDefaultWorkspaceAvatarColor(props.name).fill : props.fill;
     const fallbackAvatar = isWorkspace ? ReportUtils.getDefaultWorkspaceAvatar(props.name) : props.fallbackIcon;

From 0f268552cb558915fd50f595efdb0017e56788e2 Mon Sep 17 00:00:00 2001
From: Davi Rodrigues <developer.davi@gmail.com>
Date: Mon, 3 Jul 2023 14:43:00 -0300
Subject: [PATCH 6/6] fix: update no border radius style

---
 src/components/Avatar.js | 2 +-
 src/styles/styles.js     | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Avatar.js b/src/components/Avatar.js
index 941b6365f206..b59a8902eb13 100644
--- a/src/components/Avatar.js
+++ b/src/components/Avatar.js
@@ -76,7 +76,7 @@ function Avatar(props) {
     const imageStyle =
         props.imageStyles && props.imageStyles.length
             ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)]
-            : [StyleUtils.getAvatarStyle(props.size), styles.br0];
+            : [StyleUtils.getAvatarStyle(props.size), styles.noBorderRadius];
 
     const iconStyle = props.imageStyles && props.imageStyles.length ? [StyleUtils.getAvatarStyle(props.size), styles.bgTransparent, ...props.imageStyles] : undefined;
 
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 2c9928bd1a6f..f26f39adefba 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -551,6 +551,10 @@ const styles = {
         marginVertical: 1,
     },
 
+    noBorderRadius: {
+        borderRadius: 0,
+    },
+
     noRightBorderRadius: {
         borderTopRightRadius: 0,
         borderBottomRightRadius: 0,
@@ -742,10 +746,6 @@ const styles = {
         borderColor: themeColors.border,
     },
 
-    br0: {
-        borderRadius: 0,
-    },
-
     borderColorFocus: {
         borderColor: themeColors.borderFocus,
     },