5 files changed, 18 insertions, 21 deletions
diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx
index 746e05d9..46c0c1c8 100644
--- a/src/screens/badge/BadgeScreenHeader.tsx
+++ b/src/screens/badge/BadgeScreenHeader.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
 import {Image, StyleSheet, Text, View} from 'react-native';
-import { Universities } from 'src/types';
+import {UniversityType} from 'src/types';
 import {getUniversityBadge, normalize} from '../../utils';
 
 interface BadgeScreenHeaderProps {
-  university: Universities;
+  university: UniversityType;
 }
 
 const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => {
@@ -12,9 +12,12 @@ const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => {
     <View style={styles.container}>
       <Image
         source={getUniversityBadge(university, 'Crest')}
+        style={styles.icon}
       />
       <View style={styles.universityTextContainer}>
-        <Text style={styles.universityText}>{university} University Badges</Text>
+        <Text style={styles.universityText}>
+          {university} University Badges
+        </Text>
       </View>
       <View style={styles.searchTextContainer}>
         <Text style={styles.searchText}>
@@ -44,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 08cad020..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, Universities} from '../../types';
+import {BackgroundGradientType, UniversityType} from '../../types';
 import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils';
 import BadgeList from './BadgeList';
 import BadgeScreenHeader from './BadgeScreenHeader';
@@ -36,7 +36,7 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
   const {editing} = route.params;
   const {
     user: {userId: loggedInUserId},
-    profile: {university = Universities.brown},
+    profile: {university},
   } = useSelector((state: RootState) => state.user);
   const [selectedBadges, setSelectedBadges] = useState<string[]>([]);
   const dispatch = useDispatch();
diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index 7e84b372..683d25f4 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -22,7 +22,6 @@ import {
   ProfilePreviewType,
   ScreenType,
   SearchCategoryType,
-  Universities,
 } from '../../types';
 import {
   getRecentlySearchedCategories,
@@ -39,9 +38,9 @@ import {
 
 const SearchScreen: React.FC = () => {
   const {recentSearches} = useSelector((state: RootState) => state.taggUsers);
-  const {profile: {university = Universities.cornell} = {}} = useSelector(
-    (state: RootState) => state.user,
-  );
+  const {
+    profile: {university},
+  } = useSelector((state: RootState) => state.user);
   const [query, setQuery] = useState<string>('');
   const [results, setResults] = useState<Array<any> | undefined>(undefined);
   const [recents, setRecents] = useState<Array<ProfilePreviewType>>(
@@ -54,7 +53,7 @@ const SearchScreen: React.FC = () => {
   const top = Animated.useValue(-SCREEN_HEIGHT);
   const defaultButtons: SearchCategoryType[] = [21, 22, 23, 24].map((year) => ({
     id: -1,
-    name: `${university} '${year}`,
+    name: `${university.split(' ')[0]} '${year}`,
     category: university,
   }));
   const [keyboardVisible, setKeyboardVisible] = React.useState(
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 76889657..336e8b35 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -4,9 +4,6 @@ import {FlatList, RefreshControl, StatusBar, ViewToken} from 'react-native';
 import {useDispatch, useSelector, useStore} from 'react-redux';
 import {Background, TabsGradient, TaggLoadingIndicator} from '../../components';
 import {SP_PAGE_SIZE} from '../../constants';
-import {MainStack} from '../../routes';
-import MainStackScreen from '../../routes/main/MainStackScreen';
-import SuggestedPeopleOnboardingStackScreen from '../../routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen';
 import {getSuggestedPeople} from '../../services/SuggestedPeopleService';
 import {cancelFriendRequest, resetScreenType} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
@@ -22,15 +19,9 @@ import {
   getUserAsProfilePreviewType,
   handleAddFriend,
 } from '../../utils';
-import {SuggestedPeopleWelcomeScreen} from '../suggestedPeopleOnboarding';
 import {userXInStore} from './../../utils/';
 import SPBody from './SPBody';
 
-/**
- * Bare bones for suggested people consisting of:
- * * Image, title, name, username, add friend button [w/o functionality]
- */
-
 const SuggestedPeopleScreen: React.FC = () => {
   const navigation = useNavigation();
   const state: RootState = useStore().getState();
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index 378e69c5..e1bcb477 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -14,7 +14,7 @@ import ImagePicker from 'react-native-image-crop-picker';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import {useDispatch, useSelector} from 'react-redux';
 import {MainStackParams} from 'src/routes';
-import {Universities} from '../../types';
+import {UniversityType} from '../../types';
 import FrontArrow from '../../assets/icons/front-arrow.svg';
 import {TaggSquareButton, UniversityIcon} from '../../components';
 import TaggLoadingIndicator from '../../components/common/TaggLoadingIndicator';
@@ -52,7 +52,7 @@ const SuggestedPeopleUploadPictureScreen: React.FC<SuggestedPeopleUploadPictureS
   const navigation = useNavigation();
   const {
     user: {userId: loggedInUserId},
-    profile: {university = Universities.brown},
+    profile: {university = UniversityType.brown},
   } = useSelector((state: RootState) => state.user);
 
   useEffect(() => {