Merge pull request #163 from sharemindteam/feat/api-ongoing-consult

[Feature] 마인더 진행중인 상담 api 연동 오류 해결
sharemindteam · Mar 14, 2024 · 451b298 · 451b298
2 parents 458017f + 0ccd50d
commit 451b298
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -28,7 +28,6 @@ function OnGoingConsultSection() {
     };
     fetchOngoingConsult();
   }, []);
-  console.log(totalNum);
   return (
     <>
       <ContentTag
@@ -57,18 +56,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}`);
+                }
               }}
             />
           ))