From 4618a90df20350e1337618c18f04dadd960c3c1d Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Thu, 5 Sep 2024 18:15:34 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20currentMembership=EA=B3=BC=20currentRecr?=
 =?UTF-8?q?uitment=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bottomsheet/JoinRegularMemberBottomSheet.tsx    | 13 +++++++++----
 src/pages/Dashboard.tsx                             |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
index 1a2c0e4..5bb2c94 100644
--- a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
+++ b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
@@ -6,7 +6,10 @@ import Button from 'wowds-ui/Button';
 import styled from '@emotion/styled';
 import { Link } from 'react-router-dom';
 import RoutePath from '@/routes/routePath';
-import { CurrentRecruitmentType } from '@/apis/member/memberType';
+import {
+  CurrentMembershipType,
+  CurrentRecruitmentType
+} from '@/apis/member/memberType';
 import {
   convertRecruitmentName,
   convertRecruitmentPeriod
@@ -14,9 +17,11 @@ import {
 import useJoinRegularMember from '@/hooks/mutation/useJoinRegularMember';
 
 const JoinRegularMemberBottomSheet = ({
-  currentRecruitment
+  currentRecruitment,
+  currentMembership
 }: {
   currentRecruitment: CurrentRecruitmentType;
+  currentMembership: CurrentMembershipType;
 }) => {
   const { joinRegularMember } = useJoinRegularMember();
   const bottomSheetTitle = convertRecruitmentName(
@@ -81,11 +86,11 @@ const JoinRegularMemberBottomSheet = ({
           text={<Text typo="label1">{recruitmentPeriod}</Text>}
         />
         <Button
-          disabled={currentRecruitment ? true : false}
+          disabled={currentMembership ? true : false}
           onClick={() => {
             joinRegularMember(currentRecruitment.recruitmentId);
           }}>
-          {currentRecruitment
+          {currentMembership
             ? '정회원 가입 조건을 완료해주세요'
             : '지원하러 가기'}
         </Button>
diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
index c7cf352..82e9b75 100644
--- a/src/pages/Dashboard.tsx
+++ b/src/pages/Dashboard.tsx
@@ -60,6 +60,7 @@ export const Dashboard = () => {
       </Wrapper>
       {isOpen && (
         <JoinRegularMemberBottomSheet
+          currentMembership={currentMembership}
           currentRecruitment={currentRecruitmentRound}
         />
       )}