Commit fd130d55 authored by Max Alekseenko's avatar Max Alekseenko

some fixes

parent 9ea0081b
......@@ -159,7 +159,7 @@ export default function useNavItems(): ReturnType {
isActive: pathname.startsWith('/token'),
},
config.features.marketplace.isEnabled ? {
text: 'DApps',
text: 'Apps',
nextRoute: { pathname: '/apps' as const },
icon: appsIcon,
isActive: pathname.startsWith('/app'),
......
......@@ -39,6 +39,8 @@ const NavigationMobile = ({ onNavLinkClick, isMarketplaceAppPage }: Props) => {
const openedItem = mainNavItems[openedGroupIndex];
const isCollapsed = isMarketplaceAppPage ? false : undefined;
return (
<Flex position="relative" flexDirection="column" flexGrow={ 1 }>
<Box
......@@ -64,7 +66,7 @@ const NavigationMobile = ({ onNavLinkClick, isMarketplaceAppPage }: Props) => {
if (isGroupItem(item)) {
return <NavLinkGroupMobile key={ item.text } item={ item } onClick={ onGroupItemOpen(index) } isExpanded={ isMarketplaceAppPage }/>;
} else {
return <NavLink key={ item.text } item={ item } onClick={ onNavLinkClick } isCollapsed={ isMarketplaceAppPage ? false : undefined }/>;
return <NavLink key={ item.text } item={ item } onClick={ onNavLinkClick } isCollapsed={ isCollapsed }/>;
}
}) }
</VStack>
......@@ -78,7 +80,7 @@ const NavigationMobile = ({ onNavLinkClick, isMarketplaceAppPage }: Props) => {
borderColor="divider"
>
<VStack as="ul" spacing="1" alignItems="flex-start">
{ accountNavItems.map((item) => <NavLink key={ item.text } item={ item } onClick={ onNavLinkClick }/>) }
{ accountNavItems.map((item) => <NavLink key={ item.text } item={ item } onClick={ onNavLinkClick } isCollapsed={ isCollapsed }/>) }
</VStack>
</Box>
) }
......@@ -114,10 +116,10 @@ const NavigationMobile = ({ onNavLinkClick, isMarketplaceAppPage }: Props) => {
borderColor: 'divider',
}}
>
{ item.map(subItem => <NavLink key={ subItem.text } item={ subItem } onClick={ onNavLinkClick }/>) }
{ item.map(subItem => <NavLink key={ subItem.text } item={ subItem } onClick={ onNavLinkClick } isCollapsed={ isCollapsed }/>) }
</Box>
) :
<NavLink key={ item.text } item={ item } mb={ 1 } onClick={ onNavLinkClick }/>,
<NavLink key={ item.text } item={ item } mb={ 1 } onClick={ onNavLinkClick } isCollapsed={ isCollapsed }/>,
) }
</Box>
</Box>
......
......@@ -30,7 +30,6 @@ const WalletMenuContent = ({ address, disconnect }: Props) => (
</Text>
<AddressEntity
address={{ hash: address }}
noLink
noTooltip
truncation="dynamic"
fontSize="sm"
......
......@@ -71,8 +71,9 @@ const WalletMenuDesktop = ({ isHomePage }: Props) => {
openDelay={ 300 }
isOpen={ isTooltipShown || undefined }
onClose={ setIsTooltipShown.off }
display={{ base: 'none', lg: 'flex' }}
>
<Box ml={ 3 }>
<Box ml={ 2 }>
<PopoverTrigger>
<Button
variant={ variant }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment