4 files changed, 21 insertions, 8 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 8953cfe0..f7404f27 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -74,7 +74,10 @@ export type MainStackParams = {
     screenType: ScreenType;
   };
   UpdateSPPicture: {
-    goTo: string;
+    editing: boolean;
+  };
+  BadgeSelection: {
+    editing: boolean;
   };
   MutualBadgeHolders: {
     badge_id: string;
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index cb232297..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,
@@ -229,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', ''),
         }}
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
index 63547acb..30a83200 100644
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
+++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
@@ -3,11 +3,11 @@ import {createStackNavigator} from '@react-navigation/stack';
 export type SuggestedPeopleOnboardingStackParams = {
   WelcomeScreen: undefined;
   UploadPicture: {
-    goTo: string;
+    editing: boolean;
+  };
+  BadgeSelection: {
+    editing: boolean;
   };
-  BadgeSelection: undefined;
 };
 
-export const SuggestedPeopleOnboardingStack = createStackNavigator<
-  SuggestedPeopleOnboardingStackParams
->();
+export const SuggestedPeopleOnboardingStack = createStackNavigator<SuggestedPeopleOnboardingStackParams>();
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
index d1a6e5e1..a02e8373 100644
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
+++ b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
@@ -26,7 +26,7 @@ const SuggestedPeopleOnboardingStackScreen: React.FC = () => {
       <SuggestedPeopleOnboardingStack.Screen
         name="UploadPicture"
         component={SuggestedPeopleUploadPictureScreen}
-        initialParams={{goTo: 'SP Preview'}}
+        initialParams={{editing: false}}
         options={{
           ...headerBarOptions('white', ''),
         }}
@@ -34,6 +34,7 @@ const SuggestedPeopleOnboardingStackScreen: React.FC = () => {
       <SuggestedPeopleOnboardingStack.Screen
         name="BadgeSelection"
         component={BadgeSelection}
+        initialParams={{editing: false}}
         options={{
           ...headerBarOptions('white', ''),
         }}