refactor

lib/api/resources.ts

+import type { UserInfo, CustomAbis, PublicTags, AddressTags, TransactionTags, ApiKeys, WatchlistAddress } from 'types/api/account';
+import type {
+  Address,
+  AddressCounters,
+  AddressTokenBalance,
+  AddressTransactionsResponse,
+  AddressTokenTransferResponse,
+  AddressCoinBalanceHistoryResponse,
+  AddressBlocksValidatedResponse,
+  AddressInternalTxsResponse,
+  AddressTxsFilters,
+  AddressTokenTransferFilters,
+} from 'types/api/address';
+import type { BlocksResponse, BlockTransactionsResponse, Block, BlockFilters } from 'types/api/block';
+import type { InternalTransactionsResponse } from 'types/api/internalTransaction';
+import type { LogsResponse } from 'types/api/log';
+import type { RawTracesResponse } from 'types/api/rawTrace';
+import type { Stats, Charts } from 'types/api/stats';
+import type { TokenTransferResponse, TokenTransferFilters } from 'types/api/tokenTransfer';
+import type { TransactionsResponseValidated, TransactionsResponsePending, Transaction } from 'types/api/transaction';
+import type { TTxsFilters } from 'types/api/txsFilters';
 import type ArrayElement from 'types/utils/ArrayElement';
 
 import appConfig from 'configs/app/config';
@@ -152,3 +173,52 @@ export interface ResourceError<T = unknown> {
 }
 
 export type ResourceErrorAccount<T> = ResourceError<{ errors: T }>
+
+export type PaginatedResources = 'blocks' | 'block_txs' |
+'txs_validated' | 'txs_pending' |
+'tx_internal_txs' | 'tx_logs' | 'tx_token_transfers' |
+'address_txs' | 'address_internal_txs' | 'address_token_transfers' | 'address_blocks_validated' | 'address_coin_balance';
+
+export type PaginatedResponse<Q extends PaginatedResources> = ResourcePayload<Q>;
+
+/* eslint-disable @typescript-eslint/indent */
+export type ResourcePayload<Q extends ResourceName> =
+Q extends 'user_info' ? UserInfo :
+Q extends 'custom_abi' ? CustomAbis :
+Q extends 'public_tags' ? PublicTags :
+Q extends 'private_tags_address' ? AddressTags :
+Q extends 'private_tags_tx' ? TransactionTags :
+Q extends 'api_keys' ? ApiKeys :
+Q extends 'watchlist' ? Array<WatchlistAddress> :
+Q extends 'stats_counters' ? Stats :
+Q extends 'stats_charts' ? Charts :
+Q extends 'blocks' ? BlocksResponse :
+Q extends 'block' ? Block :
+Q extends 'block_txs' ? BlockTransactionsResponse :
+Q extends 'txs_validated' ? TransactionsResponseValidated :
+Q extends 'txs_pending' ? TransactionsResponsePending :
+Q extends 'tx' ? Transaction :
+Q extends 'tx_internal_txs' ? InternalTransactionsResponse :
+Q extends 'tx_logs' ? LogsResponse :
+Q extends 'tx_token_transfers' ? TokenTransferResponse :
+Q extends 'tx_raw_trace' ? RawTracesResponse :
+Q extends 'address' ? Address :
+Q extends 'address_counters' ? AddressCounters :
+Q extends 'address_token_balances' ? Array<AddressTokenBalance> :
+Q extends 'address_txs' ? AddressTransactionsResponse :
+Q extends 'address_internal_txs' ? AddressInternalTxsResponse :
+Q extends 'address_token_transfers' ? AddressTokenTransferResponse :
+Q extends 'address_blocks_validated' ? AddressBlocksValidatedResponse :
+Q extends 'address_coin_balance' ? AddressCoinBalanceHistoryResponse :
+never;
+/* eslint-enable @typescript-eslint/indent */
+
+/* eslint-disable @typescript-eslint/indent */
+export type PaginationFilters<Q extends PaginatedResources> =
+Q extends 'blocks' ? BlockFilters :
+Q extends 'txs_validated' | 'txs_pending' ? TTxsFilters :
+Q extends 'tx_token_transfers' ? TokenTransferFilters :
+Q extends 'address_txs' | 'address_internal_txs' ? AddressTxsFilters :
+Q extends 'address_token_transfers' ? AddressTokenTransferFilters :
+never;
+/* eslint-enable @typescript-eslint/indent */

lib/api/useApiQuery.tsx

 import type { UseQueryOptions } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 
-import type { UserInfo, CustomAbis, PublicTags, AddressTags, TransactionTags, ApiKeys, WatchlistAddress } from 'types/api/account';
-import type {
-  Address,
-  AddressCounters,
-  AddressTokenBalance,
-  AddressTransactionsResponse,
-  AddressTokenTransferResponse,
-  AddressCoinBalanceHistoryResponse,
-  AddressBlocksValidatedResponse,
-  AddressInternalTxsResponse,
-} from 'types/api/address';
-import type { BlocksResponse, BlockTransactionsResponse, Block } from 'types/api/block';
-import type { InternalTransactionsResponse } from 'types/api/internalTransaction';
-import type { LogsResponse } from 'types/api/log';
-import type { RawTracesResponse } from 'types/api/rawTrace';
-import type { Stats, Charts } from 'types/api/stats';
-import type { TokenTransferResponse } from 'types/api/tokenTransfer';
-import type { TransactionsResponseValidated, TransactionsResponsePending, Transaction } from 'types/api/transaction';
-
-import type { ResourceError, ResourceName } from './resources';
+import type { ResourceError, ResourceName, ResourcePayload } from './resources';
 import type { Params as ApiFetchParams } from './useApiFetch';
 import useApiFetch from './useApiFetch';
 
@@ -48,35 +29,3 @@ export default function useApiQuery<R extends ResourceName, E = unknown>(
       return apiFetch<R, ResourcePayload<R>, ResourceError>(resource, { pathParams, queryParams, fetchParams });
     }, queryOptions);
 }
-
-/* eslint-disable @typescript-eslint/indent */
-export type ResourcePayload<Q extends ResourceName> =
-Q extends 'user_info' ? UserInfo :
-Q extends 'custom_abi' ? CustomAbis :
-Q extends 'public_tags' ? PublicTags :
-Q extends 'private_tags_address' ? AddressTags :
-Q extends 'private_tags_tx' ? TransactionTags :
-Q extends 'api_keys' ? ApiKeys :
-Q extends 'watchlist' ? Array<WatchlistAddress> :
-Q extends 'stats_counters' ? Stats :
-Q extends 'stats_charts' ? Charts :
-Q extends 'blocks' ? BlocksResponse :
-Q extends 'block' ? Block :
-Q extends 'block_txs' ? BlockTransactionsResponse :
-Q extends 'txs_validated' ? TransactionsResponseValidated :
-Q extends 'txs_pending' ? TransactionsResponsePending :
-Q extends 'tx' ? Transaction :
-Q extends 'tx_internal_txs' ? InternalTransactionsResponse :
-Q extends 'tx_logs' ? LogsResponse :
-Q extends 'tx_token_transfers' ? TokenTransferResponse :
-Q extends 'tx_raw_trace' ? RawTracesResponse :
-Q extends 'address' ? Address :
-Q extends 'address_counters' ? AddressCounters :
-Q extends 'address_token_balances' ? Array<AddressTokenBalance> :
-Q extends 'address_txs' ? AddressTransactionsResponse :
-Q extends 'address_internal_txs' ? AddressInternalTxsResponse :
-Q extends 'address_token_transfers' ? AddressTokenTransferResponse :
-Q extends 'address_blocks_validated' ? AddressBlocksValidatedResponse :
-Q extends 'address_coin_balance' ? AddressCoinBalanceHistoryResponse :
-never;
-/* eslint-enable @typescript-eslint/indent */

lib/hooks/useQueryWithPages.ts

@@ -6,8 +6,7 @@ import { useRouter } from 'next/router';
 import React, { useCallback } from 'react';
 import { animateScroll, scroller } from 'react-scroll';
 
-import type { PaginatedResponseX, PaginatedResources, PaginationFiltersX } from 'types/api/pagination';
-
+import type { PaginatedResources, PaginatedResponse, PaginationFilters } from 'lib/api/resources';
 import { RESOURCES } from 'lib/api/resources';
 import type { Params as UseApiQueryParams } from 'lib/api/useApiQuery';
 import useApiQuery from 'lib/api/useApiQuery';
@@ -16,7 +15,7 @@ interface Params<Resource extends PaginatedResources> {
   resourceName: Resource;
   options?: UseApiQueryParams<Resource>['queryOptions'];
   pathParams?: UseApiQueryParams<Resource>['pathParams'];
-  filters?: PaginationFiltersX<Resource>;
+  filters?: PaginationFilters<Resource>;
   scroll?: { elem: string; offset: number };
 }
 
@@ -32,7 +31,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({
   const router = useRouter();
 
   type NextPageParams = {
-    [K in keyof PaginatedResponseX<Resource>['next_page_params']]: string;
+    [K in keyof PaginatedResponse<Resource>['next_page_params']]: string;
   }
   const currPageParams = mapValues(pick(router.query, resource.paginationFields), (value) => value?.toString()) as NextPageParams;
 
@@ -125,7 +124,7 @@ export default function useQueryWithPages<Resource extends PaginatedResources>({
     setHasPagination(true);
   }, [ queryClient, resourceName, router, resource.paginationFields, scrollToTop ]);
 
-  const onFilterChange = useCallback((newFilters: PaginationFiltersX<Resource> | undefined) => {
+  const onFilterChange = useCallback((newFilters: PaginationFilters<Resource> | undefined) => {
     const newQuery = omit(router.query, resource.paginationFields, 'page', resource.filterFields);
     if (newFilters) {
       Object.entries(newFilters).forEach(([ key, value ]) => {

types/api/pagination.ts

-import type {
-  AddressTxsFilters,
-  AddressTokenTransferFilters,
-} from 'types/api/address';
-import type { BlockFilters } from 'types/api/block';
-import type { TokenTransferFilters } from 'types/api/tokenTransfer';
-import type { TTxsFilters } from 'types/api/txsFilters';
-
-import type { ResourcePayload } from 'lib/api/useApiQuery';
-
-export type PaginatedResources = 'blocks' | 'block_txs' |
-'txs_validated' | 'txs_pending' |
-'tx_internal_txs' | 'tx_logs' | 'tx_token_transfers' |
-'address_txs' | 'address_internal_txs' | 'address_token_transfers' | 'address_blocks_validated' | 'address_coin_balance';
-
-export type PaginatedResponseX<Q extends PaginatedResources> = ResourcePayload<Q>;
-
-export type PaginationFiltersX<Q extends PaginatedResources> =
-  Q extends 'blocks' ? BlockFilters :
-    Q extends 'txs_validated' | 'txs_pending' ? TTxsFilters :
-      Q extends 'tx_token_transfers' ? TokenTransferFilters :
-        Q extends 'address_txs' | 'address_internal_txs' ? AddressTxsFilters :
-          Q extends 'address_token_transfers' ? AddressTokenTransferFilters :
-            never;

ui/shared/TokenTransfer/TokenTransfer.tsx

@@ -5,10 +5,10 @@ import { Element } from 'react-scroll';
 
 import type { AddressTokenTransferFilters, AddressFromToFilter } from 'types/api/address';
 import { AddressFromToFilterValues } from 'types/api/address';
-import type { PaginationFiltersX } from 'types/api/pagination';
 import type { TokenType } from 'types/api/tokenInfo';
 import type { TokenTransferFilters } from 'types/api/tokenTransfer';
 
+import type { PaginationFilters } from 'lib/api/resources';
 import type { Params as UseApiQueryParams } from 'lib/api/useApiQuery';
 import getFilterValueFromQuery from 'lib/getFilterValueFromQuery';
 import getFilterValuesFromQuery from 'lib/getFilterValuesFromQuery';
@@ -64,18 +64,18 @@ const TokenTransfer = <Resource extends 'tx_token_transfers' | 'address_token_tr
     resourceName,
     pathParams,
     options: { enabled: !isDisabled },
-    filters: filters as PaginationFiltersX<Resource>,
+    filters: filters as PaginationFilters<Resource>,
     scroll: { elem: SCROLL_ELEM, offset: SCROLL_OFFSET },
   });
 
   const handleTypeFilterChange = React.useCallback((nextValue: Array<TokenType>) => {
-    onFilterChange({ ...filters, type: nextValue } as PaginationFiltersX<Resource>);
+    onFilterChange({ ...filters, type: nextValue } as PaginationFilters<Resource>);
     setFilters((prevState) => ({ ...prevState, type: nextValue }));
   }, [ filters, onFilterChange ]);
 
   const handleAddressFilterChange = React.useCallback((nextValue: string) => {
     const filterVal = getAddressFilterValue(nextValue);
-    onFilterChange({ ...filters, filter: filterVal } as PaginationFiltersX<Resource>);
+    onFilterChange({ ...filters, filter: filterVal } as PaginationFilters<Resource>);
     setFilters((prevState) => ({ ...prevState, filter: filterVal }));
   }, [ filters, onFilterChange ]);