Merge pull request #290 from IvanIFChen/tma693-new-badges

[TMA-693] New Badge Assets

59 files changed, 228 insertions, 123 deletions

diff --git a/src/assets/images/badges/acapella.png b/src/assets/images/badges/acapella.png
new file mode 100644
index 00000000..c0adb885
--- /dev/null
+++ b/src/assets/images/badges/acapella.png
diff --git a/src/assets/images/badges/alpha_chi_omega.png b/src/assets/images/badges/alpha_chi_omega.png
index 473894cc..f6db85af 100644
--- a/src/assets/images/badges/alpha_chi_omega.png
+++ b/src/assets/images/badges/alpha_chi_omega.png
diff --git a/src/assets/images/badges/alpha_delta_phi.png b/src/assets/images/badges/alpha_delta_phi.png
new file mode 100644
index 00000000..51186468
--- /dev/null
+++ b/src/assets/images/badges/alpha_delta_phi.png
diff --git a/src/assets/images/badges/baseball.png b/src/assets/images/badges/baseball.png
index 7b470dbe..2a049c16 100644
--- a/src/assets/images/badges/baseball.png
+++ b/src/assets/images/badges/baseball.png
diff --git a/src/assets/images/badges/basketball.png b/src/assets/images/badges/basketball.png
index 45d1139b..43d08803 100644
--- a/src/assets/images/badges/basketball.png
+++ b/src/assets/images/badges/basketball.png
diff --git a/src/assets/images/badges/beta_rho_pi.png b/src/assets/images/badges/beta_rho_pi.png
new file mode 100644
index 00000000..490acebb
--- /dev/null
+++ b/src/assets/images/badges/beta_rho_pi.png
diff --git a/src/assets/images/badges/black_in_business.png b/src/assets/images/badges/black_in_business.png
new file mode 100644
index 00000000..995ae652
--- /dev/null
+++ b/src/assets/images/badges/black_in_business.png
diff --git a/src/assets/images/badges/brown_band.png b/src/assets/images/badges/brown_band.png
new file mode 100644
index 00000000..bb21bcde
--- /dev/null
+++ b/src/assets/images/badges/brown_band.png
diff --git a/src/assets/images/badges/brown_class_board.png b/src/assets/images/badges/brown_class_board.png
new file mode 100644
index 00000000..a04e0a63
--- /dev/null
+++ b/src/assets/images/badges/brown_class_board.png
diff --git a/src/assets/images/badges/brown_cs.png b/src/assets/images/badges/brown_cs.png
new file mode 100644
index 00000000..18c7165a
--- /dev/null
+++ b/src/assets/images/badges/brown_cs.png
diff --git a/src/assets/images/badges/brown_democrats.png b/src/assets/images/badges/brown_democrats.png
new file mode 100644
index 00000000..ba828a2a
--- /dev/null
+++ b/src/assets/images/badges/brown_democrats.png
diff --git a/src/assets/images/badges/brown_entrepreneurship.png b/src/assets/images/badges/brown_entrepreneurship.png
new file mode 100644
index 00000000..c4f381b2
--- /dev/null
+++ b/src/assets/images/badges/brown_entrepreneurship.png
diff --git a/src/assets/images/badges/brown_womens_collective.png b/src/assets/images/badges/brown_womens_collective.png
new file mode 100644
index 00000000..242188ab
--- /dev/null
+++ b/src/assets/images/badges/brown_womens_collective.png
diff --git a/src/assets/images/badges/bsu.png b/src/assets/images/badges/bsu.png
new file mode 100644
index 00000000..13838f32
--- /dev/null
+++ b/src/assets/images/badges/bsu.png
diff --git a/src/assets/images/badges/buxton_international.png b/src/assets/images/badges/buxton_international.png
new file mode 100644
index 00000000..2b1d33a3
--- /dev/null
+++ b/src/assets/images/badges/buxton_international.png
diff --git a/src/assets/images/badges/delta_gamma.png b/src/assets/images/badges/delta_gamma.png
index 84182eca..4f1aa675 100644
--- a/src/assets/images/badges/delta_gamma.png
+++ b/src/assets/images/badges/delta_gamma.png
diff --git a/src/assets/images/badges/delta_tau.png b/src/assets/images/badges/delta_tau.png
new file mode 100644
index 00000000..80d2a373
--- /dev/null
+++ b/src/assets/images/badges/delta_tau.png
diff --git a/src/assets/images/badges/fashion_at_brown.png b/src/assets/images/badges/fashion_at_brown.png
new file mode 100644
index 00000000..a60b65fc
--- /dev/null
+++ b/src/assets/images/badges/fashion_at_brown.png
diff --git a/src/assets/images/badges/field_hockey.png b/src/assets/images/badges/field_hockey.png
index 766f0f60..7f08587e 100644
--- a/src/assets/images/badges/field_hockey.png
+++ b/src/assets/images/badges/field_hockey.png
diff --git a/src/assets/images/badges/football.png b/src/assets/images/badges/football.png
index 2e8214b7..1a5c0f4f 100644
--- a/src/assets/images/badges/football.png
+++ b/src/assets/images/badges/football.png
diff --git a/src/assets/images/badges/gymnastics.png b/src/assets/images/badges/gymnastics.png
index 5d500f26..64735dd2 100644
--- a/src/assets/images/badges/gymnastics.png
+++ b/src/assets/images/badges/gymnastics.png
diff --git a/src/assets/images/badges/hockey.png b/src/assets/images/badges/hockey.png
index 7e269665..2cfd547e 100644
--- a/src/assets/images/badges/hockey.png
+++ b/src/assets/images/badges/hockey.png
diff --git a/src/assets/images/badges/impulse_and_mezcla.png b/src/assets/images/badges/impulse_and_mezcla.png
new file mode 100644
index 00000000..68a73028
--- /dev/null
+++ b/src/assets/images/badges/impulse_and_mezcla.png
diff --git a/src/assets/images/badges/kappa_delta.png b/src/assets/images/badges/kappa_delta.png
index 642ddb5b..7a3fdb25 100644
--- a/src/assets/images/badges/kappa_delta.png
+++ b/src/assets/images/badges/kappa_delta.png
diff --git a/src/assets/images/badges/lacrosse.png b/src/assets/images/badges/lacrosse.png
new file mode 100644
index 00000000..67ac8f5e
--- /dev/null
+++ b/src/assets/images/badges/lacrosse.png
diff --git a/src/assets/images/badges/latin_at_brown.png b/src/assets/images/badges/latin_at_brown.png
new file mode 100644
index 00000000..515599f9
--- /dev/null
+++ b/src/assets/images/badges/latin_at_brown.png
diff --git a/src/assets/images/badges/old/alpha_chi_omega.png b/src/assets/images/badges/old/alpha_chi_omega.png
new file mode 100644
index 00000000..473894cc
--- /dev/null
+++ b/src/assets/images/badges/old/alpha_chi_omega.png
diff --git a/src/assets/images/badges/alpha_phi_alpha.png b/src/assets/images/badges/old/alpha_phi_alpha.png
index 275e0eb3..275e0eb3 100644
--- a/src/assets/images/badges/alpha_phi_alpha.png
+++ b/src/assets/images/badges/old/alpha_phi_alpha.png
diff --git a/src/assets/images/badges/old/baseball.png b/src/assets/images/badges/old/baseball.png
new file mode 100644
index 00000000..7b470dbe
--- /dev/null
+++ b/src/assets/images/badges/old/baseball.png
diff --git a/src/assets/images/badges/old/basketball.png b/src/assets/images/badges/old/basketball.png
new file mode 100644
index 00000000..45d1139b
--- /dev/null
+++ b/src/assets/images/badges/old/basketball.png
diff --git a/src/assets/images/badges/beta_omega_chi.png b/src/assets/images/badges/old/beta_omega_chi.png
index f2a85996..f2a85996 100644
--- a/src/assets/images/badges/beta_omega_chi.png
+++ b/src/assets/images/badges/old/beta_omega_chi.png
diff --git a/src/assets/images/badges/old/brown_badge.png b/src/assets/images/badges/old/brown_badge.png
new file mode 100644
index 00000000..bcffb6e3
--- /dev/null
+++ b/src/assets/images/badges/old/brown_badge.png
diff --git a/src/assets/images/badges/old/delta_gamma.png b/src/assets/images/badges/old/delta_gamma.png
new file mode 100644
index 00000000..84182eca
--- /dev/null
+++ b/src/assets/images/badges/old/delta_gamma.png
diff --git a/src/assets/images/badges/delta_phi.png b/src/assets/images/badges/old/delta_phi.png
index 074317d1..074317d1 100644
--- a/src/assets/images/badges/delta_phi.png
+++ b/src/assets/images/badges/old/delta_phi.png
diff --git a/src/assets/images/badges/old/field_hockey.png b/src/assets/images/badges/old/field_hockey.png
new file mode 100644
index 00000000..766f0f60
--- /dev/null
+++ b/src/assets/images/badges/old/field_hockey.png
diff --git a/src/assets/images/badges/old/football.png b/src/assets/images/badges/old/football.png
new file mode 100644
index 00000000..2e8214b7
--- /dev/null
+++ b/src/assets/images/badges/old/football.png
diff --git a/src/assets/images/badges/old/gymnastics.png b/src/assets/images/badges/old/gymnastics.png
new file mode 100644
index 00000000..5d500f26
--- /dev/null
+++ b/src/assets/images/badges/old/gymnastics.png
diff --git a/src/assets/images/badges/old/hockey.png b/src/assets/images/badges/old/hockey.png
new file mode 100644
index 00000000..7e269665
--- /dev/null
+++ b/src/assets/images/badges/old/hockey.png
diff --git a/src/assets/images/badges/kappa_alpha_psi.png b/src/assets/images/badges/old/kappa_alpha_psi.png
index 1b7d7aff..1b7d7aff 100644
--- a/src/assets/images/badges/kappa_alpha_psi.png
+++ b/src/assets/images/badges/old/kappa_alpha_psi.png
diff --git a/src/assets/images/badges/old/kappa_delta.png b/src/assets/images/badges/old/kappa_delta.png
new file mode 100644
index 00000000..642ddb5b
--- /dev/null
+++ b/src/assets/images/badges/old/kappa_delta.png
diff --git a/src/assets/images/badges/lax.png b/src/assets/images/badges/old/lax.png
index 3810589b..3810589b 100644
--- a/src/assets/images/badges/lax.png
+++ b/src/assets/images/badges/old/lax.png
diff --git a/src/assets/images/badges/sigma.png b/src/assets/images/badges/old/sigma.png
index 7e6c9d22..7e6c9d22 100644
--- a/src/assets/images/badges/sigma.png
+++ b/src/assets/images/badges/old/sigma.png
diff --git a/src/assets/images/badges/old/theta_alpha.png b/src/assets/images/badges/old/theta_alpha.png
new file mode 100644
index 00000000..607720f5
--- /dev/null
+++ b/src/assets/images/badges/old/theta_alpha.png
diff --git a/src/assets/images/badges/old/track.png b/src/assets/images/badges/old/track.png
new file mode 100644
index 00000000..a531f641
--- /dev/null
+++ b/src/assets/images/badges/old/track.png
diff --git a/src/assets/images/badges/old/volleyball.png b/src/assets/images/badges/old/volleyball.png
new file mode 100644
index 00000000..a9bb9c88
--- /dev/null
+++ b/src/assets/images/badges/old/volleyball.png
diff --git a/src/assets/images/badges/soccer.png b/src/assets/images/badges/soccer.png
new file mode 100644
index 00000000..f2202510
--- /dev/null
+++ b/src/assets/images/badges/soccer.png
diff --git a/src/assets/images/badges/softball.png b/src/assets/images/badges/softball.png
new file mode 100644
index 00000000..2a049c16
--- /dev/null
+++ b/src/assets/images/badges/softball.png
diff --git a/src/assets/images/badges/tap.png b/src/assets/images/badges/tap.png
new file mode 100644
index 00000000..e6db8470
--- /dev/null
+++ b/src/assets/images/badges/tap.png
diff --git a/src/assets/images/badges/tennis.png b/src/assets/images/badges/tennis.png
new file mode 100644
index 00000000..358cb8c7
--- /dev/null
+++ b/src/assets/images/badges/tennis.png
diff --git a/src/assets/images/badges/theta_alpha.png b/src/assets/images/badges/theta_alpha.png
index 607720f5..323b538e 100644
--- a/src/assets/images/badges/theta_alpha.png
+++ b/src/assets/images/badges/theta_alpha.png
diff --git a/src/assets/images/badges/track.png b/src/assets/images/badges/track.png
index a531f641..5bcff810 100644
--- a/src/assets/images/badges/track.png
+++ b/src/assets/images/badges/track.png
diff --git a/src/assets/images/badges/ucs.png b/src/assets/images/badges/ucs.png
new file mode 100644
index 00000000..1009dc9b
--- /dev/null
+++ b/src/assets/images/badges/ucs.png
diff --git a/src/assets/images/badges/volleyball.png b/src/assets/images/badges/volleyball.png
index a9bb9c88..915b467c 100644
--- a/src/assets/images/badges/volleyball.png
+++ b/src/assets/images/badges/volleyball.png
diff --git a/src/assets/images/badges/women_in_business.png b/src/assets/images/badges/women_in_business.png
new file mode 100644
index 00000000..1a504676
--- /dev/null
+++ b/src/assets/images/badges/women_in_business.png
diff --git a/src/assets/images/badges/zeta_delta_xi.png b/src/assets/images/badges/zeta_delta_xi.png
new file mode 100644
index 00000000..7880d2b7
--- /dev/null
+++ b/src/assets/images/badges/zeta_delta_xi.png
diff --git a/src/constants/badges.ts b/src/constants/badges.ts
new file mode 100644
index 00000000..0604464d
--- /dev/null
+++ b/src/constants/badges.ts
@@ -0,0 +1,218 @@
+export const _badgeImages = {
+  acapella: require('../assets/images/badges/acapella.png'),
+  alpha_chi_omega: require('../assets/images/badges/alpha_chi_omega.png'),
+  alpha_delta_phi: require('../assets/images/badges/alpha_delta_phi.png'),
+  baseball: require('../assets/images/badges/baseball.png'),
+  basketball: require('../assets/images/badges/basketball.png'),
+  beta_rho_pi: require('../assets/images/badges/beta_rho_pi.png'),
+  black_in_business: require('../assets/images/badges/black_in_business.png'),
+  brown_band: require('../assets/images/badges/brown_band.png'),
+  brown_class_board: require('../assets/images/badges/brown_class_board.png'),
+  brown_cs: require('../assets/images/badges/brown_cs.png'),
+  brown_democrats: require('../assets/images/badges/brown_democrats.png'),
+  brown_entrepreneurship: require('../assets/images/badges/brown_entrepreneurship.png'),
+  brown_womens_collective: require('../assets/images/badges/brown_womens_collective.png'),
+  bsu: require('../assets/images/badges/bsu.png'),
+  buxton_international: require('../assets/images/badges/buxton_international.png'),
+  delta_gamma: require('../assets/images/badges/delta_gamma.png'),
+  delta_tau: require('../assets/images/badges/delta_tau.png'),
+  fashion_at_brown: require('../assets/images/badges/fashion_at_brown.png'),
+  field_hockey: require('../assets/images/badges/field_hockey.png'),
+  football: require('../assets/images/badges/football.png'),
+  gymnastics: require('../assets/images/badges/gymnastics.png'),
+  hockey: require('../assets/images/badges/hockey.png'),
+  impulse_and_mezcla: require('../assets/images/badges/impulse_and_mezcla.png'),
+  kappa_delta: require('../assets/images/badges/kappa_delta.png'),
+  lacrosse: require('../assets/images/badges/lacrosse.png'),
+  latin_at_brown: require('../assets/images/badges/latin_at_brown.png'),
+  soccer: require('../assets/images/badges/soccer.png'),
+  softball: require('../assets/images/badges/softball.png'),
+  tap: require('../assets/images/badges/tap.png'),
+  tennis: require('../assets/images/badges/tennis.png'),
+  theta_alpha: require('../assets/images/badges/theta_alpha.png'),
+  track: require('../assets/images/badges/track.png'),
+  ucs: require('../assets/images/badges/ucs.png'),
+  volleyball: require('../assets/images/badges/volleyball.png'),
+  women_in_business: require('../assets/images/badges/women_in_business.png'),
+  zeta_delta_xi: require('../assets/images/badges/zeta_delta_xi.png'),
+};
+
+export const BADGE_DATA = [
+  {
+    title: 'Athletics',
+    data: [
+      {
+        badgeName: 'Brown Football',
+        badgeImage: _badgeImages.football,
+      },
+      {
+        badgeName: 'Brown Track',
+        badgeImage: _badgeImages.track,
+      },
+      {
+        badgeName: 'Brown Soccer',
+        badgeImage: _badgeImages.soccer,
+      },
+      {
+        badgeName: 'Brown Volleyball',
+        badgeImage: _badgeImages.volleyball,
+      },
+      {
+        badgeName: 'Brown Lacross',
+        badgeImage: _badgeImages.lacrosse,
+      },
+      {
+        badgeName: 'Brown Basketball',
+        badgeImage: _badgeImages.basketball,
+      },
+      {
+        badgeName: 'Brown Field Hockey',
+        badgeImage: _badgeImages.field_hockey,
+      },
+      {
+        badgeName: 'Brown Gymnastics',
+        badgeImage: _badgeImages.gymnastics,
+      },
+      {
+        badgeName: 'Brown Tennis',
+        badgeImage: _badgeImages.tennis,
+      },
+      {
+        badgeName: 'Brown Hockey',
+        badgeImage: _badgeImages.hockey,
+      },
+      {
+        badgeName: 'Brown Softball',
+        badgeImage: _badgeImages.softball,
+      },
+      {
+        badgeName: 'Brown Baseball',
+        badgeImage: _badgeImages.baseball,
+      },
+    ],
+  },
+
+  {
+    title: 'Student Leadership',
+    data: [
+      {
+        badgeName: 'Brown Class Board',
+        badgeImage: _badgeImages.brown_class_board,
+      },
+      {
+        badgeName: 'UCS',
+        badgeImage: _badgeImages.ucs,
+      },
+    ],
+  },
+  {
+    title: 'Culture / Ethnic Groups',
+    data: [
+      {
+        badgeName: 'Latin @ Brown',
+        badgeImage: _badgeImages.latin_at_brown,
+      },
+      {
+        badgeName: 'Buxton/international',
+        badgeImage: _badgeImages.buxton_international,
+      },
+      {
+        badgeName: 'BSU',
+        badgeImage: _badgeImages.bsu,
+      },
+    ],
+  },
+  {
+    title: 'Sorority',
+    data: [
+      {
+        badgeName: 'Kappa Delta',
+        badgeImage: _badgeImages.kappa_delta,
+      },
+      {
+        badgeName: "Brown Women's Collective",
+        badgeImage: _badgeImages.brown_womens_collective,
+      },
+      {
+        badgeName: 'Alpha Delta Phi',
+        badgeImage: _badgeImages.alpha_delta_phi,
+      },
+      {
+        badgeName: 'Alpha Chi Omega',
+        badgeImage: _badgeImages.alpha_chi_omega,
+      },
+      {
+        badgeName: 'Delta Gamma',
+        badgeImage: _badgeImages.delta_gamma,
+      },
+    ],
+  },
+
+  {
+    title: 'Fraternity',
+    data: [
+      {
+        badgeName: 'Beta Rho Pi',
+        badgeImage: _badgeImages.beta_rho_pi,
+      },
+      {
+        badgeName: 'Delta Tau',
+        badgeImage: _badgeImages.delta_tau,
+      },
+      {
+        badgeName: 'Theta Alpha',
+        badgeImage: _badgeImages.theta_alpha,
+      },
+      {
+        badgeName: 'Zeta Delta Xi',
+        badgeImage: _badgeImages.zeta_delta_xi,
+      },
+    ],
+  },
+  {
+    title: 'Arts',
+    data: [
+      {
+        badgeName: 'Acapella',
+        badgeImage: _badgeImages.acapella,
+      },
+      {
+        badgeName: 'Taps',
+        badgeImage: _badgeImages.tap,
+      },
+      {
+        badgeName: 'Fashion @ Brown',
+        badgeImage: _badgeImages.fashion_at_brown,
+      },
+      {
+        badgeName: 'Brown Democrats',
+        badgeImage: _badgeImages.brown_democrats,
+      },
+      {
+        badgeName: 'Impulse + Mezcla',
+        badgeImage: _badgeImages.impulse_and_mezcla,
+      },
+    ],
+  },
+  {
+    title: 'Network',
+    data: [
+      {
+        badgeName: 'Brown Entrepreneurship',
+        badgeImage: _badgeImages.brown_entrepreneurship,
+      },
+      {
+        badgeName: 'Black in Business',
+        badgeImage: _badgeImages.black_in_business,
+      },
+      {
+        badgeName: 'Women in Business',
+        badgeImage: _badgeImages.women_in_business,
+      },
+      {
+        badgeName: 'Brown CS',
+        badgeImage: _badgeImages.brown_cs,
+      },
+    ],
+  },
+];
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);
       }