Commit e176fd03 authored by tom's avatar tom

fix tests

parent d675c90c
export default function getFilterValue<FilterType>(filterValues: ReadonlyArray<FilterType>, val: string | Array<string> | undefined) { export default function getFilterValue<FilterType>(filterValues: ReadonlyArray<FilterType>, val: string | Array<string> | undefined) {
if (val === undefined) {
return;
}
const valArray = []; const valArray = [];
if (typeof val === 'string') { if (typeof val === 'string') {
valArray.push(...val.split(',')); valArray.push(...val.split(','));
......
...@@ -10,7 +10,7 @@ import buildApiUrl from 'playwright/utils/buildApiUrl'; ...@@ -10,7 +10,7 @@ import buildApiUrl from 'playwright/utils/buildApiUrl';
import LatestBlocks from './LatestBlocks'; import LatestBlocks from './LatestBlocks';
const STATS_API_URL = buildApiUrl('homepage_stats'); const STATS_API_URL = buildApiUrl('homepage_stats');
const BLOCKS_API_URL = buildApiUrl('blocks'); const BLOCKS_API_URL = buildApiUrl('homepage_blocks');
export const test = base.extend<socketServer.SocketServerFixture>({ export const test = base.extend<socketServer.SocketServerFixture>({
createSocket: socketServer.createSocket, createSocket: socketServer.createSocket,
......
...@@ -27,8 +27,6 @@ test('without tx info +@mobile', async({ mount, page }) => { ...@@ -27,8 +27,6 @@ test('without tx info +@mobile', async({ mount, page }) => {
</TestApp>, </TestApp>,
); );
await page.waitForResponse(API_URL),
await expect(component).toHaveScreenshot(); await expect(component).toHaveScreenshot();
}); });
...@@ -49,7 +47,5 @@ test('with tx info +@mobile', async({ mount, page }) => { ...@@ -49,7 +47,5 @@ test('with tx info +@mobile', async({ mount, page }) => {
</TestApp>, </TestApp>,
); );
await page.waitForResponse(API_URL),
await expect(component).toHaveScreenshot(); await expect(component).toHaveScreenshot();
}); });
...@@ -3,10 +3,9 @@ import { useRouter } from 'next/router'; ...@@ -3,10 +3,9 @@ import { useRouter } from 'next/router';
import React from 'react'; import React from 'react';
import { Element } from 'react-scroll'; import { Element } from 'react-scroll';
import type { AddressTokenTransferFilters, AddressFromToFilter } from 'types/api/address'; import type { AddressFromToFilter } from 'types/api/address';
import { AddressFromToFilterValues } from 'types/api/address'; import { AddressFromToFilterValues } from 'types/api/address';
import type { TokenType } from 'types/api/tokenInfo'; import type { TokenType } from 'types/api/tokenInfo';
import type { TokenTransferFilters } from 'types/api/tokenTransfer';
import type { PaginationFilters } from 'lib/api/resources'; import type { PaginationFilters } from 'lib/api/resources';
import type { Params as UseApiQueryParams } from 'lib/api/useApiQuery'; import type { Params as UseApiQueryParams } from 'lib/api/useApiQuery';
...@@ -46,6 +45,11 @@ interface Props<Resource extends 'tx_token_transfers' | 'address_token_transfers ...@@ -46,6 +45,11 @@ interface Props<Resource extends 'tx_token_transfers' | 'address_token_transfers
pathParams?: UseApiQueryParams<Resource>['pathParams']; pathParams?: UseApiQueryParams<Resource>['pathParams'];
} }
type State = {
type: Array<TokenType> | undefined;
filter: AddressFromToFilter;
}
const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_transfers'>({ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_transfers'>({
isLoading: isLoadingProp, isLoading: isLoadingProp,
isDisabled, isDisabled,
...@@ -56,7 +60,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr ...@@ -56,7 +60,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
pathParams, pathParams,
}: Props<Resource>) => { }: Props<Resource>) => {
const router = useRouter(); const router = useRouter();
const [ filters, setFilters ] = React.useState<AddressTokenTransferFilters & TokenTransferFilters>( const [ filters, setFilters ] = React.useState<State>(
{ type: getTokenFilterValue(router.query.type), filter: getAddressFilterValue(router.query.filter) }, { type: getTokenFilterValue(router.query.type), filter: getAddressFilterValue(router.query.filter) },
); );
...@@ -79,7 +83,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr ...@@ -79,7 +83,7 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
setFilters((prevState) => ({ ...prevState, filter: filterVal })); setFilters((prevState) => ({ ...prevState, filter: filterVal }));
}, [ filters, onFilterChange ]); }, [ filters, onFilterChange ]);
const numActiveFilters = filters.type.length + (filters.filter ? 1 : 0); const numActiveFilters = (filters.type?.length || 0) + (filters.filter ? 1 : 0);
const isActionBarHidden = !numActiveFilters && !data?.items.length; const isActionBarHidden = !numActiveFilters && !data?.items.length;
const content = (() => { const content = (() => {
......
...@@ -23,7 +23,7 @@ import { TOKEN_TYPE } from './helpers'; ...@@ -23,7 +23,7 @@ import { TOKEN_TYPE } from './helpers';
interface Props { interface Props {
appliedFiltersNum?: number; appliedFiltersNum?: number;
defaultTypeFilters: Array<TokenType>; defaultTypeFilters: Array<TokenType> | undefined;
onTypeFilterChange: (nextValue: Array<TokenType>) => void; onTypeFilterChange: (nextValue: Array<TokenType>) => void;
withAddressFilter?: boolean; withAddressFilter?: boolean;
onAddressFilterChange?: (nextValue: string) => void; onAddressFilterChange?: (nextValue: string) => void;
......
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