Merge pull request #418 from code-zero-to-one/refactor/one-to-one-2

fix: 명예의 전당 MVP 주차 라벨 정리

Author: Hyeonjun0527

src/components/common/modals/study-review-modal.tsx

@@ -81,6 +81,26 @@ export default function StudyReviewModal({
     handleDismiss();
   };
 
+  const handleToggleHideForOneHour = () => {
+    const nextHideForOneHour = !hideForOneHour;
+
+    setHideForOneHour(nextHideForOneHour);
+
+    if (nextHideForOneHour) {
+      setHideForever(false);
+    }
+  };
+
+  const handleToggleHideForever = () => {
+    const nextHideForever = !hideForever;
+
+    setHideForever(nextHideForever);
+
+    if (nextHideForever) {
+      setHideForOneHour(false);
+    }
+  };
+
   return (
     <Modal.Root open={open} onOpenChange={handleOpenChange}>
       <Modal.Portal>
@@ -110,26 +130,8 @@ export default function StudyReviewModal({
             onSubmitSuccessClose={() => onOpenChange(false)}
             hideForOneHour={hideForOneHour}
             hideForever={hideForever}
-            onToggleHideForOneHour={() => {
-              setHideForOneHour((prev) => {
-                const next = !prev;
-                if (next) {
-                  setHideForever(false);
-                }
-
-                return next;
-              });
-            }}
-            onToggleHideForever={() => {
-              setHideForever((prev) => {
-                const next = !prev;
-                if (next) {
-                  setHideForOneHour(false);
-                }
-
-                return next;
-              });
-            }}
+            onToggleHideForOneHour={handleToggleHideForOneHour}
+            onToggleHideForever={handleToggleHideForever}
           />
         </Modal.Content>
       </Modal.Portal>

src/components/hall-of-fame/hall-of-fame-mvp-section.tsx

@@ -12,19 +12,21 @@ interface HallOfFameMvpSectionProps {
 export default function HallOfFameMvpSection({
   team,
 }: HallOfFameMvpSectionProps) {
+  const weekLabel = team?.weekDate?.trim();
+
   return (
     <div className="flex flex-col gap-300">
       <h3 className="font-display-headings6 text-text-strong flex items-center gap-100">
         <Users className="text-text-information h-5 w-5" />
-        저번 주 스터디 MVP 팀
+        {weekLabel ? `${weekLabel} 스터디 MVP 팀` : '최근 스터디 MVP 팀'}
       </h3>
 
       {team ? (
         <MVPTeamCard team={team} className="flex-1" />
       ) : (
         <div className="bg-background-default border-border-subtle rounded-200 flex h-[400px] items-center justify-center border">
           <p className="font-designer-14m text-text-subtle">
-            이번 주 MVP 팀이 없습니다.
+            최근 MVP 팀이 없습니다.
           </p>
         </div>
       )}

src/components/hall-of-fame/mvp-team-card.tsx

@@ -14,23 +14,7 @@ interface MVPTeamCardProps {
 }
 
 export default function MVPTeamCard({ team, className }: MVPTeamCardProps) {
-  const weekLabel = (() => {
-    const dateSource = team.weekDate || team.weekStartDate;
-    if (!dateSource) return 'MVP 팀';
-
-    const date = new Date(dateSource);
-    if (Number.isNaN(date.getTime())) return 'MVP 팀';
-
-    const firstDayOfMonth = new Date(
-      date.getFullYear(),
-      date.getMonth(),
-      1,
-    ).getDay();
-    const weekOfMonth =
-      Math.floor((date.getDate() + firstDayOfMonth - 1) / 7) + 1;
-
-    return `${date.getMonth() + 1}월 ${weekOfMonth}주차 MVP 팀`;
-  })();
+  const weekLabel = team.weekDate?.trim();
 
   return (
     <div
@@ -53,7 +37,9 @@ export default function MVPTeamCard({ team, className }: MVPTeamCardProps) {
           trigger={
             <button
               type="button"
-              aria-label="저번 주 MVP 팀 안내"
+              aria-label={
+                weekLabel ? `${weekLabel} MVP 팀 안내` : '최근 MVP 팀 안내'
+              }
               className="border-border-subtle text-text-strong bg-background-default shadow-1 font-designer-24b flex h-600 w-600 items-center justify-center rounded-full border leading-none"
             >
               ?
@@ -65,7 +51,7 @@ export default function MVPTeamCard({ team, className }: MVPTeamCardProps) {
       <div className="relative z-10 flex h-full flex-col items-center justify-center gap-400 text-center">
         <div className="flex flex-col items-center gap-100">
           <span className="bg-fill-warning-subtle-default text-text-warning font-designer-12b border-border-warning-subtle rounded-[9999px] border px-150 py-50">
-            {weekLabel}
+            {weekLabel || '최근 MVP 팀'}
           </span>
           <h3 className="font-display-headings5 text-text-strong">
             최고의 스터디 메이트