diff --git a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
index b8b4ca6..1a2c0e4 100644
--- a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
+++ b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx
@@ -81,10 +81,13 @@ const JoinRegularMemberBottomSheet = ({
text={{recruitmentPeriod}}
/>
diff --git a/src/components/myPage/ApproveBox.tsx b/src/components/myPage/ApproveBox.tsx
index 805cf00..c085ec6 100644
--- a/src/components/myPage/ApproveBox.tsx
+++ b/src/components/myPage/ApproveBox.tsx
@@ -1,6 +1,9 @@
import Box from 'wowds-ui/Box';
import styled from '@emotion/styled';
-import { CurrentRecruitmentType } from '@/apis/member/memberType';
+import {
+ CurrentMembershipType,
+ CurrentRecruitmentType
+} from '@/apis/member/memberType';
import {
convertRecruitmentPeriod,
convertRecruitmentName
@@ -13,14 +16,16 @@ type BoxStatusType = 'default' | 'success' | 'error';
export const ApproveBox = ({
role,
- currentRecruitment
+ currentRecruitment,
+ currentMembership
}: {
role: UserRoleType;
currentRecruitment: CurrentRecruitmentType;
+ currentMembership?: CurrentMembershipType;
}) => {
const { handleBottomSheet } = useBottomSheet();
- if (!currentRecruitment) {
+ if (!currentRecruitment && role !== 'REGULAR') {
return (
{
- if (role === 'ASSOCIATE') handleBottomSheet();
+ if (role === 'ASSOCIATE' && !currentMembership) handleBottomSheet();
else if (role === 'REGULAR') {
window.location.href = 'https://study.gdschongik.com/';
} else {
diff --git a/src/components/myPage/JoinStatus.tsx b/src/components/myPage/JoinStatus.tsx
index b8542e0..e6673dd 100644
--- a/src/components/myPage/JoinStatus.tsx
+++ b/src/components/myPage/JoinStatus.tsx
@@ -5,18 +5,23 @@ import styled from '@emotion/styled';
import MemberStatusInfoBox from '@/components/myPage/MemberStatusInfoBox';
import { ApproveBox } from './ApproveBox';
import { Text, Flex, Space } from '../common/Wrapper';
-import { CurrentRecruitmentType } from '@/apis/member/memberType';
+import {
+ CurrentMembershipType,
+ CurrentRecruitmentType
+} from '@/apis/member/memberType';
import MemberStatusStepper from './MemberStatusStepper';
import { User, UserRoleType } from '@/types/user';
const JoinStatus = ({
role,
currentRecruitmentRound,
- member
+ member,
+ currentMembership
}: {
role: UserRoleType;
currentRecruitmentRound: CurrentRecruitmentType;
member: User;
+ currentMembership?: CurrentMembershipType;
}) => {
const [openInfo, setOpenInfo] = useState(false);
const helpButtonRef = useRef(null);
@@ -50,7 +55,11 @@ const JoinStatus = ({
-
+
);
};
diff --git a/src/components/signup/EmailInputField.tsx b/src/components/signup/EmailInputField.tsx
index fa2f587..e7d4452 100644
--- a/src/components/signup/EmailInputField.tsx
+++ b/src/components/signup/EmailInputField.tsx
@@ -38,7 +38,7 @@ const EmailInputField = ({ control }: DepartmentSelectProps) => {
render={({ field, fieldState }) => (
{
{customEmail ? (
{