From 4e5cbb088e20fc568d9b961685968ee8d1bdb02b Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Wed, 10 Mar 2021 17:22:16 -0500
Subject: renamed param, finished initial routing

---
 src/routes/main/MainStackScreen.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/routes/main/MainStackScreen.tsx')

diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 91f41fe4..068748b1 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -230,7 +230,15 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
       <MainStack.Screen
         name="UpdateSPPicture"
         component={SuggestedPeopleUploadPictureScreen}
-        initialParams={{goTo: 'Profile'}}
+        initialParams={{editing: true}}
+        options={{
+          ...headerBarOptions('white', ''),
+        }}
+      />
+      <MainStack.Screen
+        name="BadgeSelection"
+        component={BadgeSelection}
+        initialParams={{editing: true}}
         options={{
           ...headerBarOptions('white', ''),
         }}
-- 
cgit v1.2.3-70-g09d2


From 797e0b9153e2155c045c4083f42dbae5a591cfef Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 12 Mar 2021 17:39:32 -0500
Subject: fixed merge issues

---
 src/routes/main/MainStackNavigator.tsx | 1 -
 src/routes/main/MainStackScreen.tsx    | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/routes/main/MainStackScreen.tsx')

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 252ece3b..f7404f27 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -8,7 +8,6 @@ import {
   MomentType,
   ScreenType,
   SearchCategoryType,
-  UniversityBadge,
   UserType,
 } from '../../types';
 
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 0a75dd22..95d45d32 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -7,6 +7,7 @@ import {normalize} from 'react-native-elements';
 import BackIcon from '../../assets/icons/back-arrow.svg';
 import {
   AnimatedTutorial,
+  BadgeSelection,
   CaptionScreen,
   CategorySelection,
   CreateCustomCategory,
-- 
cgit v1.2.3-70-g09d2