From 2a4c9adb484bf841917da925c905f53cc1894b94 Mon Sep 17 00:00:00 2001
From: hyeseon han <hyeseon405@gmail.com>
Date: Fri, 23 Feb 2024 23:33:33 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20API=20profileImage=20Enum=20?=
 =?UTF-8?q?=ED=95=84=EB=93=9C=EA=B0=92=20=EC=B6=94=EA=B0=80=20=EB=8C=80?=
 =?UTF-8?q?=EC=9D=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/organisms/FriendListItem.tsx | 3 +--
 src/types/friendship/index.d.ts             | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/organisms/FriendListItem.tsx b/src/components/organisms/FriendListItem.tsx
index 852733c..7e39dc9 100644
--- a/src/components/organisms/FriendListItem.tsx
+++ b/src/components/organisms/FriendListItem.tsx
@@ -14,9 +14,8 @@ const FriendListItem: React.FC<{
   return (
     <div className="flex p-[16px] mb-[12px] justify-between items-center bg-white rounded-[12px]">
       <div className="flex items-center">
-        {/* TODO profile img ENUM res 데이터로 교체  */}
         <Image
-          src={returnProfileImg('GREEN')}
+          src={returnProfileImg(data.profileImage)}
           width={40}
           height={40}
           className="w-[40px] h-[40px] aspect-square"
diff --git a/src/types/friendship/index.d.ts b/src/types/friendship/index.d.ts
index da634f8..e86ba8a 100644
--- a/src/types/friendship/index.d.ts
+++ b/src/types/friendship/index.d.ts
@@ -1,7 +1,10 @@
+import type { ProfileEnum } from '../common';
+
 export interface FriendshipData {
   userId: number;
   nickname: string;
   ingredientCount: number;
+  profileImage: ProfileEnum;
 }
 
 export type FriendshipSortType = 'nickname' | 'createdAt';

From 2b342e6bd6370de54bd68c96e6dd1f7927b3091a Mon Sep 17 00:00:00 2001
From: hyeseon han <hyeseon405@gmail.com>
Date: Fri, 23 Feb 2024 23:33:50 +0900
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=EC=B9=9C=EA=B5=AC=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EB=AC=B4=ED=95=9C=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A1=A4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/templates/FriendListTemplate.tsx | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/templates/FriendListTemplate.tsx b/src/components/templates/FriendListTemplate.tsx
index 82a3bf2..21e614d 100644
--- a/src/components/templates/FriendListTemplate.tsx
+++ b/src/components/templates/FriendListTemplate.tsx
@@ -37,7 +37,7 @@ const FriendListTemplate: React.FC<{ possibleDelete: boolean }> = ({
   const [selectedFriendIds, setSelectedFriendIds] = useState<number[]>([]);
   const {
     data: friendsData,
-    fetchNextPage: friendsNextPage,
+    fetchNextPage: fetchFriendsNextPage,
     isFetchingNextPage: isFetchingfriendsNextPage,
     refetch: friendsRefetch,
   } = useGetFriendships({
@@ -53,7 +53,7 @@ const FriendListTemplate: React.FC<{ possibleDelete: boolean }> = ({
 
   const onIntersect: IntersectionObserverCallback = ([entry]) => {
     if (entry.isIntersecting) {
-      void friendsNextPage();
+      void fetchFriendsNextPage();
     }
   };
 
@@ -116,10 +116,13 @@ const FriendListTemplate: React.FC<{ possibleDelete: boolean }> = ({
             />
           )),
         )}
+        {isFetchingfriendsNextPage ? (
+          <SuspenseFallback />
+        ) : (
+          <div ref={bottom} />
+        )}
       </div>
 
-      {isFetchingfriendsNextPage ? <SuspenseFallback /> : <div ref={bottom} />}
-
       <div className="fixed w-screen max-w-[480px] bottom-0 px-[20px] py-[26px]">
         <Button
           text={'삭제하기'}

From 31ed5521685ea6fce77b01d9ff5edbd68aad9b65 Mon Sep 17 00:00:00 2001
From: hyeseon han <hyeseon405@gmail.com>
Date: Fri, 23 Feb 2024 23:35:17 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=EC=B9=9C=EA=B5=AC=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=ED=83=AD=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20CTA=20=EB=B2=84=ED=8A=BC=20=EB=B6=84?=
 =?UTF-8?q?=EA=B8=B0=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/FriendListTemplate.tsx           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/templates/FriendListTemplate.tsx b/src/components/templates/FriendListTemplate.tsx
index 21e614d..a2918ab 100644
--- a/src/components/templates/FriendListTemplate.tsx
+++ b/src/components/templates/FriendListTemplate.tsx
@@ -123,14 +123,16 @@ const FriendListTemplate: React.FC<{ possibleDelete: boolean }> = ({
         )}
       </div>
 
-      <div className="fixed w-screen max-w-[480px] bottom-0 px-[20px] py-[26px]">
-        <Button
-          text={'삭제하기'}
-          className={`w-full ${selectedFriendIds.length === 0 ? 'bg-gray3 text-gray1' : 'bg-primary2 text-white'}`}
-          onClick={deleteOnOpen}
-          disabled={selectedFriendIds.length === 0}
-        />
-      </div>
+      {possibleDelete ? (
+        <div className="fixed w-screen max-w-[480px] bottom-0 px-[20px] py-[26px]">
+          <Button
+            text={'삭제하기'}
+            className={`w-full ${selectedFriendIds.length === 0 ? 'bg-gray3 text-gray1' : 'bg-primary2 text-white'}`}
+            onClick={deleteOnOpen}
+            disabled={selectedFriendIds.length === 0}
+          />
+        </div>
+      ) : null}
 
       <Modal
         onClose={deleteOnClose}