From ff2beae9d00cad66b09b8f15d90d671c93c93b39 Mon Sep 17 00:00:00 2001
From: cory <cory@hawkvelt.id.au>
Date: Sat, 30 May 2026 05:43:38 +0000
Subject: [PATCH] feat: show device name instead of UUID in ZeroTier All
 Approvals table

---
 src/lib/api.ts               | 2 ++
 src/pages/org/AccessPage.tsx | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/api.ts b/src/lib/api.ts
index 5d1c9ab..f65c158 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -2117,6 +2117,8 @@ export interface UserNetworkApproval {
   user_email: string | null;
   portal_network_id: string;
   device_id?: string;
+  device_name?: string | null;
+  device_nickname?: string | null;
   active?: boolean;
   active_session?: ActivationSession | null;
   join_seen?: boolean;
diff --git a/src/pages/org/AccessPage.tsx b/src/pages/org/AccessPage.tsx
index c493535..f9b8478 100644
--- a/src/pages/org/AccessPage.tsx
+++ b/src/pages/org/AccessPage.tsx
@@ -678,7 +678,14 @@ export default function AccessPage() {
                             </div>
                           </td>
                           <td className="p-3">
-                            {approval.device_id ? (
+                            {approval.device_name || approval.device_nickname ? (
+                              <div>
+                                <p className="text-sm font-medium truncate max-w-[160px]">{approval.device_name || approval.device_nickname}</p>
+                                {approval.device_nickname && approval.device_name !== approval.device_nickname && (
+                                  <p className="text-xs text-muted-foreground font-mono truncate max-w-[160px]">{approval.device_id}</p>
+                                )}
+                              </div>
+                            ) : approval.device_id ? (
                               <span className="font-mono text-xs">{approval.device_id}</span>
                             ) : (
                               <span className="text-xs text-muted-foreground">—</span>