Merge branch 'master' into hotfix-badge-name-fix

# Conflicts:
#	src/screens/suggestedPeople/SPBody.tsx

2 files changed, 8 insertions, 8 deletions

diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 7104b429..91f41fe4 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -113,16 +113,16 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           ...headerBarOptions('white', ''),
         }}
       />
-      {isSearchTab &&
+      {isSuggestedPeopleTab &&
         (respondedToAccessContacts && respondedToAccessContacts === 'true' ? (
           <MainStack.Screen
-            name="Search"
-            component={SearchScreen}
+            name="SuggestedPeople"
+            component={SuggestedPeopleScreen}
             initialParams={{screenType}}
           />
         ) : (
           <MainStack.Screen
-            name="Search"
+            name="SuggestedPeople"
             component={RequestContactsAccess}
             initialParams={{screenType}}
           />
@@ -134,10 +134,10 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           initialParams={{screenType}}
         />
       )}
-      {isSuggestedPeopleTab && (
+      {isSearchTab && (
         <MainStack.Screen
-          name="SuggestedPeople"
-          component={SuggestedPeopleScreen}
+          name="Search"
+          component={SearchScreen}
           initialParams={{screenType}}
         />
       )}
diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx
index 5d4f7cf2..e9208525 100644
--- a/src/routes/tabs/NavigationBar.tsx
+++ b/src/routes/tabs/NavigationBar.tsx
@@ -65,7 +65,7 @@ const NavigationBar: React.FC = () => {
           }
         },
       })}
-      initialRouteName={isOnboardedUser ? 'Profile' : 'Search'}
+      initialRouteName={isOnboardedUser ? 'Profile' : 'SuggestedPeople'}
       tabBarOptions={{
         showLabel: false,
         style: {