1 files changed, 41 insertions, 26 deletions

diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx
index 61a08d49..339144d6 100644
--- a/src/components/profile/Content.tsx
+++ b/src/components/profile/Content.tsx
@@ -12,6 +12,8 @@ import {
 import Animated from 'react-native-reanimated';
 import {
   CategorySelectionScreenType,
+  FriendshipStatusType,
+  MomentCategoryType,
   MomentType,
   ProfilePreviewType,
   ProfileType,
@@ -19,7 +21,7 @@ import {
   UserType,
 } from '../../types';
 import {COVER_HEIGHT, TAGG_TEXT_LIGHT_BLUE} from '../../constants';
-import {fetchUserX, moveCategory, SCREEN_HEIGHT, userLogin} from '../../utils';
+import {fetchUserX, getUserAsProfilePreviewType, moveCategory, SCREEN_HEIGHT, userLogin} from '../../utils';
 import TaggsBar from '../taggs/TaggsBar';
 import {Moment} from '../moments';
 import ProfileBody from './ProfileBody';
@@ -188,14 +190,14 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
   /**
    * This hook is called on load of profile and when you update the friends list.
    */
-  useEffect(() => {
-    const isActuallyAFriend = friendsLoggedInUser.some(
-      (friend) => friend.username === user.username,
-    );
-    if (isFriend != isActuallyAFriend) {
-      setIsFriend(isActuallyAFriend);
-    }
-  }, [friendsLoggedInUser]);
+  // useEffect(() => {
+  //   const isActuallyAFriend = friendsLoggedInUser.some(
+  //     (friend) => friend.username === user.username,
+  //   );
+  //   if (isFriend != isActuallyAFriend) {
+  //     setIsFriend(isActuallyAFriend);
+  //   }
+  // }, [friendsLoggedInUser]);
 
   useEffect(() => {
     const isActuallyBlocked = blockedUsers.some(
@@ -206,22 +208,22 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
     }
   }, [blockedUsers, user]);
 
-  /**
-   * The object returned by this method is added to the list of blocked / friended users by the reducer.
-   * Which helps us prevent an extra api call to the backend just to fetch a user.
-   */
-  const getUserAsProfilePreviewType = (
-    passedInUser: UserType,
-    passedInProfile: ProfileType,
-  ): ProfilePreviewType => {
-    const fullName = passedInProfile.name.split(' ');
-    return {
-      id: passedInUser.userId,
-      username: passedInUser.username,
-      first_name: fullName[0],
-      last_name: fullName[1],
-    };
-  };
+  // /**
+  //  * The object returned by this method is added to the list of blocked / friended users by the reducer.
+  //  * Which helps us prevent an extra api call to the backend just to fetch a user.
+  //  */
+  // const getUserAsProfilePreviewType = (
+  //   passedInUser: UserType,
+  //   passedInProfile: ProfileType,
+  // ): ProfilePreviewType => {
+  //   const fullName = passedInProfile.name.split(' ');
+  //   return {
+  //     id: passedInUser.userId,
+  //     username: passedInUser.username,
+  //     first_name: fullName[0],
+  //     last_name: fullName[1],
+  //   };
+  // };
 
   /**
    * Handles a click on the friend / unfriend button.
@@ -229,12 +231,25 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
    * updateUserXFriends updates friends list for the new friend.
    */
 
+  // Handles click on friend/requested/unfriend button
+  /*
+   * When user logged in clicks on the friend button:
+   A request is sent.
+   Which means you have to update the status of their friendshpi to requested
+   When the status is changed to requested the button should change to requested.
+   When the button is changed to requested and thr user clicks on it,
+   a request much go to the backend to delete that request
+   When that succeeds, their friendship must be updated to no-record again;
+   When the button is changed to no_record, the add friends button should be displayed again
+   */
   const handleFriendUnfriend = async () => {
+    const {friendship_status} = profile;
     await dispatch(
       friendUnfriendUser(
         loggedInUser,
         getUserAsProfilePreviewType(user, profile),
-        isFriend,
+        friendship_status,
+        screenType,
       ),
     );
     await dispatch(updateUserXFriends(user.userId, state));