Merge branch 'master' into tma664-sp-white-screen-fix

4 files changed, 13 insertions, 3 deletions

diff --git a/src/screens/main/NotificationsScreen.tsx b/src/screens/main/NotificationsScreen.tsx
index 511680ea..aa53c4a9 100644
--- a/src/screens/main/NotificationsScreen.tsx
+++ b/src/screens/main/NotificationsScreen.tsx
@@ -153,7 +153,7 @@ const NotificationsScreen: React.FC = () => {
 
   return (
     <SafeAreaView>
-      <StatusBar barStyle={'dark-content'} />
+      <StatusBar barStyle="dark-content" />
       <View style={styles.header}>
         <Text style={styles.headerText}>Notifications</Text>
       </View>
diff --git a/src/screens/profile/ProfileScreen.tsx b/src/screens/profile/ProfileScreen.tsx
index 9cdba555..5edc6277 100644
--- a/src/screens/profile/ProfileScreen.tsx
+++ b/src/screens/profile/ProfileScreen.tsx
@@ -46,7 +46,7 @@ const ProfileScreen: React.FC<ProfileOnboardingProps> = ({route}) => {
 
   return (
     <>
-      <StatusBar />
+      <StatusBar barStyle="dark-content" />
       <Content {...{y, userXId, screenType}} />
       <TabsGradient />
     </>
diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index f0be7c9e..84efa931 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -139,7 +139,7 @@ const SearchScreen: React.FC = () => {
 
   return (
     <SearchBackground>
-      <StatusBar />
+      <StatusBar barStyle="dark-content" />
       <ScrollView
         scrollEnabled={!searching}
         keyboardShouldPersistTaps={'always'}
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 1844f6ee..0f7e5cdd 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -6,6 +6,7 @@ import React, {
   useEffect,
   useState,
   useMemo,
+  useRef,
 } from 'react';
 import {
   FlatList,
@@ -84,6 +85,8 @@ const SuggestedPeopleScreen: React.FC = () => {
     people.length ? setLoading(false) : setLoading(true);
   }, [people]);
 
+  const stausBarRef = useRef(hideStatusBar);
+
   // loads data and append it to users based on current page
   useEffect(() => {
     loadMore();
@@ -165,6 +168,12 @@ const SuggestedPeopleScreen: React.FC = () => {
         }
       };
       navigateToAnimatedTutorial();
+      StatusBar.setHidden(stausBarRef.current);
+      StatusBar.setBarStyle('light-content');
+      return () => {
+        StatusBar.setHidden(false);
+        StatusBar.setBarStyle('dark-content');
+      };
     }, [navigation, suggested_people_linked]),
   );
 
@@ -240,6 +249,7 @@ const SuggestedPeopleScreen: React.FC = () => {
   const onViewableItemsChanged = useCallback(
     ({viewableItems}: {viewableItems: ViewToken[]}) => {
       setHideStatusBar(viewableItems[0].index !== 0);
+      stausBarRef.current = viewableItems[0].index !== 0;
     },
     [],
   );