fix merge

types/api/transaction.ts

@@ -46,5 +46,5 @@ export interface TransactionsResponse {
     block_number: number;
     index: number;
     items_count: number;
-  };
+  } | null;
 }

ui/txs/TxsContent.tsx

@@ -25,6 +25,7 @@ type Props = {
 }
 
 const TxsContent = ({
+  queryName,
   showDescription,
   stateFilter,
   apiPath,
@@ -66,7 +67,7 @@ const TxsContent = ({
     onNextPageClick,
     hasPagination,
     resetPage,
-  } = useQueryWithPages({ filter: stateFilter }, apiPath);
+  } = useQueryWithPages(apiPath, queryName, stateFilter && { filter: stateFilter });
   // } = useQueryWithPages({ ...filters, filter: stateFilter, apiPath });
 
   const isMobile = useIsMobile(false);
@@ -124,7 +125,7 @@ const TxsContent = ({
         { hasPagination ? (
           <Pagination
             currentPage={ page }
-            hasNextPage={ data?.next_page_params !== undefined && Object.keys(data?.next_page_params).length > 0 }
+            hasNextPage={ data?.next_page_params !== undefined && Object.keys(data?.next_page_params || {}).length > 0 }
             onNextPageClick={ onNextPageClick }
             onPrevPageClick={ onPrevPageClick }
           />

ui/txs/TxsTab.tsx

 import React from 'react';
 
+import { QueryKeys } from 'types/client/queries';
+
 import TxsContent from './TxsContent';
 
 type Props = {
@@ -9,6 +11,7 @@ type Props = {
 const TxsTab = ({ tab }: Props) => {
   return (
     <TxsContent
+      queryName={ QueryKeys.transactions }
       showDescription={ tab === 'validated' }
       stateFilter={ tab }
       apiPath="/api/transactions"

ui/txs/useQueryWithPages.ts

@@ -6,13 +6,13 @@ import { animateScroll } from 'react-scroll';
 
 import type { TransactionsResponse } from 'types/api/transaction';
 import type { TTxsFilters } from 'types/api/txsFilters';
-import { QueryKeys } from 'types/client/queries';
+import type { QueryKeys } from 'types/client/queries';
 
 import useFetch from 'lib/hooks/useFetch';
 
 const PAGINATION_FIELDS = [ 'block_number', 'index', 'items_count' ];
 
-export default function useQueryWithPages(filters: TTxsFilters, apiPath: string) {
+export default function useQueryWithPages(apiPath: string, queryName: QueryKeys, filters?: TTxsFilters) {
   const queryClient = useQueryClient();
   const router = useRouter();
   const [ page, setPage ] = React.useState(1);
@@ -21,7 +21,7 @@ export default function useQueryWithPages(filters: TTxsFilters, apiPath: string)
   const fetch = useFetch();
 
   const { data, isLoading, isError } = useQuery<unknown, unknown, TransactionsResponse>(
-    [ QueryKeys.transactions, { page, filters } ],
+    [ queryName, { page, filters } ],
     async() => {
       const params: Array<string> = [];