Commit 12689343 authored by tom's avatar tom

Merge branch 'main' of github.com:blockscout/frontend into no-link

parents cc381104 41d9034a
...@@ -157,7 +157,7 @@ blockscout: ...@@ -157,7 +157,7 @@ blockscout:
DISABLE_EXCHANGE_RATES: DISABLE_EXCHANGE_RATES:
_default: 'true' _default: 'true'
DISABLE_INDEXER: DISABLE_INDEXER:
_default: 'true' _default: 'false'
FIRST_BLOCK: FIRST_BLOCK:
_default: '8446041' _default: '8446041'
LAST_BLOCK: LAST_BLOCK:
......
...@@ -20,6 +20,7 @@ const AddressCsvExportLink = ({ className, address, type }: Props) => { ...@@ -20,6 +20,7 @@ const AddressCsvExportLink = ({ className, address, type }: Props) => {
className={ className } className={ className }
display="inline-flex" display="inline-flex"
alignItems="center" alignItems="center"
whiteSpace="nowrap"
href={ route({ pathname: '/csv-export', query: { type, address } }) } href={ route({ pathname: '/csv-export', query: { type, address } }) }
flexShrink={ 0 } flexShrink={ 0 }
> >
......
...@@ -23,6 +23,7 @@ import TOKEN_TYPE from 'lib/token/tokenTypes'; ...@@ -23,6 +23,7 @@ import TOKEN_TYPE from 'lib/token/tokenTypes';
import EmptySearchResult from 'ui/apps/EmptySearchResult'; import EmptySearchResult from 'ui/apps/EmptySearchResult';
import ActionBar from 'ui/shared/ActionBar'; import ActionBar from 'ui/shared/ActionBar';
import DataFetchAlert from 'ui/shared/DataFetchAlert'; import DataFetchAlert from 'ui/shared/DataFetchAlert';
import HashStringShorten from 'ui/shared/HashStringShorten';
import Pagination from 'ui/shared/Pagination'; import Pagination from 'ui/shared/Pagination';
import SkeletonList from 'ui/shared/skeletons/SkeletonList'; import SkeletonList from 'ui/shared/skeletons/SkeletonList';
import SkeletonTable from 'ui/shared/skeletons/SkeletonTable'; import SkeletonTable from 'ui/shared/skeletons/SkeletonTable';
...@@ -161,7 +162,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD ...@@ -161,7 +162,7 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
}); });
const numActiveFilters = (filters.type?.length || 0) + (filters.filter ? 1 : 0); const numActiveFilters = (filters.type?.length || 0) + (filters.filter ? 1 : 0);
const isActionBarHidden = !tokenFilter && !numActiveFilters && !data?.items.length; const isActionBarHidden = !tokenFilter && !numActiveFilters && !data?.items.length && !currentAddress;
const content = (() => { const content = (() => {
if (isLoading) { if (isLoading) {
...@@ -226,23 +227,25 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD ...@@ -226,23 +227,25 @@ const AddressTokenTransfers = ({ scrollRef }: {scrollRef?: React.RefObject<HTMLD
})(); })();
const tokenFilterComponent = tokenFilter && ( const tokenFilterComponent = tokenFilter && (
<Flex alignItems="center" py={ 1 } flexWrap="wrap" mb={{ base: isPaginationVisible ? 6 : 3, lg: 0 }}> <Flex alignItems="center" flexWrap="wrap" mb={{ base: isActionBarHidden ? 3 : 6, lg: 0 }} mr={ 4 }>
Filtered by token <Text whiteSpace="nowrap" mr={ 2 } py={ 1 }>Filtered by token</Text>
<TokenLogo hash={ tokenFilter } boxSize={ 6 } mx={ 2 }/> <Flex alignItems="center" py={ 1 }>
{ isMobile ? tokenFilter.slice(0, 4) + '...' + tokenFilter.slice(-4) : tokenFilter } <TokenLogo hash={ tokenFilter } boxSize={ 6 } mr={ 2 }/>
<Tooltip label="Reset filter"> { isMobile ? <HashStringShorten hash={ tokenFilter }/> : tokenFilter }
<Flex> <Tooltip label="Reset filter">
<Icon <Flex>
as={ crossIcon } <Icon
boxSize={ 6 } as={ crossIcon }
ml={ 1 } boxSize={ 6 }
color={ resetTokenIconColor } ml={ 1 }
cursor="pointer" color={ resetTokenIconColor }
_hover={{ color: resetTokenIconHoverColor }} cursor="pointer"
onClick={ resetTokenFilter } _hover={{ color: resetTokenIconHoverColor }}
/> onClick={ resetTokenFilter }
</Flex> />
</Tooltip> </Flex>
</Tooltip>
</Flex>
</Flex> </Flex>
); );
......
...@@ -30,7 +30,7 @@ const TokenTransferTable = ({ ...@@ -30,7 +30,7 @@ const TokenTransferTable = ({
}: Props) => { }: Props) => {
return ( return (
<Table variant="simple" size="sm"> <Table variant="simple" size="sm" minW="950px">
<Thead top={ top }> <Thead top={ top }>
<Tr> <Tr>
{ showTxInfo && <Th width="44px"></Th> } { showTxInfo && <Th width="44px"></Th> }
......
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