From 06b37efaca9ce5ac46baf16c62c0fbc3b04b3951 Mon Sep 17 00:00:00 2001
From: inyoung <rmdnps10@gmail.com>
Date: Thu, 14 Mar 2024 13:44:46 +0900
Subject: [PATCH 1/2] =?UTF-8?q?Feat:=20=EC=A7=84=ED=96=89=EC=A4=91?=
 =?UTF-8?q?=EC=9D=B8=20=EC=83=81=EB=8B=B4=20api=20view=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84=20#158?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Seller/Common/OngoingCounsultBox.tsx        |  2 ++
 .../Seller/SellerHome/OnGoingConsultSection.tsx | 17 +++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/Seller/Common/OngoingCounsultBox.tsx b/src/components/Seller/Common/OngoingCounsultBox.tsx
index bf4133a8..b9ee8240 100644
--- a/src/components/Seller/Common/OngoingCounsultBox.tsx
+++ b/src/components/Seller/Common/OngoingCounsultBox.tsx
@@ -27,12 +27,14 @@ interface OngoingCounsultBoxProps {
   counselorprofileStatus: number | undefined;
   onClick?: () => void;
   reviewCompleted?: boolean;
+  isChat: boolean;
 }
 function OngoingCounsultBox({
   categoryStatus,
   consultStatus,
   counselorName,
   beforeMinutes,
+  isChat,
   counselorprofileStatus,
   content,
   newMessageCounts = 0,
diff --git a/src/components/Seller/SellerHome/OnGoingConsultSection.tsx b/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
index 6e110fc3..6503f07e 100644
--- a/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
+++ b/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
@@ -28,7 +28,7 @@ function OnGoingConsultSection() {
     };
     fetchOngoingConsult();
   }, []);
-  console.log(totalNum);
+  console.log(consult);
   return (
     <>
       <ContentTag
@@ -57,18 +57,23 @@ function OnGoingConsultSection() {
           consult?.map((item: any) => (
             <OngoingCounsultBox
               key={item?.id}
+              isChat={item?.isChat}
               consultStatus={item?.status}
               counselorName={item?.opponentNickname}
-              beforeMinutes={null}
+              beforeMinutes={item?.latestMessageUpdatedAt}
               content={
                 item?.status === '질문 대기'
-                  ? '셰어의 질문이 도착할 때까지 조금만 기다려주세요! '
-                  : item?.lastMessageContent
+                  ? '셰어의 질문이 도착할 때까지 조금만 기다려주세요!'
+                  : item?.latestMessageContent
               }
-              newMessageCounts={1}
+              newMessageCounts={item?.unreadMessageCount}
               counselorprofileStatus={consultStyleToCharNum(item?.consultStyle)}
               onClick={() => {
-                navigate(`/minder/letter/${item?.id}`);
+                if (item?.isChat) {
+                  navigate(`/minder/chat/${item?.id}`);
+                } else {
+                  navigate(`/minder/letter/${item?.id}`);
+                }
               }}
             />
           ))

From 0ccd50d86fee642d273015261083bc47deb8b2ce Mon Sep 17 00:00:00 2001
From: inyoung <rmdnps10@gmail.com>
Date: Thu, 14 Mar 2024 13:56:09 +0900
Subject: [PATCH 2/2] Delete console.log

---
 src/components/Seller/SellerHome/OnGoingConsultSection.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Seller/SellerHome/OnGoingConsultSection.tsx b/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
index 6503f07e..d937f487 100644
--- a/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
+++ b/src/components/Seller/SellerHome/OnGoingConsultSection.tsx
@@ -28,7 +28,6 @@ function OnGoingConsultSection() {
     };
     fetchOngoingConsult();
   }, []);
-  console.log(consult);
   return (
     <>
       <ContentTag