diff --git a/src/components/TeamDropdown/TeamDropdown.tsx b/src/components/TeamDropdown/TeamDropdown.tsx index 5fccaa30a..a4124ef7d 100644 --- a/src/components/TeamDropdown/TeamDropdown.tsx +++ b/src/components/TeamDropdown/TeamDropdown.tsx @@ -101,9 +101,8 @@ export function TeamDropdown() { - {progress.resourceTitle} + {progress.resourceTitle} {progress.done} / {progress.total} diff --git a/src/components/TeamProgress/TeamProgressPage.tsx b/src/components/TeamProgress/TeamProgressPage.tsx index 51188d101..0ab12507a 100644 --- a/src/components/TeamProgress/TeamProgressPage.tsx +++ b/src/components/TeamProgress/TeamProgressPage.tsx @@ -10,6 +10,7 @@ import { GroupRoadmapItem } from './GroupRoadmapItem'; import { setUrlParams } from '../../lib/browser'; import { getUrlParams } from '../../lib/browser'; import { $toastMessage } from '../../stores/toast'; +import { useAuth } from '../../hooks/use-auth'; export type UserProgress = { resourceTitle: string; @@ -55,6 +56,7 @@ export function TeamProgressPage() { const [isLoading, setIsLoading] = useState(true); const toast = useToast(); const currentTeam = useStore($currentTeam); + const user = useAuth(); const [teamMembers, setTeamMembers] = useState([]); const [selectedGrouping, setSelectedGrouping] = useState< @@ -70,7 +72,10 @@ export function TeamProgressPage() { return; } - setTeamMembers(response); + const currentUserProgress = response.find((member) => member.email === user?.email) + const otherUserProgresses = response.filter(member => member.email !== user?.email); + const allUserProgresses = currentUserProgress ? [currentUserProgress, ...otherUserProgresses] : otherUserProgresses; + setTeamMembers(allUserProgresses); } useEffect(() => { @@ -134,11 +139,10 @@ export function TeamProgressPage() {
{groupingTypes.map((grouping) => (