From f3fb2d304899e545d8a8fb7314bdfb1e858dcece Mon Sep 17 00:00:00 2001
From: lim396 <90199432+lim396@users.noreply.github.com>
Date: Mon, 4 Mar 2024 18:47:59 +0900
Subject: [PATCH] [frontend] Change to not display the add friend button and
 confirm button while blocking (#295)

---
 frontend/app/user/[id]/page.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/app/user/[id]/page.tsx b/frontend/app/user/[id]/page.tsx
index a424cd66..22eba42b 100644
--- a/frontend/app/user/[id]/page.tsx
+++ b/frontend/app/user/[id]/page.tsx
@@ -38,8 +38,10 @@ export default async function FindUser({
   const hasSentRequest = requests.requesting.some((r) => r.id === userId);
   const hasReceivedRequest = requests.requestedBy.some((r) => r.id === userId);
   const isFriend = myFriends.some((f) => f.id == userId);
-  const canAddFriend = !hasSentRequest && !hasReceivedRequest && !isFriend;
   const isBlocking = blockingUsers.some((b) => b.id === userId);
+  const canAddFriend =
+    !hasSentRequest && !hasReceivedRequest && !isFriend && !isBlocking;
+  const canAcceptFriend = hasReceivedRequest && !isFriend && !isBlocking;
   // TODO: Must consider these situations
   // 1. Already friends
   // 2. Friend request sent
@@ -58,7 +60,7 @@ export default async function FindUser({
         <>
           <div className="flex gap-4">
             {hasSentRequest && <CancelFriendRequestButton id={userId} />}
-            {hasReceivedRequest && <AcceptFriendButton id={userId} />}
+            {canAcceptFriend && <AcceptFriendButton id={userId} />}
             {hasReceivedRequest && <RejectFriendButton id={userId} />}
             {isFriend && <RemoveFriendButton id={userId} />}
             {canAddFriend && <AddFriendButton id={userId} />}