From 30a148dfa36f90c1ee736a91822d7d1211657d24 Mon Sep 17 00:00:00 2001
From: Dev Singh <dev@devksingh.com>
Date: Sat, 15 Nov 2025 14:34:50 -0600
Subject: [PATCH 1/6] Implement batch name resolution for emails

---
 src/api/functions/uin.ts                      |  80 ++++++
 src/api/routes/user.ts                        |  40 ++-
 src/common/types/user.ts                      |  15 ++
 src/ui/App.tsx                                |   5 +-
 src/ui/components/NameOptionalCard/index.tsx  | 241 ++++++++++++++++++
 src/ui/pages/apiKeys/ManageKeys.page.tsx      |   2 +-
 src/ui/pages/apiKeys/ManageKeysTable.tsx      |   7 +-
 src/ui/pages/iam/GroupMemberManagement.tsx    |  17 +-
 src/ui/pages/logs/LogRenderer.tsx             |  11 +-
 .../ExternalMemberListManagement.tsx          |  10 +-
 .../roomRequest/ViewRoomRequest.page.tsx      |  14 +-
 src/ui/pages/stripe/CurrentLinks.tsx          |   5 +-
 src/ui/pages/tickets/ViewTickets.page.tsx     |  37 ++-
 13 files changed, 439 insertions(+), 45 deletions(-)
 create mode 100644 src/ui/components/NameOptionalCard/index.tsx

diff --git a/src/api/functions/uin.ts b/src/api/functions/uin.ts
index 251fd22d..b3130bcc 100644
--- a/src/api/functions/uin.ts
+++ b/src/api/functions/uin.ts
@@ -1,10 +1,13 @@
 import {
+  BatchGetItemCommand,
   DynamoDBClient,
   PutItemCommand,
   QueryCommand,
   UpdateItemCommand,
 } from "@aws-sdk/client-dynamodb";
 import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
+import { ValidLoggers } from "api/types.js";
+import { retryDynamoTransactionWithBackoff } from "api/utils.js";
 import { argon2id, hash } from "argon2";
 import { genericConfig } from "common/config.js";
 import {
@@ -235,3 +238,80 @@ export async function getUserIdByUin({
   const data = unmarshall(response.Items[0]) as { id: string };
   return data;
 }
+
+export async function batchGetUserInfo({
+  emails,
+  dynamoClient,
+  logger,
+}: {
+  emails: string[];
+  dynamoClient: DynamoDBClient;
+  logger: ValidLoggers;
+}) {
+  const results: Record<
+    string,
+    {
+      firstName?: string;
+      lastName?: string;
+    }
+  > = {};
+
+  // DynamoDB BatchGetItem has a limit of 100 items per request
+  const BATCH_SIZE = 100;
+
+  for (let i = 0; i < emails.length; i += BATCH_SIZE) {
+    const batch = emails.slice(i, i + BATCH_SIZE);
+
+    try {
+      await retryDynamoTransactionWithBackoff(
+        async () => {
+          const response = await dynamoClient.send(
+            new BatchGetItemCommand({
+              RequestItems: {
+                [genericConfig.UserInfoTable]: {
+                  Keys: batch.map((email) => ({
+                    id: { S: email },
+                  })),
+                  ProjectionExpression: "id, firstName, lastName",
+                },
+              },
+            }),
+          );
+
+          // Process responses
+          const items = response.Responses?.[genericConfig.UserInfoTable] || [];
+          for (const item of items) {
+            const email = item.id?.S;
+            if (email) {
+              results[email] = {
+                firstName: item.firstName?.S,
+                lastName: item.lastName?.S,
+              };
+            }
+          }
+
+          // If there are unprocessed keys, throw to trigger retry
+          if (
+            response.UnprocessedKeys &&
+            Object.keys(response.UnprocessedKeys).length > 0
+          ) {
+            const error = new Error(
+              "UnprocessedKeys present - triggering retry",
+            );
+            error.name = "TransactionCanceledException";
+            throw error;
+          }
+        },
+        logger,
+        `batchGetUserInfo (batch ${i / BATCH_SIZE + 1})`,
+      );
+    } catch (error) {
+      logger.warn(
+        `Failed to fetch batch ${i / BATCH_SIZE + 1} after retries, returning partial results`,
+        { error },
+      );
+    }
+  }
+
+  return results;
+}
diff --git a/src/api/routes/user.ts b/src/api/routes/user.ts
index b14a3b29..e15abd23 100644
--- a/src/api/routes/user.ts
+++ b/src/api/routes/user.ts
@@ -9,10 +9,16 @@ import {
 } from "common/errors/index.js";
 import * as z from "zod/v4";
 import {
+  batchResolveUserInfoRequest,
+  batchResolveUserInfoResponse,
   searchUserByUinRequest,
   searchUserByUinResponse,
 } from "common/types/user.js";
-import { getUinHash, getUserIdByUin } from "api/functions/uin.js";
+import {
+  batchGetUserInfo,
+  getUinHash,
+  getUserIdByUin,
+} from "api/functions/uin.js";
 import { FastifyZodOpenApiTypeProvider } from "fastify-zod-openapi";
 import { QueryCommand } from "@aws-sdk/client-dynamodb";
 import { genericConfig } from "common/config.js";
@@ -58,6 +64,38 @@ const userRoute: FastifyPluginAsync = async (fastify, _options) => {
       );
     },
   );
+  fastify.withTypeProvider<FastifyZodOpenApiTypeProvider>().post(
+    "/batchResolveInfo",
+    {
+      schema: withRoles(
+        [],
+        withTags(["Generic"], {
+          summary: "Resolve user emails to user info.",
+          body: batchResolveUserInfoRequest,
+          response: {
+            200: {
+              description: "The search was performed.",
+              content: {
+                "application/json": {
+                  schema: batchResolveUserInfoResponse,
+                },
+              },
+            },
+          },
+        }),
+      ),
+      onRequest: fastify.authorizeFromSchema,
+    },
+    async (request, reply) => {
+      return reply.send(
+        await batchGetUserInfo({
+          dynamoClient: fastify.dynamoClient,
+          emails: request.body.emails,
+          logger: request.log,
+        }),
+      );
+    },
+  );
 };
 
 export default userRoute;
diff --git a/src/common/types/user.ts b/src/common/types/user.ts
index baee5293..f66b240a 100644
--- a/src/common/types/user.ts
+++ b/src/common/types/user.ts
@@ -8,3 +8,18 @@ export const searchUserByUinRequest = z.object({
 export const searchUserByUinResponse = z.object({
   email: z.email(),
 });
+
+export const batchResolveUserInfoRequest = z.object({
+  emails: z.array(z.email()).min(1)
+})
+
+
+export const batchResolveUserInfoResponse = z.object({
+}).catchall(
+  z.object({
+    firstName: z.string().optional(),
+    lastName: z.string().optional()
+  })
+);
+
+export type BatchResolveUserInfoResponse = z.infer<typeof batchResolveUserInfoResponse>;
diff --git a/src/ui/App.tsx b/src/ui/App.tsx
index 5f2253e7..d04e6395 100644
--- a/src/ui/App.tsx
+++ b/src/ui/App.tsx
@@ -8,6 +8,7 @@ import { Notifications } from "@mantine/notifications";
 
 import ColorSchemeContext from "./ColorSchemeContext";
 import { Router } from "./Router";
+import { UserResolverProvider } from "./components/NameOptionalCard";
 
 export default function App() {
   const preferredColorScheme = useColorScheme();
@@ -25,7 +26,9 @@ export default function App() {
         forceColorScheme={colorScheme}
       >
         <Notifications position="top-right" />
-        <Router />
+        <UserResolverProvider>
+          <Router />
+        </UserResolverProvider>
       </MantineProvider>
     </ColorSchemeContext.Provider>
   );
diff --git a/src/ui/components/NameOptionalCard/index.tsx b/src/ui/components/NameOptionalCard/index.tsx
new file mode 100644
index 00000000..63443449
--- /dev/null
+++ b/src/ui/components/NameOptionalCard/index.tsx
@@ -0,0 +1,241 @@
+import {
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+  useRef,
+  ReactNode,
+} from "react";
+import { Avatar, Group, Text, Skeleton, Badge } from "@mantine/core";
+import { useApi } from "@ui/util/api";
+import { BatchResolveUserInfoResponse } from "@common/types/user";
+import { useAuth } from "../AuthContext";
+
+// Types
+interface UserData {
+  email: string;
+  name?: string;
+}
+
+const AVATAR_SIZES = {
+  xs: 16,
+  sm: 26,
+  md: 38,
+  lg: 56,
+  xl: 84,
+} as const;
+
+// Basic email validation regex
+const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+
+interface UserResolverContextType {
+  resolveUser: (email: string) => UserData | undefined;
+  requestUser: (email: string) => void;
+  isResolving: (email: string) => boolean;
+}
+
+// Context
+const UserResolverContext = createContext<UserResolverContextType | null>(null);
+
+// Provider Props
+interface UserResolverProviderProps {
+  children: ReactNode;
+  batchDelay?: number;
+}
+
+interface UserDataResponse {
+  name?: string;
+}
+
+// Sentinel value to indicate we've checked and there's no name
+const NO_NAME_FOUND = Symbol("NO_NAME_FOUND");
+
+export function UserResolverProvider({
+  children,
+  batchDelay = 50,
+}: UserResolverProviderProps) {
+  const api = useApi("core");
+  const [userCache, setUserCache] = useState<
+    Record<string, string | typeof NO_NAME_FOUND>
+  >({});
+  const pendingRequests = useRef<Set<string>>(new Set());
+  const batchTimeout = useRef<NodeJS.Timeout | null>(null);
+
+  const fetchUsers = async (emailsToFetch: string[]) => {
+    const response = await api.post<BatchResolveUserInfoResponse>(
+      "/api/v1/users/batchResolveInfo",
+      {
+        emails: emailsToFetch,
+      },
+    );
+
+    const emailToName: Record<string, string | typeof NO_NAME_FOUND> = {};
+    for (const email of emailsToFetch) {
+      const userData = response.data[email];
+      if (userData?.firstName || userData?.lastName) {
+        const nameParts = [userData.firstName, userData.lastName].filter(
+          Boolean,
+        );
+        emailToName[email] = nameParts.join(" ");
+      } else {
+        emailToName[email] = NO_NAME_FOUND;
+      }
+    }
+
+    return emailToName;
+  };
+
+  const executeBatch = async () => {
+    if (pendingRequests.current.size === 0) {
+      return;
+    }
+
+    const emailsToFetch = Array.from(pendingRequests.current);
+    pendingRequests.current.clear();
+
+    try {
+      const results = await fetchUsers(emailsToFetch);
+      setUserCache((prev) => ({ ...prev, ...results }));
+    } catch (error) {
+      console.error("Failed to fetch users:", error);
+      const failedCache: Record<string, typeof NO_NAME_FOUND> = {};
+      emailsToFetch.forEach((email) => {
+        failedCache[email] = NO_NAME_FOUND;
+      });
+      setUserCache((prev) => ({ ...prev, ...failedCache }));
+    }
+  };
+
+  const requestUser = (email: string) => {
+    // Skip if already cached (including NO_NAME_FOUND sentinel)
+    if (email in userCache) {
+      return;
+    }
+
+    // Validate email format - if invalid, mark as NO_NAME_FOUND immediately
+    if (!EMAIL_REGEX.test(email)) {
+      setUserCache((prev) => ({ ...prev, [email]: NO_NAME_FOUND }));
+      return;
+    }
+
+    pendingRequests.current.add(email);
+
+    // Clear existing timeout and set new one
+    if (batchTimeout.current) {
+      clearTimeout(batchTimeout.current);
+    }
+
+    batchTimeout.current = setTimeout(() => {
+      executeBatch();
+    }, batchDelay);
+  };
+
+  const isResolving = (email: string): boolean => {
+    return !(email in userCache);
+  };
+
+  const resolveUser = (email: string): UserData | undefined => {
+    const cached = userCache[email];
+    if (!cached || cached === NO_NAME_FOUND) {
+      return undefined;
+    }
+    return { email, name: cached };
+  };
+
+  return (
+    <UserResolverContext.Provider
+      value={{ resolveUser, requestUser, isResolving }}
+    >
+      {children}
+    </UserResolverContext.Provider>
+  );
+}
+
+// Hook
+function useUserResolver() {
+  const context = useContext(UserResolverContext);
+  if (!context) {
+    throw new Error("useUserResolver must be used within UserResolverProvider");
+  }
+  return context;
+}
+
+// Component Props
+interface NameOptionalUserCardProps {
+  email: string;
+  name?: string;
+  size?: "xs" | "sm" | "md" | "lg" | "xl";
+  fallback?: (email: string) => ReactNode;
+}
+
+// Component
+export function NameOptionalUserCard({
+  name: providedName,
+  email,
+  size = "sm",
+  fallback,
+}: NameOptionalUserCardProps) {
+  const { resolveUser, requestUser, isResolving } = useUserResolver();
+  const [resolvedUser, setResolvedUser] = useState<UserData | undefined>();
+  const { userData } = useAuth();
+
+  // Check if this is actually an email
+  const isValidEmail = EMAIL_REGEX.test(email);
+
+  useEffect(() => {
+    // If name is already provided or not a valid email, don't resolve
+    if (providedName || !isValidEmail) {
+      return;
+    }
+
+    // Request the user (will be batched)
+    requestUser(email);
+
+    // Set up polling to check if user has been resolved
+    const interval = setInterval(() => {
+      const user = resolveUser(email);
+      if (user) {
+        setResolvedUser(user);
+        clearInterval(interval);
+      }
+    }, 10);
+
+    return () => clearInterval(interval);
+  }, [email, providedName, isValidEmail, resolveUser, requestUser]);
+
+  // If not a valid email, render fallback or default text
+  if (!isValidEmail) {
+    return fallback ? <>{fallback(email)}</> : <Text fz="sm">{email}</Text>;
+  }
+
+  const displayName = providedName || resolvedUser?.name || email;
+  const isLoading = !providedName && isResolving(email);
+
+  const isCurrentUser = !!userData && userData.email === email;
+
+  return (
+    <Group gap="sm">
+      {isLoading ? (
+        <Skeleton circle height={AVATAR_SIZES[size]} />
+      ) : (
+        <Avatar name={displayName} color="initials" size={size} />
+      )}
+      <div style={{ flex: 1, minWidth: 0 }}>
+        <Group gap="xs" align="center">
+          <Text fz="sm" fw={500}>
+            {isLoading ? <Skeleton height={16} width="60%" /> : displayName}
+          </Text>
+
+          {isCurrentUser && !isLoading && (
+            <Badge size="sm" variant="light">
+              You
+            </Badge>
+          )}
+        </Group>
+        <Text fz="xs" c="dimmed">
+          {isLoading ? <Skeleton height={12} width="80%" /> : email}
+        </Text>
+      </div>
+    </Group>
+  );
+}
diff --git a/src/ui/pages/apiKeys/ManageKeys.page.tsx b/src/ui/pages/apiKeys/ManageKeys.page.tsx
index 80b62a51..60def845 100644
--- a/src/ui/pages/apiKeys/ManageKeys.page.tsx
+++ b/src/ui/pages/apiKeys/ManageKeys.page.tsx
@@ -16,7 +16,7 @@ export const ManageApiKeysPage: React.FC = () => {
       }}
       showSidebar
     >
-      <Container>
+      <Container size="lg">
         <Title>API Keys</Title>
         <Text>Manage organization API keys.</Text>
         <Text size="xs" c="dimmed">
diff --git a/src/ui/pages/apiKeys/ManageKeysTable.tsx b/src/ui/pages/apiKeys/ManageKeysTable.tsx
index f8762aef..3c7e0e49 100644
--- a/src/ui/pages/apiKeys/ManageKeysTable.tsx
+++ b/src/ui/pages/apiKeys/ManageKeysTable.tsx
@@ -38,6 +38,7 @@ import { AppRoles } from "@common/roles";
 import { BlurredTextDisplay } from "../../components/BlurredTextDisplay";
 import * as z from "zod/v4";
 import { ResponsiveTable, Column } from "@ui/components/ResponsiveTable";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 const HumanFriendlyDate = ({ date }: { date: number }) => {
   return (
@@ -208,11 +209,7 @@ export const OrgApiKeyTable: React.FC<OrgApiKeyTableProps> = ({
     {
       key: "owner",
       label: "Owner",
-      render: (key) => (
-        <Text size="sm">
-          {key.owner === userData?.email ? "You" : key.owner}
-        </Text>
-      ),
+      render: (key) => <NameOptionalUserCard size="sm" email={key.owner} />,
     },
     {
       key: "created",
diff --git a/src/ui/pages/iam/GroupMemberManagement.tsx b/src/ui/pages/iam/GroupMemberManagement.tsx
index 005c223e..8ad04e8b 100644
--- a/src/ui/pages/iam/GroupMemberManagement.tsx
+++ b/src/ui/pages/iam/GroupMemberManagement.tsx
@@ -22,6 +22,7 @@ import {
 import { notifications } from "@mantine/notifications";
 import { GroupMemberGetResponse, EntraActionResponse } from "@common/types/iam";
 import { ResponsiveTable, Column } from "@ui/components/ResponsiveTable";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 interface GroupMemberManagementProps {
   fetchMembers: () => Promise<GroupMemberGetResponse>;
@@ -188,21 +189,7 @@ const GroupMemberManagement: React.FC<GroupMemberManagementProps> = ({
       label: "Member",
       isPrimaryColumn: true,
       render: (member) => (
-        <Group gap="sm">
-          <Avatar
-            name={member.name || member.email[0]}
-            color="initials"
-            size="sm"
-          />
-          <div>
-            <Text fz="sm" fw={500}>
-              {member.name}
-            </Text>
-            <Text fz="xs" c="dimmed">
-              {member.email}
-            </Text>
-          </div>
-        </Group>
+        <NameOptionalUserCard name={member.name} email={member.email} />
       ),
     },
     {
diff --git a/src/ui/pages/logs/LogRenderer.tsx b/src/ui/pages/logs/LogRenderer.tsx
index 0753f105..abf1a3fd 100644
--- a/src/ui/pages/logs/LogRenderer.tsx
+++ b/src/ui/pages/logs/LogRenderer.tsx
@@ -24,6 +24,7 @@ import {
 import { Modules, ModulesToHumanName } from "@common/modules";
 import { notifications } from "@mantine/notifications";
 import { ResponsiveTable, Column } from "@ui/components/ResponsiveTable";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 interface LogEntry {
   actor: string;
@@ -211,7 +212,7 @@ export const LogRenderer: React.FC<LogRendererProps> = ({ getLogs }) => {
     {
       key: "actor",
       label: "Actor",
-      render: (log) => <Text size="sm">{log.actor}</Text>,
+      render: (log) => <NameOptionalUserCard email={log.actor} />,
     },
     {
       key: "action",
@@ -234,9 +235,11 @@ export const LogRenderer: React.FC<LogRendererProps> = ({ getLogs }) => {
       render: (log) => (
         <Text size="sm">
           {selectedModule === Modules.AUDIT_LOG &&
-          Object.values(Modules).includes(log.target as Modules)
-            ? ModulesToHumanName[log.target as Modules]
-            : log.target}
+          Object.values(Modules).includes(log.target as Modules) ? (
+            ModulesToHumanName[log.target as Modules]
+          ) : (
+            <NameOptionalUserCard email={log.target} />
+          )}
         </Text>
       ),
     },
diff --git a/src/ui/pages/membershipLists/ExternalMemberListManagement.tsx b/src/ui/pages/membershipLists/ExternalMemberListManagement.tsx
index 2054e308..4a1046a8 100644
--- a/src/ui/pages/membershipLists/ExternalMemberListManagement.tsx
+++ b/src/ui/pages/membershipLists/ExternalMemberListManagement.tsx
@@ -23,6 +23,7 @@ import { illinoisNetId } from "@common/types/generic";
 import { AuthGuard } from "@ui/components/AuthGuard";
 import { AppRoles } from "@common/roles";
 import pluralize from "pluralize";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 interface ExternalMemberListManagementProps {
   fetchMembers: (listId: string) => Promise<string[]>;
@@ -327,12 +328,7 @@ const ExternalMemberListManagement: React.FC<
     return (
       <Table.Tr key={member} style={{ opacity: isQueuedForRemoval ? 0.5 : 1 }}>
         <Table.Td>
-          <Group gap="sm">
-            <Avatar name={member} color="initials" />
-            <Text fz="sm" fw={500}>
-              {member}
-            </Text>
-          </Group>
+          <NameOptionalUserCard email={`${member}@illinois.edu`} />
         </Table.Td>
         <Table.Td>{statusBadge}</Table.Td>
         <Table.Td>{actionButton}</Table.Td>
@@ -379,7 +375,7 @@ const ExternalMemberListManagement: React.FC<
       <Table verticalSpacing="sm" highlightOnHover>
         <Table.Thead>
           <Table.Tr>
-            <Table.Th>Member NetID</Table.Th>
+            <Table.Th>Member</Table.Th>
             <Table.Th>Status</Table.Th>
             <Table.Th>Actions</Table.Th>
           </Table.Tr>
diff --git a/src/ui/pages/roomRequest/ViewRoomRequest.page.tsx b/src/ui/pages/roomRequest/ViewRoomRequest.page.tsx
index d0f20917..9ebec954 100644
--- a/src/ui/pages/roomRequest/ViewRoomRequest.page.tsx
+++ b/src/ui/pages/roomRequest/ViewRoomRequest.page.tsx
@@ -49,6 +49,7 @@ import {
   downloadFromS3PresignedUrl,
   uploadToS3PresignedUrl,
 } from "@ui/util/s3";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 export const ViewRoomRequest: React.FC = () => {
   const { semesterId, requestId } = useParams();
@@ -446,17 +447,19 @@ export const ViewRoomRequest: React.FC = () => {
             <>
               <Timeline
                 active={data.updates.length}
-                bulletSize={28}
+                bulletSize={32}
                 lineWidth={4}
               >
                 {data.updates.map((x) => (
                   <Timeline.Item
                     bullet={getStatusIcon(x.status)}
-                    title={formatStatus(x.status)}
+                    title={<Text size="md">{formatStatus(x.status)}</Text>}
                   >
-                    {x.createdBy && <Text size="xs">{x.createdBy}</Text>}
+                    {x.createdBy && (
+                      <NameOptionalUserCard email={x.createdBy} />
+                    )}
                     {x.notes && (
-                      <Text c="dimmed" size="sm">
+                      <Text c="dimmed" size="sm" mt="xs">
                         {x.notes}
                       </Text>
                     )}
@@ -464,6 +467,7 @@ export const ViewRoomRequest: React.FC = () => {
                       <Button
                         size="xs"
                         variant="light"
+                        mt="xs"
                         leftSection={
                           downloadingAttachment ===
                           `${x.createdAt}#${x.status}` ? (
@@ -496,7 +500,7 @@ export const ViewRoomRequest: React.FC = () => {
                         position="top"
                         withArrow
                       >
-                        <Text c="dimmed" size="xs">
+                        <Text c="dimmed" size="xs" mt="xs">
                           {moment.tz(x.createdAt, "America/Chicago").fromNow()}
                         </Text>
                       </Tooltip>
diff --git a/src/ui/pages/stripe/CurrentLinks.tsx b/src/ui/pages/stripe/CurrentLinks.tsx
index c2b98284..9f5ab49d 100644
--- a/src/ui/pages/stripe/CurrentLinks.tsx
+++ b/src/ui/pages/stripe/CurrentLinks.tsx
@@ -14,11 +14,11 @@ import { IconAlertCircle } from "@tabler/icons-react";
 import React, { useEffect, useState } from "react";
 import { GetInvoiceLinksResponse } from "@common/types/stripe";
 import { notifications } from "@mantine/notifications";
-import { useAuth } from "@ui/components/AuthContext";
 import pluralize from "pluralize";
 import dayjs from "dayjs";
 import { STRIPE_LINK_RETENTION_DAYS } from "@common/constants";
 import { ResponsiveTable, Column } from "@ui/components/ResponsiveTable";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 const HumanFriendlyDate = ({ date }: { date: string | Date }) => {
   return <Text size="sm">{dayjs(date).format("MMMM D, YYYY")}</Text>;
@@ -41,7 +41,6 @@ export const StripeCurrentLinksPanel: React.FC<
   const [selectedRows, setSelectedRows] = useState<
     { id: string; active: boolean }[]
   >([]);
-  const { userData } = useAuth();
 
   const deleteLinks = async (linkIds: string[]) => {
     const promises = linkIds.map((x) => deactivateLink(x));
@@ -185,7 +184,7 @@ export const StripeCurrentLinksPanel: React.FC<
     {
       key: "createdBy",
       label: "Created By",
-      render: (link) => link.userId.replace(userData!.email!, "You"),
+      render: (link) => <NameOptionalUserCard email={link.userId} />,
     },
     {
       key: "createdAt",
diff --git a/src/ui/pages/tickets/ViewTickets.page.tsx b/src/ui/pages/tickets/ViewTickets.page.tsx
index 89c21b11..6b846846 100644
--- a/src/ui/pages/tickets/ViewTickets.page.tsx
+++ b/src/ui/pages/tickets/ViewTickets.page.tsx
@@ -11,6 +11,8 @@ import {
   Stack,
   TextInput,
   Alert,
+  Tooltip,
+  Box,
 } from "@mantine/core";
 import { IconAlertCircle } from "@tabler/icons-react";
 import { notifications } from "@mantine/notifications";
@@ -23,6 +25,7 @@ import FullScreenLoader from "@ui/components/AuthContext/LoadingScreen";
 import { AuthGuard } from "@ui/components/AuthGuard";
 import { useApi } from "@ui/util/api";
 import { AppRoles } from "@common/roles";
+import { NameOptionalUserCard } from "@ui/components/NameOptionalCard";
 
 // Define the schemas
 const purchaseSchema = z.object({
@@ -295,6 +298,20 @@ const ViewTicketsPage: React.FC = () => {
   const startIndex = (currentPage - 1) * parseInt(pageSize, 10);
   const endIndex = startIndex + parseInt(pageSize, 10);
   const currentTickets = allTickets.slice(startIndex, endIndex);
+  const copyTicketId = (ticketId: string) => {
+    try {
+      navigator.clipboard.writeText(ticketId);
+      notifications.show({
+        message: "Ticket ID copied!",
+      });
+    } catch (e) {
+      notifications.show({
+        title: "Failed to copy ticket ID",
+        message: "Please try again or contact support.",
+        color: "red",
+      });
+    }
+  };
   return (
     <AuthGuard
       resourceDef={{ service: "core", validRoles: [AppRoles.TICKETS_MANAGER] }}
@@ -335,7 +352,6 @@ const ViewTicketsPage: React.FC = () => {
               <Table.Th>Status</Table.Th>
               <Table.Th>Quantity</Table.Th>
               <Table.Th>Size</Table.Th>
-              <Table.Th>Ticket ID</Table.Th>
               <Table.Th>Actions</Table.Th>
             </Table.Tr>
           </Table.Thead>
@@ -344,13 +360,28 @@ const ViewTicketsPage: React.FC = () => {
               const { status, color } = getTicketStatus(ticket);
               return (
                 <Table.Tr key={ticket.ticketId}>
-                  <Table.Td>{ticket.purchaserData.email}</Table.Td>
+                  <Table.Td>
+                    <Tooltip
+                      label="Click to copy ticket ID"
+                      position="top"
+                      withArrow
+                    >
+                      <Box
+                        style={{ cursor: "pointer" }}
+                        onClick={() => copyTicketId(ticket.ticketId)}
+                      >
+                        <NameOptionalUserCard
+                          email={ticket.purchaserData.email}
+                          size="sm"
+                        />
+                      </Box>
+                    </Tooltip>
+                  </Table.Td>
                   <Table.Td>
                     <Badge color={color}>{status}</Badge>
                   </Table.Td>
                   <Table.Td>{ticket.purchaserData.quantity}</Table.Td>
                   <Table.Td>{ticket.purchaserData.size || "N/A"}</Table.Td>
-                  <Table.Td>{ticket.ticketId}</Table.Td>
                   <Table.Td>
                     {!(ticket.fulfilled || ticket.refunded) && (
                       <AuthGuard

From 9ff5d6d4fe26186556005b727d4701d5d0a1a57e Mon Sep 17 00:00:00 2001
From: Dev Singh <dev@devksingh.com>
Date: Sat, 15 Nov 2025 14:53:21 -0600
Subject: [PATCH 2/6] Fix existing UI unit tests

---
 src/ui/components/NameOptionalCard/index.tsx  | 48 +++++++++++--------
 src/ui/pages/apiKeys/ManageKeysTable.test.tsx | 17 ++++---
 .../pages/iam/GroupMemberManagement.test.tsx  | 11 +++--
 src/ui/pages/logs/LogRenderer.test.tsx        |  8 ++--
 src/ui/pages/logs/LogRenderer.tsx             | 20 ++++----
 src/ui/pages/stripe/CurrentLinks.test.tsx     | 30 +++---------
 6 files changed, 66 insertions(+), 68 deletions(-)

diff --git a/src/ui/components/NameOptionalCard/index.tsx b/src/ui/components/NameOptionalCard/index.tsx
index 63443449..4d447a04 100644
--- a/src/ui/components/NameOptionalCard/index.tsx
+++ b/src/ui/components/NameOptionalCard/index.tsx
@@ -32,6 +32,7 @@ interface UserResolverContextType {
   resolveUser: (email: string) => UserData | undefined;
   requestUser: (email: string) => void;
   isResolving: (email: string) => boolean;
+  resolutionDisabled: boolean;
 }
 
 // Context
@@ -41,10 +42,7 @@ const UserResolverContext = createContext<UserResolverContextType | null>(null);
 interface UserResolverProviderProps {
   children: ReactNode;
   batchDelay?: number;
-}
-
-interface UserDataResponse {
-  name?: string;
+  resolutionDisabled?: boolean;
 }
 
 // Sentinel value to indicate we've checked and there's no name
@@ -53,6 +51,7 @@ const NO_NAME_FOUND = Symbol("NO_NAME_FOUND");
 export function UserResolverProvider({
   children,
   batchDelay = 50,
+  resolutionDisabled = false,
 }: UserResolverProviderProps) {
   const api = useApi("core");
   const [userCache, setUserCache] = useState<
@@ -107,6 +106,12 @@ export function UserResolverProvider({
   };
 
   const requestUser = (email: string) => {
+    // If resolution is disabled, mark as NO_NAME_FOUND immediately
+    if (resolutionDisabled) {
+      setUserCache((prev) => ({ ...prev, [email]: NO_NAME_FOUND }));
+      return;
+    }
+
     // Skip if already cached (including NO_NAME_FOUND sentinel)
     if (email in userCache) {
       return;
@@ -144,13 +149,12 @@ export function UserResolverProvider({
 
   return (
     <UserResolverContext.Provider
-      value={{ resolveUser, requestUser, isResolving }}
+      value={{ resolveUser, requestUser, isResolving, resolutionDisabled }}
     >
       {children}
     </UserResolverContext.Provider>
   );
 }
-
 // Hook
 function useUserResolver() {
   const context = useContext(UserResolverContext);
@@ -166,6 +170,7 @@ interface NameOptionalUserCardProps {
   name?: string;
   size?: "xs" | "sm" | "md" | "lg" | "xl";
   fallback?: (email: string) => ReactNode;
+  resolutionDisabled?: boolean;
 }
 
 // Component
@@ -175,23 +180,20 @@ export function NameOptionalUserCard({
   size = "sm",
   fallback,
 }: NameOptionalUserCardProps) {
-  const { resolveUser, requestUser, isResolving } = useUserResolver();
+  const { resolveUser, requestUser, isResolving, resolutionDisabled } =
+    useUserResolver();
   const [resolvedUser, setResolvedUser] = useState<UserData | undefined>();
   const { userData } = useAuth();
 
-  // Check if this is actually an email
   const isValidEmail = EMAIL_REGEX.test(email);
 
   useEffect(() => {
-    // If name is already provided or not a valid email, don't resolve
-    if (providedName || !isValidEmail) {
+    if (resolutionDisabled || providedName || !isValidEmail) {
       return;
     }
 
-    // Request the user (will be batched)
     requestUser(email);
 
-    // Set up polling to check if user has been resolved
     const interval = setInterval(() => {
       const user = resolveUser(email);
       if (user) {
@@ -201,38 +203,42 @@ export function NameOptionalUserCard({
     }, 10);
 
     return () => clearInterval(interval);
-  }, [email, providedName, isValidEmail, resolveUser, requestUser]);
+  }, [
+    email,
+    providedName,
+    isValidEmail,
+    resolutionDisabled,
+    resolveUser,
+    requestUser,
+  ]);
 
-  // If not a valid email, render fallback or default text
   if (!isValidEmail) {
     return fallback ? <>{fallback(email)}</> : <Text fz="sm">{email}</Text>;
   }
 
   const displayName = providedName || resolvedUser?.name || email;
-  const isLoading = !providedName && isResolving(email);
-
+  const isLoading = !resolutionDisabled && !providedName && isResolving(email);
   const isCurrentUser = !!userData && userData.email === email;
 
   return (
-    <Group gap="sm">
+    <Group gap="sm" wrap="nowrap">
       {isLoading ? (
         <Skeleton circle height={AVATAR_SIZES[size]} />
       ) : (
         <Avatar name={displayName} color="initials" size={size} />
       )}
       <div style={{ flex: 1, minWidth: 0 }}>
-        <Group gap="xs" align="center">
-          <Text fz="sm" fw={500}>
+        <Group gap="xs" align="center" wrap="nowrap">
+          <Text fz="sm" fw={500} component="span">
             {isLoading ? <Skeleton height={16} width="60%" /> : displayName}
           </Text>
-
           {isCurrentUser && !isLoading && (
             <Badge size="sm" variant="light">
               You
             </Badge>
           )}
         </Group>
-        <Text fz="xs" c="dimmed">
+        <Text fz="xs" c="dimmed" component="span">
           {isLoading ? <Skeleton height={12} width="80%" /> : email}
         </Text>
       </div>
diff --git a/src/ui/pages/apiKeys/ManageKeysTable.test.tsx b/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
index 6bec2c1e..e38aff69 100644
--- a/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
+++ b/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
@@ -8,6 +8,7 @@ import { OrgApiKeyTable } from "./ManageKeysTable";
 import { MemoryRouter } from "react-router-dom";
 import { ApiKeyMaskedEntry, ApiKeyPostBody } from "@common/types/apiKey";
 import { AppRoles } from "@common/roles";
+import { UserResolverProvider } from "@ui/components/NameOptionalCard";
 
 // Mock the notifications module
 vi.mock("@mantine/notifications", () => ({
@@ -83,11 +84,13 @@ describe("OrgApiKeyTable Tests", () => {
             withCssVariables
             forceColorScheme="light"
           >
-            <OrgApiKeyTable
-              createApiKey={createApiKey}
-              getApiKeys={getApiKeys}
-              deleteApiKeys={deleteApiKeys}
-            />
+            <UserResolverProvider resolutionDisabled>
+              <OrgApiKeyTable
+                createApiKey={createApiKey}
+                getApiKeys={getApiKeys}
+                deleteApiKeys={deleteApiKeys}
+              />
+            </UserResolverProvider>
           </MantineProvider>
         </MemoryRouter>,
       );
@@ -129,8 +132,8 @@ describe("OrgApiKeyTable Tests", () => {
     });
 
     expect(screen.getByText("Test API Key 1")).toBeInTheDocument();
-    expect(screen.getByText("You")).toBeInTheDocument(); // Current user's key
-    expect(screen.getByText("other@example.com")).toBeInTheDocument();
+    expect(screen.getAllByText("test@example.com")).length(2);
+    expect(screen.getAllByText("other@example.com")).length(2);
     expect(screen.getByText("Never")).toBeInTheDocument(); // For key that never expires
   });
 
diff --git a/src/ui/pages/iam/GroupMemberManagement.test.tsx b/src/ui/pages/iam/GroupMemberManagement.test.tsx
index e0c554b4..7b8b2554 100644
--- a/src/ui/pages/iam/GroupMemberManagement.test.tsx
+++ b/src/ui/pages/iam/GroupMemberManagement.test.tsx
@@ -5,6 +5,7 @@ import GroupMemberManagement from "./GroupMemberManagement";
 import { MantineProvider } from "@mantine/core";
 import { notifications } from "@mantine/notifications";
 import userEvent from "@testing-library/user-event";
+import { UserResolverProvider } from "@ui/components/NameOptionalCard";
 
 describe("Exec Group Management Panel tests", () => {
   const renderComponent = async (
@@ -19,10 +20,12 @@ describe("Exec Group Management Panel tests", () => {
             withCssVariables
             forceColorScheme="light"
           >
-            <GroupMemberManagement
-              fetchMembers={fetchMembers}
-              updateMembers={updateMembers}
-            />
+            <UserResolverProvider resolutionDisabled>
+              <GroupMemberManagement
+                fetchMembers={fetchMembers}
+                updateMembers={updateMembers}
+              />
+            </UserResolverProvider>
           </MantineProvider>
         </MemoryRouter>,
       );
diff --git a/src/ui/pages/logs/LogRenderer.test.tsx b/src/ui/pages/logs/LogRenderer.test.tsx
index 75514224..399b6dc9 100644
--- a/src/ui/pages/logs/LogRenderer.test.tsx
+++ b/src/ui/pages/logs/LogRenderer.test.tsx
@@ -7,13 +7,13 @@ import { notifications } from "@mantine/notifications";
 import { LogRenderer } from "./LogRenderer";
 import { Modules, ModulesToHumanName } from "@common/modules";
 import { MemoryRouter } from "react-router-dom";
+import { UserResolverProvider } from "@ui/components/NameOptionalCard";
 
 describe("LogRenderer Tests", () => {
   const getLogsMock = vi.fn();
 
   // Mock date for consistent testing
   const mockCurrentDate = new Date("2023-01-15T12:00:00Z");
-  const mockPastDate = new Date("2023-01-14T12:00:00Z");
 
   // Sample log data for testing
   const sampleLogs = [
@@ -46,7 +46,9 @@ describe("LogRenderer Tests", () => {
             withCssVariables
             forceColorScheme="light"
           >
-            <LogRenderer getLogs={getLogsMock} />
+            <UserResolverProvider resolutionDisabled>
+              <LogRenderer getLogs={getLogsMock} />
+            </UserResolverProvider>
           </MantineProvider>
         </MemoryRouter>,
       );
@@ -112,7 +114,7 @@ describe("LogRenderer Tests", () => {
     // Verify logs are displayed
     await screen.findByText("User created");
     expect(screen.getByText("admin")).toBeInTheDocument();
-    expect(screen.getByText("user@example.com")).toBeInTheDocument();
+    expect(screen.getAllByText("user@example.com")).length(2);
     expect(screen.getByText("req-123")).toBeInTheDocument();
   });
 
diff --git a/src/ui/pages/logs/LogRenderer.tsx b/src/ui/pages/logs/LogRenderer.tsx
index abf1a3fd..7f4ed471 100644
--- a/src/ui/pages/logs/LogRenderer.tsx
+++ b/src/ui/pages/logs/LogRenderer.tsx
@@ -232,16 +232,16 @@ export const LogRenderer: React.FC<LogRendererProps> = ({ getLogs }) => {
     {
       key: "target",
       label: "Target",
-      render: (log) => (
-        <Text size="sm">
-          {selectedModule === Modules.AUDIT_LOG &&
-          Object.values(Modules).includes(log.target as Modules) ? (
-            ModulesToHumanName[log.target as Modules]
-          ) : (
-            <NameOptionalUserCard email={log.target} />
-          )}
-        </Text>
-      ),
+      render: (log) =>
+        selectedModule === Modules.AUDIT_LOG &&
+        Object.values(Modules).includes(log.target as Modules) ? (
+          ModulesToHumanName[log.target as Modules]
+        ) : (
+          <NameOptionalUserCard
+            email={log.target}
+            fallback={(email) => <>{email}</>}
+          />
+        ),
     },
     {
       key: "requestId",
diff --git a/src/ui/pages/stripe/CurrentLinks.test.tsx b/src/ui/pages/stripe/CurrentLinks.test.tsx
index 88eea9ce..c7adbf48 100644
--- a/src/ui/pages/stripe/CurrentLinks.test.tsx
+++ b/src/ui/pages/stripe/CurrentLinks.test.tsx
@@ -5,6 +5,7 @@ import { MantineProvider } from "@mantine/core";
 import { notifications } from "@mantine/notifications";
 import { MemoryRouter } from "react-router-dom";
 import StripeCurrentLinksPanel from "./CurrentLinks";
+import { UserResolverProvider } from "@ui/components/NameOptionalCard";
 
 vi.mock("@ui/components/AuthContext", async () => {
   return {
@@ -27,10 +28,12 @@ describe("StripeCurrentLinksPanel Tests", () => {
             withCssVariables
             forceColorScheme="light"
           >
-            <StripeCurrentLinksPanel
-              getLinks={getLinksMock}
-              deactivateLink={deactivateLinkMock}
-            />
+            <UserResolverProvider resolutionDisabled>
+              <StripeCurrentLinksPanel
+                getLinks={getLinksMock}
+                deactivateLink={deactivateLinkMock}
+              />
+            </UserResolverProvider>
           </MantineProvider>
         </MemoryRouter>,
       );
@@ -82,7 +85,6 @@ describe("StripeCurrentLinksPanel Tests", () => {
     expect(rows[1]).toHaveTextContent("$50");
     expect(rows[2]).toHaveTextContent("INV-002");
     expect(rows[2]).toHaveTextContent("$75");
-    expect(screen.getByText("You")).toBeInTheDocument();
     expect(screen.getByText("Unknown")).toBeInTheDocument();
     const user = userEvent.setup();
     const copyButtons = screen.getAllByRole("button", { name: /copy/i });
@@ -98,24 +100,6 @@ describe("StripeCurrentLinksPanel Tests", () => {
     });
   });
 
-  it('correctly replaces the user email with "You"', async () => {
-    getLinksMock.mockResolvedValue([
-      {
-        id: "3",
-        active: true,
-        invoiceId: "INV-003",
-        invoiceAmountUsd: 10000,
-        userId: "infraunittests@acm.illinois.edu",
-        createdAt: "2024-02-05",
-        link: "http://example.com/3",
-      },
-    ]);
-    await renderComponent();
-
-    expect(getLinksMock).toHaveBeenCalledOnce();
-    expect(await screen.findByText("You")).toBeInTheDocument();
-  });
-
   it("handles API failure gracefully", async () => {
     const notificationsMock = vi.spyOn(notifications, "show");
     getLinksMock.mockRejectedValue(new Error("API Error"));

From 2ccd435bf5fe8ba3a856c176b7ed13f99ef3461e Mon Sep 17 00:00:00 2001
From: Dev Singh <dev@devksingh.com>
Date: Sat, 15 Nov 2025 14:57:00 -0600
Subject: [PATCH 3/6] Add live tests

---
 tests/live/user.test.ts | 50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/live/user.test.ts

diff --git a/tests/live/user.test.ts b/tests/live/user.test.ts
new file mode 100644
index 00000000..d0e00575
--- /dev/null
+++ b/tests/live/user.test.ts
@@ -0,0 +1,50 @@
+import { expect, test, describe } from "vitest";
+import { createJwt } from "./utils.js";
+import { getBaseEndpoint } from "./utils.js";
+
+const baseEndpoint = getBaseEndpoint();
+
+describe("User info live tests", async () => {
+  const token = await createJwt();
+  test(
+    "Test that invalid emails are rejected",
+    { timeout: 10000 },
+    async () => {
+      const response = await fetch(
+        `${baseEndpoint}/api/v1/users/batchResolveInfo`,
+        {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          body: JSON.stringify({
+            emails: ["invalid"],
+          }),
+        },
+      );
+      expect(response.status).toBe(400);
+    },
+  );
+  test("Test that valid emails are resolved", { timeout: 10000 }, async () => {
+    const response = await fetch(
+      `${baseEndpoint}/api/v1/users/batchResolveInfo`,
+      {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          emails: ["testinguser@illinois.edu"],
+        }),
+      },
+    );
+    expect(response.status).toBe(200);
+    const responseJson = (await response.json()) as string[];
+    expect(responseJson).toEqual({
+      "testinguser@illinois.edu": {
+        firstName: "Testing",
+        lastName: "User",
+      },
+    });
+  });
+});

From 84cf6f814c15e843b19b3c8340cb6039b90a61a5 Mon Sep 17 00:00:00 2001
From: Dev Singh <dsingh14@illinois.edu>
Date: Sat, 15 Nov 2025 15:13:24 -0600
Subject: [PATCH 4/6] Update src/ui/pages/apiKeys/ManageKeysTable.test.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/ui/pages/apiKeys/ManageKeysTable.test.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/pages/apiKeys/ManageKeysTable.test.tsx b/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
index e38aff69..04e8f73b 100644
--- a/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
+++ b/src/ui/pages/apiKeys/ManageKeysTable.test.tsx
@@ -132,8 +132,8 @@ describe("OrgApiKeyTable Tests", () => {
     });
 
     expect(screen.getByText("Test API Key 1")).toBeInTheDocument();
-    expect(screen.getAllByText("test@example.com")).length(2);
-    expect(screen.getAllByText("other@example.com")).length(2);
+    expect(screen.getAllByText("test@example.com")).toHaveLength(2);
+    expect(screen.getAllByText("other@example.com")).toHaveLength(2);
     expect(screen.getByText("Never")).toBeInTheDocument(); // For key that never expires
   });
 

From 108d933879876fc8af93e012a7f5339e1708415a Mon Sep 17 00:00:00 2001
From: Dev Singh <dev@devksingh.com>
Date: Sat, 15 Nov 2025 15:11:58 -0600
Subject: [PATCH 5/6] Fix tests

---
 tests/e2e/auditLogs.spec.ts       |   2 +
 tests/e2e/membershipLists.spec.ts |   9 +-
 tests/live/user.test.ts           |   2 +
 yarn.lock                         | 186 +-----------------------------
 4 files changed, 15 insertions(+), 184 deletions(-)

diff --git a/tests/e2e/auditLogs.spec.ts b/tests/e2e/auditLogs.spec.ts
index fecee243..5c59572f 100644
--- a/tests/e2e/auditLogs.spec.ts
+++ b/tests/e2e/auditLogs.spec.ts
@@ -20,7 +20,9 @@ describe("Audit Log tests", () => {
     await expect(page.getByRole("cell", { name: "Request ID" })).toBeVisible();
     await page.getByRole("button", { name: "Fetch Logs" }).click();
     await page.getByRole("button", { name: "Fetch Logs" }).click();
+    await page.waitForTimeout(500);
     await page.getByRole("button", { name: "Fetch Logs" }).click();
+
     await expect(page.locator("tbody")).toContainText(
       "core-e2e-testing@illinois.edu",
     );
diff --git a/tests/e2e/membershipLists.spec.ts b/tests/e2e/membershipLists.spec.ts
index cb788223..6c9df9e1 100644
--- a/tests/e2e/membershipLists.spec.ts
+++ b/tests/e2e/membershipLists.spec.ts
@@ -37,8 +37,7 @@ describe("External Membership tests", () => {
       .getByRole("textbox", { name: "Initial Member NetID" })
       .fill("corete5");
     await page.getByRole("button", { name: "Create List" }).click();
-    await expect(page.getByText("corete5")).toBeVisible();
-    await expect(page.locator("tbody")).toContainText("corete5");
+    await expect(page.locator("tbody").getByText("corete5")).toHaveCount(2);
     await expect(page.locator("tbody")).toContainText("Active");
     await expect(page.getByText("Found 1 member.")).toBeVisible();
     await page.getByRole("button", { name: "Replace List" }).click();
@@ -46,7 +45,7 @@ describe("External Membership tests", () => {
       .getByRole("textbox", { name: "jdoe2 asmith3@illinois.edu" })
       .fill("corete5\ncorete6");
     await page.getByRole("button", { name: "Compute Changes" }).click();
-    await expect(page.locator("tbody")).toContainText("corete6");
+    await expect(page.locator("tbody").getByText("corete6")).toHaveCount(2);
     await expect(page.locator("tbody")).toContainText("Queued for addition");
     await expect(page.locator("tbody")).toContainText("Cancel Add");
     await page.getByRole("button", { name: "Save Changes" }).click();
@@ -55,7 +54,9 @@ describe("External Membership tests", () => {
     await page.getByRole("button", { name: "Save Changes" }).click();
     await page.getByRole("button", { name: "Confirm and Save" }).click();
     await page
-      .getByRole("row", { name: "CO corete5 Active Remove" })
+      .getByRole("row", {
+        name: "CO corete5@illinois.edu corete5@illinois.edu",
+      })
       .getByRole("button")
       .click();
     await page.getByRole("button", { name: "Remove" }).click();
diff --git a/tests/live/user.test.ts b/tests/live/user.test.ts
index d0e00575..26c6dfed 100644
--- a/tests/live/user.test.ts
+++ b/tests/live/user.test.ts
@@ -16,6 +16,7 @@ describe("User info live tests", async () => {
           method: "POST",
           headers: {
             "Content-Type": "application/json",
+            Authorization: `Bearer ${token}`,
           },
           body: JSON.stringify({
             emails: ["invalid"],
@@ -32,6 +33,7 @@ describe("User info live tests", async () => {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
+          Authorization: `Bearer ${token}`,
         },
         body: JSON.stringify({
           emails: ["testinguser@illinois.edu"],
diff --git a/yarn.lock b/yarn.lock
index b572b07a..39f4a1e6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1989,7 +1989,7 @@
   resolved "https://registry.yarnpkg.com/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.81.tgz#e76784880f26d48f4863d73c9891c53f161ffe6e"
   integrity sha512-57ryVbhm/z7RE9/UVcS7mrLPdlayLesy+9U0Uf6epCoeSGrs99tfieCcgZWFbIgmByQ1AZnNtFI2N6huqDLlWQ==
 
-"@napi-rs/canvas@^0.1.65", "@napi-rs/canvas@^0.1.80", "@napi-rs/canvas@^0.1.81":
+"@napi-rs/canvas@^0.1.65":
   version "0.1.81"
   resolved "https://registry.yarnpkg.com/@napi-rs/canvas/-/canvas-0.1.81.tgz#4cb1556171a64480e52d2a3766aa5413bfc4a9b1"
   integrity sha512-ReCjd5SYI/UKx/olaQLC4GtN6wUQGjlgHXs1lvUvWGXfBMR3Fxnik3cL+OxKN5ithNdoU0/GlCrdKcQDFh2XKQ==
@@ -4575,7 +4575,7 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-bl@^4.0.2, bl@^4.0.3:
+bl@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
@@ -4716,14 +4716,6 @@ caniuse-lite@^1.0.30001726:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz#a15bd87d5a4bf01f6b6f70ae7c97fdfd28b5ae47"
   integrity sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==
 
-canvas@^3.0.0-rc2:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/canvas/-/canvas-3.2.0.tgz#877c51aabdb99cbb5b2b378138a6cdd681e9d390"
-  integrity sha512-jk0GxrLtUEmW/TmFsk2WghvgHe8B0pxGilqCL21y8lHkPUGa6FTsnCNtHPOzT8O3y+N+m3espawV80bbBlgfTA==
-  dependencies:
-    node-addon-api "^7.0.0"
-    prebuild-install "^7.1.3"
-
 chai@^5.1.1, chai@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-5.2.0.tgz#1358ee106763624114addf84ab02697e411c9c05"
@@ -4785,11 +4777,6 @@ chokidar@^3.5.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 cli-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
@@ -5107,13 +5094,6 @@ decimal.js@^10.5.0:
   resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.5.0.tgz#0f371c7cf6c4898ce0afb09836db73cd82010f22"
   integrity sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==
 
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
 deep-eql@^5.0.1:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
@@ -5143,11 +5123,6 @@ deep-equal@^2.0.5:
     which-collection "^1.0.1"
     which-typed-array "^1.1.13"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
@@ -5201,11 +5176,6 @@ dequal@^2.0.2, dequal@^2.0.3:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-detect-libc@^2.0.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
-  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
-
 detect-node-es@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/detect-node-es/-/detect-node-es-1.1.0.tgz#163acdf643330caa0b4cd7c21e7ee7755d6fa493"
@@ -6027,11 +5997,6 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 expect-type@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/expect-type/-/expect-type-1.2.1.tgz#af76d8b357cf5fa76c41c09dafb79c549e75f71f"
@@ -6373,11 +6338,6 @@ formidable@^3.5.4:
     dezalgo "^1.0.4"
     once "^1.4.0"
 
-fs-constants@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-  integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
-
 fs-extra@^10.0.1:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
@@ -6484,11 +6444,6 @@ get-tsconfig@^4.10.1, get-tsconfig@^4.7.5:
   dependencies:
     resolve-pkg-maps "^1.0.0"
 
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
-
 glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -6841,7 +6796,7 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.5:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -7821,11 +7776,6 @@ mimic-fn@^2.1.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
 min-indent@^1.0.0, min-indent@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -7852,7 +7802,7 @@ minimatch@^9.0.4:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -7862,11 +7812,6 @@ minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 mkdirp@^0.5.1:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
@@ -7952,11 +7897,6 @@ nanoid@^3.3.11:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
   integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
 
-napi-build-utils@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e"
-  integrity sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==
-
 napi-postinstall@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/napi-postinstall/-/napi-postinstall-0.3.0.tgz#888e51d1fb500e86dcf6ace1baccdbb377e654ce"
@@ -7988,18 +7928,6 @@ nise@^6.0.0:
     just-extend "^6.2.0"
     path-to-regexp "^8.1.0"
 
-node-abi@^3.3.0:
-  version "3.80.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.80.0.tgz#d7390951f27caa129cceeec01e1c20fc9f07581c"
-  integrity sha512-LyPuZJcI9HVwzXK1GPxWNzrr+vr8Hp/3UqlmWxxh8p54U1ZbclOqbSog9lWHaCX+dBaiGi6n/hIX+mKu74GmPA==
-  dependencies:
-    semver "^7.3.5"
-
-node-addon-api@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
-  integrity sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==
-
 node-addon-api@^8.5.0:
   version "8.5.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.5.0.tgz#c91b2d7682fa457d2e1c388150f0dff9aafb8f3f"
@@ -8385,11 +8313,6 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-path2d@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/path2d/-/path2d-0.2.2.tgz#cc85d61ed7827e7863a2ee36713d4b5315a3d85d"
-  integrity sha512-+vnG6S4dYcYxZd+CZxzXCNKdELYZSKfohrk98yajCo1PtRoDgCTrrwOvK1GT0UoAdVszagDVllQc0U1vaX4NUQ==
-
 pathe@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
@@ -8400,35 +8323,13 @@ pathval@^2.0.0:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.1.tgz#8855c5a2899af072d6ac05d11e46045ad0dc605d"
   integrity sha512-//nshmD55c46FuFw26xV/xFAaB5HF9Xdap7HJBBnrKdAd6/GxDBaNA1870O79+9ueg61cZLSVc+OaFlfmObYVQ==
 
-pdfjs-dist@4.8.69:
-  version "4.8.69"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-4.8.69.tgz#61ea5d66863d49b40e5eacbd4070341175bdda2e"
-  integrity sha512-IHZsA4T7YElCKNNXtiLgqScw4zPd3pG9do8UrznC757gMd7UPeHSL2qwNNMJo4r79fl8oj1Xx+1nh2YkzdMpLQ==
-  optionalDependencies:
-    canvas "^3.0.0-rc2"
-    path2d "^0.2.1"
-
-pdfjs-dist@5.4.296:
-  version "5.4.296"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-5.4.296.tgz#b1aa7ded8828f29537bc7cc99c1343c8b3a5d2d6"
-  integrity sha512-DlOzet0HO7OEnmUmB6wWGJrrdvbyJKftI1bhMitK7O2N8W2gc757yyYBbINy9IDafXAV9wmKr9t7xsTaNKRG5Q==
-  optionalDependencies:
-    "@napi-rs/canvas" "^0.1.80"
-
-pdfjs-dist@^4.6.82:
+pdfjs-dist@4.8.69, pdfjs-dist@5.4.296, pdfjs-dist@^4.6.82, pdfjs-dist@^4.8.69, pdfjs-dist@^5.4.394:
   version "4.10.38"
   resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-4.10.38.tgz#3ee698003790dc266cc8b55c0e662ccb9ae18f53"
   integrity sha512-/Y3fcFrXEAsMjJXeL9J8+ZG9U01LbuWaYypvDW2ycW1jL269L3js3DVBjDJ0Up9Np1uqDXsDrRihHANhZOlwdQ==
   optionalDependencies:
     "@napi-rs/canvas" "^0.1.65"
 
-pdfjs-dist@^5.4.394:
-  version "5.4.394"
-  resolved "https://registry.yarnpkg.com/pdfjs-dist/-/pdfjs-dist-5.4.394.tgz#48697151afce097132673883a55bede103ded6e4"
-  integrity sha512-9ariAYGqUJzx+V/1W4jHyiyCep6IZALmDzoaTLZ6VNu8q9LWi1/ukhzHgE2Xsx96AZi0mbZuK4/ttIbqSbLypg==
-  optionalDependencies:
-    "@napi-rs/canvas" "^0.1.81"
-
 picocolors@1.1.1, picocolors@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
@@ -8624,24 +8525,6 @@ postcss@^8.3.11, postcss@^8.5.3, postcss@^8.5.6:
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
-prebuild-install@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec"
-  integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==
-  dependencies:
-    detect-libc "^2.0.0"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^2.0.0"
-    node-abi "^3.3.0"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^4.0.0"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -8766,16 +8649,6 @@ raw-body@^3.0.0:
     iconv-lite "0.6.3"
     unpipe "1.0.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 react-docgen-typescript@^2.2.2:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/react-docgen-typescript/-/react-docgen-typescript-2.4.0.tgz#033428b4a6a639d050ac8baf2a5195c596521713"
@@ -9306,7 +9179,7 @@ semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.5, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.7.1:
+semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2, semver@^7.7.1:
   version "7.7.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
   integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
@@ -9441,20 +9314,6 @@ signal-exit@^4.0.1:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
 
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
-  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
 simple-update-notifier@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb"
@@ -9790,11 +9649,6 @@ strip-json-comments@^5.0.2:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-5.0.2.tgz#14a76abd63b84a6d2419d14f26a0281d0cf6ea46"
   integrity sha512-4X2FR3UwhNUE9G49aIsJW5hRRR3GXGTBTZRMfv568O60ojM8HcWjV/VxAxCDW3SUND33O6ZY66ZuRcdkj73q2g==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==
-
 strip-literal@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-literal/-/strip-literal-3.0.0.tgz#ce9c452a91a0af2876ed1ae4e583539a353df3fc"
@@ -10006,27 +9860,6 @@ table@^6.9.0:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tar-fs@^2.0.0:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.4.tgz#800824dbf4ef06ded9afea4acafe71c67c76b930"
-  integrity sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-stream@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
-  integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
-  dependencies:
-    bl "^4.0.3"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
 test-exclude@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-7.0.1.tgz#20b3ba4906ac20994e275bbcafd68d510264c2a2"
@@ -10230,13 +10063,6 @@ tsx@^4.20.4:
   optionalDependencies:
     fsevents "~2.3.3"
 
-tunnel-agent@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
-  dependencies:
-    safe-buffer "^5.0.1"
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"

From feab4350f3a464553d33681fc953c79bc6e8e3b6 Mon Sep 17 00:00:00 2001
From: Dev Singh <dev@devksingh.com>
Date: Sat, 15 Nov 2025 15:17:38 -0600
Subject: [PATCH 6/6] Fix rendering poll

---
 src/ui/components/NameOptionalCard/index.tsx | 62 ++++++++++++++------
 src/ui/pages/tickets/ViewTickets.page.tsx    |  4 +-
 2 files changed, 47 insertions(+), 19 deletions(-)

diff --git a/src/ui/components/NameOptionalCard/index.tsx b/src/ui/components/NameOptionalCard/index.tsx
index 4d447a04..999b5f92 100644
--- a/src/ui/components/NameOptionalCard/index.tsx
+++ b/src/ui/components/NameOptionalCard/index.tsx
@@ -33,6 +33,7 @@ interface UserResolverContextType {
   requestUser: (email: string) => void;
   isResolving: (email: string) => boolean;
   resolutionDisabled: boolean;
+  cacheVersion: number;
 }
 
 // Context
@@ -57,6 +58,7 @@ export function UserResolverProvider({
   const [userCache, setUserCache] = useState<
     Record<string, string | typeof NO_NAME_FOUND>
   >({});
+  const [cacheVersion, setCacheVersion] = useState(0);
   const pendingRequests = useRef<Set<string>>(new Set());
   const batchTimeout = useRef<NodeJS.Timeout | null>(null);
 
@@ -94,21 +96,30 @@ export function UserResolverProvider({
 
     try {
       const results = await fetchUsers(emailsToFetch);
-      setUserCache((prev) => ({ ...prev, ...results }));
+      setUserCache((prev) => {
+        setCacheVersion((v) => v + 1);
+        return { ...prev, ...results };
+      });
     } catch (error) {
       console.error("Failed to fetch users:", error);
       const failedCache: Record<string, typeof NO_NAME_FOUND> = {};
       emailsToFetch.forEach((email) => {
         failedCache[email] = NO_NAME_FOUND;
       });
-      setUserCache((prev) => ({ ...prev, ...failedCache }));
+      setUserCache((prev) => {
+        setCacheVersion((v) => v + 1);
+        return { ...prev, ...failedCache };
+      });
     }
   };
 
   const requestUser = (email: string) => {
     // If resolution is disabled, mark as NO_NAME_FOUND immediately
     if (resolutionDisabled) {
-      setUserCache((prev) => ({ ...prev, [email]: NO_NAME_FOUND }));
+      setUserCache((prev) => {
+        setCacheVersion((v) => v + 1);
+        return { ...prev, [email]: NO_NAME_FOUND };
+      });
       return;
     }
 
@@ -119,7 +130,10 @@ export function UserResolverProvider({
 
     // Validate email format - if invalid, mark as NO_NAME_FOUND immediately
     if (!EMAIL_REGEX.test(email)) {
-      setUserCache((prev) => ({ ...prev, [email]: NO_NAME_FOUND }));
+      setUserCache((prev) => {
+        setCacheVersion((v) => v + 1);
+        return { ...prev, [email]: NO_NAME_FOUND };
+      });
       return;
     }
 
@@ -149,12 +163,19 @@ export function UserResolverProvider({
 
   return (
     <UserResolverContext.Provider
-      value={{ resolveUser, requestUser, isResolving, resolutionDisabled }}
+      value={{
+        resolveUser,
+        requestUser,
+        isResolving,
+        resolutionDisabled,
+        cacheVersion,
+      }}
     >
       {children}
     </UserResolverContext.Provider>
   );
 }
+
 // Hook
 function useUserResolver() {
   const context = useContext(UserResolverContext);
@@ -179,9 +200,21 @@ export function NameOptionalUserCard({
   email,
   size = "sm",
   fallback,
+  resolutionDisabled: resolutionDisabledProp,
 }: NameOptionalUserCardProps) {
-  const { resolveUser, requestUser, isResolving, resolutionDisabled } =
-    useUserResolver();
+  const {
+    resolveUser,
+    requestUser,
+    isResolving,
+    resolutionDisabled: contextResolutionDisabled,
+    cacheVersion,
+  } = useUserResolver();
+
+  const resolutionDisabled =
+    typeof resolutionDisabledProp === "boolean"
+      ? resolutionDisabledProp
+      : contextResolutionDisabled;
+
   const [resolvedUser, setResolvedUser] = useState<UserData | undefined>();
   const { userData } = useAuth();
 
@@ -193,21 +226,16 @@ export function NameOptionalUserCard({
     }
 
     requestUser(email);
-
-    const interval = setInterval(() => {
-      const user = resolveUser(email);
-      if (user) {
-        setResolvedUser(user);
-        clearInterval(interval);
-      }
-    }, 10);
-
-    return () => clearInterval(interval);
+    const user = resolveUser(email);
+    if (user) {
+      setResolvedUser(user);
+    }
   }, [
     email,
     providedName,
     isValidEmail,
     resolutionDisabled,
+    cacheVersion,
     resolveUser,
     requestUser,
   ]);
diff --git a/src/ui/pages/tickets/ViewTickets.page.tsx b/src/ui/pages/tickets/ViewTickets.page.tsx
index 6b846846..f1f017d7 100644
--- a/src/ui/pages/tickets/ViewTickets.page.tsx
+++ b/src/ui/pages/tickets/ViewTickets.page.tsx
@@ -298,9 +298,9 @@ const ViewTicketsPage: React.FC = () => {
   const startIndex = (currentPage - 1) * parseInt(pageSize, 10);
   const endIndex = startIndex + parseInt(pageSize, 10);
   const currentTickets = allTickets.slice(startIndex, endIndex);
-  const copyTicketId = (ticketId: string) => {
+  const copyTicketId = async (ticketId: string) => {
     try {
-      navigator.clipboard.writeText(ticketId);
+      await navigator.clipboard.writeText(ticketId);
       notifications.show({
         message: "Ticket ID copied!",
       });