Merge branch 'hotfix/joam_qa'

TeamPiickle · Sep 29, 2022 · ccf1936 · ccf1936
2 parents 65b21b8 + c3c8639
commit ccf1936
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/@components/JoinPage/EmailAuthenticationPage/index.tsx b/src/@components/JoinPage/EmailAuthenticationPage/index.tsx
@@ -16,7 +16,7 @@ import { St } from "./style";
 const emailInvalidMessage = {
   NULL: "",
   form: "이메일 형식이 올바르지 않습니다",
-  duplicaton: "중복된 이메일입니다",
+  duplicaton: "이미 사용중인 이메일입니다",
 };
 type EmailInvalidMessage = typeof emailInvalidMessage[keyof typeof emailInvalidMessage];
 

diff --git a/src/core/api/common/axios.ts b/src/core/api/common/axios.ts
@@ -8,11 +8,12 @@ const real = axios.create({
 });
 
 real.interceptors.request.use((config) => {
+  if (localStorage.getItem("piickle-token") === null) return { ...config };
+
   const headers = {
     ...config.headers,
     "x-auth-token": `Bearer ${localStorage.getItem("piickle-token")}`,
   };
-
   return { ...config, headers };
 });
 

diff --git a/src/core/join/agreeListsContents.ts b/src/core/join/agreeListsContents.ts
@@ -10,10 +10,10 @@ export const agreeListsContents = [
     text: "개인정보 수집 및 이용동의 (필수)",
     link: "https://www.notion.so/0525fb9e664f4ce4a317cef1e7abdcd3",
   },
+  { required: true, text: "만 14세 이상입니다 (필수)" },
   {
     required: false,
     text: "마케팅 활용/광고성 정보 수신동의 (선택)",
     link: "https://www.notion.so/df173163c9bc426c92ea6bc3686102ef",
   },
-  { required: true, text: "만 14세 이상입니다 (필수)" },
 ];