From 8eadd7a9b02c9a9aa75b5a0b6272ca8b3f849306 Mon Sep 17 00:00:00 2001
From: jaeml06 <jaeml0630@gmail.com>
Date: Wed, 23 Oct 2024 18:01:52 +0900
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20if=20=EB=B6=84=EA=B8=B0=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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);

From d0e1a75adfe05afe7a80322df5a2e79439489d88 Mon Sep 17 00:00:00 2001
From: jaeml06 <jaeml0630@gmail.com>
Date: Wed, 23 Oct 2024 18:10:14 +0900
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=EC=A4=84=EB=84=98=EA=B9=80=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OAuthMigrationResult/OAuthMigrationResultPage.tsx       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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() {
         <LoginLayout.Main>
           <div css={S.titleWrapper}>
             <span css={S.title({ theme })}>
-              모우다를 사용할 준비가 되었어요
+              모우다를 사용할 <br /> 준비가 되었어요
             </span>
             <br />
             <span css={S.subtitle({ theme })}>
@@ -65,7 +65,9 @@ export default function OAuthMigrationResultPage() {
         <LoginLayout.Header></LoginLayout.Header>
         <LoginLayout.Main>
           <div css={S.titleWrapper}>
-            <span css={S.title({ theme })}>기록을 이전하는데 실패했어요!</span>
+            <span css={S.title({ theme })}>
+              기록을 이전하는데 <br /> 실패했어요!
+            </span>
             <br />
             <span css={S.subtitle({ theme })}>
               혹시 이전 카카오 계정 가입자가 아닌가요?