Merge branch 'master' into tma739-bugfix-profile-onboarding-tutorial

# Conflicts:
#	src/components/profile/Content.tsx

2 files changed, 27 insertions, 0 deletions

diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx
index bbe9baf0..9b089634 100644
--- a/src/routes/main/MainStackNavigator.tsx
+++ b/src/routes/main/MainStackNavigator.tsx
@@ -28,6 +28,9 @@ export type MainStackParams = {
     userXId: string | undefined;
     screenType: ScreenType;
   };
+  SettingsScreen: {};
+  PrivacyScreen: {};
+  AccountTypeScreen: {};
   SocialMediaTaggs: {
     socialMediaType: string;
     userXId: string | undefined;
diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 8cefd3cc..d855f0df 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -6,6 +6,7 @@ import {StyleSheet, Text} from 'react-native';
 import {normalize} from 'react-native-elements';
 import BackIcon from '../../assets/icons/back-arrow.svg';
 import {
+  AccountType,
   AnimatedTutorial,
   BadgeSelection,
   CaptionScreen,
@@ -20,12 +21,14 @@ import {
   MomentUploadPromptScreen,
   NotificationsScreen,
   ProfileScreen,
+  PrivacyScreen,
   RequestContactsAccess,
   SearchScreen,
   SocialMediaTaggs,
   SuggestedPeopleScreen,
   SuggestedPeopleUploadPictureScreen,
   SuggestedPeopleWelcomeScreen,
+  SettingsScreen,
 } from '../../screens';
 import MutualBadgeHolders from '../../screens/suggestedPeople/MutualBadgeHolders';
 import {ScreenType} from '../../types';
@@ -151,6 +154,27 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         }}
       />
       <MainStack.Screen
+        name="SettingsScreen"
+        component={SettingsScreen}
+        options={{
+          ...headerBarOptions('white', 'Settings and Privacy'),
+        }}
+      />
+      <MainStack.Screen
+        name="PrivacyScreen"
+        component={PrivacyScreen}
+        options={{
+          ...headerBarOptions('white', 'Privacy'),
+        }}
+      />
+      <MainStack.Screen
+        name="AccountTypeScreen"
+        component={AccountType}
+        options={{
+          ...headerBarOptions('white', 'Account Type'),
+        }}
+      />
+      <MainStack.Screen
         name="AnimatedTutorial"
         component={AnimatedTutorial}
         options={{