feat: only show tooltip if active timer or voting is there

liza-kl · liza-kl · commit 6093bcce9aea · 2024-08-29T10:50:03.000+02:00
diff --git a/src/components/MenuBars/MenuBars.tsx b/src/components/MenuBars/MenuBars.tsx
@@ -210,10 +210,10 @@ export const MenuBars = ({showPreviousColumn, showNextColumn, onPreviousColumn,
       setIsReadyTooltipClass("tooltip-button--content-extended");
       setTimeout(() => setIsReadyTooltipClass(""), 28000);
     };
-    if ((timerExpired || USED_VOTES) && USER_NOT_READY) {
+    if ((timerExpired || USED_VOTES) && USER_NOT_READY && (state.activeTimer || state.activeVoting)) {
       timer = setTimeout(handleTimeout, 2000);
     }
-    if (!USER_NOT_READY || (!state.activeTimer && !state.activeVoting)) {
+    if (!USER_NOT_READY || (!state.activeTimer && !state.activeVoting) || !USED_VOTES) {
       setIsReadyTooltipClass("");
     }
     return () => clearTimeout(timer);

Original file line number	Diff line number	Diff line change
`@@ -210,10 +210,10 @@ export const MenuBars = ({showPreviousColumn, showNextColumn, onPreviousColumn,`
`210`	`210`	`setIsReadyTooltipClass("tooltip-button--content-extended");`
`211`	`211`	`setTimeout(() => setIsReadyTooltipClass(""), 28000);`
`212`	`212`	`};`
`213`		`- if ((timerExpired \|\| USED_VOTES) && USER_NOT_READY) {`
	`213`	`+ if ((timerExpired \|\| USED_VOTES) && USER_NOT_READY && (state.activeTimer \|\| state.activeVoting)) {`
`214`	`214`	`timer = setTimeout(handleTimeout, 2000);`
`215`	`215`	`}`
`216`		`- if (!USER_NOT_READY \|\| (!state.activeTimer && !state.activeVoting)) {`
	`216`	`+ if (!USER_NOT_READY \|\| (!state.activeTimer && !state.activeVoting) \|\| !USED_VOTES) {`
`217`	`217`	`setIsReadyTooltipClass("");`
`218`	`218`	`}`
`219`	`219`	`return () => clearTimeout(timer);`