Remove timer useEffect for refactor

CDCgov · Jul 11, 2024 · c0adf16 · c0adf16
1 parent 7404252
commit c0adf16
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/frontend/src/app/testQueue/TestCard/TestCard.tsx b/frontend/src/app/testQueue/TestCard/TestCard.tsx
@@ -71,18 +71,6 @@ export const TestCard = ({
     }
   };
 
-  // when the test order has a new timer started at value, check if we need to clear the timer
-  // this happens when another user stops a timer, so to keep it in sync
-  // we need to stop it for any other users viewing the same queue
-  useEffect(() => {
-    if (
-      testOrder.timerStartedAt === null ||
-      testOrder.timerStartedAt === undefined
-    ) {
-      timer.reset(trackTimerReset);
-    }
-  }, [testOrder.timerStartedAt]);
-
   useEffect(() => {
     if (startTestPatientId === testOrder.patient.internalId) {
       testCardElement.current.scrollIntoView({ behavior: "smooth" });
@@ -114,6 +102,8 @@ export const TestCard = ({
     if (startedAt === undefined) {
       timer.reset(trackTimerReset);
       testOrder.timerStartedAt = "0";
+    } else {
+      testOrder.timerStartedAt = startedAt?.toString();
     }
   };
 

diff --git a/frontend/src/app/testQueue/TestTimer.tsx b/frontend/src/app/testQueue/TestTimer.tsx
@@ -178,8 +178,15 @@ export const useTestTimer = (
   startedAt: number = 0
 ) => {
   const [, setCount] = useState(0);
+  const existingTimer = findTimer(id);
+  if (existingTimer && startedAt == 0) {
+    // if timer already exists and startedAt is 0,
+    // then reset the timer
+    existingTimer.reset();
+    saveTimers();
+  }
   const timer: Timer = findTimer(id) || addTimer(id, testLength);
-  if (startedAt !== null && startedAt !== undefined && startedAt !== 0) {
+  if (!!startedAt) {
     timer.setStartedAt(startedAt);
   }
   useEffect(() => {