Merge branch 'CS3219-AY2425S1:main' into main

Author: SPWwj

frontend/src/domain/context/MatchmakingContext.tsx

@@ -147,6 +147,7 @@ export const MatchmakingProvider: React.FC<{ children: ReactNode }> = ({ childre
                 dispatch({ type: "SOCKET_CONNECTED" });
                 matchService.startMatch(category, difficulty);
                 dispatch({ type: "START_MATCHING" });
+                timerDispatch({ type: "RESET_TIMER" });
                 startTimer();
 
                 matchTimeoutRef.current = setTimeout(() => {
@@ -231,7 +232,6 @@ export const MatchmakingProvider: React.FC<{ children: ReactNode }> = ({ childre
             }
         });
 
-
         // When the match status is "found", start countdown (if triggered elsewhere)
         if (state.status === "found" && !intervalId) {
             startCountdown();