From 0299543f0220c30d5fdc0c6dea1360d79b33dbaf Mon Sep 17 00:00:00 2001
From: Arjun Patel <patel.arjun50@gmail.com>
Date: Fri, 14 Jan 2022 21:36:11 -0800
Subject: [PATCH] fixing race conditions and such

---
 pages/teams/[teamid]/admin.tsx | 17 ++++++++++++++---
 pages/teams/index.tsx          | 10 ++++++++--
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/pages/teams/[teamid]/admin.tsx b/pages/teams/[teamid]/admin.tsx
index 5707334..0ecf0dc 100644
--- a/pages/teams/[teamid]/admin.tsx
+++ b/pages/teams/[teamid]/admin.tsx
@@ -14,7 +14,12 @@ import {
 import { toast } from "react-hot-toast";
 import { Team, TeamStatus } from "../../../models/team";
 
-import { FaMoneyBillWave, FaTrash, FaPaperPlane } from "react-icons/fa";
+import {
+  FaMoneyBillWave,
+  FaTrash,
+  FaPaperPlane,
+  FaArrowLeft,
+} from "react-icons/fa";
 import TeamService from "../../../services/teamService";
 import Router from "next/router";
 import Moment from "react-moment";
@@ -201,7 +206,13 @@ function TeamAdmin() {
         className="flex flex-col space-y-5"
       >
         {/* header */}
-        <div className="text-lg">🙌Manage Team</div>
+        <div className="text-lg flex flex-row items-center space-x-2">
+          <FaArrowLeft
+            className="hover:cursor-pointer"
+            onClick={() => router.push("/teams/" + teamid)}
+          />{" "}
+          <span>Manage Team</span>
+        </div>
 
         {error && <span className="text-red-300 text-md">{error}</span>}
 
@@ -235,7 +246,7 @@ function TeamAdmin() {
 
         <span className="flex flex-row justify-end space-x-2">
           <button
-            onClick={() => router.push("/teams")}
+            onClick={() => router.push("/teams/" + team.id)}
             className="bg-gray-100 py-2 px-5 rounded text-gray-400"
           >
             Cancel
diff --git a/pages/teams/index.tsx b/pages/teams/index.tsx
index 724505c..5edd774 100644
--- a/pages/teams/index.tsx
+++ b/pages/teams/index.tsx
@@ -59,16 +59,22 @@ function RouteHandler() {
         );
         console.log(returnedTeamMembers);
         // if the user is deleted from a team, don't let them go there
+        var teamId = "";
         returnedTeamMembers.map((tm) => {
           if (tm.status != TeamMemberStatus.deleted) {
             console.log(
               "in a team! going to the team dashboard of the first one!"
             );
-            router.push("/teams/" + returnedTeamMembers[0].teamId);
-            return;
+
+            teamId = returnedTeamMembers[0].teamId;
           }
         });
 
+        if (teamId) {
+          router.push("/teams/" + teamId);
+          return;
+        }
+
         setLoading(false);
       } catch (error) {
         console.log(error);