feat: close the tooltip if no voting or timer is active

liza-kl · liza-kl · commit 83f5ccb9bcb4 · 2024-08-28T15:26:09.000+02:00
diff --git a/src/components/MenuBars/MenuBars.tsx b/src/components/MenuBars/MenuBars.tsx
@@ -213,11 +213,11 @@ export const MenuBars = ({showPreviousColumn, showNextColumn, onPreviousColumn,
     if ((timerExpired || USED_VOTES) && USER_NOT_READY) {
       timer = setTimeout(handleTimeout, 2000);
     }
-    if (!USER_NOT_READY) {
+    if (!USER_NOT_READY || (!state.activeTimer && !state.activeVoting)) {
       setIsReadyTooltipClass("");
     }
     return () => clearTimeout(timer);
-  }, [timerExpired, USER_NOT_READY, state.timerEnd, USED_VOTES]);
+  }, [timerExpired, USER_NOT_READY, state.timerEnd, USED_VOTES, state.activeTimer, state.activeVoting]);
 
   return (
     <>

Original file line number	Diff line number	Diff line change
`@@ -213,11 +213,11 @@ export const MenuBars = ({showPreviousColumn, showNextColumn, onPreviousColumn,`
`213`	`213`	`if ((timerExpired \|\| USED_VOTES) && USER_NOT_READY) {`
`214`	`214`	`timer = setTimeout(handleTimeout, 2000);`
`215`	`215`	`}`
`216`		`- if (!USER_NOT_READY) {`
	`216`	`+ if (!USER_NOT_READY \|\| (!state.activeTimer && !state.activeVoting)) {`
`217`	`217`	`setIsReadyTooltipClass("");`
`218`	`218`	`}`
`219`	`219`	`return () => clearTimeout(timer);`
`220`		`- }, [timerExpired, USER_NOT_READY, state.timerEnd, USED_VOTES]);`
	`220`	`+ }, [timerExpired, USER_NOT_READY, state.timerEnd, USED_VOTES, state.activeTimer, state.activeVoting]);`
`221`	`221`
`222`	`222`	`return (`
`223`	`223`	`<>`