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
33 changes: 6 additions & 27 deletions desktop/src/features/profile/ui/ProfilePopover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { ProfileAvatar } from "@/features/profile/ui/ProfileAvatar";
import { PresenceDot } from "@/features/presence/ui/PresenceBadge";
import { getPresenceLabel } from "@/features/presence/lib/presence";
import { SetStatusDialog } from "@/features/user-status/ui/SetStatusDialog";
import { StatusEmoji } from "@/features/user-status/ui/StatusEmoji";
import type { PresenceStatus } from "@/shared/api/types";
import { isMacPlatform } from "@/shared/lib/platform";

Expand All @@ -18,7 +17,6 @@ interface ProfilePopoverProps {
open: boolean;
onOpenChange: (open: boolean) => void;
displayName: string;
nip05?: string | null;
avatarUrl: string | null;
currentStatus: PresenceStatus;
isStatusPending?: boolean;
Expand Down Expand Up @@ -56,7 +54,6 @@ export function ProfilePopover({
open,
onOpenChange,
displayName,
nip05,
avatarUrl,
currentStatus,
isStatusPending,
Expand Down Expand Up @@ -154,31 +151,13 @@ export function ProfilePopover({
<p className="truncate text-sm font-semibold leading-tight text-popover-foreground">
{displayName}
</p>
<div className="flex items-center gap-1.5 text-xs text-muted-foreground">
{nip05 ? <span className="truncate">@{nip05}</span> : null}
{nip05 ? <span aria-hidden="true">·</span> : null}
<span
className="inline-flex items-center gap-1.5"
data-testid="profile-popover-current-status"
>
<PresenceDot status={currentStatus} />
<span>{getPresenceLabel(currentStatus)}</span>
</span>
<div
className="inline-flex items-center gap-1.5 text-xs text-muted-foreground"
data-testid="profile-popover-current-status"
>
<PresenceDot status={currentStatus} />
<span>{getPresenceLabel(currentStatus)}</span>
</div>
{hasUserStatus ? (
<p
className="mt-0.5 truncate text-xs text-muted-foreground"
data-testid="profile-popover-user-status"
>
{userStatusEmoji ? (
<StatusEmoji
className="mr-1 h-3.5 w-3.5"
value={userStatusEmoji}
/>
) : null}
{userStatusText}
</p>
) : null}
</div>
</div>

Expand Down
1 change: 0 additions & 1 deletion desktop/src/features/sidebar/ui/SidebarProfileCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@ export function SidebarProfileCard({
open={profilePopoverOpen}
onOpenChange={setProfilePopoverOpen}
displayName={resolvedDisplayName}
nip05={profile?.nip05Handle}
avatarUrl={profile?.avatarUrl ?? null}
currentStatus={selfPresenceStatus}
isStatusPending={isPresencePending}
Expand Down