From cf420db54deb32be1e6bc4092eef105cc23d93e4 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 22 Jan 2021 18:31:55 -0500
Subject: fixed merge issue and addressed review

---
 src/components/profile/ProfileHeader.tsx     | 9 +--------
 src/screens/profile/MomentCommentsScreen.tsx | 3 +--
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx
index 7fc90257..7dad2a68 100644
--- a/src/components/profile/ProfileHeader.tsx
+++ b/src/components/profile/ProfileHeader.tsx
@@ -58,13 +58,8 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({
             </View>
           )}
           <View style={styles.friendsAndUniversity}>
-            <FriendsCount
-              style={styles.friends}
-              screenType={screenType}
-              userXId={userXId}
-            />
+            <FriendsCount screenType={screenType} userXId={userXId} />
             <UniversityIcon
-              style={styles.university}
               university="brown"
               university_class={university_class}
             />
@@ -101,8 +96,6 @@ const styles = StyleSheet.create({
     fontWeight: '500',
     alignSelf: 'center',
   },
-  friends: {},
-  university: {},
   friendsAndUniversity: {
     flexDirection: 'row',
     alignItems: 'center',
diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx
index dee86e15..fa35a33b 100644
--- a/src/screens/profile/MomentCommentsScreen.tsx
+++ b/src/screens/profile/MomentCommentsScreen.tsx
@@ -13,8 +13,7 @@ import {AddComment} from '../../components/';
 import {ProfileStackParams} from '../../routes/main';
 import {logout} from '../../store/actions';
 import {CommentType} from '../../types';
-import {SCREEN_WIDTH} from '../../utils';
-import {SCREEN_HEIGHT} from '../../utils/screenDimensions';
+import {SCREEN_WIDTH, SCREEN_HEIGHT} from '../../utils';
 
 /**
  * Comments Screen for an image uploaded
-- 
cgit v1.2.3-70-g09d2