diff options
Diffstat (limited to 'src/components/profile')
| -rw-r--r-- | src/components/profile/ProfileHeader.tsx | 7 | ||||
| -rw-r--r-- | src/components/profile/UniversityIcon.tsx | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index 9d9a5cbd..0b93de98 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -4,7 +4,7 @@ import {useSelector} from 'react-redux'; import UniversityIcon from './UniversityIcon'; import {PROFILE_CUTOUT_TOP_Y} from '../../constants'; import {RootState} from '../../store/rootreducer'; -import {ScreenType} from '../../types'; +import {ScreenType, Universities} from '../../types'; import {normalize} from '../../utils'; import Avatar from './Avatar'; import FriendsCount from './FriendsCount'; @@ -24,7 +24,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({ handleBlockUnblock, }) => { const { - profile: {name = '', university_class = 2021} = {}, + profile: {name = '', university_class = 2021, university = Universities.cornell} = {}, user: {username: userXName = ''}, } = userXId ? useSelector((state: RootState) => state.userX[screenType][userXId]) @@ -60,8 +60,7 @@ const ProfileHeader: React.FC<ProfileHeaderProps> = ({ <View style={styles.friendsAndUniversity}> <FriendsCount screenType={screenType} userXId={userXId} /> <UniversityIcon - university="brown" //TODO: Update for Cornell - university_class={university_class} + {...{university, university_class}} /> </View> </View> diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx index d738e745..1642b8f0 100644 --- a/src/components/profile/UniversityIcon.tsx +++ b/src/components/profile/UniversityIcon.tsx @@ -2,9 +2,9 @@ import React from 'react'; import {ImageStyle, StyleProp, StyleSheet, ViewProps} from 'react-native'; import {Image, Text, View} from 'react-native-animatable'; import {getUniversityClass, normalize} from '../../utils'; - +import {Universities} from '../../types'; export interface UniversityIconProps extends ViewProps { - university: string; + university: Universities; university_class?: number; imageStyle?: StyleProp<ImageStyle>; } @@ -20,10 +20,10 @@ const UniversityIcon: React.FC<UniversityIconProps> = ({ }) => { var universityIcon; switch (university) { - case 'cornell': + case 'Cornell': universityIcon = require('../../assets/universities/cornell.png'); break; - case 'brown': + case 'Brown': universityIcon = require('../../assets/universities/brown.png'); break; default: |
