Merge branch 'master' into tma698-api-profile

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

6 files changed, 27 insertions, 62 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>
   );
 };
diff --git a/src/routes/onboarding/OnboardingStackNavigator.tsx b/src/routes/onboarding/OnboardingStackNavigator.tsx
index 0cdeecdf..a51a6c86 100644
--- a/src/routes/onboarding/OnboardingStackNavigator.tsx
+++ b/src/routes/onboarding/OnboardingStackNavigator.tsx
@@ -35,7 +35,7 @@ export type OnboardingStackParams = {
   PhoneVerification: {firstName: string; lastName: string; phone: string};
   OnboardingStepTwo: {firstName: string; lastName: string; phone: string};
   OnboardingStepThree: {userId: string; username: string};
-  InvitationCodeVerification: {userId: string};
+  InvitationCodeVerification: {userId: string; username: string};
 };
 
 export const OnboardingStack = createStackNavigator<OnboardingStackParams>();
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
deleted file mode 100644
index 30a83200..00000000
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackNavigator.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import {createStackNavigator} from '@react-navigation/stack';
-
-export type SuggestedPeopleOnboardingStackParams = {
-  WelcomeScreen: undefined;
-  UploadPicture: {
-    editing: boolean;
-  };
-  BadgeSelection: {
-    editing: boolean;
-  };
-};
-
-export const SuggestedPeopleOnboardingStack = createStackNavigator<SuggestedPeopleOnboardingStackParams>();
diff --git a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx b/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
deleted file mode 100644
index a02e8373..00000000
--- a/src/routes/suggestedPeopleOnboarding/SuggestedPeopleOnboardingStackScreen.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import {SuggestedPeopleOnboardingStack} from './SuggestedPeopleOnboardingStackNavigator';
-import {
-  SuggestedPeopleWelcomeScreen,
-  SuggestedPeopleUploadPictureScreen,
-  BadgeSelection,
-} from '../../screens';
-import {SCREEN_WIDTH} from '../../utils';
-import {headerBarOptions} from '../main';
-
-const SuggestedPeopleOnboardingStackScreen: React.FC = () => {
-  return (
-    <SuggestedPeopleOnboardingStack.Navigator
-      initialRouteName="WelcomeScreen"
-      screenOptions={{
-        headerShown: false,
-        gestureResponseDistance: {horizontal: SCREEN_WIDTH * 0.6},
-      }}>
-      <SuggestedPeopleOnboardingStack.Screen
-        name="WelcomeScreen"
-        component={SuggestedPeopleWelcomeScreen}
-        options={{
-          ...headerBarOptions('white', ''),
-        }}
-      />
-      <SuggestedPeopleOnboardingStack.Screen
-        name="UploadPicture"
-        component={SuggestedPeopleUploadPictureScreen}
-        initialParams={{editing: false}}
-        options={{
-          ...headerBarOptions('white', ''),
-        }}
-      />
-      <SuggestedPeopleOnboardingStack.Screen
-        name="BadgeSelection"
-        component={BadgeSelection}
-        initialParams={{editing: false}}
-        options={{
-          ...headerBarOptions('white', ''),
-        }}
-      />
-    </SuggestedPeopleOnboardingStack.Navigator>
-  );
-};
-
-export default SuggestedPeopleOnboardingStackScreen;
diff --git a/src/routes/suggestedPeopleOnboarding/index.ts b/src/routes/suggestedPeopleOnboarding/index.ts
deleted file mode 100644
index df711493..00000000
--- a/src/routes/suggestedPeopleOnboarding/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './SuggestedPeopleOnboardingStackNavigator';
-export * from './SuggestedPeopleOnboardingStackScreen';