Merge pull request #21657 from developerdavi/bugfix/workspace-logo

fix: solve missing avatar workspace logo issue
Expensify · Jul 3, 2023 · e7a17f8 · e7a17f8
2 parents a05baab + 0f26855
commit e7a17f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/components/Avatar.js b/src/components/Avatar.js
@@ -73,9 +73,12 @@ 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
+            ? [StyleUtils.getAvatarStyle(props.size), ...props.imageStyles, StyleUtils.getAvatarBorderRadius(props.size, props.type)]
+            : [StyleUtils.getAvatarStyle(props.size), styles.noBorderRadius];
 
-    const iconStyle = props.imageStyles ? [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;
@@ -101,11 +104,13 @@ function Avatar(props) {
                     />
                 </View>
             ) : (
-                <Image
-                    source={{uri: props.source}}
-                    style={imageStyle}
-                    onError={() => setImageError(true)}
-                />
+                <View style={[iconStyle, StyleUtils.getAvatarBorderStyle(props.size, props.type), ...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
@@ -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),

diff --git 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,