Merge branch 'develop' of https://github.com/boostcampwm-2024/web23-P…

…inoco into develop
boostcampwm-2024 · Nov 28, 2024 · 62858c9 · 62858c9
2 parents 8240fa3 + 904b4ec
commit 62858c9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx b/packages/frontend/src/components/gamePage/leftSection/MainDisplay.tsx
@@ -30,7 +30,7 @@ export default function MainDisplay() {
   const { gameStartData, currentSpeaker, endSpeaking, votePinoco } = useGameSocket(setGamePhase);
   const { endingResult } = useEnding(setGamePhase);
   const { submitGuess } = useGuessing(isPinoco, setGamePhase);
-  const { voteResult, deadPerson } = useVoteResult(
+  const { voteResult, deadPerson, isDeadPersonPinoco } = useVoteResult(
     setIsVoteSubmitted,
     setGamePhase,
     setSelectedVote,
@@ -118,7 +118,11 @@ export default function MainDisplay() {
         )}
 
         {gamePhase === GAME_PHASE.VOTING_RESULT && (
-          <VoteResult deadPerson={deadPerson ?? ''} voteResult={voteResult} isPinoco={isPinoco} />
+          <VoteResult
+            deadPerson={deadPerson ?? ''}
+            voteResult={voteResult}
+            isDeadPersonPinoco={isDeadPersonPinoco ?? null}
+          />
         )}
         {gamePhase === GAME_PHASE.GUESSING && (
           <div className="flex flex-col items-center justify-center h-full">

diff --git a/packages/frontend/src/hooks/useVoteResult.ts b/packages/frontend/src/hooks/useVoteResult.ts
@@ -18,7 +18,7 @@ export default function useVoteResult(
   const { removeUser } = useRoomStore();
   const [voteResult, setVoteResult] = useState<Record<string, number>>({});
   const [deadPerson, setDeadPerson] = useState<string | null>(null);
-  const [isDeadPersonPinoco, setIsDeadPersonPinoco] = useState<boolean | null>(null); // 추가
+  const [isDeadPersonPinoco, setIsDeadPersonPinoco] = useState<boolean | null>(null);
 
   useEffect(() => {
     if (!socket) return;
@@ -33,7 +33,7 @@ export default function useVoteResult(
 
       setVoteResult(data.voteResult);
       setDeadPerson(data.deadPerson);
-      setIsDeadPersonPinoco(data.isDeadPersonPinoco); // 추가
+      setIsDeadPersonPinoco(data.isDeadPersonPinoco);
 
       if (setSelectedVote) {
         setSelectedVote(null);
@@ -48,5 +48,5 @@ export default function useVoteResult(
     };
   }, [socket, onIsVotedChange, onPhaseChange, removeUser, setSelectedVote]);
 
-  return { voteResult, deadPerson, isDeadPersonPinoco }; // 수정
+  return { voteResult, deadPerson, isDeadPersonPinoco };
 }