Skip to content

fix(header): keep profile-completion dot visible inside the stats pill #6108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idoshamun merged 3 commits into from
May 28, 2026
+103 −82
Merged

fix(header): keep profile-completion dot visible inside the stats pill #6108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff5d768
fix(header): keep profile-completion dot visible inside the stats pill
tsahimatsliah May 28, 2026
dfa47f8
fix(header): move streak timezone warning to a corner badge
tsahimatsliah May 28, 2026
fa15f65
Merge branch 'main' into claude/fix-profile-indicator-clipped
tsahimatsliah May 28, 2026
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
149 changes: 79 additions & 70 deletions packages/shared/src/components/profile/ProfileButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
import classNames from 'classnames';
import dynamic from 'next/dynamic';
import { useAuthContext } from '../../contexts/AuthContext';
import { ProfilePictureWithIndicator } from './ProfilePictureWithIndicator';
import { ProfileImageSize } from '../ProfilePicture';
import { ProfileImageSize, ProfilePicture } from '../ProfilePicture';
import { useProfileCompletionIndicator } from '../../hooks/profile/useProfileCompletionIndicator';
import { CoreIcon, ReputationIcon, SettingsIcon } from '../icons';
import { Button, ButtonSize, ButtonVariant } from '../buttons/Button';
import { IconSize } from '../Icon';
Expand Down Expand Up @@ -37,6 +37,7 @@ export default function ProfileButton({
}: ProfileButtonProps): ReactElement {
const { isOpen, onUpdate, wrapHandler } = useInteractivePopup();
const { user, isAuthReady } = useAuthContext();
const { showIndicator } = useProfileCompletionIndicator();
const { streak, isLoading, isStreaksEnabled } = useReadingStreak();
const hasCoresAccess = useHasAccessToCores();
const [animatedCores, setAnimatedCores] = useState<number | null>(null);
Expand Down Expand Up @@ -208,77 +209,85 @@ export default function ProfileButton({
icon={<SettingsIcon />}
/>
) : (
<div className="flex h-10 items-stretch overflow-hidden rounded-12 border border-border-subtlest-tertiary bg-surface-float">
{isStreaksEnabled && streak && (
<ReadingStreakButton
streak={streak}
isLoading={isLoading}
compact
className="!h-full !rounded-none !pl-1.5 !pr-2"
/>
)}
{hasCoresAccess && (
<Tooltip
content={
<>
Wallet
<br />
{preciseBalance} Cores
</>
}
>
<div
ref={coresCounterRef}
className="flex origin-center justify-center will-change-transform"
<div className="relative">
<div className="flex h-10 items-stretch overflow-hidden rounded-12 border border-border-subtlest-tertiary bg-surface-float">
{isStreaksEnabled && streak && (
<ReadingStreakButton
streak={streak}
isLoading={isLoading}
compact
className="!h-full !rounded-none !pl-1.5 !pr-2"
/>
)}
{hasCoresAccess && (
<Tooltip
content={
<>
Wallet
<br />
{preciseBalance} Cores
</>
}
>
<Link href={walletUrl} passHref>
<Button
data-reward-target={QuestRewardType.Cores}
icon={<CoreIcon />}
tag="a"
variant={ButtonVariant.Tertiary}
size={ButtonSize.Small}
className="!h-full !rounded-none !pl-1.5 !pr-2"
>
{largeNumberFormat(displayedBalance)}
</Button>
</Link>
</div>
<div
ref={coresCounterRef}
className="flex origin-center justify-center will-change-transform"
>
<Link href={walletUrl} passHref>
<Button
data-reward-target={QuestRewardType.Cores}
icon={<CoreIcon />}
tag="a"
variant={ButtonVariant.Tertiary}
size={ButtonSize.Small}
className="!h-full !rounded-none !pl-1.5 !pr-2"
>
{largeNumberFormat(displayedBalance)}
</Button>
</Link>
</div>
</Tooltip>
)}
<Tooltip side="bottom" content="Profile settings">
<Button
type="button"
aria-label="Profile settings"
icon={
<ReputationIcon
className="text-accent-onion-default"
size={IconSize.Medium}
/>
}
variant={ButtonVariant.Tertiary}
size={ButtonSize.Small}
className={classNames(
'!h-full !gap-0 !rounded-none !pl-0.5 !pr-0',
className,
)}
onClick={wrapHandler(() => onUpdate(!isOpen))}
>
<span
ref={reputationCounterRef}
data-reward-target={QuestRewardType.Reputation}
className="inline-flex origin-center items-center will-change-transform"
>
{largeNumberFormat(displayedReputation ?? 0)}
</span>
<ProfilePicture
user={user}
size={ProfileImageSize.Large}
className="ml-2 !h-9 !w-9 !rounded-10"
nativeLazyLoading
/>
</Button>
</Tooltip>
</div>
{showIndicator && (
<div
aria-hidden
className="pointer-events-none absolute -bottom-1 right-[31px] size-3 rounded-full bg-accent-cheese-default"
/>
)}
<Tooltip side="bottom" content="Profile settings">
<Button
type="button"
aria-label="Profile settings"
icon={
<ReputationIcon
className="text-accent-onion-default"
size={IconSize.Medium}
/>
}
variant={ButtonVariant.Tertiary}
size={ButtonSize.Small}
className={classNames(
'!h-full !gap-0 !rounded-none !pl-0.5 !pr-0',
className,
)}
onClick={wrapHandler(() => onUpdate(!isOpen))}
>
<span
ref={reputationCounterRef}
data-reward-target={QuestRewardType.Reputation}
className="inline-flex origin-center items-center will-change-transform"
>
{largeNumberFormat(displayedReputation ?? 0)}
</span>
<ProfilePictureWithIndicator
user={user}
size={ProfileImageSize.Large}
className="!h-9 !w-9 !rounded-10"
wrapperClassName="relative ml-2"
/>
</Button>
</Tooltip>
</div>
)}
{isOpen && <ProfileMenu onClose={() => onUpdate(false)} />}
Expand Down
36 changes: 24 additions & 12 deletions packages/shared/src/components/streak/ReadingStreakButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,18 +122,30 @@ export function ReadingStreakButton({
type="button"
iconPosition={iconPosition}
icon={
<IconWrapper
size={compact ? IconSize.XSmall : undefined}
wrapperClassName={classnames(
'relative flex items-center gap-2',
compact && 'h-6 w-6 justify-center',
)}
>
<ReadingStreakIcon secondary={hasReadToday} />
{!isTimezoneOk && (
<WarningIcon className="!mr-0 text-raw-cheese-40" secondary />
)}
</IconWrapper>
compact ? (
<div className="relative flex h-6 w-6 items-center justify-center">
<IconWrapper
size={IconSize.XSmall}
wrapperClassName="flex h-full w-full items-center justify-center"
>
<ReadingStreakIcon secondary={hasReadToday} />
</IconWrapper>
{!isTimezoneOk && (
<WarningIcon
size={IconSize.Size16}
className="!absolute -bottom-1.5 -left-1.5 text-raw-cheese-40"
secondary
/>
)}
</div>
) : (
<IconWrapper wrapperClassName="relative flex items-center gap-2">
<ReadingStreakIcon secondary={hasReadToday} />
{!isTimezoneOk && (
<WarningIcon className="!mr-0 text-raw-cheese-40" secondary />
)}
</IconWrapper>
)
}
variant={
compact || isLaptop || isMobile
Expand Down
Loading