fix: paymentStatus enum 변경

GDSC-Hongik · Aug 11, 2024 · a222441 · a222441
1 parent 0f07894
commit a222441
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git 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
@@ -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 = ({
       </Text>
       <Box
         text={
-          paymentStatus === 'PENDING'
+          paymentStatus === 'UNSATISFIED'
             ? '이번 학기 회비를 납부해주세요.'
             : '이번 학기 회비를 납부했어요.'
         }
-        variant={paymentStatus === 'PENDING' ? 'arrow' : 'text'}
-        status={paymentStatus === 'PENDING' ? 'error' : 'success'}
+        variant={paymentStatus === 'UNSATISFIED' ? 'arrow' : 'text'}
+        status={paymentStatus === 'UNSATISFIED' ? 'error' : 'success'}
         subText={
-          paymentStatus === 'PENDING'
-            ? '이제 카드·페이 등 여러 결제수단을 지원해요.'
+          paymentStatus === 'UNSATISFIED'
+            ? '이제 카드·계좌이체 등 여러 결제수단을 지원해요.'
             : undefined
         }
       />