Merge pull request #187 from shravyaramesh/tma538-friend-requests

[TMA485] friend request frontend

1 files changed, 11 insertions, 16 deletions

diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx
index 23cb2155..e6311daa 100644
--- a/src/components/profile/ProfilePreview.tsx
+++ b/src/components/profile/ProfilePreview.tsx
@@ -18,7 +18,7 @@ import {isUserBlocked, loadAvatar} from '../../services';
 import {useSelector, useDispatch, useStore} from 'react-redux';
 import {RootState} from '../../store/rootreducer';
 import {logout} from '../../store/actions';
-import {fetchUserX, userXInStore} from '../../utils';
+import {checkIfUserIsBlocked, fetchUserX, userXInStore} from '../../utils';
 import {SearchResultsBackground} from '../search';
 import NavigationBar from 'src/routes/tabs';
 import {ERROR_UNABLE_TO_VIEW_PROFILE} from '../../constants/strings';
@@ -73,15 +73,6 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({
    * needed to make space.
    */
 
-  const checkIfUserIsBlocked = async (userId: string) => {
-    const token = await AsyncStorage.getItem('token');
-    if (!token) {
-      dispatch(logout());
-      return false;
-    }
-    return await isUserBlocked(userId, loggedInUser.userId, token);
-  };
-
   const state: RootState = useStore().getState();
 
   const addToRecentlyStoredAndNavigateToProfile = async () => {
@@ -93,13 +84,17 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({
     };
 
     try {
+      //If the logged in user is blocked by the user being viewed, do not proceed.
+      const isUserBlocked = await checkIfUserIsBlocked(
+        user.id,
+        dispatch,
+        loggedInUser,
+      );
+      if (isUserBlocked) {
+        Alert.alert(ERROR_UNABLE_TO_VIEW_PROFILE);
+        return;
+      }
       if (previewType !== 'Comment') {
-        //If the logged in user is blocked by the user being viewed, do not proceed.
-        const isUserBlocked = await checkIfUserIsBlocked(user.id);
-        if (isUserBlocked) {
-          Alert.alert(ERROR_UNABLE_TO_VIEW_PROFILE);
-          return;
-        }
         const jsonValue = await AsyncStorage.getItem(
           '@recently_searched_users',
         );