Merge branch 'master' into tma538-friend-requests

1 files changed, 11 insertions, 8 deletions

diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx
index 0d8d9852..e6311daa 100644
--- a/src/components/profile/ProfilePreview.tsx
+++ b/src/components/profile/ProfilePreview.tsx
@@ -21,6 +21,7 @@ import {logout} from '../../store/actions';
 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';
 
 const NO_USER: UserType = {
   userId: '',
@@ -90,7 +91,7 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({
         loggedInUser,
       );
       if (isUserBlocked) {
-        Alert.alert('You cannot view this profile');
+        Alert.alert(ERROR_UNABLE_TO_VIEW_PROFILE);
         return;
       }
       if (previewType !== 'Comment') {
@@ -129,21 +130,23 @@ const ProfilePreview: React.FC<ProfilePreviewProps> = ({
         }
       }
 
+      const userXId =
+        loggedInUser.username === user.username ? undefined : user.id;
+
       /**
-       * Dispatch an event to Fetch the user details
-       * If the user is already present in store, do not fetch again
-       * Finally, Navigate to profile of the user selected
+       * Dispatch an event to Fetch the user details only if we're navigating to
+       * a userX's profile.
+       * If the user is already present in store, do not fetch again.
+       * Finally, Navigate to profile of the user selected.
        */
-
-      if (!userXInStore(state, screenType, user.id)) {
+      if (userXId && !userXInStore(state, screenType, user.id)) {
         await fetchUserX(
           dispatch,
           {userId: user.id, username: user.username},
           screenType,
         );
       }
-      const userXId =
-        loggedInUser.username === user.username ? undefined : user.id;
+
       navigation.push('Profile', {
         userXId,
         screenType,