a4d2c6b0a6
## Issue Closes 627 account header doesn't refresh on sign up / log in ## Changes Looking back at "[Header] Changes, fixes and improvements (#493)", noticed that old code was looking at `has_verified_email` instead of just checking whether an email exists. So, restored original code. This does have a side-effect of the Logout button not showing any email address underneath it immediately after sign up (with the flow cancelled). But I vaguely recall it was that way previously. A refresh cleans it up. Perhaps another `user/me` when leaving the Sign Up page can make everything in sync, but this PR simpler to test.
77 lines
3 KiB
JavaScript
77 lines
3 KiB
JavaScript
// @flow
|
|
import 'scss/component/_header.scss';
|
|
|
|
import { Menu, MenuList, MenuButton, MenuItem } from '@reach/menu-button';
|
|
import * as ICONS from 'constants/icons';
|
|
import * as PAGES from 'constants/pages';
|
|
import ChannelThumbnail from 'component/channelThumbnail';
|
|
import classnames from 'classnames';
|
|
import HeaderMenuLink from 'component/common/header-menu-link';
|
|
import Icon from 'component/common/icon';
|
|
import React from 'react';
|
|
import Skeleton from '@mui/material/Skeleton';
|
|
|
|
type HeaderMenuButtonProps = {
|
|
activeChannelClaim: ?ChannelClaim,
|
|
authenticated: boolean,
|
|
email: ?string,
|
|
signOut: () => void,
|
|
};
|
|
|
|
export default function HeaderProfileMenuButton(props: HeaderMenuButtonProps) {
|
|
const { activeChannelClaim, authenticated, email, signOut } = props;
|
|
|
|
const activeChannelUrl = activeChannelClaim && activeChannelClaim.permanent_url;
|
|
|
|
return (
|
|
<div className="header__buttons">
|
|
<Menu>
|
|
{activeChannelUrl === undefined ? (
|
|
<Skeleton variant="circular" animation="wave" className="header__navigationItem--iconSkeleton" />
|
|
) : (
|
|
<MenuButton
|
|
aria-label={__('Your account')}
|
|
title={__('Your account')}
|
|
className={classnames('header__navigationItem', {
|
|
'header__navigationItem--icon': !activeChannelUrl,
|
|
'header__navigationItem--profilePic': activeChannelUrl,
|
|
})}
|
|
>
|
|
{activeChannelUrl ? (
|
|
<ChannelThumbnail uri={activeChannelUrl} small noLazyLoad />
|
|
) : (
|
|
<Icon size={18} icon={ICONS.ACCOUNT} aria-hidden />
|
|
)}
|
|
</MenuButton>
|
|
)}
|
|
|
|
<MenuList className="menu__list--header">
|
|
{authenticated ? (
|
|
<>
|
|
<HeaderMenuLink page={PAGES.UPLOADS} icon={ICONS.PUBLISH} name={__('Uploads')} />
|
|
<HeaderMenuLink page={PAGES.CHANNELS} icon={ICONS.CHANNEL} name={__('Channels')} />
|
|
<HeaderMenuLink page={PAGES.CREATOR_DASHBOARD} icon={ICONS.ANALYTICS} name={__('Creator Analytics')} />
|
|
<HeaderMenuLink page={PAGES.REWARDS} icon={ICONS.REWARDS} name={__('Rewards')} />
|
|
<HeaderMenuLink page={PAGES.INVITE} icon={ICONS.INVITE} name={__('Invites')} />
|
|
|
|
<MenuItem onSelect={signOut}>
|
|
<div className="menu__link">
|
|
<Icon aria-hidden icon={ICONS.SIGN_OUT} />
|
|
{__('Sign Out')}
|
|
</div>
|
|
<span className="menu__link-help">{email}</span>
|
|
</MenuItem>
|
|
</>
|
|
) : (
|
|
<>
|
|
<HeaderMenuLink page={PAGES.AUTH_SIGNIN} icon={ICONS.SIGN_IN} name={__('Log In')} />
|
|
<HeaderMenuLink page={PAGES.AUTH} icon={ICONS.SIGN_UP} name={__('Sign Up')} />
|
|
<HeaderMenuLink page={PAGES.SETTINGS} icon={ICONS.SETTINGS} name={__('Settings')} />
|
|
<HeaderMenuLink page={PAGES.HELP} icon={ICONS.HELP} name={__('Help')} />
|
|
</>
|
|
)}
|
|
</MenuList>
|
|
</Menu>
|
|
</div>
|
|
);
|
|
}
|