diff --git a/frontend/src/components/Fallback/MissingFallback/MissingFallback.style.ts b/frontend/src/components/Fallback/MissingFallback/MissingFallback.style.ts
index c7ee1ab1f..9ff1a1235 100644
--- a/frontend/src/components/Fallback/MissingFallback/MissingFallback.style.ts
+++ b/frontend/src/components/Fallback/MissingFallback/MissingFallback.style.ts
@@ -22,8 +22,6 @@ export const container = ({
`;
export const image = css`
- width: 100%;
max-width: 40rem;
- height: 100%;
max-height: 40rem;
`;
diff --git a/frontend/src/pages/Bet/BetListPage/components/BetList/BetList.tsx b/frontend/src/pages/Bet/BetListPage/components/BetList/BetList.tsx
index 74c82ef8e..9521f8c6f 100644
--- a/frontend/src/pages/Bet/BetListPage/components/BetList/BetList.tsx
+++ b/frontend/src/pages/Bet/BetListPage/components/BetList/BetList.tsx
@@ -12,6 +12,6 @@ export default function BetList() {
return bets && bets.length > 0 ? (
) : (
-
+
);
}
diff --git a/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx b/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx
index c2506639f..462364efa 100644
--- a/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx
+++ b/frontend/src/pages/Chatting/ChatPage/ChatPage.tsx
@@ -86,7 +86,7 @@ export default function ChatPage() {
/>
))
) : (
-
+
)}
diff --git a/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx
index 8d008f986..e12884e32 100644
--- a/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx
+++ b/frontend/src/pages/Chatting/ChattingRoomPage/ChattingRoomPage.tsx
@@ -209,7 +209,9 @@ export default function ChattingRoomPage() {
tagValue={chatRoomDetail.attributes.isLoser ? '당첨!' : '미당첨'}
textList={
chatRoomDetail.attributes.isLoser
- ? ['축하드립니다!']
+ ? [
+ `축하드립니다 ${chatRoomDetail.attributes.loser.nickname}님!`,
+ ]
: [
`당첨된 사람은 ${chatRoomDetail.attributes.loser.nickname}님입니다!`,
]
diff --git a/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx b/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx
index c4dd552b5..28d8e064d 100644
--- a/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx
+++ b/frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx
@@ -53,7 +53,7 @@ export default function OAuthMigrationResultPage() {
}
}}
>
- 다락방으로 이동하기
+ 다락방 선택 페이지로 이동하기
diff --git a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx
index 20e75a2c6..ac581cf0a 100644
--- a/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx
+++ b/frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx
@@ -43,12 +43,20 @@ export default function OAuthLoginPage() {
const oauthHandlers: Record Promise> = {
apple: async () => {
setAccessToken(codeOrToken);
- navigate(ROUTES.kakaoSelection);
+ const isConverted = urlParams.get('isConverted');
+ if (isConverted === 'true') {
+ navigate(ROUTES.kakaoSelection);
+ } else {
+ navigate(ROUTES.darakbangSelectOption);
+ }
},
google: async () => {
const response = await googleOAuth(codeOrToken);
setAccessToken(response.data.accessToken);
- navigate(ROUTES.kakaoSelection);
+ if (response.data.isConverted) {
+ navigate(ROUTES.kakaoSelection);
+ }
+ navigate(ROUTES.darakbangSelectOption);
},
kakao: async () => {
kakaoMigration(codeOrToken);