Move useEffect down to handle stale data

CS3219-AY2324S1 · Nov 13, 2023 · 0832792 · 0832792
1 parent d7142f6
commit 0832792
Showing 1 changed file with 37 additions and 34 deletions.
diff --git a/src/pages/collab/index.tsx b/src/pages/collab/index.tsx
@@ -60,40 +60,6 @@ const MatchRequestPage = () => {
     };
   });
 
-  useEffect(() => {
-    if (time === REQUEST_EXPIRY_TIME_SECS && curUserMatchRequest) {
-      const { difficulty, category, matchType } = curUserMatchRequest;
-      const sameRequest = { difficulty, category, matchType };
-      deleteMatchRequest({ matchType: curUserMatchRequest.matchType });
-      toast(
-        (t) => (
-          <div className="flex flex-col justify-evenly text-slate-800">
-            <span className="text-center mb-2">No requests found 🫠.</span>
-            <div className="flex justify-stretch">
-              <button
-                className="border bg-blue-500 rounded-md text-slate-100 p-2 mr-1"
-                onClick={() => {
-                  toast.dismiss(t.id);
-                  createMatchRequest(sameRequest);
-                }}
-                type="button"
-              >
-                Recreate again
-              </button>
-              <button
-                className="border bg-stone-500 rounded-md text-slate-100 p-2"
-                onClick={() => toast.dismiss(t.id)}
-                type="button"
-              >
-                Dismiss
-              </button>
-            </div>
-          </div>
-        ),
-        { duration: 60000, id: "timeout", position: "top-center" },
-      );
-    }
-  }, [time]);
 
   const matchUsers = useMatchUsers();
   const [isCreatingMatchRequest, setIsCreatingMatchRequest] = useState(false);
@@ -177,6 +143,43 @@ const MatchRequestPage = () => {
   });
   // subscprtions api -- END
 
+
+  useEffect(() => {
+    if (time >= REQUEST_EXPIRY_TIME_SECS && curUserMatchRequest) {
+      console.log(curUserMatchRequest);
+      const { difficulty, category, matchType } = curUserMatchRequest;
+      const sameRequest = { difficulty, category, matchType };
+      deleteMatchRequest({ matchType: curUserMatchRequest.matchType });
+      toast(
+        (t) => (
+          <div className="flex flex-col justify-evenly text-slate-800">
+            <span className="text-center mb-2">No requests found 🫠.</span>
+            <div className="flex justify-stretch">
+              <button
+                className="border bg-blue-500 rounded-md text-slate-100 p-2 mr-1"
+                onClick={() => {
+                  toast.dismiss(t.id);
+                  createMatchRequest(sameRequest);
+                }}
+                type="button"
+              >
+                Recreate again
+              </button>
+              <button
+                className="border bg-stone-500 rounded-md text-slate-100 p-2"
+                onClick={() => toast.dismiss(t.id)}
+                type="button"
+              >
+                Dismiss
+              </button>
+            </div>
+          </div>
+        ),
+        { duration: 60000, id: "timeout", position: "top-center" },
+      );
+    }
+  }, [time]);
+
   useEffect(() => {
     if (!curUserMatchRequest) {
       if (intervalRef.current) {