main 최신화

src/entities/main/ui/DateContainer/index.tsx

@@ -27,7 +27,7 @@ const DateContainer = () => {
   }, []);
   const pastDays = Math.floor(totalDays / 2);
 
-  const { setSelectDate } = useSelectDateStore();
+  const { selectDate, setSelectDate } = useSelectDateStore();
 
   const { stageId } = useMyStageIdStore();
 
@@ -42,39 +42,37 @@ const DateContainer = () => {
     return { short: `${month}-${day}`, full: `${year}-${month}-${day}` };
   });
 
+  const syncSelectedDate = (fullDate: string) => {
+    const matchedDate = dates.find((d) => d.full === fullDate);
+
+    if (matchedDate) {
+      setSelectedDate(matchedDate.short);
+      setSelectDate(matchedDate.full);
+      setStartIndex(dates.findIndex((d) => d.full === fullDate));
+    } else {
+      const date = new Date(fullDate);
+      const short = `${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
+      setSelectedDate(short);
+      setSelectDate(fullDate);
+      setStartIndex(dates.findIndex((d) => d.full === fullDate));
+    }
+  };
+
   useEffect(() => {
-    const localSelectDate = sessionStorage.getItem('selectDate');
-
-    if (localSelectDate) {
-      const { selectDate: localDate, stageId: localStageId } =
-        JSON.parse(localSelectDate);
-
-      if (localDate !== '') {
-        if (stageId === localStageId) {
-          const matchedDate = dates.find((d) => d.full === localDate);
-
-          if (matchedDate) {
-            setSelectedDate(matchedDate.short);
-            setSelectDate(matchedDate.full);
-            const matchedIndex = dates.findIndex((d) => d.full === localDate);
-            setStartIndex(matchedIndex);
-          } else {
-            const date = new Date(localDate);
-            const month = String(date.getMonth() + 1).padStart(2, '0');
-            const day = String(date.getDate()).padStart(2, '0');
-            const short = `${month}-${day}`;
-
-            setSelectedDate(short);
-            setSelectDate(localDate);
-            const matchedIndex = dates.findIndex((d) => d.full === localDate);
-            setStartIndex(matchedIndex);
-          }
-        }
-      }
+    if (selectDate) syncSelectedDate(selectDate);
+  }, []);
+
+  useEffect(() => {
+    const local = sessionStorage.getItem('selectDate');
+    if (!local) return;
+
+    const { selectDate: localDate, stageId: localStageId } = JSON.parse(local);
+    sessionStorage.removeItem('selectDate');
 
-      sessionStorage.removeItem('selectDate');
+    if (localDate && stageId === localStageId) {
+      syncSelectedDate(localDate);
     }
-  }, [dates]);
+  }, [dates, stageId]);
 
   const todayIndex = dates.findIndex(
     (d) =>

src/shared/ui/stageMatchContainer/index.tsx

@@ -89,11 +89,15 @@ const StageMatchContainer = ({
 
           {matches?.matches
             .slice()
-            .sort(
-              (a, b) =>
-                new Date(a.startDate).getTime() -
-                new Date(b.startDate).getTime(),
-            )
+            .sort((a, b) => {
+              if (a.isEnd === b.isEnd) {
+                return (
+                  new Date(a.startDate).getTime() -
+                  new Date(b.startDate).getTime()
+                );
+              }
+              return a.isEnd ? 1 : -1;
+            })
             .map((match) => (
               <div
                 key={match.matchId}

src/views/coupon/ui/CouponPage/index.tsx

@@ -11,7 +11,10 @@ import { usePostMyCoupon } from '../../model/usePostMyCoupon';
 const CouponPage = () => {
   const searchParams = useSearchParams();
   const couponId = searchParams.get('couponId');
-  const { data: couponInfo } = useGetMyCouponInfo(String(couponId));
+  const { data: couponInfo, isPending } = useGetMyCouponInfo(String(couponId), {
+    enabled: !!couponId,
+    retry: false,
+  });
   const { mutate: postCoupon, data: couponData } = usePostMyCoupon(
     String(couponId),
   );
@@ -36,10 +39,15 @@ const CouponPage = () => {
   useEffect(() => {
     if (couponInfo) {
       setIsUseCoupon(couponInfo.isUsed);
-      localStorage.removeItem('couponId');
     }
   }, [couponInfo]);
 
+  useEffect(() => {
+    if (!isPending) {
+      localStorage.removeItem('couponId');
+    }
+  }, [isPending]);
+
   useEffect(() => {
     if (couponData) {
       setIsGain(couponData.isGain);

src/views/main/ui/MainPage/index.tsx

@@ -154,7 +154,7 @@ const MainPage = () => {
               포인트
             </h2>
             <h2 className={cn('laptop:text-h3e', 'text-body1e', 'text-white')}>
-              {formatPoint(point)}
+              {userPointData ? formatPoint(point) : '000'}
             </h2>
             <h3
               className={cn(
@@ -164,7 +164,7 @@ const MainPage = () => {
                 'hidden',
               )}
             >
-              ({point.toLocaleString()})
+              {userPointData ? `(${point.toLocaleString()})` : '(000)'}
             </h3>
           </div>
           <DateContainer />
@@ -174,6 +174,7 @@ const MainPage = () => {
             text={isToday ? '오늘 최신 매치' : `${selectDate.slice(5)} 매치`}
             icon={<MatchClockIcon />}
             path={`/match/list/${stageId}`}
+            onClick={() => setSelectDate(selectDate)}
           >
             <StageMatchSection
               matches={searchMatchData}

src/views/match/ui/MatchPage/index.tsx

@@ -34,6 +34,10 @@ const MatchPage = () => {
     setSelectDate('');
   }, [stageId]);
 
+  useEffect(() => {
+    setSelectDate(selectDate);
+  }, []);
+
   const today = new Date();
 
   const [year, month, day] = selectDate