Mirrors/colanode
1
0
Fork 0
mirror of https://github.com/colanode/colanode.git synced 2025-12-29 00:25:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading of account avatar in sidebar footer

Browse Source
This commit is contained in:
Hakan Shehu
2024-12-07 18:40:35 +01:00
parent da6b26ff74
commit c93edcf7b4
2 changed files with 34 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/desktop/src/renderer/components/avatars/avatar.tsx
View File

@@ -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 (
<img
src={url}

56
apps/desktop/src/renderer/components/layouts/layout-sidebar-footer.tsx
View File

@@ -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>
);
})}