3 files changed, 14 insertions, 6 deletions
diff --git a/src/components/common/NavigationIcon.tsx b/src/components/common/NavigationIcon.tsx
index 1a9934f2..5128f3da 100644
--- a/src/components/common/NavigationIcon.tsx
+++ b/src/components/common/NavigationIcon.tsx
@@ -14,7 +14,8 @@ interface NavigationIconProps extends TouchableOpacityProps {
     | 'Upload'
     | 'Notifications'
     | 'Profile'
-    | 'SuggestedPeople';
+    | 'SuggestedPeople'
+    | 'Chat';
   disabled?: boolean;
   newIcon?: boolean;
 }
@@ -44,6 +45,13 @@ const NavigationIcon = (props: NavigationIconProps) => {
           : require('../../assets/navigationIcons/notifications.png')
         : require('../../assets/navigationIcons/notifications-clicked.png');
       break;
+    case 'Chat':
+      imgSrc = props.disabled
+        ? props.newIcon
+          ? require('../../assets/navigationIcons/chat-notifications.png')
+          : require('../../assets/navigationIcons/chat.png')
+        : require('../../assets/navigationIcons/chat-clicked.png');
+      break;
     case 'Profile':
       imgSrc = props.disabled
         ? require('../../assets/navigationIcons/profile.png')
diff --git a/src/components/common/TaggPrompt.tsx b/src/components/common/TaggPrompt.tsx
index 721b1eb8..5e125d00 100644
--- a/src/components/common/TaggPrompt.tsx
+++ b/src/components/common/TaggPrompt.tsx
@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     backgroundColor: 'white',
-    height: isIPhoneX() ? SCREEN_HEIGHT / 6 : SCREEN_HEIGHT / 5,
+    height: SCREEN_HEIGHT / 4,
   },
   closeButton: {
     position: 'relative',
diff --git a/src/components/profile/Friends.tsx b/src/components/profile/Friends.tsx
index 44f6bb48..c1dca755 100644
--- a/src/components/profile/Friends.tsx
+++ b/src/components/profile/Friends.tsx
@@ -27,7 +27,7 @@ interface FriendsProps {
 const Friends: React.FC<FriendsProps> = ({result, screenType, userId}) => {
   const state: RootState = useStore().getState();
   const dispatch = useDispatch();
-  const {user: loggedInUser = NO_USER} = state;
+  const {user: loggedInUser = NO_USER} = state.user;
   const navigation = useNavigation();
   const [usersFromContacts, setUsersFromContacts] = useState<
     ProfilePreviewType[]
@@ -39,7 +39,7 @@ const Friends: React.FC<FriendsProps> = ({result, screenType, userId}) => {
         const permission = await checkPermission();
         if (permission === 'authorized') {
           let response = await usersFromContactsService(contacts);
-          await setUsersFromContacts(response.existing_tagg_users);
+          setUsersFromContacts(response.existing_tagg_users);
         } else {
           console.log('Authorize access to contacts');
         }
@@ -84,10 +84,10 @@ const Friends: React.FC<FriendsProps> = ({result, screenType, userId}) => {
 
   return (
     <>
-      {loggedInUser.userId === userId && (
+      {loggedInUser.userId === userId && usersFromContacts.length !== 0 && (
         <View style={styles.subheader}>
           <View style={styles.addFriendHeaderContainer}>
-            <Text style={[styles.subheaderText]}>Contacts on tagg</Text>
+            <Text style={[styles.subheaderText]}>Contacts on Tagg</Text>
           </View>
           <UsersFromContacts />
         </View>