Merge branch 'master' into tma698-api-profile

# Conflicts:
#	src/components/search/SearchBar.tsx

2 files changed, 26 insertions, 0 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index 142249ce..26d9943b 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -84,6 +84,10 @@ export type MainStackParams = {
     badge_title: string;
     badge_img: string;
   };
+  InviteFriendsScreen: {
+    screenType: ScreenType;
+  };
+  SPWelcomeScreen: {};
 };
 
 export const MainStack = createStackNavigator<MainStackParams>();
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 35c306e5..8cefd3cc 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -15,6 +15,7 @@ import {
   EditProfile,
   FriendsListScreen,
   IndividualMoment,
+  InviteFriendsScreen,
   MomentCommentsScreen,
   MomentUploadPromptScreen,
   NotificationsScreen,
@@ -24,6 +25,7 @@ import {
   SocialMediaTaggs,
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
+  SuggestedPeopleWelcomeScreen,
 } from '../../screens';
 import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
@@ -221,6 +223,19 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         }}
       />
       <MainStack.Screen
+        name="InviteFriendsScreen"
+        component={InviteFriendsScreen}
+        initialParams={{screenType}}
+        options={{
+          ...headerBarOptions('black', 'Invites'),
+        }}
+      />
+      <MainStack.Screen
+        name="RequestContactsAccess"
+        component={RequestContactsAccess}
+        initialParams={{screenType}}
+      />
+      <MainStack.Screen
         name="EditProfile"
         component={EditProfile}
         options={{
@@ -248,6 +263,13 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         component={MutualBadgeHolders}
         options={{...modalStyle}}
       />
+      <MainStack.Screen
+        name="SPWelcomeScreen"
+        component={SuggestedPeopleWelcomeScreen}
+        options={{
+          ...headerBarOptions('white', ''),
+        }}
+      />
     </MainStack.Navigator>
   );
 };