diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-27 20:30:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-27 20:30:36 -0400 |
| commit | 67fb6f5cae06dfbcb359dd6468cb66ad85fa230d (patch) | |
| tree | eaf092811d5be72e89e4dec9942dc59a1f8a0211 /src/screens/badge/BadgeSelection.tsx | |
| parent | bef5728b24a71d1bf327a72e425346020a997037 (diff) | |
| parent | bf0a2abf8bab333ff0d87bc07002e6f96199ce3b (diff) | |
Merge pull request #330 from ankit-thanekar007/tma-722-cornell-fe
[TMA 722] : Cornell FrontEnd changes
Diffstat (limited to 'src/screens/badge/BadgeSelection.tsx')
| -rw-r--r-- | src/screens/badge/BadgeSelection.tsx | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 335d4333..deaefb52 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -15,7 +15,7 @@ import {BACKGROUND_GRADIENT_MAP} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {suggestedPeopleBadgesFinished} from '../../store/actions'; -import {BackgroundGradientType} from '../../types'; +import {BackgroundGradientType, UniversityType} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; @@ -34,9 +34,10 @@ type BadgeSelectionProps = { const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => { const {editing} = route.params; - const {userId: loggedInUserId} = useSelector( - (state: RootState) => state.user.user, - ); + const { + user: {userId: loggedInUserId}, + profile: {university}, + } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState<string[]>([]); const dispatch = useDispatch(); const navigation = useNavigation(); @@ -114,18 +115,20 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => { <StatusBar barStyle={'light-content'} /> <SafeAreaView> <View style={styles.listContainer}> - <BadgeScreenHeader /> + <BadgeScreenHeader {...{university}} /> {/* filter not working, comment out for now */} {/* <SearchBar style={styles.searchBarStyle} onCancel={() => {}} top={Animated.useValue(0)} /> */} - <BadgeList - data={BADGE_DATA} - selectedBadges={selectedBadges} - selectKey={selectKey} - /> + {university && ( + <BadgeList + data={BADGE_DATA[university]} + selectedBadges={selectedBadges} + selectKey={selectKey} + /> + )} </View> </SafeAreaView> </LinearGradient> |