Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Fix loading of account avatar in sidebar footer
Hakan Shehuc93edcf7b487
diff --git a/apps/desktop/src/renderer/components/avatars/avatar.tsx b/apps/desktop/src/renderer/components/avatars/avatar.tsxindex 235a6d1f..9590977f 100644--- a/apps/desktop/src/renderer/components/avatars/avatar.tsx+++ b/apps/desktop/src/renderer/components/avatars/avatar.tsx@@ -100,13 +100,13 @@ const IconAvatar = ({ avatar, size, className }: AvatarProps) => {};const CustomAvatar = ({ avatar, size, className }: AvatarProps) => {- const server = useAccount();+ const account = useAccount();if (!avatar) {return null;}- const url = getAvatarUrl(server.id, avatar);+ const url = getAvatarUrl(account.id, avatar);return (<imgsrc={url}diff --git a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsxindex 11be90cb..3ed81238 100644--- a/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx+++ b/apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx@@ -17,7 +17,7 @@ import {SidebarMenuButton,SidebarMenuItem,} from '@/renderer/components/ui/sidebar';-import { useAccount } from '@/renderer/contexts/account';+import { AccountContext, useAccount } from '@/renderer/contexts/account';import { useRadar } from '@/renderer/contexts/radar';import { useQuery } from '@/renderer/hooks/use-query';import { AccountReadState } from '@/shared/types/radars';@@ -130,30 +130,38 @@ export function LayoutSidebarFooter() {navigate(`/${accountItem.id}`);}}>- <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">- <Avatar- className="h-8 w-8 rounded-lg"- id={accountItem.id}- name={accountItem.name}- avatar={accountItem.avatar}- />- <div className="grid flex-1 text-left text-sm leading-tight">- <span className="truncate font-semibold">- {accountItem.name}- </span>- <span className="truncate text-xs">- {accountItem.email}- </span>- </div>- {accountItem.id === account.id ? (- <Check className="size-4" />- ) : (- <ReadStateIndicator- count={state.importantCount}- hasChanges={state.hasUnseenChanges}+ <AccountContext.Provider+ value={{+ ...accountItem,+ openSettings: () => {},+ openLogout: () => {},+ }}+ >+ <div className="w-full flex items-center gap-2 px-1 py-1.5 text-left text-sm">+ <Avatar+ className="h-8 w-8 rounded-lg"+ id={accountItem.id}+ name={accountItem.name}+ avatar={accountItem.avatar}/>- )}- </div>+ <div className="grid flex-1 text-left text-sm leading-tight">+ <span className="truncate font-semibold">+ {accountItem.name}+ </span>+ <span className="truncate text-xs">+ {accountItem.email}+ </span>+ </div>+ {accountItem.id === account.id ? (+ <Check className="size-4" />+ ) : (+ <ReadStateIndicator+ count={state.importantCount}+ hasChanges={state.hasUnseenChanges}+ />+ )}+ </div>+ </AccountContext.Provider></DropdownMenuItem>);})}