Merge branch 'master' into tma258-sp-pagination-2

# Conflicts:
#	src/constants/api.ts
#	src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
#	src/services/SuggestedPeopleService.ts

2 files changed, 12 insertions, 0 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 9771c1e6..901dd993 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -69,6 +69,9 @@ export type MainStackParams = {
   AnimatedTutorial: {
     screenType: ScreenType;
   };
+  UpdateSPPicture: {
+    goTo: string;
+  };
 };
 
 export const MainStack = createStackNavigator<MainStackParams>();
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 0b762dff..aec860f2 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -21,6 +21,7 @@ import {
   SearchScreen,
   SocialMediaTaggs,
   SuggestedPeopleScreen,
+  SuggestedPeopleUploadPictureScreen,
 } from '../../screens';
 import {ScreenType} from '../../types';
 import {AvatarHeaderHeight, SCREEN_WIDTH} from '../../utils';
@@ -222,6 +223,14 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           ...headerBarOptions('white', 'Edit Profile'),
         }}
       />
+      <MainStack.Screen
+        name="UpdateSPPicture"
+        component={SuggestedPeopleUploadPictureScreen}
+        initialParams={{goTo: 'Profile'}}
+        options={{
+          ...headerBarOptions('white', ''),
+        }}
+      />
     </MainStack.Navigator>
   );
 };