Merge branch 'develop' of https://github.com/woowacourse-teams/2024-c…

…orea into feat/#773
woowacourse-teams · Nov 25, 2024 · d53e91d · d53e91d
2 parents 9981209 + 66148a4
commit d53e91d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx b/frontend/src/components/roomDetailPage/myReviewee/MyReviewee.tsx
@@ -33,16 +33,14 @@ const MyReviewee = ({ roomInfo }: MyRevieweeProps) => {
     if (loadingButtonId.includes(reviewee.userId)) return;
     setLoadingButtonId((prev) => [...prev, reviewee.userId]);
 
-    postReviewCompleteMutation.mutate(
-      { roomId: roomInfo.id, revieweeId: reviewee.userId },
-      {
-        onSuccess: () => {
-          handleNavigateFeedbackPage(reviewee);
-          setLoadingButtonId((prev) => prev.filter((id) => id !== reviewee.userId));
-        },
-        onError: () => setLoadingButtonId((prev) => prev.filter((id) => id !== reviewee.userId)),
-      },
-    );
+    postReviewCompleteMutation
+      .mutateAsync({ roomId: roomInfo.id, revieweeId: reviewee.userId })
+      .then(() => {
+        handleNavigateFeedbackPage(reviewee);
+      })
+      .finally(() => {
+        setLoadingButtonId((prev) => prev.filter((id) => id !== reviewee.userId));
+      });
   };
 
   // 리뷰 및 피드백 여부 버튼 렌더링 함수

diff --git a/frontend/src/components/shared/roomCardModal/RoomCardModalButton.tsx b/frontend/src/components/shared/roomCardModal/RoomCardModalButton.tsx
@@ -127,7 +127,11 @@ const RoomCardModalButton = ({ roomInfo }: RoomCardModalButtonProps) => {
         </S.FormWrapper>
       </S.FormContainer>
 
-      <Button variant="primary" size="small" onClick={handleNoticeModal}>
+      <Button
+        variant="primary"
+        size="small"
+        onClick={roomInfo.isPublic ? handleParticipateRoomClick : handleNoticeModal}
+      >
         참여하기
       </Button>
     </S.ButtonContainer>