[QA 중감점검] 공개상담 관련한 이슈 해결

src/components/Buyer/BuyerConsult/BuyerOpenConsultSection.tsx

@@ -7,7 +7,9 @@ import { LoadingSpinner } from 'utils/LoadingSpinner';
 import { isBuyPopupOpenState } from 'utils/atom';
 import { ReactComponent as LockIcon } from 'assets/icons/icon-lock.svg';
 import { ReactComponent as HeartIcon } from 'assets/icons/icon-heart2.svg';
-import { ReactComponent as SaveIcon } from 'assets/icons/icon-save2.svg';
+import { ReactComponent as HeartEmptyIcon } from 'assets/icons/icon-heart4.svg';
+import { ReactComponent as SaveIcon } from 'assets/icons/icon-save4.svg';
+import { ReactComponent as SaveEmptyIcon } from 'assets/icons/icon-save5.svg';
 import { ReactComponent as CommentIcon } from 'assets/icons/icon-comment.svg';
 import { Space } from 'components/Common/Space';
 import { BackDrop } from 'components/Common/BackDrop';
@@ -147,11 +149,17 @@ function BuyerOpenConsultSection({ isChecked }: BuyerOpenConsultSectionProps) {
                     <div className="row2">{item?.content}</div>
                     <div className="row3">
                       <IconItem>
-                        <HeartResizeIcon />
+                        {item?.isLiked ? (
+                          <HeartResizeIcon />
+                        ) : (
+                          <HeartEmptyIcon />
+                        )}
+
                         <Caption1 color={Grey2}>{item?.totalLike}</Caption1>
                       </IconItem>
                       <IconItem>
-                        <SaveIcon />
+                        {item?.isScrapped ? <SaveIcon /> : <SaveEmptyIcon />}
+
                         <Caption1 color={Grey2}>{item?.totalScrap}</Caption1>
                       </IconItem>
                       <IconItem>

src/components/Buyer/BuyerLetterWrite/LetterPostModal.tsx

@@ -43,6 +43,7 @@ export const LetterPostModal = ({
         if (categoryType === 0) {
           alert('상담 카테고리를 정해주세요.');
           setIsActive(false);
+          return;
         } else {
           //첫번째 질문 임시저장 X 메세지 임시저장 수정
           try {

src/components/Buyer/BuyerOpenConsult/OpenConsultList.tsx

@@ -3,7 +3,9 @@ import styled from 'styled-components';
 import { Grey1, Grey2, Grey6 } from 'styles/color';
 import { Body1, Caption1 } from 'styles/font';
 import { ReactComponent as HeartIcon } from 'assets/icons/icon-heart2.svg';
-import { ReactComponent as SaveIcon } from 'assets/icons/icon-save2.svg';
+import { ReactComponent as HeartEmptyIcon } from 'assets/icons/icon-heart4.svg';
+import { ReactComponent as SaveIcon } from 'assets/icons/icon-save4.svg';
+import { ReactComponent as SaveEmptyIcon } from 'assets/icons/icon-save5.svg';
 import { ReactComponent as CommentIcon } from 'assets/icons/icon-comment.svg';
 import { Space } from 'components/Common/Space';
 import { openConsultApiObject } from 'pages/Buyer/BuyerConsult';
@@ -96,15 +98,16 @@ function OpenConsultList() {
               <div className="row1">
                 <Body1>{item.title}</Body1>
               </div>
-              <Space height="1.2rem" />
+              <Space height="0.8rem" />
               <div className="row2">{item.content}</div>
               <div className="row3">
                 <IconItem>
-                  <HeartResizeIcon />
+                  {item.isLiked ? <HeartIcon /> : <HeartEmptyIcon />}
                   <Caption1 color={Grey2}>{item.totalLike}</Caption1>
                 </IconItem>
+
                 <IconItem>
-                  <SaveIcon />
+                  {item.isScrapped ? <SaveResizeIcon /> : <SaveEmptyIcon />}
                   <Caption1 color={Grey2}>{item.totalScrap}</Caption1>
                 </IconItem>
                 <IconItem>
@@ -169,6 +172,8 @@ const BuyerOpenConsultCard = styled.div`
     line-height: 155%;
   }
   .row3 {
+    position: absolute;
+    bottom: 1.6rem;
     display: flex;
     gap: 1.2rem;
   }
@@ -179,7 +184,7 @@ const IconItem = styled.div`
   gap: 0.5rem;
 `;
 
-const HeartResizeIcon = styled(HeartIcon)`
+const SaveResizeIcon = styled(SaveIcon)`
   width: 2rem;
   height: 2rem;
 `;

src/components/Buyer/BuyerOpenConsultDetail/CommentCard.tsx

@@ -13,6 +13,7 @@ import { deleteCommentLikes } from 'api/delete';
 import { postLikeComment } from 'api/post';
 import { consultStyleToCharNum } from 'utils/convertStringToCharNum';
 import { formattedMessage } from 'utils/formattedMessage';
+import { useNavigate } from 'react-router-dom';
 interface CommentCardProps {
   item: commentApiObject;
   isMyPost: boolean;
@@ -31,6 +32,7 @@ function CommentCard({
   // 보내기 중복 방지
   const [isSending, setIsSending] = useState<boolean>(false);
   const [isFirstRendering, setIsFirstRendering] = useState<boolean>(true);
+  const navigate = useNavigate();
   const handleClickLikeButton = useCallback(async () => {
     if (isSending) {
       return;
@@ -64,12 +66,25 @@ function CommentCard({
   return (
     <CommentCardWrapper>
       <div className="flex1">
-        <Characters
-          number={consultStyleToCharNum(item.consultStyle) ?? 1}
-          width="3.2rem"
-          height="3.3rem"
-        />
-        <Body1>{item.nickName}</Body1>
+        <div
+          className="minder-profile"
+          onClick={() => {
+            navigate(`/profile/${item.counselorId}`);
+          }}
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            gap: '0.8rem',
+            cursor: 'pointer',
+          }}
+        >
+          <Characters
+            number={consultStyleToCharNum(item.consultStyle) ?? 1}
+            width="3.2rem"
+            height="3.3rem"
+          />
+          <Body1>{item.nickName}</Body1>
+        </div>
         <Circle />
         <Caption2>{item.updatedAt}</Caption2>
         <SettingButton />

src/components/Buyer/BuyerOpenConsultDetail/CommentListSection.tsx

@@ -33,7 +33,7 @@ function CommentListSection() {
             }
           }
           const res2: any = await getCustomerIsWriter(id);
-          if (res2.status === 200) setIsMyPost(res.data);
+          if (res2.status === 200) setIsMyPost(res2.data);
           else if (res2?.response.status === 404) {
             alert('존재하지 않는 게시물입니다.');
             navigate('/open-consult');

src/components/Buyer/BuyerWriteOpenConsult/FianlWritePopup.tsx

@@ -36,8 +36,14 @@ function FinalWritePopup({ title, content, category }: FianlWritePopupProps) {
         alert('작성권한이 없습니다.');
         navigate('/consult?type=open-consult');
       } else if (res?.response.status === 404) {
-        alert('존재하지 않는 일대다상담입니다.');
-        navigate('/consult?type=open-consult');
+        if (res?.response.data.errorName === 'CONSULT_CATEGORY_NOT_FOUND') {
+          alert('상담 카테고리를 선택해주세요.');
+          setIsPostPopupOpen(false);
+          return;
+        } else if (res?.data.errorName === 'CONSULT_TYPE_NOT_FOUND') {
+          alert('존재하지 않는 일대다상담입니다.');
+          navigate('/consult?type=open-consult');
+        }
       }
     } catch (err) {
       alert(err);

src/components/Seller/Common/OngoingCounsultBox.tsx

@@ -19,10 +19,10 @@ import { useNavigate } from 'react-router-dom';
 import { CartegoryState, ConsultState } from 'utils/type';
 interface OngoingCounsultBoxProps {
   categoryStatus?: string;
-  consultStatus: string;
+  consultStatus?: string;
   counselorName: string | undefined;
-  beforeMinutes: string | null;
-  content: string | null;
+  beforeMinutes: string | undefined | null;
+  content: string | null | undefined;
   newMessageCounts: number | null;
   counselorprofileStatus: number | undefined;
   onClick?: () => void;
@@ -43,7 +43,10 @@ function OngoingCounsultBox({
 }: OngoingCounsultBoxProps) {
   const navigate = useNavigate();
   return (
-    <OngoingCounsultBoxWrapper onClick={onClick}>
+    <OngoingCounsultBoxWrapper
+      onClick={onClick}
+      $categoryStatus={categoryStatus}
+    >
       <div className="flex-1">
         {categoryStatus && (
           <div className="button">
@@ -107,7 +110,9 @@ function OngoingCounsultBox({
     </OngoingCounsultBoxWrapper>
   );
 }
-const OngoingCounsultBoxWrapper = styled.div`
+const OngoingCounsultBoxWrapper = styled.div<{
+  $categoryStatus: string | undefined;
+}>`
   width: calc(100% - 4rem);
   box-sizing: border-box;
   padding: 1.6rem;
@@ -122,9 +127,8 @@ const OngoingCounsultBoxWrapper = styled.div`
   background-color: ${Grey6};
   margin: 0 2rem;
   .button {
-    display: flex;
-    width: 6rem;
-    justify-content: center;
+    width: fit-content;
+    min-width: 5.6rem;
   }
   .flex-1 {
     display: flex;
@@ -138,7 +142,8 @@ const OngoingCounsultBoxWrapper = styled.div`
   }
   .flex-2 {
     display: flex;
-    gap: 1.2rem;
+    gap: ${(props) =>
+      props.$categoryStatus === '썸/연애시작' ? '2.4rem' : '1.2rem'};
   }
 `;
 

src/components/Seller/SellerLetterWrite/LetterIsSaveModal.tsx

@@ -6,12 +6,16 @@ interface SaveModalProps {
   setReplyText: React.Dispatch<React.SetStateAction<string>>;
   lastModifyDate: string | undefined;
   saveText: string;
+  setIsActiveSaveButton: React.Dispatch<React.SetStateAction<boolean>>;
+  setIsActivePostButton: React.Dispatch<React.SetStateAction<boolean>>;
 }
 // 임시저장할지 여부 모달
 export const LetterIsSaveModal = ({
   setIsActive,
   setReplyText,
   lastModifyDate,
+  setIsActivePostButton,
+  setIsActiveSaveButton,
   saveText,
 }: SaveModalProps) => {
   return (
@@ -31,6 +35,8 @@ export const LetterIsSaveModal = ({
             onClick={() => {
               setIsActive(false);
               setReplyText(saveText);
+              setIsActiveSaveButton(true);
+              setIsActivePostButton(true);
             }}
           >
             불러오기

src/components/Seller/SellerLetterWrite/LetterSavePostModal.tsx

@@ -10,6 +10,7 @@ interface LetterWriteSavePostModal {
   isSave: boolean;
   messageType: string;
   saveId: string;
+
 }
 // 임시저장 할까요? 모달
 export const LetterSavePostModal = ({

src/components/Seller/SellerLetterWrite/LetterWriteMainSection.tsx

@@ -14,6 +14,7 @@ import {
 } from 'api/get';
 import { LoadingSpinner } from 'utils/LoadingSpinner';
 import { Space } from 'components/Common/Space';
+import { CartegoryState } from 'utils/type';
 interface LetterConsultInform {
   categoryStatus?: CartegoryState;
   counselorName: string | undefined;
@@ -130,7 +131,7 @@ export const LetterWriteMainSection = ({
       setConsultInform({
         categoryStatus: customerInfoResponse?.data?.category,
         counselorName: customerInfoResponse?.data?.nickname,
-        beforeMinutes: '5분 전', // 포매팅 필요
+        beforeMinutes: letterResponse?.data?.updatedAt2,
         counselorprofileStatus: 1, // 포매팅 필요
         newMessageCounts: 0,
         content: letterResponse?.data?.content,
@@ -159,6 +160,8 @@ export const LetterWriteMainSection = ({
           setReplyText={setReplyText}
           setIsActive={setIsActiveSaveModal}
           lastModifyDate={saveDate}
+          setIsActivePostButton={setIsActivePostButton}
+          setIsActiveSaveButton={setIsActiveSaveButton}
         />
       )}
       {isActiveSavePostModal && (
@@ -226,7 +229,7 @@ export const LetterWriteMainSection = ({
               onClick={() => {
                 setIsActivePostModal(true);
               }}
-              isActive={isActiveSaveButton}
+              isActive={isActivePostButton}
               disabled={isActivePostButton ? false : true}
             >
               보내기

src/components/Seller/SellerOpenConsult/CommentListSection.tsx

@@ -29,6 +29,7 @@ export interface commentApiObject {
   totalLike: number;
   consultStyle: string;
   updatedAt: string;
+  counselorId: number;
   isChosen: boolean;
 }
 

src/components/Seller/SellerOpenConsult/MainQuestionSection.tsx

@@ -46,7 +46,7 @@ function MainQuestionSection() {
         </div>
         <Space height="1rem" />
       </MainQuestionText>
-      <ButtonList>
+      {/* <ButtonList>
         <ButtonItem>
           <HeartIcon />
           <Caption1 color={Grey2}>{card?.totalLike}</Caption1>
@@ -55,7 +55,7 @@ function MainQuestionSection() {
           <SaveResizeIcon />
           <Caption1 color={Grey2}>{card?.totalScrap}</Caption1>
         </ButtonItem>
-      </ButtonList>
+      </ButtonList> */}
     </MainQuestionWrapper>
   );
 }
@@ -103,22 +103,22 @@ const Circle = styled.div`
   background-color: ${Grey3};
 `;
 
-const ButtonList = styled.div`
-  display: flex;
-  gap: 1.2rem;
-`;
+// const ButtonList = styled.div`
+//   display: flex;
+//   gap: 1.2rem;
+// `;
 
-const ButtonItem = styled.div`
-  border-radius: 0.8rem;
-  background: ${Grey6};
-  display: flex;
-  padding: 0.6rem 1.2rem 0.6rem 0.6rem;
-  align-items: center;
-  gap: 0.4rem;
-`;
+// const ButtonItem = styled.div`
+//   border-radius: 0.8rem;
+//   background: ${Grey6};
+//   display: flex;
+//   padding: 0.6rem 1.2rem 0.6rem 0.6rem;
+//   align-items: center;
+//   gap: 0.4rem;
+// `;
 
-const SaveResizeIcon = styled(SaveIcon)`
-  width: 2rem;
-  height: 2rem;
-`;
+// const SaveResizeIcon = styled(SaveIcon)`
+//   width: 2rem;
+//   height: 2rem;
+// `;
 export default React.memo(MainQuestionSection);

src/pages/Buyer/BuyerFinishPayment.tsx

@@ -30,7 +30,6 @@ function BuyerFinishPayment() {
         <Heading color={Green} margin="0 0 2.2rem 0">
           상담 신청 완료
         </Heading>
-        <Body2>blabla</Body2>
       </div>
       <div className="buttons">
         <Button