diff options
author | Ivan Chen <ivan@tagg.id> | 2021-01-22 18:31:55 -0500 |
---|---|---|
committer | Ivan Chen <ivan@tagg.id> | 2021-01-22 18:31:55 -0500 |
commit | cf420db54deb32be1e6bc4092eef105cc23d93e4 (patch) | |
tree | c6e371773d785436b2253e5821e0063ad1f58541 | |
parent | d31f8c3ad157f4637a37ce83ee16bdba048126f8 (diff) |
fixed merge issue and addressed review
-rw-r--r-- | src/components/profile/ProfileHeader.tsx | 9 | ||||
-rw-r--r-- | src/screens/profile/MomentCommentsScreen.tsx | 3 |
2 files changed, 2 insertions, 10 deletions
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 |