From a2224416085c315a727d697c4dfb771ad1cb7dc6 Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Mon, 12 Aug 2024 01:08:37 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20paymentStatus=20enum=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis/member/memberType.ts | 5 ++--- src/components/myPage/JoinRegularMember.tsx | 20 ++++++++------------ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/apis/member/memberType.ts b/src/apis/member/memberType.ts index b0da467..abd5ae0 100644 --- a/src/apis/member/memberType.ts +++ b/src/apis/member/memberType.ts @@ -1,6 +1,5 @@ -import { PaymentStatus } from '@/types/status'; import { User } from '@/types/user'; - +import { Status } from '@/types/status'; export interface MemberInfoResponse { member: User; currentRecruitmentRound: CurrentRecruitmentType; @@ -25,7 +24,7 @@ export interface CurrentMembershipType { memberId: number; recruitmentId: number; regularRequirement: { - paymentStatus: PaymentStatus; + paymentStatus: Status; allSatisfied: boolean; paymentSatisfied: boolean; }; diff --git a/src/components/myPage/JoinRegularMember.tsx b/src/components/myPage/JoinRegularMember.tsx index 5995f01..6286d03 100644 --- a/src/components/myPage/JoinRegularMember.tsx +++ b/src/components/myPage/JoinRegularMember.tsx @@ -1,18 +1,14 @@ import { Text, Flex } from '@/components/common/Wrapper'; import RoutePath from '@/routes/routePath'; -import { PaymentStatus } from '@/types/status'; +import { Status } from '@/types/status'; import { useNavigate } from 'react-router-dom'; import Box from 'wowds-ui/Box'; -const JoinRegularMember = ({ - paymentStatus -}: { - paymentStatus: PaymentStatus; -}) => { +const JoinRegularMember = ({ paymentStatus }: { paymentStatus: Status }) => { const navigate = useNavigate(); const handleClickRoute = () => { - if (paymentStatus !== 'PENDING') { + if (paymentStatus !== 'UNSATISFIED') { return; } navigate(RoutePath.PaymentsCheckout); @@ -29,15 +25,15 @@ const JoinRegularMember = ({