From 779af42601bc663504cb26180567253c12d72762 Mon Sep 17 00:00:00 2001
From: Gabe Cook <gabe565@gmail.com>
Date: Fri, 20 Jun 2025 18:26:44 -0500
Subject: [PATCH] fix: username never falling back to email

---
 app/routes/machines/components/machine-row.tsx | 2 +-
 app/routes/machines/machine.tsx                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/routes/machines/components/machine-row.tsx b/app/routes/machines/components/machine-row.tsx
index 285e7fb..f1860e0 100644
--- a/app/routes/machines/components/machine-row.tsx
+++ b/app/routes/machines/components/machine-row.tsx
@@ -64,7 +64,7 @@ export default function MachineRow({
 						{node.givenName}
 					</p>
 					<p className="text-sm opacity-50">
-						{node.user.name ?? node.user.email}
+						{node.user.name || node.user.email}
 					</p>
 					<div className="flex gap-1 flex-wrap mt-1.5">
 						{mapTagsToComponents(node, uiTags)}
diff --git a/app/routes/machines/machine.tsx b/app/routes/machines/machine.tsx
index ae3f892..7f24cd6 100644
--- a/app/routes/machines/machine.tsx
+++ b/app/routes/machines/machine.tsx
@@ -109,7 +109,7 @@ export default function Page() {
 					</span>
 					<div className="flex items-center gap-x-2.5 mt-1">
 						<UserCircle />
-						{node.user.name ?? node.user.email}
+						{node.user.name || node.user.email}
 					</div>
 				</div>
 				<div className="p-2 pl-4">
@@ -254,7 +254,7 @@ export default function Page() {
 				className="w-full max-w-full grid grid-cols-1 lg:grid-cols-2 gap-y-2 sm:gap-x-12"
 			>
 				<div className="flex flex-col gap-1">
-					<Attribute name="Creator" value={node.user.name ?? node.user.email} />
+					<Attribute name="Creator" value={node.user.name || node.user.email} />
 					<Attribute name="Machine name" value={node.givenName} />
 					<Attribute
 						tooltip="OS hostname is published by the machine’s operating system and is used as the default name for the machine."