Merge pull request #733 from woowacourse-teams/feat/#722

사용자 전환 QA를 통한 사용자 전환 분기처리 버그 수정
woowacourse-teams · Oct 24, 2024 · 82e4427 · 82e4427
2 parents 77cb433 + d0e1a75
commit 82e4427
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git 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 })}>
               혹시 이전 카카오 계정 가입자가 아닌가요?

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