From 10aa8805038f07b1affdcfa1b924810a2c89bee1 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 5 Mar 2021 17:20:46 -0500
Subject: commented out search bar, added screen to onboarding flow, fixed some
 layout issues

---
 src/routes/main/MainStackNavigator.tsx                            | 3 ---
 src/routes/main/MainStackScreen.tsx                               | 7 -------
 .../SuggestedPeopleOnboardingStackNavigator.tsx                   | 1 +
 .../SuggestedPeopleOnboardingStackScreen.tsx                      | 8 ++++++++
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/routes')

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 4230f4a6..901dd993 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -72,9 +72,6 @@ export type MainStackParams = {
   UpdateSPPicture: {
     goTo: string;
   };
-  Badge: {
-    screenType: ScreenType;
-  };
 };
 
 export const MainStack = createStackNavigator<MainStackParams>();
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 42b096f1..91ed2f70 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -226,13 +226,6 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           ...headerBarOptions('white', ''),
         }}
       />
-      <MainStack.Screen
-        name="Badge"
-        component={BadgeSelection}
-        options={{
-          ...headerBarOptions('white', ''),
-        }}
-      />
     </MainStack.Navigator>
   );
 };
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
index 85249034..737c503c 100644
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
+++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
@@ -5,6 +5,7 @@ export type SuggestedPeopleOnboardingStackParams = {
   UploadPicture: {
     goTo: string;
   };
+  BadgeSelection: undefined;
 };
 
 export const SuggestedPeopleOnboardingStack = createStackNavigator<SuggestedPeopleOnboardingStackParams>();
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
index 61cc694c..d1a6e5e1 100644
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
+++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
@@ -3,6 +3,7 @@ import {SuggestedPeopleOnboardingStack} from './SuggestedPeopleOnboardingStackNa
 import {
   SuggestedPeopleWelcomeScreen,
   SuggestedPeopleUploadPictureScreen,
+  BadgeSelection,
 } from '../../screens';
 import {SCREEN_WIDTH} from '../../utils';
 import {headerBarOptions} from '../main';
@@ -30,6 +31,13 @@ const SuggestedPeopleOnboardingStackScreen: React.FC = () => {
           ...headerBarOptions('white', ''),
         }}
       />
+      <SuggestedPeopleOnboardingStack.Screen
+        name="BadgeSelection"
+        component={BadgeSelection}
+        options={{
+          ...headerBarOptions('white', ''),
+        }}
+      />
     </SuggestedPeopleOnboardingStack.Navigator>
   );
 };
-- 
cgit v1.2.3-70-g09d2