updated helper function, cleaned up code, prevent friends navigation

1 files changed, 19 insertions, 4 deletions

diff --git a/src/utils/users.ts b/src/utils/users.ts
index 6cb6d46c..0b8a0582 100644
--- a/src/utils/users.ts
+++ b/src/utils/users.ts
@@ -176,9 +176,24 @@ export const defaultUserProfile = () => {
 };
 
 export const canViewProfile = (
-  ownProfile: boolean,
-  isPrivate: boolean,
-  isFriend: boolean,
+  state: RootState,
+  userXId: string | undefined,
+  screenType: ScreenType,
 ) => {
-  return ownProfile || isFriend || !isPrivate;
+  // own profile
+  if (!userXId || state.user.user.userId === userXId) {
+    return true;
+  }
+  // not private
+  if (!(userXId && state.userX[screenType][userXId].profile.is_private)) {
+    return true;
+  }
+  // is friend
+  if (
+    userXId &&
+    state.userX[screenType][userXId].profile.friendship_status === 'friends'
+  ) {
+    return true;
+  }
+  return false;
 };