fix: 버그 수정3

Hana4Team · Jun 11, 2024 · 824df97 · 824df97
1 parent bbfe950
commit 824df97
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 24 deletions.
diff --git a/src/components/molecules/MoneyBoxItem.tsx b/src/components/molecules/MoneyBoxItem.tsx
@@ -20,7 +20,6 @@ export const MoneyBoxItem: FC<Iprops> = ({
   color2,
   onClick,
   onClick2,
-  onClickQuestion,
   isLimit,
 }) => {
   return (
@@ -38,9 +37,6 @@ export const MoneyBoxItem: FC<Iprops> = ({
               >
                 출금제한
               </div>
-              <button onClick={() => onClickQuestion!()}>
-                <GoQuestion size={13} />
-              </button>
             </>
           )}
         </div>

diff --git a/src/pages/main/MyPage.tsx b/src/pages/main/MyPage.tsx
@@ -86,10 +86,10 @@ export const MyPage = () => {
                   : 'icons/bankbook.svg'
               }
               link={
-                item.type === 'DEPOSITWITHDRAWL'
+                item.type === 'DEPOSITWITHDRAWAL'
                   ? '/account'
                   : item.type === 'SAVING100'
-                    ? '/saving100'
+                    ? '/savings100Days'
                     : item.type === 'SAVING'
                       ? '/roadmap4'
                       : item.type === 'DEPOSIT'

diff --git a/src/pages/mission3/Mission3AccountOpening.tsx b/src/pages/mission3/Mission3AccountOpening.tsx
@@ -87,7 +87,11 @@ export const Mission3AccountOpening = () => {
       return;
     }
     if (currentNumber === 5) {
-      navigate('/savings100Days');
+      navigate('/savings100Days', {
+        state: {
+          prev: true,
+        },
+      });
       return;
     }
     setCurrentNumber((prev) => prev + 1);

diff --git a/src/pages/mission3/Savings100Days.tsx b/src/pages/mission3/Savings100Days.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from 'react';
 import { Calendar } from '../../components/organisms/Calendar';
 import Topbar from '../../components/Topbar';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ApiClient } from '../../apis/apiClient';
 import { differenceInDays, formatDate } from 'date-fns';
@@ -10,11 +10,16 @@ import { AlertModal } from '../../components/AlertModal';
 
 export const Savings100Days = () => {
   const navigate = useNavigate();
+  const location = useLocation();
   const queryClient = useQueryClient();
   const [showStepModal, setShowStepModal] = useState<boolean>(false);
   const [showAlarm, setShowAlarm] = useState<boolean>(false);
   const alarmMsgRef = useRef<string>('');
 
+  const locationState = location.state as {
+    prev: boolean;
+  };
+
   const { data: saving100, isSuccess } = useQuery({
     queryKey: ['saving100'],
     queryFn: () => {
@@ -92,6 +97,15 @@ export const Savings100Days = () => {
     }
   };
 
+  const onClickBack = () => {
+    if (locationState != null && locationState.prev) {
+      navigate('/mission');
+      return;
+    }
+
+    navigate(-1);
+  };
+
   const moveToTermination = () => {
     isSuccess &&
       navigate('/termination', {
@@ -132,10 +146,7 @@ export const Savings100Days = () => {
             </AlertModal>
           )}
 
-          <Topbar
-            title={saving100.productName}
-            onClick={() => navigate('/mission')}
-          />
+          <Topbar title={saving100.productName} onClick={() => onClickBack()} />
           <div className='bg-hanaAqua pb-[100px]'>
             <div className='bg-white font-hanaMedium p-8'>
               <div className='text-3xl mb-2'>생활비</div>

diff --git a/src/pages/mission4/Mission4AccountOpening.tsx b/src/pages/mission4/Mission4AccountOpening.tsx
@@ -110,7 +110,11 @@ export const Mission4AccountOpening = () => {
       return;
     }
     if (currentNumber === 5) {
-      navigate('/roadmap4');
+      navigate('/roadmap4', {
+        state: {
+          prev: true,
+        },
+      });
       return;
     }
     setCurrentNumber((prev) => prev + 1);

diff --git a/src/pages/mission4/RoadMap4.tsx b/src/pages/mission4/RoadMap4.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import Topbar from '../../components/Topbar';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ApiClient } from '../../apis/apiClient';
 import { differenceInDays, formatDate } from 'date-fns';
@@ -10,12 +10,17 @@ import { AlertModal } from '../../components/AlertModal';
 
 export const RoadMap4 = () => {
   const navigate = useNavigate();
+  const location = useLocation();
   const percent = useRef<number>(0);
   const queryClient = useQueryClient();
   const [showStepModal, setShowStepModal] = useState<boolean>(false);
   const [showAlarm, setShowAlarm] = useState<boolean>(false);
   const alarmMsgRef = useRef<string>('');
 
+  const locationState = location.state as {
+    prev: boolean;
+  };
+
   const { data: roadmap, isSuccess } = useQuery({
     queryKey: ['roadMap4'],
     queryFn: () => {
@@ -85,6 +90,15 @@ export const RoadMap4 = () => {
     }
   };
 
+  const onClickBack = () => {
+    if (locationState != null && locationState.prev) {
+      navigate('/mission');
+      return;
+    }
+
+    navigate(-1);
+  };
+
   if (isSuccess) {
     percent.current = Math.floor(
       (differenceInDays(new Date(), roadmap.startDate) /
@@ -132,10 +146,7 @@ export const RoadMap4 = () => {
               </div>
             </AlertModal>
           )}
-          <Topbar
-            title={roadmap.productName}
-            onClick={() => navigate('/mission')}
-          />
+          <Topbar title={roadmap.productName} onClick={() => onClickBack()} />
           <div className='bg-hanaSky min-h-real-screen2'>
             <div className='absolute top-[70px] left-[15px] w-[150px]'>
               <div className='font-hanaMedium text-lg mb-2'>

diff --git a/src/pages/mission5/Mission5AccountOpening.tsx b/src/pages/mission5/Mission5AccountOpening.tsx
@@ -85,7 +85,11 @@ export const Mission5AccountOpening = () => {
       return;
     }
     if (currentNumber === 4) {
-      navigate('/roadmap5');
+      navigate('/roadmap5', {
+        state: {
+          prev: true,
+        },
+      });
       return;
     }
     setCurrentNumber((prev) => prev + 1);

diff --git a/src/pages/mission5/RoadMap5.tsx b/src/pages/mission5/RoadMap5.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
 import Topbar from '../../components/Topbar';
-import { useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router-dom';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { ApiClient } from '../../apis/apiClient';
 import { differenceInDays, formatDate } from 'date-fns';
@@ -9,11 +9,16 @@ import { AlertModal } from '../../components/AlertModal';
 
 export const RoadMap5 = () => {
   const navigate = useNavigate();
+  const location = useLocation();
   const queryClient = useQueryClient();
   const [showStepModal, setShowStepModal] = useState<boolean>(false);
   const [showAlarm, setShowAlarm] = useState<boolean>(false);
   const alarmMsgRef = useRef<string>('');
 
+  const locationState = location.state as {
+    prev: boolean;
+  };
+
   const { data: roadmap, isSuccess } = useQuery({
     queryKey: ['roadMap5'],
     queryFn: () => {
@@ -83,6 +88,15 @@ export const RoadMap5 = () => {
     }
   };
 
+  const onClickBack = () => {
+    if (locationState != null && locationState.prev) {
+      navigate('/mission');
+      return;
+    }
+
+    navigate(-1);
+  };
+
   const moveToTermination = () => {
     isSuccess &&
       navigate('/termination', {
@@ -122,10 +136,7 @@ export const RoadMap5 = () => {
               </div>
             </AlertModal>
           )}
-          <Topbar
-            title={roadmap.productName}
-            onClick={() => navigate('/mission')}
-          />
+          <Topbar title={roadmap.productName} onClick={() => onClickBack()} />
           <div className='bg-hanaSky min-h-real-screen'>
             <img
               src='/images/pado.svg'

diff --git a/src/pages/moneyBox/MoneyBox.tsx b/src/pages/moneyBox/MoneyBox.tsx
@@ -53,6 +53,7 @@ export const MoneyBox = () => {
       const res = ApiClient.getInstance().updateMissionCheck();
       return res;
     },
+    onSettled: () => queryClient.invalidateQueries({ queryKey: ['userInfo'] }),
   });
 
   const { mutate: updateHanaMoney } = useMutation({