1 files changed, 25 insertions, 14 deletions

diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx
index 8042d267..15695288 100644
--- a/src/routes/main/MainStackScreen.tsx
+++ b/src/routes/main/MainStackScreen.tsx
@@ -1,6 +1,7 @@
+import AsyncStorage from '@react-native-community/async-storage';
 import {RouteProp} from '@react-navigation/native';
 import {StackNavigationOptions} from '@react-navigation/stack';
-import React from 'react';
+import React, {useState} from 'react';
 import {
   CaptionScreen,
   CategorySelection,
@@ -43,6 +44,14 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
   const isSearchTab = screenType === ScreenType.Search;
   const isNotificationsTab = screenType === ScreenType.Notifications;
 
+  AsyncStorage.getItem('respondedToAccessContacts').then((value) =>
+    setRespondedToAccessContacts(value ? value : 'false'),
+  );
+
+  const [respondedToAccessContacts, setRespondedToAccessContacts] = useState(
+    'false',
+  );
+
   const initialRouteName = (() => {
     switch (screenType) {
       case ScreenType.Profile:
@@ -55,7 +64,7 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
         // If responded is true, show search screen
         // Else, show RequestContactsAccess
         // If user responds, update store and Async and remove popup
-        return 'RequestContactsAccess';
+        return 'Search';
       case ScreenType.Notifications:
         return 'Notifications';
     }
@@ -98,18 +107,20 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => {
           screenType,
         }}
       />
-      {isSearchTab && (
-        // <MainStack.Screen
-        //   name="Search"
-        //   component={SearchScreen}
-        //   initialParams={{screenType}}
-        // />
-        <MainStack.Screen
-          name="RequestContactsAccess"
-          component={RequestContactsAccess}
-          initialParams={{screenType}}
-        />
-      )}
+      {isSearchTab &&
+        (respondedToAccessContacts && respondedToAccessContacts === 'true' ? (
+          <MainStack.Screen
+            name="Search"
+            component={SearchScreen}
+            initialParams={{screenType}}
+          />
+        ) : (
+          <MainStack.Screen
+            name="Search"
+            component={RequestContactsAccess}
+            initialParams={{screenType}}
+          />
+        ))}
       {isNotificationsTab && (
         <MainStack.Screen
           name="Notifications"