From 0a960032c44cc022e6179e0ce544362baf6a7674 Mon Sep 17 00:00:00 2001
From: Mish Ushakov <mishushakov@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:02:23 +0100
Subject: [PATCH 1/4] add added by and added at fields to table, changes to API
 header

---
 apps/web/src/components/Dashboard/Team.tsx | 28 ++++++++++++----------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/apps/web/src/components/Dashboard/Team.tsx b/apps/web/src/components/Dashboard/Team.tsx
index 98aedb9ed..a612f614e 100644
--- a/apps/web/src/components/Dashboard/Team.tsx
+++ b/apps/web/src/components/Dashboard/Team.tsx
@@ -22,13 +22,17 @@ import {
   AlertDialogFooter,
   AlertDialogHeader,
   AlertDialogTitle,
-  AlertDialogTrigger,
 } from '../ui/alert-dialog'
 import Spinner from '@/components/Spinner'
 
 interface TeamMember {
   id: string
   email: string
+  addedBy: {
+    id: string
+    email: string
+  } | null
+  addedAt: string
 }
 
 const emailRegex = new RegExp(
@@ -62,7 +66,7 @@ export const TeamContent = ({
         `${process.env.NEXT_PUBLIC_BILLING_API_URL}/teams/${team.id}/users`,
         {
           headers: {
-            'X-Team-API-Key': team.apiKeys[0],
+            'X-User-Access-Token': user.accessToken,
           },
         }
       )
@@ -261,6 +265,8 @@ export const TeamContent = ({
           <TableHeader>
             <TableRow className="hover:bg-inherit dark:hover:bg-inherit border-b border-white/5">
               <TableHead>Email</TableHead>
+              <TableHead>Added by</TableHead>
+              <TableHead>Added at</TableHead>
               <TableHead></TableHead>
             </TableRow>
           </TableHeader>
@@ -278,13 +284,14 @@ export const TeamContent = ({
                   key={user.id}
                 >
                   <TableCell>{user.email}</TableCell>
-                  <TableCell>
+                  <TableCell>{user.addedBy?.email}</TableCell>
+                  <TableCell>{user.addedAt}</TableCell>
+                  <TableCell align="right">
                     <Button
-                      className="text-sm"
                       variant="desctructive"
                       onClick={() => openDialog(user.id)}
                     >
-                      Remove team member
+                      Remove
                     </Button>
                   </TableCell>
                 </TableRow>
@@ -295,18 +302,13 @@ export const TeamContent = ({
       )}
 
       <AlertDialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
-        <AlertDialogTrigger asChild>
-          <Button variant="outline" style={{ display: 'none' }}>
-            Show Dialog
-          </Button>
-        </AlertDialogTrigger>
         <AlertDialogContent className="bg-inherit text-white border-black">
           <AlertDialogHeader>
             <AlertDialogTitle>
-              You are about to delete a member from the team
+              You are about to remove a member from the team
             </AlertDialogTitle>
             <AlertDialogDescription className="text-white/90">
-              This action cannot be undone. This will permanently delete the
+              This action cannot be undone. This will permanently remove the
               member from the team.
             </AlertDialogDescription>
           </AlertDialogHeader>
@@ -321,7 +323,7 @@ export const TeamContent = ({
               className="bg-red-500 text-white hover:bg-red-600"
               onClick={() => deleteUserFromTeam()}
             >
-              Continue
+              Remove
             </AlertDialogAction>
           </AlertDialogFooter>
         </AlertDialogContent>

From 686f56982206c498ea05612a90a983a8c5e3243b Mon Sep 17 00:00:00 2001
From: Mish Ushakov <mishushakov@users.noreply.github.com>
Date: Thu, 5 Dec 2024 17:33:29 +0100
Subject: [PATCH 2/4] user.addedAt toLocaleString

---
 apps/web/src/components/Dashboard/Team.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/Dashboard/Team.tsx b/apps/web/src/components/Dashboard/Team.tsx
index a612f614e..facba8b4a 100644
--- a/apps/web/src/components/Dashboard/Team.tsx
+++ b/apps/web/src/components/Dashboard/Team.tsx
@@ -285,7 +285,9 @@ export const TeamContent = ({
                 >
                   <TableCell>{user.email}</TableCell>
                   <TableCell>{user.addedBy?.email}</TableCell>
-                  <TableCell>{user.addedAt}</TableCell>
+                  <TableCell>
+                    {new Date(user.addedAt).toLocaleString()}
+                  </TableCell>
                   <TableCell align="right">
                     <Button
                       variant="desctructive"

From 1bb820cf9a25da2cf9a21fddea652ea23da5e99c Mon Sep 17 00:00:00 2001
From: Mish Ushakov <mishushakov@users.noreply.github.com>
Date: Thu, 5 Dec 2024 19:48:51 +0100
Subject: [PATCH 3/4] send both headers

---
 apps/web/src/components/Dashboard/Team.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/web/src/components/Dashboard/Team.tsx b/apps/web/src/components/Dashboard/Team.tsx
index facba8b4a..9443c889b 100644
--- a/apps/web/src/components/Dashboard/Team.tsx
+++ b/apps/web/src/components/Dashboard/Team.tsx
@@ -67,6 +67,7 @@ export const TeamContent = ({
         {
           headers: {
             'X-User-Access-Token': user.accessToken,
+            'X-Team-API-Key': team.apiKeys[0],
           },
         }
       )

From b5cbb72b6be0bcc281c1c9134063a6e2ea2355ce Mon Sep 17 00:00:00 2001
From: Mish Ushakov <mishushakov@users.noreply.github.com>
Date: Thu, 5 Dec 2024 22:24:04 +0100
Subject: [PATCH 4/4] empty table col width

---
 apps/web/src/components/Dashboard/Team.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/Dashboard/Team.tsx b/apps/web/src/components/Dashboard/Team.tsx
index 9443c889b..c13f9787a 100644
--- a/apps/web/src/components/Dashboard/Team.tsx
+++ b/apps/web/src/components/Dashboard/Team.tsx
@@ -274,7 +274,7 @@ export const TeamContent = ({
           <TableBody>
             {members.length === 0 ? (
               <TableRow className="border-b border-white/5">
-                <TableCell colSpan={2} className="text-center">
+                <TableCell colSpan={4} className="text-center">
                   No members found
                 </TableCell>
               </TableRow>
@@ -287,7 +287,9 @@ export const TeamContent = ({
                   <TableCell>{user.email}</TableCell>
                   <TableCell>{user.addedBy?.email}</TableCell>
                   <TableCell>
-                    {new Date(user.addedAt).toLocaleString()}
+                    {user.addedAt
+                      ? new Date(user.addedAt).toLocaleString()
+                      : ''}
                   </TableCell>
                   <TableCell align="right">
                     <Button