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

# Conflicts:
#	src/constants/strings.ts

2 files changed, 4 insertions, 12 deletions

diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx
index 7bedb137..f38945f7 100644
--- a/src/screens/suggestedPeople/SPBody.tsx
+++ b/src/screens/suggestedPeople/SPBody.tsx
@@ -33,6 +33,7 @@ interface SPBodyProps {
 const SPBody: React.FC<SPBodyProps> = ({
   item: {
     user,
+    university,
     mutual_friends,
     social_links,
     suggested_people_url,
@@ -57,7 +58,7 @@ const SPBody: React.FC<SPBodyProps> = ({
   useEffect(() => {
     const newBadges: {badge: UniversityBadge; img: any}[] = [];
     const findBadgeIcons = (badge: UniversityBadge) => {
-      BADGE_DATA?.forEach((item) => {
+      BADGE_DATA[university]?.forEach((item) => {
         if (item.title === badge.category) {
           item.data.forEach((object) => {
             if (object.badgeName === badge.name) {
@@ -127,7 +128,7 @@ const SPBody: React.FC<SPBodyProps> = ({
     return (
       <TouchableOpacity
         onPress={() => {
-          navigation.push('Profile', {
+          navigation.navigate('Profile', {
             userXId: loggedInUserId === user.id ? undefined : user.id,
             screenType,
           });
@@ -146,7 +147,7 @@ const SPBody: React.FC<SPBodyProps> = ({
         <View style={styles.topContainer}>
           <Text style={styles.title}>{firstItem && 'Suggested People'}</Text>
           {localBadges && (
-            <BadgesDropdown localBadges={localBadges} badges={badges} />
+            <BadgesDropdown {...{university, localBadges, badges}} />
           )}
         </View>
         <View style={styles.body}>
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();