merge fixes

ui/blocks/BlocksTable.tsx

@@ -16,7 +16,7 @@ interface Props {
 const BlocksTable = ({ data }: Props) => {
 
   return (
-    <Table variant="simple" minWidth="1040px" size="md" fontWeight={ 500 }  mt={ 8 }>
+    <Table variant="simple" minWidth="1040px" size="md" fontWeight={ 500 } mt={ 8 }>
       <Thead>
         <Tr>
           <Th width="125px">Block</Th>

ui/txs/TxsContent.tsx

@@ -93,7 +93,7 @@ const TxsContent = ({
   return (
     <>
       { showDescription && <Box mb={ 12 }>Only the first 10,000 elements are displayed</Box> }
-      <TxsHeader sorting={ sorting } paginationProps={ paginationProps }/>
+      <TxsHeader sorting={ sorting } setSorting={ setSorting } paginationProps={ paginationProps }/>
       { content }
     </>
   );

ui/txs/TxsHeader.tsx

@@ -9,19 +9,20 @@ import useIsMobile from 'lib/hooks/useIsMobile';
 import ScrollDirectionContext from 'ui/ScrollDirectionContext';
 import Pagination from 'ui/shared/Pagination';
 import type { Props as PaginationProps } from 'ui/shared/Pagination';
-import SortButton from 'ui/shared/SortButton';
+import TxsSorting from 'ui/txs/TxsSorting';
 
 // import TxsFilters from './TxsFilters';
 
 type Props = {
   sorting: Sort;
+  setSorting: (val: Sort | ((val: Sort) => Sort)) => void;
   paginationProps: PaginationProps;
 }
 
 const TOP_UP = 106;
 const TOP_DOWN = 0;
 
-const TxsHeader = ({ sorting, paginationProps }: Props) => {
+const TxsHeader = ({ sorting, setSorting, paginationProps }: Props) => {
   const [ isSticky, setIsSticky ] = React.useState(false);
   const ref = React.useRef<HTMLDivElement>(null);
 
@@ -79,10 +80,10 @@ const TxsHeader = ({ sorting, paginationProps }: Props) => {
           appliedFiltersNum={ 0 }
         /> */ }
             { isMobile && (
-              <SortButton
-                // eslint-disable-next-line react/jsx-no-bind
-                handleSort={ () => {} }
-                isSortActive={ Boolean(sorting) }
+              <TxsSorting
+                isActive={ Boolean(sorting) }
+                setSorting={ setSorting }
+                sorting={ sorting }
               />
             ) }
             { /* api is not implemented */ }