Merge branch 'master' into tma694-edit-badges

1 files changed, 6 insertions, 6 deletions

diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx
index bba137c0..06d3efb3 100644
--- a/src/screens/suggestedPeople/SPBody.tsx
+++ b/src/screens/suggestedPeople/SPBody.tsx
@@ -3,10 +3,11 @@ import React, {Fragment, useEffect, useMemo, useState} from 'react';
 import {StyleSheet, Text, View} from 'react-native';
 import {Image} from 'react-native-animatable';
 import {TouchableOpacity} from 'react-native-gesture-handler';
+import Animated from 'react-native-reanimated';
 import RequestedButton from '../../assets/ionicons/requested-button.svg';
 import {TaggsBar} from '../../components';
 import {BadgesDropdown, MutualFriends} from '../../components/suggestedPeople';
-import {DATA} from '../../screens/badge/BadgeSelection';
+import {BADGE_DATA} from '../../constants/badges';
 import {
   ProfilePreviewType,
   ScreenType,
@@ -14,7 +15,6 @@ import {
   UniversityBadge,
 } from '../../types';
 import {isIPhoneX, normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
-import Animated from 'react-native-reanimated';
 
 interface SPBodyProps {
   item: SuggestedPeopleDataType;
@@ -47,19 +47,19 @@ const SPBody: React.FC<SPBodyProps> = ({
     }[]
   >([]);
   const navigation = useNavigation();
-  let array = [];
   useEffect(() => {
+    const newBadges: {badge: UniversityBadge; img: any}[] = [];
     const findBadgeIcons = (badge: UniversityBadge) => {
-      DATA?.forEach((item) => {
+      BADGE_DATA?.forEach((item) => {
         if (item.title === badge.category) {
           item.data.forEach((object) => {
             if (object.badgeName === badge.name) {
-              array.push({badge, img: object.badgeImage});
+              newBadges.push({badge, img: object.badgeImage});
             }
           });
         }
       });
-      setLocalBadges(array);
+      setLocalBadges(newBadges);
     };
     badges
       ? badges.forEach((badge) => findBadgeIcons(badge))