Merge branch 'master' into tma-701-private-account-banner

# Conflicts:
#	src/constants/strings.ts

2 files changed, 31 insertions, 14 deletions

diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx
index fd250585..46c0c1c8 100644
--- a/src/screens/badge/BadgeScreenHeader.tsx
+++ b/src/screens/badge/BadgeScreenHeader.tsx
@@ -1,13 +1,23 @@
 import React from 'react';
 import {Image, StyleSheet, Text, View} from 'react-native';
-import {normalize} from '../../utils';
+import {UniversityType} from 'src/types';
+import {getUniversityBadge, normalize} from '../../utils';
 
-const BadgeScreenHeader: React.FC = () => {
+interface BadgeScreenHeaderProps {
+  university: UniversityType;
+}
+
+const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => {
   return (
     <View style={styles.container}>
-      <Image source={require('../../assets/images/badges/brown_badge.png')} />
+      <Image
+        source={getUniversityBadge(university, 'Crest')}
+        style={styles.icon}
+      />
       <View style={styles.universityTextContainer}>
-        <Text style={styles.universityText}>Brown University Badges</Text>
+        <Text style={styles.universityText}>
+          {university} University Badges
+        </Text>
       </View>
       <View style={styles.searchTextContainer}>
         <Text style={styles.searchText}>
@@ -37,6 +47,10 @@ const styles = StyleSheet.create({
     lineHeight: normalize(17.9),
     color: 'white',
   },
+  icon: {
+    aspectRatio: 675 / 750,
+    height: 40,
+  },
 });
 
 export default BadgeScreenHeader;
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>