From 835f359854bdecbbfea656d2f5f0a785af10f104 Mon Sep 17 00:00:00 2001 From: Aditya Thebe Date: Wed, 1 Jan 2025 21:41:58 +0545 Subject: [PATCH 1/2] fix: use email in avatar --- src/constants/index.ts | 2 +- src/ui/Avatar/index.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/index.ts b/src/constants/index.ts index da67db401..ec5f260b9 100644 --- a/src/constants/index.ts +++ b/src/constants/index.ts @@ -14,7 +14,7 @@ export const NodePodPropToLabelMap = { ip: "IP" } as const; -export const AVATAR_INFO = `id,name,avatar`; +export const AVATAR_INFO = `id,name,avatar,email`; export const SortOrders = { asc: "asc", diff --git a/src/ui/Avatar/index.tsx b/src/ui/Avatar/index.tsx index 20bd5299d..c0afba496 100644 --- a/src/ui/Avatar/index.tsx +++ b/src/ui/Avatar/index.tsx @@ -39,7 +39,7 @@ export function Avatar({ return "14px"; }); const srcList = user?.avatar; - const fallbackInitials = user?.name || "?"; + const fallbackInitials = user?.name?.trim() || user?.email || "?"; const { src, isLoading } = useImage({ srcList: (Array.isArray(srcList) ? srcList : [srcList]).filter(Boolean), @@ -103,7 +103,7 @@ export function Avatar({ circular ? "rounded-full" : "rounded-md" )} data-tooltip-id="user-name" - data-tooltip-content={user?.name} + data-tooltip-content={user?.name?.trim() || user?.email || "?"} > {srcList && src ? ( Date: Wed, 1 Jan 2025 21:46:55 +0545 Subject: [PATCH 2/2] fix: z-index for avatar in silence page --- src/ui/Avatar/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ui/Avatar/index.tsx b/src/ui/Avatar/index.tsx index c0afba496..f2868fb1a 100644 --- a/src/ui/Avatar/index.tsx +++ b/src/ui/Avatar/index.tsx @@ -132,7 +132,8 @@ export function Avatar({ )} {showName && {user?.name}} - + + ); }