Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion desktop/src/features/channels/ui/MembersSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import {
useChannelMembersQuery,
} from "@/features/channels/hooks";
import { useClassifiedMembers } from "@/features/channels/lib/useClassifiedMembers";
import { formatMemberName } from "@/features/channels/lib/memberUtils";
import {
formatMemberName,
formatPubkey,
} from "@/features/channels/lib/memberUtils";
import { useUsersBatchQuery } from "@/features/profile/hooks";
import { usePresenceQuery } from "@/features/presence/hooks";
import { changeChannelMemberRole } from "@/shared/api/tauri";
Expand Down Expand Up @@ -162,6 +165,7 @@ export function MembersSidebar({
}
member={member}
memberIsBot={memberIsBot}
memberAvatarLabel={member.displayName ?? formatPubkey(member.pubkey)}
memberLabel={formatMemberName(member, currentPubkey)}
onChangeRole={(m, role) => {
void changeRoleMutation.mutateAsync({ pubkey: m.pubkey, role });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ type MembersSidebarMemberCardProps = {
isArchived: boolean;
managedAgent?: ManagedAgent;
member: ChannelMember;
memberAvatarLabel: string;
memberIsBot: boolean;
memberLabel: string;
onChangeRole: (member: ChannelMember, role: string) => void;
Expand Down Expand Up @@ -77,6 +78,7 @@ export function MembersSidebarMemberCard({
isArchived,
managedAgent,
member,
memberAvatarLabel,
memberIsBot,
memberLabel,
onChangeRole,
Expand Down Expand Up @@ -107,7 +109,7 @@ export function MembersSidebarMemberCard({
avatarUrl={profileAvatarUrl ?? null}
className="h-9 w-9 rounded-full text-[11px] shadow-none"
iconClassName="h-4 w-4"
label={memberLabel}
label={memberAvatarLabel}
/>
{presenceStatus ? (
<span
Expand Down
9 changes: 8 additions & 1 deletion desktop/src/features/messages/ui/SystemMessageRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,14 @@ export const SystemMessageRow = React.memo(function SystemMessageRow({
}

const avatarPubkey = payload.actor ?? payload.target;
const avatarLabel = resolveLabel(avatarPubkey, currentPubkey, profiles);
const avatarLabel = avatarPubkey
? resolveUserLabel({
pubkey: avatarPubkey,
currentPubkey,
profiles,
preferResolvedSelfLabel: true,
})
: "Someone";

return (
<div
Expand Down
Loading