Merge branch 'dev' into seo

salt26 · May 19, 2023 · 11cb477 · 11cb477
2 parents 62be2ef + 24775ac
commit 11cb477
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/client/src/pages/GameResultPage.js b/client/src/pages/GameResultPage.js
@@ -46,10 +46,8 @@ export default function GameResultPage() {
     end.setSeconds(end.getSeconds() + RESULT_TIME); // 종료되는 시간
     var left = parseInt((end.getTime() - current.getTime()) / 1000);
 
-    if (left < 0) {
-      // 남은 시간이 지난경우
-    } else {
-      setCount(left); //타이머 초깃값 세팅
+    if (left >= 0) {
+      setCount(left);
     }
   };
 

diff --git a/client/src/pages/MobileGameResultScreen.js b/client/src/pages/MobileGameResultScreen.js
@@ -33,12 +33,8 @@ export default function MobileGameResultScreen() {
     end.setSeconds(end.getSeconds() + RESULT_TIME); // 종료되는 시간
     var left = parseInt((end.getTime() - current.getTime()) / 1000);
 
-    if (left < 0) {
-      // 남은 시간이 지난경우
-      alert(Language[mode].already_end);
-      navigate(`/rooms`);
-    } else {
-      setCount(left); //타이머 초깃값 세팅
+    if (left >= 0) {
+      setCount(left);
     }
   };
 

diff --git a/client/src/utils/WebSocketProvider.js b/client/src/utils/WebSocketProvider.js
@@ -29,7 +29,6 @@ export const WebsocketProvider = ({ children }) => {
   const ws = useRef(null);
   // 웹소켓 연결
 
-  const savedMode = localStorage.getItem("language_mode");
   function createWebSocketConnection(name, setIsLoading) {
     return new Promise((resolve, reject) => {
       const token = localStorage.getItem("access_token");
@@ -58,11 +57,8 @@ export const WebsocketProvider = ({ children }) => {
           return;
         }
 
-        if (savedMode) {
-          alert(Language[1].reconnection_request);
-        } else {
-          alert(Language[0].reconnection_request);
-        }
+        alert(Language[mode].reconnection_request);
+
         setIsReady(false);
         navigate("/");
         reject();