Merge branch 'master' into tma-634-badge-selection-screen

# Conflicts:
#	src/components/taggs/SocialMediaInfo.tsx

2 files changed, 38 insertions, 1 deletions

diff --git a/src/utils/common.ts b/src/utils/common.ts
index 6a8b66d3..30122e79 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -29,7 +29,7 @@ export const handleOpenSocialUrlOnBrowser = (
 
 //Returns university class just like we would like to display on profile page
 export const getUniversityClass = (universityClass: number) => {
-  return `Class of ${(universityClass % 2000).toString()}'`;
+  return `Class of '${(universityClass % 2000).toString()}`;
 };
 
 export const getDateAge: (
diff --git a/src/utils/users.ts b/src/utils/users.ts
index ca917ae4..653c941e 100644
--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -159,3 +159,40 @@ export const checkIfUserIsBlocked = async (
   }
   return await isUserBlocked(userId, loggedInUser.userId, token);
 };
+
+export const defaultUserProfile = () => {
+  const defaultImage = require('../assets/images/avatar-placeholder.png');
+  return defaultImage;
+};
+
+export const addUserToRecentlyViewed = async (user: ProfilePreviewType) => {
+  const jsonValue = await AsyncStorage.getItem('@recently_searched_users');
+  let recentlySearchedList = jsonValue != null ? JSON.parse(jsonValue) : null;
+  if (recentlySearchedList) {
+    if (recentlySearchedList.length > 0) {
+      if (
+        recentlySearchedList.some(
+          (saved_user: ProfilePreviewType) => saved_user.id === user.id,
+        )
+      ) {
+        console.log('User already in recently searched.');
+      } else {
+        if (recentlySearchedList.length >= 10) {
+          recentlySearchedList.pop();
+        }
+        recentlySearchedList.unshift(user);
+      }
+    }
+  } else {
+    recentlySearchedList = [user];
+  }
+  try {
+    let recentlySearchedListString = JSON.stringify(recentlySearchedList);
+    await AsyncStorage.setItem(
+      '@recently_searched_users',
+      recentlySearchedListString,
+    );
+  } catch (e) {
+    console.log(e);
+  }
+};