From bdb247a90ea253987393700da10d1737b26f2dda Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 16 Mar 2018 16:14:02 +0200
Subject: [PATCH] Fix team_icon to reference the pure component (#1507)

* Fix team_icon to reference the pure component

* Fix team icon in Android extension

* Fix team icon in select team screen

* Fix team switch divider in channel drawer
---
 .../switch_teams_button/switch_teams_button.js         |  7 +++++++
 app/screens/select_team/select_team.js                 |  5 +++--
 .../android/extension_teams/team_item/team_item.js     |  4 ++++
 share_extension/ios/extension_team_item.js             | 10 ++++++++--
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js b/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js
index c1484062a..aeabaa37a 100644
--- a/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js
+++ b/app/components/channel_drawer/channels_list/switch_teams_button/switch_teams_button.js
@@ -70,6 +70,7 @@ export default class SwitchTeamsButton extends React.PureComponent {
                             size={12}
                             style={styles.switcherArrow}
                         />
+                        <View style={styles.switcherDivider}/>
                         <TeamIcon
                             teamId={currentTeamId}
                             styleContainer={styles.teamIconContainer}
@@ -100,6 +101,12 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             color: theme.sidebarHeaderBg,
             marginRight: 3,
         },
+        switcherDivider: {
+            backgroundColor: theme.sidebarHeaderBg,
+            height: 15,
+            marginHorizontal: 6,
+            width: 1,
+        },
         teamIconContainer: {
             width: 26,
             height: 26,
diff --git a/app/screens/select_team/select_team.js b/app/screens/select_team/select_team.js
index a47d40db2..b208cc28c 100644
--- a/app/screens/select_team/select_team.js
+++ b/app/screens/select_team/select_team.js
@@ -7,7 +7,6 @@ import {
     Alert,
     FlatList,
     InteractionManager,
-    StyleSheet,
     Text,
     TouchableOpacity,
     View,
@@ -261,7 +260,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         line: {
             backgroundColor: changeOpacity(theme.centerChannelColor, 0.2),
             width: '100%',
-            height: StyleSheet.hairlineWidth,
+            height: 1,
         },
         teamWrapper: {
             marginTop: 20,
@@ -275,8 +274,10 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
         teamIconContainer: {
             width: 40,
             height: 40,
+            backgroundColor: theme.sidebarBg,
         },
         teamIconText: {
+            color: theme.sidebarText,
             fontSize: 18,
         },
         noTeam: {
diff --git a/share_extension/android/extension_teams/team_item/team_item.js b/share_extension/android/extension_teams/team_item/team_item.js
index cf02b7fa7..47c709186 100644
--- a/share_extension/android/extension_teams/team_item/team_item.js
+++ b/share_extension/android/extension_teams/team_item/team_item.js
@@ -96,8 +96,12 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             paddingRight: 5,
         },
         teamIconContainer: {
+            backgroundColor: theme.sidebarBg,
             marginRight: 10,
         },
+        teamIconText: {
+            color: theme.sidebarText,
+        },
         checkmarkContainer: {
             alignItems: 'flex-end',
         },
diff --git a/share_extension/ios/extension_team_item.js b/share_extension/ios/extension_team_item.js
index 317652e4d..a6c6f83b2 100644
--- a/share_extension/ios/extension_team_item.js
+++ b/share_extension/ios/extension_team_item.js
@@ -12,7 +12,7 @@ import {
 import {preventDoubleTap} from 'app/utils/tap';
 import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
 
-import TeamIcon from 'app/components/team_icon';
+import TeamIcon from 'app/components/team_icon/team_icon';
 
 export default class TeamsListItem extends React.PureComponent {
     static propTypes = {
@@ -51,9 +51,11 @@ export default class TeamsListItem extends React.PureComponent {
                 <View style={styles.container}>
                     <View style={styles.item}>
                         <TeamIcon
-                            teamId={team.id}
                             styleContainer={styles.teamIconContainer}
                             styleText={styles.teamIconText}
+                            teamId={team.id}
+                            team={team}
+                            theme={theme}
                         />
                         <Text
                             style={[styles.text]}
@@ -96,8 +98,12 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             paddingRight: 5,
         },
         teamIconContainer: {
+            backgroundColor: theme.sidebarBg,
             marginRight: 10,
         },
+        teamIconText: {
+            color: theme.sidebarText,
+        },
         checkmarkContainer: {
             alignItems: 'flex-end',
         },