Merge pull request #679 from Merit-Systems/br/fix-user-display

fix user display

Author: rsproule

packages/app/control/src/app/(app)/app/[id]/transactions/_components/transactions.tsx

@@ -26,6 +26,7 @@ interface Transaction {
   user?: {
     id: string | null;
     name: string | null;
+    email: string | null;
     image: string | null;
   };
   date: Date;
@@ -111,7 +112,10 @@ const TransactionRow = ({ transaction }: { transaction: Transaction }) => {
           <div className="flex flex-col items-start">
             <p className="text-sm leading-tight">
               <span className="font-medium">
-                {transaction.user?.name ?? 'x402 Users'}
+                {transaction.user?.name ??
+                  (transaction.user?.email
+                    ? `${transaction.user.id}`
+                    : 'Unknown User')}
               </span>{' '}
               made {transaction.callCount} requests
             </p>

packages/app/control/src/app/(app)/app/[id]/users/_components/users.tsx

@@ -56,7 +56,7 @@ export const UsersTable: React.FC<Props> = ({ appId }) => {
       ...rows.map(row =>
         [
           `"${row.name ?? ''}"`,
-          `"${row.email || ''}"`,
+          `"${row.email ?? ''}"`,
           row.usage.totalTransactions,
           row.usage.rawCost,
           row.usage.markupProfit,
@@ -187,7 +187,9 @@ const UserRow = ({ user, showEmail }: { user: User; showEmail: boolean }) => {
       <TableCell className="pl-4">
         <div className="flex flex-row items-center gap-2">
           <UserAvatar src={user.image} className="size-6" />
-          <p className="text-sm font-medium">{user.name}</p>
+          <p className="text-sm font-medium">
+            {user.name ?? (user.email ? `${user.id}` : 'Unknown User')}
+          </p>
         </div>
       </TableCell>
       {showEmail && (

packages/app/control/src/services/db/apps/transactions.ts

@@ -49,6 +49,7 @@ export const listAppTransactions = async (
           select: {
             id: true,
             name: true,
+            email: true,
             image: true,
           },
         },
@@ -69,6 +70,7 @@ export const listAppTransactions = async (
       user: {
         id: string | null;
         name: string | null;
+        email: string | null;
         image: string | null;
       };
       date: Date;
@@ -93,6 +95,7 @@ export const listAppTransactions = async (
         id: transaction.id,
         user: {
           id: transaction.userId,
+          email: transaction.user?.email ?? null,
           name:
             transaction.user?.name ??
             (transaction.userId === null ? 'x402 Users' : null),