diff --git a/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx b/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx index 28d8e064..fad27693 100644 --- a/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx +++ b/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx @@ -30,7 +30,7 @@ export default function OAuthMigrationResultPage() {
- 모우다를 사용할 준비가 되었어요 + 모우다를 사용할
준비가 되었어요

@@ -65,7 +65,9 @@ export default function OAuthMigrationResultPage() {
- 기록을 이전하는데 실패했어요! + + 기록을 이전하는데
실패했어요! +

혹시 이전 카카오 계정 가입자가 아닌가요? diff --git a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx index ac581cf0..2f858b06 100644 --- a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx +++ b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx @@ -44,7 +44,7 @@ export default function OAuthLoginPage() { apple: async () => { setAccessToken(codeOrToken); const isConverted = urlParams.get('isConverted'); - if (isConverted === 'true') { + if (isConverted === 'false') { navigate(ROUTES.kakaoSelection); } else { navigate(ROUTES.darakbangSelectOption); @@ -53,10 +53,11 @@ export default function OAuthLoginPage() { google: async () => { const response = await googleOAuth(codeOrToken); setAccessToken(response.data.accessToken); - if (response.data.isConverted) { + if (!response.data.isConverted) { navigate(ROUTES.kakaoSelection); + } else { + navigate(ROUTES.darakbangSelectOption); } - navigate(ROUTES.darakbangSelectOption); }, kakao: async () => { kakaoMigration(codeOrToken);