Skip to content

fix/timer-bug #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RiyanMak merged 1 commit into from
May 1, 2026
Merged

fix/timer-bug #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions bsg-frontend/apps/extension/customComponents/Toolbar/Toolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export const Toolbar = () => {
viewBox="0 0 36 30"
fill="currentColor"
xmlns="http://www.w3.org/2000/svg">
\\<path d="M0.585786 13.3138C-0.195262 14.0949 -0.195262 15.3612 0.585786 16.1422L13.3137 28.8702C14.0948 29.6512 15.3611 29.6512 16.1421 28.8702C16.9232 28.0891 16.9232 26.8228 16.1421 26.0417L4.82843 14.728L16.1421 3.41432C16.9232 2.63327 16.9232 1.36694 16.1421 0.585892C15.3611 -0.195157 14.0948 -0.195157 13.3137 0.585892L0.585786 13.3138ZM34 16.728C35.1046 16.728 36 15.8326 36 14.728C36 13.6235 35.1046 12.728 34 12.728V14.728V16.728ZM2 14.728V16.728H34V14.728V12.728H2V14.728Z" />
<path d="M0.585786 13.3138C-0.195262 14.0949 -0.195262 15.3612 0.585786 16.1422L13.3137 28.8702C14.0948 29.6512 15.3611 29.6512 16.1421 28.8702C16.9232 28.0891 16.9232 26.8228 16.1421 26.0417L4.82843 14.728L16.1421 3.41432C16.9232 2.63327 16.9232 1.36694 16.1421 0.585892C15.3611 -0.195157 14.0948 -0.195157 13.3137 0.585892L0.585786 13.3138ZM34 16.728C35.1046 16.728 36 15.8326 36 14.728C36 13.6235 35.1046 12.728 34 12.728V14.728V16.728ZM2 14.728V16.728H34V14.728V12.728H2V14.728Z" />
</svg>
</Button>
</TooltipWrapper>
Expand Down Expand Up @@ -62,8 +62,8 @@ export const Toolbar = () => {
fill="none"
stroke="currentColor"
xmlns="http://www.w3.org/2000/svg">
<path
stroke-width="4"
<path
strokeWidth="4"
d="M19.6538 16.1257C20.1154 16.5143 20.1154 17.4857 19.6538 17.8743L3.03846 31.8632C2.57692 32.2518 2 31.7661 2 30.9889V3.01107C2 2.2339 2.57692 1.74818 3.03846 2.13676L19.6538 16.1257Z M37.6538 16.1257C38.1154 16.5143 38.1154 17.4857 37.6538 17.8743L21.0385 31.8632C20.5769 32.2518 20 31.7661 20 30.9889V3.01107C20 2.2339 20.5769 1.74818 21.0385 2.13676L37.6538 16.1257Z"
/>
</svg>
Expand All @@ -81,8 +81,8 @@ export const Toolbar = () => {
fill="none"
stroke="currentColor"
xmlns="http://www.w3.org/2000/svg">
<path
stroke-width="3.5"
<path
strokeWidth="3.5"
d="M27.5 15.9948C28.1667 16.3797 28.1667 17.342 27.5 17.7269L3.5 31.5833C2.83333 31.9682 2 31.487 2 30.7172V3.00443C2 2.23463 2.83333 1.75351 3.5 2.13841L27.5 15.9948Z"
/>
</svg>
Expand Down Expand Up @@ -141,9 +141,9 @@ export const Toolbar = () => {
stroke="currentColor"
>
<path
stroke-width="3.5"
stroke-linecap="round"
stroke-linejoin="round"
strokeWidth="3.5"
strokeLinecap="round"
strokeLinejoin="round"
d="M16 2H8C4.68629 2 2 4.68629 2 8V28C2 31.3137 4.68629 34 8 34H16M14 13.5V22.5H26V28.5L36.5 18L26 7.5V13.5H14Z"
/>
</svg>
Expand Down
10 changes: 5 additions & 5 deletions bsg-frontend/apps/extension/hooks/useRoundTimer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ export function useRoundTimer() {
const minutes = Math.floor((diff % 3600000) / 60000);
const seconds = Math.floor((diff % 60000) / 1000);
setTimeRemaining(
`${hours > 0 ? `${hours}:` : ''}${hours > 0 && minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
`${hours > 0 ? `${hours}:` : ''}${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`
);
}
};

updateTimer();
const interval = setInterval(updateTimer, 1000);
return () => clearInterval(interval);
}
updateTimer();
const interval = setInterval(updateTimer, 1000);
return () => clearInterval(interval);
}, [roundEndTime]);

return { timeRemaining };
Expand Down
Loading