From 73204977f1f817106079ba224bf5ad7177a49899 Mon Sep 17 00:00:00 2001
From: "Au Chen Xi, Gabriel" <au.gabriel@u.nus.edu>
Date: Mon, 13 Nov 2023 23:48:43 +0800
Subject: [PATCH] Add the isfetching check

---
 src/pages/collab/index.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/collab/index.tsx b/src/pages/collab/index.tsx
index 7dd33ef..5df56c4 100644
--- a/src/pages/collab/index.tsx
+++ b/src/pages/collab/index.tsx
@@ -73,7 +73,7 @@ const MatchRequestPage = () => {
   const { data: numOfOnlineUsers = 0, refetch: refetchGetNumOfMatchReqs } =
     api.matchRequest.getNumOfMatchRequests.useQuery();
 
-  const { data: curUserMatchRequest, refetch: refetchCurrentUserRequest } =
+  const { data: curUserMatchRequest, refetch: refetchCurrentUserRequest, isFetching: isCurUserMatchFetching } =
     api.matchRequest.getCurrentUserRequest.useQuery(undefined, {
       onError() {
         toast.error("Error loading current user's match request");
@@ -145,8 +145,7 @@ const MatchRequestPage = () => {
 
 
   useEffect(() => {
-    if (time >= REQUEST_EXPIRY_TIME_SECS && curUserMatchRequest) {
-      console.log(curUserMatchRequest);
+    if (time >= REQUEST_EXPIRY_TIME_SECS && curUserMatchRequest && !isCurUserMatchFetching) {
       const { difficulty, category, matchType } = curUserMatchRequest;
       const sameRequest = { difficulty, category, matchType };
       deleteMatchRequest({ matchType: curUserMatchRequest.matchType });
@@ -178,7 +177,7 @@ const MatchRequestPage = () => {
         { duration: 60000, id: "timeout", position: "top-center" },
       );
     }
-  }, [time]);
+  }, [time, curUserMatchRequest]);
 
   useEffect(() => {
     if (!curUserMatchRequest) {