From a6a20afce0e9d7277b75eb65b24d914e95ec198c Mon Sep 17 00:00:00 2001 From: Joshua McNabb Date: Mon, 20 Jun 2022 22:59:52 -0600 Subject: [PATCH 1/2] fix green outline showing on workspace avatar image --- src/pages/settings/InitialSettingsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index e9374be7f609..ee2b3c649427 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -139,7 +139,7 @@ const InitialSettingsPage = (props) => { icon: policy.avatarURL ? policy.avatarURL : Expensicons.Building, iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), - iconStyles: [styles.popoverMenuIconEmphasized], + iconStyles: policy.avatarURL ? undefined : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, })) From 6cd580794923e2a1985720effa646ff8e7506503 Mon Sep 17 00:00:00 2001 From: Joshua McNabb Date: Wed, 22 Jun 2022 18:24:14 -0600 Subject: [PATCH 2/2] refactor undefined to be empty array for icon styles --- src/pages/settings/InitialSettingsPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/InitialSettingsPage.js b/src/pages/settings/InitialSettingsPage.js index ee2b3c649427..209c84bb921f 100755 --- a/src/pages/settings/InitialSettingsPage.js +++ b/src/pages/settings/InitialSettingsPage.js @@ -139,7 +139,7 @@ const InitialSettingsPage = (props) => { icon: policy.avatarURL ? policy.avatarURL : Expensicons.Building, iconType: policy.avatarURL ? CONST.ICON_TYPE_AVATAR : CONST.ICON_TYPE_ICON, action: () => Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policy.id)), - iconStyles: policy.avatarURL ? undefined : [styles.popoverMenuIconEmphasized], + iconStyles: policy.avatarURL ? [] : [styles.popoverMenuIconEmphasized], iconFill: themeColors.iconReversed, fallbackIcon: Expensicons.FallbackWorkspaceAvatar, }))