3 files changed, 10 insertions, 123 deletions
diff --git a/src/screens/badge/BadgeItem.tsx b/src/screens/badge/BadgeItem.tsx
index d7c0b74a..adf74026 100644
--- a/src/screens/badge/BadgeItem.tsx
+++ b/src/screens/badge/BadgeItem.tsx
@@ -44,7 +44,7 @@ const BadgeItem: React.FC<BadgeItemProps> = ({
 const styles = StyleSheet.create({
   item: {
     width: SCREEN_WIDTH / 3 - 20,
-    height: SCREEN_WIDTH / 3 - 20,
+    height: 140,
     marginLeft: 15,
     marginBottom: 12,
     borderRadius: 8,
@@ -66,8 +66,8 @@ const styles = StyleSheet.create({
     borderRadius: 8,
   },
   imageStyles: {
-    width: '31%',
-    height: '31%',
+    width: 40,
+    height: 40,
     marginTop: '11%',
   },
   textContainer: {marginTop: '16%'},
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index 4946bd96..f1cd000c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -7,6 +7,7 @@ import {TouchableOpacity} from 'react-native-gesture-handler';
 import LinearGradient from 'react-native-linear-gradient';
 import {useDispatch} from 'react-redux';
 import {ADD_USER_BADGES, BACKGROUND_GRADIENT_MAP} from '../../constants';
+import {BADGE_DATA} from '../../constants/badges';
 import {
   ERROR_BADGES_EXCEED_LIMIT,
   ERROR_UPLOAD_BADGES,
@@ -21,124 +22,6 @@ import BadgeScreenHeader from './BadgeScreenHeader';
  * Home Screen for displaying Tagg Badge Selections
  **/
 
-export const BadgeImages = {
-  football: require('../../assets/images/badges/football.png'),
-  track: require('../../assets/images/badges/track.png'),
-  volleyball: require('../../assets/images/badges/volleyball.png'),
-  lax: require('../../assets/images/badges/brown_badge.png'),
-  fieldHockey: require('../../assets/images/badges/field_hockey.png'),
-  gymnastics: require('../../assets/images/badges/gymnastics.png'),
-  hockey: require('../../assets/images/badges/hockey.png'),
-  baseball: require('../../assets/images/badges/baseball.png'),
-  basketball: require('../../assets/images/badges/basketball.png'),
-  kappadelta: require('../../assets/images/badges/kappa_delta.png'),
-  alphachiomega: require('../../assets/images/badges/alpha_chi_omega.png'),
-  deltagamma: require('../../assets/images/badges/delta_gamma.png'),
-  sigma: require('../../assets/images/badges/sigma.png'),
-  thetaalpha: require('../../assets/images/badges/theta_alpha.png'),
-  deltaphi: require('../../assets/images/badges/delta_phi.png'),
-  kappaalphapsi: require('../../assets/images/badges/kappa_alpha_psi.png'),
-  alphaphialpha: require('../../assets/images/badges/alpha_phi_alpha.png'),
-  betaomegachi: require('../../assets/images/badges/beta_omega_chi.png'),
-};
-
-export const DATA = [
-  {
-    title: 'Athletics',
-    data: [
-      {
-        badgeName: 'Brown Football',
-        badgeImage: BadgeImages.football,
-      },
-      {
-        badgeName: 'Brown Track',
-        badgeImage: BadgeImages.track,
-      },
-      {
-        badgeName: 'Brown Volleyball',
-        badgeImage: BadgeImages.volleyball,
-      },
-      {
-        badgeName: 'Brown LAX',
-        badgeImage: BadgeImages.lax,
-      },
-      {
-        badgeName: 'Brown Field Hockey',
-        badgeImage: BadgeImages.fieldHockey,
-      },
-      {
-        badgeName: 'Brown Gymnastics',
-        badgeImage: BadgeImages.gymnastics,
-      },
-      {
-        badgeName: 'Brown Hockey',
-        badgeImage: BadgeImages.hockey,
-      },
-      {
-        badgeName: 'Brown Baseball',
-        badgeImage: BadgeImages.baseball,
-      },
-      {
-        badgeName: 'Brown Basketball',
-        badgeImage: BadgeImages.basketball,
-      },
-    ],
-  },
-
-  {
-    title: 'Sorority',
-    data: [
-      {
-        badgeName: 'Kappa Delta',
-        badgeImage: BadgeImages.kappadelta,
-      },
-      {
-        badgeName: 'Alpha Chi Omega',
-        badgeImage: BadgeImages.alphachiomega,
-      },
-      {
-        badgeName: 'Delta Gamma',
-        badgeImage: BadgeImages.deltagamma,
-      },
-    ],
-  },
-
-  {
-    title: 'Fraternity',
-    data: [
-      {
-        badgeName: 'Sigma',
-        badgeImage: BadgeImages.sigma,
-      },
-      {
-        badgeName: 'Theta Alpha',
-        badgeImage: BadgeImages.thetaalpha,
-      },
-      {
-        badgeName: 'Delta Phi',
-        badgeImage: BadgeImages.deltaphi,
-      },
-    ],
-  },
-  {
-    title: 'Historically Black Fraternities',
-    data: [
-      {
-        badgeName: 'Kappa Alpha Psi',
-        badgeImage: BadgeImages.kappadelta,
-      },
-      {
-        badgeName: 'Alpha Phi Alpha',
-        badgeImage: BadgeImages.alphaphialpha,
-      },
-      {
-        badgeName: 'Beta Omega Chi',
-        badgeImage: BadgeImages.betaomegachi,
-      },
-    ],
-  },
-];
-
 type BadgeSelectionParamList = {
   BadgeList: any[];
 };
@@ -161,6 +44,8 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({navigation}) => {
         onPress={() => {
           if (canSubmit) {
             uploadUserSelection();
+          } else {
+            dispatch(suggestedPeopleBadgesFinished());
           }
         }}>
         <Text style={styles.rightButton}>{canSubmit ? 'Done' : 'Skip'}</Text>
@@ -226,7 +111,7 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({navigation}) => {
             top={Animated.useValue(0)}
           /> */}
           <BadgeList
-            data={DATA}
+            data={BADGE_DATA}
             selectedBadges={selectedBadges}
             selectKey={selectKey}
           />
diff --git a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
index bb8aaccf..92f862c4 100644
--- a/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
+++ b/src/screens/suggestedPeopleOnboarding/SuggestedPeopleUploadPictureScreen.tsx
@@ -76,7 +76,9 @@ const SuggestedPeopleUploadPictureScreen: React.FC = ({route}) => {
       const success = await sendSuggestedPeoplePhoto(image);
       if (success) {
         dispatch(uploadedSuggestedPeoplePhoto(image));
-        navigation.push('BadgeSelection');
+        if (goTo !== 'Profile') {
+          navigation.push('BadgeSelection');
+        }
       } else {
         Alert.alert(ERROR_UPLOAD);
       }