Commit e4ef1455 authored by tom's avatar tom

error color, token balance border radius and gas tooltop fixes

parent 2e9728ef
...@@ -20,8 +20,8 @@ const semanticTokens = { ...@@ -20,8 +20,8 @@ const semanticTokens = {
'default': 'blue.400', 'default': 'blue.400',
}, },
error: { error: {
'default': 'red.400', 'default': 'red.500',
_dark: 'red.300', _dark: 'red.500',
}, },
dialog_bg: { dialog_bg: {
'default': 'white', 'default': 'white',
......
...@@ -14,7 +14,7 @@ const TokenBalancesItem = ({ name, icon, value, valueSecondary, isLoading }: Pro ...@@ -14,7 +14,7 @@ const TokenBalancesItem = ({ name, icon, value, valueSecondary, isLoading }: Pro
const bgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50'); const bgColor = useColorModeValue('blackAlpha.50', 'whiteAlpha.50');
return ( return (
<Box px="12px" py="10px" bgColor={ bgColor } borderRadius="16px"> <Box px="12px" py="10px" bgColor={ bgColor } borderRadius="base">
<Text variant="secondary" fontSize="xs">{ name }</Text> <Text variant="secondary" fontSize="xs">{ name }</Text>
<Flex alignItems="center"> <Flex alignItems="center">
{ icon } { icon }
......
import { Box, DarkMode, Flex, Grid, Popover, PopoverBody, PopoverContent, PopoverTrigger, Portal, useColorModeValue } from '@chakra-ui/react'; import type {
PlacementWithLogical } from '@chakra-ui/react';
import {
Box,
DarkMode,
Flex,
Grid,
Popover,
PopoverBody,
PopoverContent,
PopoverTrigger,
Portal,
useColorModeValue,
} from '@chakra-ui/react';
import React from 'react'; import React from 'react';
import type { HomeStats } from 'types/api/stats'; import type { HomeStats } from 'types/api/stats';
...@@ -17,12 +30,13 @@ interface Props { ...@@ -17,12 +30,13 @@ interface Props {
data: HomeStats; data: HomeStats;
dataUpdatedAt: number; dataUpdatedAt: number;
isOpen?: boolean; // for testing purposes only; the tests were flaky, i couldn't find a better way isOpen?: boolean; // for testing purposes only; the tests were flaky, i couldn't find a better way
placement?: PlacementWithLogical;
} }
const POPOVER_OFFSET: [ number, number ] = [ 0, 10 ]; const POPOVER_OFFSET: [ number, number ] = [ 0, 10 ];
const feature = config.features.gasTracker; const feature = config.features.gasTracker;
const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen }: Props) => { const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen, placement }: Props) => {
const tooltipBg = useColorModeValue('gray.700', 'gray.900'); const tooltipBg = useColorModeValue('gray.700', 'gray.900');
if (!data.gas_prices) { if (!data.gas_prices) {
...@@ -36,7 +50,7 @@ const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen }: Props) => { ...@@ -36,7 +50,7 @@ const GasInfoTooltip = ({ children, data, dataUpdatedAt, isOpen }: Props) => {
3 : 2; 3 : 2;
return ( return (
<Popover trigger="hover" isLazy offset={ POPOVER_OFFSET } isOpen={ isOpen }> <Popover trigger="hover" isLazy offset={ POPOVER_OFFSET } isOpen={ isOpen } placement={ placement }>
<PopoverTrigger> <PopoverTrigger>
{ children } { children }
</PopoverTrigger> </PopoverTrigger>
......
...@@ -78,7 +78,7 @@ const TopBarStats = () => { ...@@ -78,7 +78,7 @@ const TopBarStats = () => {
{ data?.gas_prices && data.gas_prices.average !== null && config.features.gasTracker.isEnabled && ( { data?.gas_prices && data.gas_prices.average !== null && config.features.gasTracker.isEnabled && (
<Skeleton isLoaded={ !isPlaceholderData }> <Skeleton isLoaded={ !isPlaceholderData }>
<chakra.span color="text_secondary">Gas </chakra.span> <chakra.span color="text_secondary">Gas </chakra.span>
<GasInfoTooltip data={ data } dataUpdatedAt={ dataUpdatedAt } > <GasInfoTooltip data={ data } dataUpdatedAt={ dataUpdatedAt } placement={ !data?.coin_price ? 'bottom-start' : undefined }>
<Link> <Link>
<GasPrice data={ data.gas_prices.average }/> <GasPrice data={ data.gas_prices.average }/>
</Link> </Link>
......
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