From 3a775aed61a9dfc64f364cab97ef8b1e1766b29e Mon Sep 17 00:00:00 2001 From: Arik Chakma Date: Tue, 25 Jul 2023 22:28:06 +0600 Subject: [PATCH] fix: user progress sort --- src/components/TeamProgress/TeamProgressPage.tsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/TeamProgress/TeamProgressPage.tsx b/src/components/TeamProgress/TeamProgressPage.tsx index 7a6aa76fa..0ab12507a 100644 --- a/src/components/TeamProgress/TeamProgressPage.tsx +++ b/src/components/TeamProgress/TeamProgressPage.tsx @@ -71,14 +71,11 @@ export function TeamProgressPage() { toast.error(error?.message || 'Failed to get team progress'); return; } - const userProgress = response.find((member) => member.email === user?.email); - if (userProgress) { - const index = response.indexOf(userProgress); - response.splice(index, 1); - response.unshift(userProgress); - } - 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(() => {