diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-29 14:02:31 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-29 14:02:31 -0400 |
| commit | 04bf806285e7626644234b7febee2dad5c912f8d (patch) | |
| tree | 9ed3ec581792d6a0e1135f02a1d4716890ca75fc /src/components/suggestedPeople/BadgesDropdown.tsx | |
| parent | e8324a7278a82d926acceedc10921f0b14e6d403 (diff) | |
| parent | 4de1ebd43437712e28a89bb624c5b12afad45cc6 (diff) | |
Merge branch 'master' into tma-701-private-account-banner
# Conflicts:
# src/constants/strings.ts
Diffstat (limited to 'src/components/suggestedPeople/BadgesDropdown.tsx')
| -rw-r--r-- | src/components/suggestedPeople/BadgesDropdown.tsx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/components/suggestedPeople/BadgesDropdown.tsx b/src/components/suggestedPeople/BadgesDropdown.tsx index 99c03057..bc4e7a54 100644 --- a/src/components/suggestedPeople/BadgesDropdown.tsx +++ b/src/components/suggestedPeople/BadgesDropdown.tsx @@ -4,11 +4,12 @@ import {Image, StyleSheet} from 'react-native'; import {TouchableOpacity} from 'react-native-gesture-handler'; import LinearGradient from 'react-native-linear-gradient'; import Animated, {Easing} from 'react-native-reanimated'; -import {UniversityBadge} from 'src/types'; +import {UniversityType, UniversityBadge} from '../../types'; import {UniversityIcon} from '..'; import {normalize, SCREEN_WIDTH} from '../../utils'; import UniversityIconClicked from './UniversityIconClicked'; interface BadgesDropdownProps { + university: UniversityType; localBadges: { badge: UniversityBadge; img: string; @@ -17,6 +18,7 @@ interface BadgesDropdownProps { } const BadgesDropdown: React.FC<BadgesDropdownProps> = ({ + university, localBadges, badges, }) => { @@ -81,13 +83,13 @@ const BadgesDropdown: React.FC<BadgesDropdownProps> = ({ }}> {displayBadges ? ( <UniversityIconClicked - university="brown" + university={university} style={styles.universityIconContainer} imageStyle={{width: normalize(31), height: normalize(38)}} /> ) : ( <UniversityIcon - university="brown" + university={university} style={styles.universityIconContainer} imageStyle={{width: normalize(31), height: normalize(38)}} /> |
