2 files changed, 26 insertions, 34 deletions
diff --git a/src/screens/search/SearchScreen.tsx b/src/screens/search/SearchScreen.tsx
index f9a42d86..65ec3934 100644
--- a/src/screens/search/SearchScreen.tsx
+++ b/src/screens/search/SearchScreen.tsx
@@ -18,12 +18,18 @@ import {loadSearchResults} from '../../services';
 import {resetScreenType} from '../../store/actions';
 import {RootState} from '../../store/rootReducer';
 import {
+  CategoryPreviewType,
   ProfilePreviewType,
   ScreenType,
-  CategoryPreviewType,
   SearchCategoryType,
 } from '../../types';
-import {normalize, SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
+import {
+  getRecentlySearchedCategories,
+  getRecentlySearchedUsers,
+  normalize,
+  SCREEN_HEIGHT,
+  SCREEN_WIDTH,
+} from '../../utils';
 
 /**
  * Search Screen for user recommendations and a search
@@ -70,11 +76,8 @@ const SearchScreen: React.FC = () => {
     if (!searching) {
       return;
     }
-    if (!query.length) {
-      loadRecentSearches();
-    }
     if (query.length < 3) {
-      setResults(undefined);
+      loadRecentlySearched().then(() => setResults(undefined));
       return;
     }
     (async () => {
@@ -115,7 +118,9 @@ const SearchScreen: React.FC = () => {
   // when searching state changes, run animation and reset query accordingly
   useEffect(() => {
     if (searching) {
-      timing(top, topInConfig).start();
+      loadRecentlySearched().then(() => {
+        timing(top, topInConfig).start();
+      });
     } else {
       setQuery('');
       handleBlur();
@@ -123,36 +128,23 @@ const SearchScreen: React.FC = () => {
     }
   }, [searching]);
 
-  const loadRecentlySearchedUsers = async () => {
-    try {
-      const asyncCache = await AsyncStorage.getItem('@recently_searched_users');
-      asyncCache != null ? setRecents(JSON.parse(asyncCache)) : setRecents([]);
-    } catch (e) {
-      console.log(e);
-    }
-  };
-  const loadRecentlySearchedCategories = async () => {
-    try {
-      const recentCategoriesJSON = await AsyncStorage.getItem(
-        '@recently_searched_categories',
-      );
-      setRecentCategories(
-        recentCategoriesJSON ? JSON.parse(recentCategoriesJSON) : [],
-      );
-    } catch (e) {
-      console.log(e);
-    }
-  };
-  const loadRecentSearches = () => {
-    loadRecentlySearchedUsers();
-    loadRecentlySearchedCategories();
+  // loads recent searches (users & categories) from AsyncStorage
+  const loadRecentlySearched = async () => {
+    return Promise.all([
+      getRecentlySearchedUsers(),
+      getRecentlySearchedCategories(),
+    ]).then(
+      ([users, categories]: [ProfilePreviewType[], CategoryPreviewType[]]) => {
+        setRecents(users);
+        setRecentCategories(categories);
+      },
+    );
   };
   const clearRecentlySearched = async () => {
     try {
       AsyncStorage.removeItem('@recently_searched_users');
       AsyncStorage.removeItem('@recently_searched_categories');
-      loadRecentlySearchedUsers();
-      loadRecentlySearchedCategories();
+      loadRecentlySearched();
     } catch (e) {
       console.log(e);
     }
@@ -187,7 +179,7 @@ const SearchScreen: React.FC = () => {
         onBlur={handleBlur}
         onFocus={handleFocus}
         value={query}
-        {...{top}}
+        {...{top, searching}}
       />
       <ScrollView
         scrollEnabled={!searching}
diff --git a/src/screens/suggestedPeople/SPBody.tsx b/src/screens/suggestedPeople/SPBody.tsx
index 6572dc55..bba137c0 100644
--- a/src/screens/suggestedPeople/SPBody.tsx
+++ b/src/screens/suggestedPeople/SPBody.tsx
@@ -50,7 +50,7 @@ const SPBody: React.FC<SPBodyProps> = ({
   let array = [];
   useEffect(() => {
     const findBadgeIcons = (badge: UniversityBadge) => {
-      DATA.forEach((item) => {
+      DATA?.forEach((item) => {
         if (item.title === badge.category) {
           item.data.forEach((object) => {
             if (object.badgeName === badge.name) {