chore: merge remote-tracking branch 'origin' into next

2025-06-23 00:35:04 -04:00 · 2025-06-23 00:35:04 -04:00 · 84c820efb1
commit 84c820efb1
parent f990670e86 779af42601
2 changed files with 3 additions and 3 deletions
--- a/app/routes/machines/components/machine-row.tsx
+++ b/app/routes/machines/components/machine-row.tsx
@ -65,7 +65,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)}