Skip to content
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

Jump to bottom

fix: fix the issue where timer doesn't work in TEAM_HEALTH phase #9597

Merged
merged 1 commit into from
Apr 4, 2024
Merged

fix: fix the issue where timer doesn't work in TEAM_HEALTH phase #9597

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
3 changes: 2 additions & 1 deletion packages/client/components/MeetingControlBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ const DEFAULT_TIME_LIMIT = {
vote: 3,
discuss: 5,
ESTIMATE: 5,
SCOPE: 3
SCOPE: 3,
TEAM_HEALTH: 1
} as Record<NewMeetingPhaseTypeEnum, number>

interface Props {
Expand Down
4 changes: 4 additions & 0 deletions packages/client/components/TeamHealth.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import * as RadioGroup from '@radix-ui/react-radio-group'
import clsx from 'clsx'
import RaisedButton from './RaisedButton'
import getTeamHealthVoteColor from '../utils/getTeamHealthVoteColor'
import StageTimerDisplay from './StageTimerDisplay'

interface Props {
avatarGroup: ReactElement
Expand All @@ -32,6 +33,8 @@ const TeamHealth = (props: Props) => {
const meeting = useFragment(
graphql`
fragment TeamHealth_meeting on NewMeeting {
...StageTimerDisplay_meeting
...StageTimerControl_meeting
id
endedAt
showSidebar
Expand Down Expand Up @@ -83,6 +86,7 @@ const TeamHealth = (props: Props) => {
<PhaseHeaderTitle>{phaseLabelLookup.TEAM_HEALTH}</PhaseHeaderTitle>
</MeetingTopBar>
<PhaseWrapper>
<StageTimerDisplay meeting={meeting} />
<div className='flex h-[300px] flex-col items-center'>
<div className='text-center text-2xl'>{question}</div>
{isRevealed && votes ? (
Expand Down
Loading