Shashi/fix develop branch (#517)

Co-authored-by: Chris Nowicki <102450568+chris-nowicki@users.noreply.github.com>
LetsGetTechnical · Sep 10, 2024 · 6ce440d · 6ce440d
1 parent 0fd4b4d
commit 6ce440d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx b/app/(main)/league/[leagueId]/entry/[entryId]/week/Week.tsx
@@ -101,8 +101,8 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
       });
 
       if (userWeeklyPickResults?.[user.id]?.[entry]) {
-        const userPick = userWeeklyPickResults[user.id][entry].teamName;
-        setUserPick(userPick.teamName);
+        const userPick = userWeeklyPickResults[user.id][entry];
+        setUserPick(userPick.teamName as unknown as string);
       }
     } catch (error) {
       console.error('Error getting weekly pick:', error);
@@ -182,6 +182,7 @@ const Week = ({ entry, league, NFLTeams, week }: IWeekProps): JSX.Element => {
 
     try {
       await onWeeklyPickChange(params);
+      setUserPick(teamSelect);
     } catch (error) {
       console.error('Submission error:', error);
     }

diff --git a/app/(main)/league/[leagueId]/entry/all/page.tsx b/app/(main)/league/[leagueId]/entry/all/page.tsx
@@ -196,7 +196,7 @@ const Entry = ({
                 const selectedTeam = entry.selectedTeams[currentWeek - 1];
                 const isPickSet =
                   // eslint-disable-next-line no-undefined
-                  selectedTeam !== undefined;
+                  selectedTeam !== null && selectedTeam !== undefined;
 
                 const teamLogo = NFLTeams.find(
                   (teams) => teams.teamName === selectedTeam,

diff --git a/app/(main)/register/page.test.tsx b/app/(main)/register/page.test.tsx
@@ -129,7 +129,6 @@ describe('Register', () => {
         password: 'pw1234',
         confirmPassword: 'pw1234',
       });
-      expect(mockPush).toHaveBeenCalledWith('/league/all');
       expect(toast.custom).toHaveBeenCalledWith(
         <Alert
           variant={AlertVariants.Success}

diff --git a/app/(main)/register/page.tsx b/app/(main)/register/page.tsx
@@ -107,7 +107,6 @@ const Register = (): JSX.Element => {
     try {
       await registerAccount(data);
       await login(data);
-      router.push('/league/all');
       toast.custom(
         <Alert
           variant={AlertVariants.Success}

diff --git a/package.json b/package.json
@@ -79,4 +79,4 @@
     "ts-node": "^10.9.2",
     "typescript": "5.1.3"
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,4 +79,4 @@ @@
         "ts-node": "^10.9.2",
         "typescript": "5.1.3"
       }
-    }
+    }