From 78add8801486d5f8cfa2a50f43308e1b57b866e5 Mon Sep 17 00:00:00 2001
From: Matthew Russell <mattrussell36@gmail.com>
Date: Tue, 14 Nov 2023 16:43:36 -0800
Subject: [PATCH] chore(trading,governance,explorer): comply with eslint type
 import rules (#5257)

---
 .eslintrc.json                                |  3 +-
 .../app/components/assets/assets-table.tsx    |  8 +--
 .../app/components/markets/markets-table.tsx  | 12 ++---
 .../components/proposals/proposals-table.tsx  | 14 ++---
 .../txs/details/tx-details-wrapper.tsx        |  4 +-
 .../src/app/components/txs/txs-per-block.tsx  |  4 +-
 apps/explorer/src/app/hooks/use-txs-data.ts   | 10 ++--
 .../src/app/routes/assets/asset-page.tsx      |  6 ++-
 .../src/app/routes/blocks/home/index.tsx      |  6 +--
 .../src/app/routes/blocks/id/block.tsx        |  6 ++-
 .../explorer/src/app/routes/genesis/index.tsx |  2 +-
 .../src/app/routes/markets/market-page.tsx    |  4 +-
 .../oracles/components/oracle-markets.tsx     |  6 ++-
 .../src/app/routes/oracles/id/index.tsx       |  4 +-
 .../app/routes/parties/id/accounts/index.tsx  |  4 +-
 .../src/app/routes/parties/id/index.tsx       |  8 +--
 apps/explorer/src/app/routes/txs/id/index.tsx |  6 ++-
 apps/governance-e2e/.eslintrc.json            |  2 +-
 .../integration/flow/proposal-details.cy.ts   |  2 +-
 .../src/integration/flow/proposal-flow.cy.ts  |  2 +-
 .../src/integration/flow/proposal-list.cy.ts  |  2 +-
 .../src/components/vega-wallet/hooks.ts       | 13 ++---
 .../contexts/contracts/contracts-provider.tsx |  2 +-
 .../components/list-asset/list-asset.tsx      |  4 +-
 .../components/vote-details/use-user-vote.tsx |  2 +-
 .../proposals/proposals-container.tsx         | 10 ++--
 .../test-helpers/generate-proposals.ts        |  6 +--
 .../home/redemption-information.tsx           |  8 +--
 .../src/routes/redemption/redemption.tsx      |  5 +-
 .../src/routes/redemption/tranche/index.tsx   | 10 ++--
 .../src/routes/staking/associate/hooks.ts     | 10 ++--
 .../consensus-validators-table.tsx            | 14 ++---
 .../standby-pending-validators-table.tsx      |  6 +--
 .../src/routes/staking/node/node.tsx          |  4 +-
 .../src/routes/tranches/tranche.tsx           |  6 ++-
 .../dashboard/market-list/market-list.tsx     | 14 ++---
 .../src/app/components/detail/detail.tsx      | 12 +++--
 .../components/detail/providers/providers.tsx |  8 +--
 .../src/app/components/grid/grid.tsx          | 10 ++--
 .../add-signer-form/add-signer-form.tsx       | 10 ++--
 .../remove-signer-form/remove-signer-form.tsx | 10 ++--
 .../config/contracts/contracts-provider.tsx   |  2 +-
 .../src/lib/accounts-data-provider.ts         | 10 ++--
 libs/accounts/src/lib/accounts-manager.tsx    | 10 ++--
 libs/accounts/src/lib/breakdown-table.tsx     | 10 ++--
 libs/accounts/src/lib/margin-data-provider.ts | 10 ++--
 libs/assets/src/lib/asset-data-provider.ts    |  8 +--
 libs/assets/src/lib/assets-data-provider.ts   |  5 +-
 libs/candles-chart/src/lib/candles-menu.tsx   |  2 +-
 libs/candles-chart/src/lib/data-source.ts     | 32 +++++++-----
 .../src/generic-data-provider.spec.ts         | 36 ++++++-------
 libs/data-provider/src/pagination.ts          |  7 ++-
 .../src/use-data-provider.spec.ts             |  9 ++--
 libs/data-provider/src/use-data-provider.ts   | 10 ++--
 libs/datagrid/src/lib/ag-grid/ag-grid.tsx     |  2 +-
 .../src/lib/filters/date-range-filter.tsx     | 22 ++++----
 .../src/lib/use-datagrid-events.spec.tsx      | 24 ++++-----
 libs/datagrid/src/lib/use-datagrid-events.ts  | 18 +++----
 .../deal-ticket/deal-ticket-stop-order.tsx    | 24 ++++-----
 .../components/deal-ticket/deal-ticket.tsx    | 12 ++---
 .../src/hooks/use-position-estimate.ts        |  6 +--
 libs/deposits/src/lib/deposits-provider.ts    | 14 +++--
 libs/deposits/src/lib/deposits-table.tsx      | 12 ++---
 .../src/hooks/mocks/apollo-client.tsx         |  9 ++--
 libs/environment/src/hooks/use-environment.ts | 12 +++--
 .../src/hooks/use-vega-releases.ts            |  3 +-
 libs/fills/src/lib/fills-data-provider.ts     | 21 ++++----
 libs/fills/src/lib/fills-manager.tsx          | 13 +++--
 libs/fills/src/lib/fills-table.tsx            | 38 +++++++-------
 .../src/lib/funding-payments-data-provider.ts | 12 ++---
 .../src/lib/funding-payments-manager.tsx      |  6 +--
 .../src/lib/funding-payments-table.tsx        | 10 ++--
 .../src/lib/liquidity-data-provider.ts        | 16 +++---
 .../src/lib/markets-liquidity-provider.ts     | 17 ++++---
 libs/logger/src/hooks/use-logger.ts           |  2 +-
 libs/market-depth/src/lib/depth-chart.tsx     | 14 ++---
 .../src/lib/market-depth-provider.ts          | 10 ++--
 .../src/lib/orderbook-manager.tsx             |  8 +--
 .../market-info/market-info-data-provider.ts  | 14 ++---
 .../src/lib/hooks/use-market-oracle.spec.ts   | 10 ++--
 .../src/lib/hooks/use-oracle-proofs.ts        |  2 +-
 .../src/lib/market-candles-provider.ts        | 10 ++--
 libs/markets/src/lib/market-data-provider.ts  | 12 ++---
 .../src/lib/markets-candles-provider.ts       | 10 ++--
 libs/markets/src/lib/markets-data-provider.ts | 20 ++++----
 libs/markets/src/lib/markets-provider.ts      | 21 ++++----
 .../order-data-provider.ts                    | 23 +++++----
 .../stop-orders-data-provider.ts              | 12 ++---
 .../order-list-manager/order-list-manager.tsx | 15 +++---
 .../order-list/order-list.stories.tsx         |  2 +-
 .../lib/components/order-list/order-list.tsx  | 19 +++----
 .../stop-orders-manager.tsx                   |  9 ++--
 .../src/lib/positions-data-providers.ts       | 41 +++++++--------
 libs/positions/src/lib/positions-table.tsx    | 19 +++----
 .../proposals-data-provider.tsx               | 20 ++++----
 .../lib/proposals-hooks/use-proposal-event.ts | 14 ++---
 .../proposals-hooks/use-proposal-submit.ts    |  4 +-
 .../use-block-rising.ts                       |  6 ++-
 .../src/lib/voting-hooks/use-vote-event.ts    | 14 ++---
 libs/tendermint/src/lib/use-block-info.ts     |  2 +-
 libs/trades/src/lib/trades-data-provider.ts   | 23 +++++----
 libs/trades/src/lib/trades-table.tsx          | 22 ++++----
 .../dropdown-menu/dropdown-menu.tsx           |  2 +-
 .../navigation/navigation-drawer.tsx          | 12 ++---
 .../ui-toolkit/src/components/toast/toast.tsx | 45 ++++++++--------
 .../trading-button/trading-button.tsx         | 14 ++---
 .../trading-dropdown/trading-dropdown.tsx     |  3 +-
 .../src/connect-dialog/connect-dialog.tsx     | 51 ++++++++++---------
 libs/wallet/src/provider.tsx                  | 13 +++--
 .../use-ethereum-transaction-manager.spec.tsx |  8 +--
 .../use-ethereum-transaction-updater.spec.tsx | 14 ++---
 ...hereum-withdraw-approvals-manager.spec.tsx | 28 +++++-----
 ...se-ethereum-withdraw-approvals-manager.tsx | 12 ++---
 ...ethereum-withdraw-approvals-store.spec.tsx |  8 +--
 libs/web3/src/lib/use-transaction-result.ts   | 10 ++--
 .../lib/use-vega-transaction-manager.spec.tsx |  8 +--
 .../lib/use-vega-transaction-updater.spec.tsx | 20 ++++----
 .../src/lib/wait-for-withdrawal-approval.ts   | 12 ++---
 .../src/lib/use-complete-withdraw.ts          | 16 +++---
 .../src/lib/use-verify-withdrawal.ts          | 10 ++--
 .../src/lib/use-withdrawal-approval.ts        |  8 +--
 .../withdraws/src/lib/use-withdrawal-event.ts | 14 ++---
 .../withdraws/src/lib/withdrawals-provider.ts | 10 ++--
 libs/withdraws/src/lib/withdrawals-table.tsx  | 14 ++---
 124 files changed, 731 insertions(+), 700 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 88d9bd572..e58c2f737 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -73,7 +73,8 @@
           "error",
           {
             "prefer": "type-imports",
-            "disallowTypeAnnotations": true
+            "disallowTypeAnnotations": true,
+            "fixStyle": "inline-type-imports"
           }
         ],
         "curly": ["error", "multi-line"]
diff --git a/apps/explorer/src/app/components/assets/assets-table.tsx b/apps/explorer/src/app/components/assets/assets-table.tsx
index af3959d7a..dbcb44aaf 100644
--- a/apps/explorer/src/app/components/assets/assets-table.tsx
+++ b/apps/explorer/src/app/components/assets/assets-table.tsx
@@ -1,15 +1,15 @@
 import { useMemo } from 'react';
-import type { AssetFieldsFragment } from '@vegaprotocol/assets';
+import { type AssetFieldsFragment } from '@vegaprotocol/assets';
 import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 import { AgGrid } from '@vegaprotocol/datagrid';
-import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
+import { type VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { useNavigate } from 'react-router-dom';
-import type { RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 
 type AssetsTableProps = {
   data: AssetFieldsFragment[] | null;
diff --git a/apps/explorer/src/app/components/markets/markets-table.tsx b/apps/explorer/src/app/components/markets/markets-table.tsx
index fd02c4d59..0ecbe5769 100644
--- a/apps/explorer/src/app/components/markets/markets-table.tsx
+++ b/apps/explorer/src/app/components/markets/markets-table.tsx
@@ -2,18 +2,18 @@ import { useMemo } from 'react';
 import { getAsset, type MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
-import type { AgGridReact } from 'ag-grid-react';
-import type { ColDef } from 'ag-grid-community';
+import { type AgGridReact } from 'ag-grid-react';
+import { type ColDef } from 'ag-grid-community';
 import { AgGrid } from '@vegaprotocol/datagrid';
-import type {
-  VegaICellRendererParams,
-  VegaValueGetterParams,
+import {
+  type VegaICellRendererParams,
+  type VegaValueGetterParams,
 } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { MarketStateMapping } from '@vegaprotocol/types';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type { RowClickedEvent } from 'ag-grid-community';
+import { type RowClickedEvent } from 'ag-grid-community';
 import { Link, useNavigate } from 'react-router-dom';
 
 type MarketsTableProps = {
diff --git a/apps/explorer/src/app/components/proposals/proposals-table.tsx b/apps/explorer/src/app/components/proposals/proposals-table.tsx
index 2bfb32992..dcf25e05c 100644
--- a/apps/explorer/src/app/components/proposals/proposals-table.tsx
+++ b/apps/explorer/src/app/components/proposals/proposals-table.tsx
@@ -1,14 +1,14 @@
-import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
+import { type ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { AgGrid } from '@vegaprotocol/datagrid';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
+import {
+  type VegaICellRendererParams,
+  type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import type { RowClickedEvent, ColDef } from 'ag-grid-community';
+import { type RowClickedEvent, ColDef } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
               ? new BigNumber(0)
               : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
             return (
-              <div className="flex items-center justify-center h-full pt-2 uppercase">
+              <div className="flex h-full items-center justify-center pt-2 uppercase">
                 <VoteProgress
                   threshold={requiredMajorityPercentage}
                   progress={yesPercentage}
diff --git a/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx b/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx
index f8292e9fd..6c6478d76 100644
--- a/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx
+++ b/apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx
@@ -3,8 +3,8 @@ import { DATA_SOURCES } from '../../../config';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { TxDetailsOrder } from './tx-order';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { type BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import { type TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
 import { TxDetailsHeartbeat } from './tx-hearbeat';
 import { TxDetailsGeneric } from './tx-generic';
 import { TxDetailsBatch } from './tx-batch';
diff --git a/apps/explorer/src/app/components/txs/txs-per-block.tsx b/apps/explorer/src/app/components/txs/txs-per-block.tsx
index 63b9a76ef..b15a1fe0d 100644
--- a/apps/explorer/src/app/components/txs/txs-per-block.tsx
+++ b/apps/explorer/src/app/components/txs/txs-per-block.tsx
@@ -1,7 +1,7 @@
 import { Table, TableRow } from '../table';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
-import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
+import { type BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
 import { getTxsDataUrl } from '../../hooks/get-txs-data-url';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
@@ -22,7 +22,7 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
   return (
     <AsyncRenderer data={data} error={error} loading={!!loading}>
       {data && data.transactions.length > 0 ? (
-        <div className="overflow-x-auto whitespace-nowrap mb-28">
+        <div className="mb-28 overflow-x-auto whitespace-nowrap">
           <Table>
             <thead>
               <TableRow modifier="bordered" className="font-mono">
diff --git a/apps/explorer/src/app/hooks/use-txs-data.ts b/apps/explorer/src/app/hooks/use-txs-data.ts
index 13ab7fd98..7d8f638a8 100644
--- a/apps/explorer/src/app/hooks/use-txs-data.ts
+++ b/apps/explorer/src/app/hooks/use-txs-data.ts
@@ -1,14 +1,14 @@
 import { useSearchParams } from 'react-router-dom';
-import type { URLSearchParamsInit } from 'react-router-dom';
+import { type URLSearchParamsInit } from 'react-router-dom';
 import { useCallback } from 'react';
 import { useFetch } from '@vegaprotocol/react-helpers';
-import type {
-  BlockExplorerTransactionResult,
-  BlockExplorerTransactions,
+import {
+  type BlockExplorerTransactionResult,
+  type BlockExplorerTransactions,
 } from '../routes/types/block-explorer-response';
 import isNumber from 'lodash/isNumber';
 import { AllFilterOptions } from '../components/txs/tx-filter';
-import type { FilterOption } from '../components/txs/tx-filter';
+import { type FilterOption } from '../components/txs/tx-filter';
 import { BE_TXS_PER_REQUEST, getTxsDataUrl } from './get-txs-data-url';
 
 export function getTypeFilters(filters?: Set<FilterOption>) {
diff --git a/apps/explorer/src/app/routes/assets/asset-page.tsx b/apps/explorer/src/app/routes/assets/asset-page.tsx
index 9288bafab..ccf949100 100644
--- a/apps/explorer/src/app/routes/assets/asset-page.tsx
+++ b/apps/explorer/src/app/routes/assets/asset-page.tsx
@@ -9,11 +9,13 @@ import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
 import { useState } from 'react';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
+type Params = { assetId: string };
+
 export const AssetPage = () => {
   useDocumentTitle(['Assets']);
   useScrollToLocation();
 
-  const { assetId } = useParams<{ assetId: string }>();
+  const { assetId } = useParams<Params>();
   const { data, loading, error } = useAssetDataProvider(assetId || '');
 
   const title = data ? data.name : error ? t('Asset not found') : '';
@@ -41,7 +43,7 @@ export const AssetPage = () => {
           loading={loading}
           error={error}
         >
-          <div className="h-full relative">
+          <div className="relative h-full">
             <AssetDetailsTable asset={data as AssetFieldsFragment} />
           </div>
         </AsyncRenderer>
diff --git a/apps/explorer/src/app/routes/blocks/home/index.tsx b/apps/explorer/src/app/routes/blocks/home/index.tsx
index a92050a7d..abfa8f820 100644
--- a/apps/explorer/src/app/routes/blocks/home/index.tsx
+++ b/apps/explorer/src/app/routes/blocks/home/index.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useState } from 'react';
 import { DATA_SOURCES } from '../../../config';
-import type {
-  BlockMeta,
-  TendermintBlockchainResponse,
+import {
+  type BlockMeta,
+  type TendermintBlockchainResponse,
 } from '../tendermint-blockchain-response';
 import { RouteTitle } from '../../../components/route-title';
 import { BlocksRefetch } from '../../../components/blocks';
diff --git a/apps/explorer/src/app/routes/blocks/id/block.tsx b/apps/explorer/src/app/routes/blocks/id/block.tsx
index 888988b0a..7d54a7461 100644
--- a/apps/explorer/src/app/routes/blocks/id/block.tsx
+++ b/apps/explorer/src/app/routes/blocks/id/block.tsx
@@ -17,8 +17,10 @@ import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
 
+type Params = { block: string };
+
 const Block = () => {
-  const { block } = useParams<{ block: string }>();
+  const { block } = useParams<Params>();
   useDocumentTitle(['Blocks', `Block #${block}`]);
   const {
     state: { data: blockData, loading, error },
@@ -29,7 +31,7 @@ const Block = () => {
       <RouteTitle data-testid="block-header">{t(`BLOCK ${block}`)}</RouteTitle>
       <AsyncRenderer data={blockData} error={error} loading={!!loading}>
         <>
-          <div className="grid grid-cols-2 gap-2 mb-8">
+          <div className="mb-8 grid grid-cols-2 gap-2">
             <Link
               data-testid="previous-block"
               to={`/${Routes.BLOCKS}/${Number(block) - 1}`}
diff --git a/apps/explorer/src/app/routes/genesis/index.tsx b/apps/explorer/src/app/routes/genesis/index.tsx
index e7477b905..b87c7f7a8 100644
--- a/apps/explorer/src/app/routes/genesis/index.tsx
+++ b/apps/explorer/src/app/routes/genesis/index.tsx
@@ -3,7 +3,7 @@ import { useFetch } from '@vegaprotocol/react-helpers';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { DATA_SOURCES } from '../../config';
-import type { TendermintGenesisResponse } from './tendermint-genesis-response';
+import { type TendermintGenesisResponse } from './tendermint-genesis-response';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 
 const Genesis = () => {
diff --git a/apps/explorer/src/app/routes/markets/market-page.tsx b/apps/explorer/src/app/routes/markets/market-page.tsx
index dae69f227..4a1b21db3 100644
--- a/apps/explorer/src/app/routes/markets/market-page.tsx
+++ b/apps/explorer/src/app/routes/markets/market-page.tsx
@@ -11,10 +11,12 @@ import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
 import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
+type Params = { marketId: string };
+
 export const MarketPage = () => {
   useScrollToLocation();
 
-  const { marketId } = useParams<{ marketId: string }>();
+  const { marketId } = useParams<Params>();
 
   const { data, loading, error } = useDataProvider({
     dataProvider: marketInfoWithDataProvider,
diff --git a/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx b/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx
index fa1bbd45e..0bb02e8b0 100644
--- a/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx
+++ b/apps/explorer/src/app/routes/oracles/components/oracle-markets.tsx
@@ -1,8 +1,10 @@
 import { getNodes } from '@vegaprotocol/utils';
 import { MarketLink } from '../../../components/links';
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
-import type { ExplorerOracleForMarketsMarketFragment } from '../__generated__/OraclesForMarkets';
-import { useExplorerOracleFormMarketsQuery } from '../__generated__/OraclesForMarkets';
+import {
+  useExplorerOracleFormMarketsQuery,
+  type ExplorerOracleForMarketsMarketFragment,
+} from '../__generated__/OraclesForMarkets';
 
 interface OracleMarketsProps {
   id: string;
diff --git a/apps/explorer/src/app/routes/oracles/id/index.tsx b/apps/explorer/src/app/routes/oracles/id/index.tsx
index de979d949..52ccdf4d4 100644
--- a/apps/explorer/src/app/routes/oracles/id/index.tsx
+++ b/apps/explorer/src/app/routes/oracles/id/index.tsx
@@ -9,8 +9,10 @@ import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import filter from 'recursive-key-filter';
 import { TruncateInline } from '../../../components/truncate/truncate';
 
+type Params = { id: string };
+
 export const Oracle = () => {
-  const { id } = useParams<{ id: string }>();
+  const { id } = useParams<Params>();
 
   useDocumentTitle(['Oracle', `Oracle #${truncateByChars(id || '1', 5, 5)}`]);
 
diff --git a/apps/explorer/src/app/routes/parties/id/accounts/index.tsx b/apps/explorer/src/app/routes/parties/id/accounts/index.tsx
index 1a7ba9aa7..40c37acd5 100644
--- a/apps/explorer/src/app/routes/parties/id/accounts/index.tsx
+++ b/apps/explorer/src/app/routes/parties/id/accounts/index.tsx
@@ -6,8 +6,10 @@ import { useDocumentTitle } from '../../../../hooks/use-document-title';
 
 import { PartyAccounts } from '../components/party-accounts';
 
+type Params = { party: string };
+
 const PartyAccountsByAsset = () => {
-  const { party } = useParams<{ party: string }>();
+  const { party } = useParams<Params>();
 
   useDocumentTitle(['Public keys', party || '-']);
   const partyId = toNonHex(party ? party : '');
diff --git a/apps/explorer/src/app/routes/parties/id/index.tsx b/apps/explorer/src/app/routes/parties/id/index.tsx
index 196616fed..319d69101 100644
--- a/apps/explorer/src/app/routes/parties/id/index.tsx
+++ b/apps/explorer/src/app/routes/parties/id/index.tsx
@@ -19,11 +19,13 @@ import type { FilterOption } from '../../../components/txs/tx-filter';
 import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
 import { useSearchParams } from 'react-router-dom';
 
+type Params = { party: string };
+
 const Party = () => {
   const [params] = useSearchParams();
 
   const [filters, setFilters] = useState(new Set(AllFilterOptions));
-  const { party } = useParams<{ party: string }>();
+  const { party } = useParams<Params>();
 
   useDocumentTitle(['Public keys', party || '-']);
   const navigate = useNavigate();
@@ -60,7 +62,7 @@ const Party = () => {
 
   if (!isValidPartyId(partyId)) {
     return (
-      <div className="max-w-sm mx-auto">
+      <div className="mx-auto max-w-sm">
         <Notification
           message={t('Invalid party ID')}
           intent={Intent.Danger}
@@ -84,7 +86,7 @@ const Party = () => {
         truncateEnd={visibleChars}
       />
 
-      <div className="grid md:grid-flow-col grid-flow-row md:space-x-4 grid-cols-1 md:grid-cols-2 w-full">
+      <div className="grid w-full grid-flow-row grid-cols-1 md:grid-flow-col md:grid-cols-2 md:space-x-4">
         <PartyBlockAccounts
           accountError={AccountError}
           accountLoading={AccountLoading}
diff --git a/apps/explorer/src/app/routes/txs/id/index.tsx b/apps/explorer/src/app/routes/txs/id/index.tsx
index aa6e962a1..175aad293 100644
--- a/apps/explorer/src/app/routes/txs/id/index.tsx
+++ b/apps/explorer/src/app/routes/txs/id/index.tsx
@@ -4,13 +4,15 @@ import { useFetch } from '@vegaprotocol/react-helpers';
 import { DATA_SOURCES } from '../../../config';
 import { RenderFetched } from '../../../components/render-fetched';
 import { TxDetails } from './tx-details';
-import type { BlockExplorerTransaction } from '../../../routes/types/block-explorer-response';
+import { type BlockExplorerTransaction } from '../../../routes/types/block-explorer-response';
 import { toNonHex } from '../../../components/search/detect-search';
 import { PageHeader } from '../../../components/page-header';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 
+type Params = { txHash: string };
+
 const Tx = () => {
-  const { txHash } = useParams<{ txHash: string }>();
+  const { txHash } = useParams<Params>();
   const hash = txHash ? toNonHex(txHash) : '';
   let errorMessage: string | undefined = undefined;
 
diff --git a/apps/governance-e2e/.eslintrc.json b/apps/governance-e2e/.eslintrc.json
index 70128adc7..225e97426 100644
--- a/apps/governance-e2e/.eslintrc.json
+++ b/apps/governance-e2e/.eslintrc.json
@@ -1,6 +1,6 @@
 {
   "extends": ["plugin:cypress/recommended", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*"],
+  "ignorePatterns": ["!**/*", "cypress"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
diff --git a/apps/governance-e2e/src/integration/flow/proposal-details.cy.ts b/apps/governance-e2e/src/integration/flow/proposal-details.cy.ts
index dafde4ee4..c57424cb7 100644
--- a/apps/governance-e2e/src/integration/flow/proposal-details.cy.ts
+++ b/apps/governance-e2e/src/integration/flow/proposal-details.cy.ts
@@ -31,7 +31,7 @@ import {
   switchVegaWalletPubKey,
   vegaWalletSetSpecifiedApprovalAmount,
 } from '../../support/wallet-functions';
-import type { testFreeformProposal } from '../../support/common-interfaces';
+import { type testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
 import {
   createGovernanceTransferProposalTxBody,
diff --git a/apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts b/apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts
index d2bdf64f7..fbb115d34 100644
--- a/apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts
+++ b/apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts
@@ -34,7 +34,7 @@ import {
   vegaWalletTeardown,
 } from '../../support/wallet-functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import type { testFreeformProposal } from '../../support/common-interfaces';
+import { type testFreeformProposal } from '../../support/common-interfaces';
 
 const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
 const vegaWalletAssociatedBalance = 'associated-amount';
diff --git a/apps/governance-e2e/src/integration/flow/proposal-list.cy.ts b/apps/governance-e2e/src/integration/flow/proposal-list.cy.ts
index 01c10a424..e94c8200e 100644
--- a/apps/governance-e2e/src/integration/flow/proposal-list.cy.ts
+++ b/apps/governance-e2e/src/integration/flow/proposal-list.cy.ts
@@ -1,4 +1,4 @@
-import type { testFreeformProposal } from '../../support/common-interfaces';
+import { type testFreeformProposal } from '../../support/common-interfaces';
 import {
   navigateTo,
   navigation,
diff --git a/apps/governance/src/components/vega-wallet/hooks.ts b/apps/governance/src/components/vega-wallet/hooks.ts
index 569de10ec..df62a3d19 100644
--- a/apps/governance/src/components/vega-wallet/hooks.ts
+++ b/apps/governance/src/components/vega-wallet/hooks.ts
@@ -10,7 +10,7 @@ import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
 import vegaVesting from '../../images/vega_vesting.png';
 import { BigNumber } from '../../lib/bignumber';
-import type { WalletCardAssetProps } from '../wallet-card';
+import { type WalletCardAssetProps } from '../wallet-card';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useContracts } from '../../contexts/contracts/contracts-context';
 import * as Schema from '@vegaprotocol/types';
@@ -21,12 +21,12 @@ import {
   toBigNum,
 } from '@vegaprotocol/utils';
 import { useAppState } from '../../contexts/app-state/app-state-context';
-import type {
-  DelegationsQuery,
-  DelegationsQueryVariables,
-  WalletDelegationFieldsFragment,
+import {
+  DelegationsDocument,
+  type DelegationsQuery,
+  type DelegationsQueryVariables,
+  type WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
-import { DelegationsDocument } from './__generated__/Delegations';
 import { isPartyNotFoundError } from '../../lib/party';
 
 export const usePollForDelegations = () => {
@@ -44,6 +44,7 @@ export const usePollForDelegations = () => {
   const [delegatedNodes, setDelegatedNodes] = React.useState<
     {
       nodeId: string;
+      // eslint-disable-next-line
       name: string;
       hasStakePending: boolean;
       currentEpochStake?: BigNumber;
diff --git a/apps/governance/src/contexts/contracts/contracts-provider.tsx b/apps/governance/src/contexts/contracts/contracts-provider.tsx
index f4a4c470f..d416a674b 100644
--- a/apps/governance/src/contexts/contracts/contracts-provider.tsx
+++ b/apps/governance/src/contexts/contracts/contracts-provider.tsx
@@ -9,7 +9,7 @@ import { useWeb3React } from '@web3-react/core';
 import React from 'react';
 
 import { SplashLoader } from '../../components/splash-loader';
-import type { ContractsContextShape } from './contracts-context';
+import { type ContractsContextShape } from './contracts-context';
 import { ContractsContext } from './contracts-context';
 import { createDefaultProvider } from '../../lib/web3-connectors';
 import { useEthereumConfig } from '@vegaprotocol/web3';
diff --git a/apps/governance/src/routes/proposals/components/list-asset/list-asset.tsx b/apps/governance/src/routes/proposals/components/list-asset/list-asset.tsx
index c4dc20d62..41b49a713 100644
--- a/apps/governance/src/routes/proposals/components/list-asset/list-asset.tsx
+++ b/apps/governance/src/routes/proposals/components/list-asset/list-asset.tsx
@@ -1,4 +1,4 @@
-import type { CollateralBridge } from '@vegaprotocol/smart-contracts';
+import { type CollateralBridge } from '@vegaprotocol/smart-contracts';
 import * as Schema from '@vegaprotocol/types';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { useBridgeContract, useEthereumTransaction } from '@vegaprotocol/web3';
@@ -88,7 +88,7 @@ export const ListAsset = ({
     assetData.erc20ListAssetBundle;
   return (
     <div className="mb-8">
-      <h3 className="text-xl mb-2">{t('ListAsset')}</h3>
+      <h3 className="mb-2 text-xl">{t('ListAsset')}</h3>
       <p className="pr-8">{t('ListAssetDescription')}</p>
       <EthWalletContainer>
         <Button
diff --git a/apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx b/apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx
index 92c3859eb..49e81d914 100644
--- a/apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx
+++ b/apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx
@@ -4,7 +4,7 @@ import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { FinalizedVote } from '@vegaprotocol/proposals';
+import { type FinalizedVote } from '@vegaprotocol/proposals';
 
 export enum VoteState {
   NotCast = 'NotCast',
diff --git a/apps/governance/src/routes/proposals/proposals/proposals-container.tsx b/apps/governance/src/routes/proposals/proposals/proposals-container.tsx
index 187633f4b..0dd21bd04 100644
--- a/apps/governance/src/routes/proposals/proposals/proposals-container.tsx
+++ b/apps/governance/src/routes/proposals/proposals/proposals-container.tsx
@@ -5,15 +5,17 @@ import { useTranslation } from 'react-i18next';
 
 import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
-import { useProposalsQuery } from './__generated__/Proposals';
 import { getNodes, removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   ProposalState,
   ProtocolUpgradeProposalStatus,
 } from '@vegaprotocol/types';
-import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
-import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type NodeConnection, type NodeEdge } from '@vegaprotocol/utils';
+import {
+  useProposalsQuery,
+  type ProposalFieldsFragment,
+} from './__generated__/Proposals';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 import { FLAGS } from '@vegaprotocol/environment';
 
diff --git a/apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts b/apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts
index 6eb6ae9ad..83b0251f4 100644
--- a/apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts
+++ b/apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts
@@ -5,9 +5,9 @@ import * as faker from 'faker';
 import isArray from 'lodash/isArray';
 import mergeWith from 'lodash/mergeWith';
 
-import type { PartialDeep } from 'type-fest';
-import type { ProposalQuery } from '../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { type PartialDeep } from 'type-fest';
+import { type ProposalQuery } from '../proposal/__generated__/Proposal';
+import { type ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 export function generateProtocolUpgradeProposal(
   override: PartialDeep<ProtocolUpgradeProposalFieldsFragment> = {}
diff --git a/apps/governance/src/routes/redemption/home/redemption-information.tsx b/apps/governance/src/routes/redemption/home/redemption-information.tsx
index 6072e98f5..37fc034c6 100644
--- a/apps/governance/src/routes/redemption/home/redemption-information.tsx
+++ b/apps/governance/src/routes/redemption/home/redemption-information.tsx
@@ -22,11 +22,13 @@ interface UserBalances {
   balance: BigNumber;
 }
 
+type Params = { address: string };
+
 export const RedemptionInformation = () => {
   const { t } = useTranslation();
   const navigate = useNavigate();
   const tranches = useTranches((state) => state.tranches);
-  const { address } = useParams<{ address: string }>();
+  const { address } = useParams<Params>();
   const [userBalances, setUserBalances] = useState<null | UserBalances>();
   const getUsersBalances = useGetUserBalances(address);
   useEffect(() => {
@@ -84,7 +86,7 @@ export const RedemptionInformation = () => {
               i18nKey="noVestingTokens"
               components={{
                 tranchesLink: (
-                  <Link className="underline text-white" to={Routes.SUPPLY} />
+                  <Link className="text-white underline" to={Routes.SUPPLY} />
                 ),
               }}
             />
@@ -160,7 +162,7 @@ export const RedemptionInformation = () => {
         intent={Intent.Warning}
       >
         <p>{t('Find out more about Staking.')}</p>
-        <Link to={Routes.VALIDATORS} className="underline text-white">
+        <Link to={Routes.VALIDATORS} className="text-white underline">
           {t('Stake VEGA tokens')}
         </Link>
       </Callout>
diff --git a/apps/governance/src/routes/redemption/redemption.tsx b/apps/governance/src/routes/redemption/redemption.tsx
index bd5f8ba51..efe2ab5a7 100644
--- a/apps/governance/src/routes/redemption/redemption.tsx
+++ b/apps/governance/src/routes/redemption/redemption.tsx
@@ -21,9 +21,10 @@ import RoutesConfig from '../routes';
 interface FormFields {
   address: string;
 }
+type Params = { address: string };
 
 const RedemptionRouter = () => {
-  const { address } = useParams<{ address: string }>();
+  const { address } = useParams<Params>();
   const navigate = useNavigate();
   const { t } = useTranslation();
   const validatePubkey = useCallback(
@@ -89,7 +90,7 @@ const RedemptionRouter = () => {
             {t('View connected Eth Wallet')}
           </Button>
         )}
-        <p className="py-4 flex justify-center">{t('OR')}</p>
+        <p className="flex justify-center py-4">{t('OR')}</p>
         <form
           onSubmit={handleSubmit(onSubmit)}
           data-testid="view-connector-form"
diff --git a/apps/governance/src/routes/redemption/tranche/index.tsx b/apps/governance/src/routes/redemption/tranche/index.tsx
index 15bf0198a..f077e5e3f 100644
--- a/apps/governance/src/routes/redemption/tranche/index.tsx
+++ b/apps/governance/src/routes/redemption/tranche/index.tsx
@@ -21,6 +21,8 @@ import { EthConnectPrompt } from '../../../components/eth-connect-prompt';
 import { useUserTrancheBalances } from '../hooks';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 
+type Params = { id: string };
+
 export const RedeemFromTranche = () => {
   const { account: address } = useWeb3React();
   const { vesting } = useContracts();
@@ -34,7 +36,7 @@ export const RedeemFromTranche = () => {
     tranches: state.tranches,
     getTranches: state.getTranches,
   }));
-  const { id } = useParams<{ id: string }>();
+  const { id } = useParams<Params>();
   const numberId = Number(id);
   const tranche = React.useMemo(
     () => tranches?.find(({ tranche_id }) => tranche_id === numberId) || null,
@@ -86,7 +88,7 @@ export const RedeemFromTranche = () => {
             i18nKey="noVestingTokens"
             components={{
               tranchesLink: (
-                <Link className="underline text-white" to={Routes.SUPPLY} />
+                <Link className="text-white underline" to={Routes.SUPPLY} />
               ),
             }}
           />
@@ -128,13 +130,13 @@ export const RedeemFromTranche = () => {
                   components={{
                     stakingLink: (
                       <Link
-                        className="underline text-white"
+                        className="text-white underline"
                         to={Routes.VALIDATORS}
                       />
                     ),
                     governanceLink: (
                       <Link
-                        className="underline text-white"
+                        className="text-white underline"
                         to={Routes.PROPOSALS}
                       />
                     ),
diff --git a/apps/governance/src/routes/staking/associate/hooks.ts b/apps/governance/src/routes/staking/associate/hooks.ts
index 394fb7918..d42fe8b09 100644
--- a/apps/governance/src/routes/staking/associate/hooks.ts
+++ b/apps/governance/src/routes/staking/associate/hooks.ts
@@ -11,12 +11,12 @@ import { useTransaction } from '../../../hooks/use-transaction';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 import { removeDecimal, removePaginationWrapper } from '@vegaprotocol/utils';
 import * as Schema from '@vegaprotocol/types';
-import type {
-  LinkingsFieldsFragment,
-  PartyStakeLinkingsQuery,
-  PartyStakeLinkingsQueryVariables,
+import {
+  PartyStakeLinkingsDocument,
+  type LinkingsFieldsFragment,
+  type PartyStakeLinkingsQuery,
+  type PartyStakeLinkingsQueryVariables,
 } from './__generated__/PartyStakeLinkings';
-import { PartyStakeLinkingsDocument } from './__generated__/PartyStakeLinkings';
 
 export const useAddStake = (
   address: string,
diff --git a/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx b/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx
index 2a07ddc76..6fb29be83 100644
--- a/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx
+++ b/apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx
@@ -26,9 +26,9 @@ import {
   ValidatorRenderer,
   VotingPowerRenderer,
 } from './shared';
-import type { AgGridReact } from 'ag-grid-react';
-import type { ColDef, RowHeightParams } from 'ag-grid-community';
-import type { ValidatorsTableProps } from './shared';
+import { type AgGridReact } from 'ag-grid-react';
+import { type ColDef, type RowHeightParams } from 'ag-grid-community';
+import { type ValidatorsTableProps } from './shared';
 import {
   formatNumber,
   formatNumberPercentage,
@@ -83,19 +83,19 @@ const TopThirdCellRenderer = (
         e.preventDefault();
         setHideTopThird(false);
       }}
-      className="grid grid-cols-[60px_1fr] w-full h-full py-4 px-0 text-sm text-white text-center overflow-scroll"
+      className="grid h-full w-full grid-cols-[60px_1fr] overflow-scroll px-0 py-4 text-center text-sm text-white"
     >
-      <div className="px-3 text-xs text-left">
+      <div className="px-3 text-left text-xs">
         {params?.data?.rankingDisplay}
       </div>
-      <div className="px-3 whitespace-normal">
+      <div className="whitespace-normal px-3">
         <div className="mb-4">
           <Button
             data-testid="show-all-validators"
             rightIcon={
               <Icon
                 name="arrow-right"
-                className="mr-2 align-text-top fill-current"
+                className="mr-2 fill-current align-text-top"
               />
             }
             className="inline-flex items-center"
diff --git a/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx b/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx
index 164f29b4f..4c6bfa6e9 100644
--- a/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx
+++ b/apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx
@@ -22,9 +22,9 @@ import {
   PendingStakeRenderer,
   VotingPowerRenderer,
 } from './shared';
-import type { AgGridReact } from 'ag-grid-react';
-import type { ColDef } from 'ag-grid-community';
-import type { ValidatorsTableProps } from './shared';
+import { type AgGridReact } from 'ag-grid-react';
+import { type ColDef } from 'ag-grid-community';
+import { type ValidatorsTableProps } from './shared';
 import {
   formatNumber,
   formatNumberPercentage,
diff --git a/apps/governance/src/routes/staking/node/node.tsx b/apps/governance/src/routes/staking/node/node.tsx
index 24c357181..1fdaeebd0 100644
--- a/apps/governance/src/routes/staking/node/node.tsx
+++ b/apps/governance/src/routes/staking/node/node.tsx
@@ -28,12 +28,14 @@ interface StakingNodeProps {
   previousEpochData?: PreviousEpochQuery;
 }
 
+type Params = { node: string };
+
 export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
   const { pubKey: vegaKey } = useVegaWallet();
   const {
     appState: { decimals },
   } = useAppState();
-  const { node } = useParams<{ node: string }>();
+  const { node } = useParams<Params>();
   const { t } = useTranslation();
 
   const { nodeInfo, currentEpoch, delegations } = React.useMemo(
diff --git a/apps/governance/src/routes/tranches/tranche.tsx b/apps/governance/src/routes/tranches/tranche.tsx
index 0bc5ed8b5..c9598f828 100644
--- a/apps/governance/src/routes/tranches/tranche.tsx
+++ b/apps/governance/src/routes/tranches/tranche.tsx
@@ -16,10 +16,12 @@ import Routes from '../routes';
 import { TrancheLabel } from './tranche-label';
 import { useTranches } from '../../lib/tranches/tranches-store';
 
+type Params = { trancheId: string; address: string };
+
 export const Tranche = () => {
   const tranches = useTranches((state) => state.tranches);
   const { t } = useTranslation();
-  const { trancheId } = useParams<{ trancheId: string; address: string }>();
+  const { trancheId } = useParams<Params>();
   const { chainId } = useWeb3React();
   const tranche = tranches?.find(
     (tranche) => trancheId && parseInt(trancheId) === tranche.tranche_id
@@ -41,7 +43,7 @@ export const Tranche = () => {
         }
       />
       <div
-        className="flex justify-between gap-x-4 py-2 px-4"
+        className="flex justify-between gap-x-4 px-4 py-2"
         data-testid="redeemed-tranche-tokens"
       >
         <span>{t('alreadyRedeemed')}</span>
diff --git a/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx b/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx
index 80c31ac8a..0ad2c2446 100644
--- a/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx
+++ b/apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx
@@ -1,5 +1,5 @@
 import { DApp, useLinks } from '@vegaprotocol/environment';
-import type { Market } from '@vegaprotocol/liquidity';
+import { type Market } from '@vegaprotocol/liquidity';
 import {
   displayChange,
   formatWithAsset,
@@ -12,7 +12,7 @@ import {
   toBigNum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid';
+import { type VegaValueFormatterParams } from '@vegaprotocol/datagrid';
 import { PriceChangeCell } from '@vegaprotocol/datagrid';
 import type * as Schema from '@vegaprotocol/types';
 import {
@@ -21,10 +21,10 @@ import {
   HealthBar,
   TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import type {
-  GetRowIdParams,
-  RowClickedEvent,
-  ColDef,
+import {
+  type GetRowIdParams,
+  type RowClickedEvent,
+  type ColDef,
 } from 'ag-grid-community';
 import 'ag-grid-community/styles/ag-grid.css';
 import 'ag-grid-community/styles/ag-theme-alpine.css';
@@ -253,7 +253,7 @@ export const MarketList = () => {
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
       <div
-        className="grow w-full"
+        className="w-full grow"
         style={{ minHeight: 500, overflow: 'hidden' }}
       >
         <Grid
diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx
index 0bde50b49..846ccfaf6 100644
--- a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx
+++ b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx
@@ -60,19 +60,21 @@ const useMarketDetails = (marketId: string | undefined) => {
   };
 };
 
+type Params = { marketId: string };
+
 export const Detail = () => {
-  const { marketId } = useParams<{ marketId: string }>();
+  const { marketId } = useParams<Params>();
   const { data, loading, error } = useMarketDetails(marketId);
 
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
-      <div className="px-16 pt-14 pb-12 bg-greys-light-100">
-        <div className="max-w-screen-xl mx-auto">
+      <div className="bg-greys-light-100 px-16 pb-12 pt-14">
+        <div className="mx-auto max-w-screen-xl">
           <Header name={data.name} symbol={data.symbol} />
         </div>
       </div>
       <div className="px-16">
-        <div className="max-w-screen-xl mx-auto">
+        <div className="mx-auto max-w-screen-xl">
           <div className="py-12">
             {marketId && (
               <Market
@@ -86,7 +88,7 @@ export const Detail = () => {
             )}
           </div>
           <div>
-            <h2 className="font-alpha calt text-2xl mb-4">
+            <h2 className="font-alpha calt mb-4 text-2xl">
               {t('Current Liquidity Provision')}
             </h2>
             <LPProvidersGrid
diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx
index 4186a135e..1c9915deb 100644
--- a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx
+++ b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx
@@ -1,11 +1,11 @@
 import { useCallback, useMemo } from 'react';
 
-import type { GetRowIdParams, ColDef } from 'ag-grid-community';
+import { type GetRowIdParams, type ColDef } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';
 
-import type {
-  LiquidityProviderFeeShareFieldsFragment,
-  LiquidityProvisionFieldsFragment,
+import {
+  type LiquidityProviderFeeShareFieldsFragment,
+  type LiquidityProvisionFieldsFragment,
 } from '@vegaprotocol/liquidity';
 import { formatWithAsset } from '@vegaprotocol/liquidity';
 
diff --git a/apps/liquidity-provision-dashboard/src/app/components/grid/grid.tsx b/apps/liquidity-provision-dashboard/src/app/components/grid/grid.tsx
index a94b515d4..8483b97af 100644
--- a/apps/liquidity-provision-dashboard/src/app/components/grid/grid.tsx
+++ b/apps/liquidity-provision-dashboard/src/app/components/grid/grid.tsx
@@ -1,9 +1,9 @@
 import { useRef, useCallback, useEffect } from 'react';
 import { AgGridReact } from 'ag-grid-react';
-import type {
-  AgGridReactProps,
-  AgReactUiProps,
-  AgGridReact as AgGridReactType,
+import {
+  type AgGridReactProps,
+  type AgReactUiProps,
+  type AgGridReact as AgGridReactType,
 } from 'ag-grid-react';
 import classNames from 'classnames';
 import 'ag-grid-community/styles/ag-grid.css';
@@ -34,7 +34,7 @@ export const Grid = ({ isRowClickable, ...props }: Props) => {
 
   return (
     <AgGridReact
-      className={classNames('ag-theme-alpine h-full font-alpha calt', {
+      className={classNames('ag-theme-alpine font-alpha calt h-full', {
         'row-hover': isRowClickable,
       })}
       rowHeight={92}
diff --git a/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx b/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx
index 997c536a8..114b7e86f 100644
--- a/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx
+++ b/apps/multisig-signer/src/app/components/add-signer-form/add-signer-form.tsx
@@ -11,12 +11,12 @@ import {
   Loader,
 } from '@vegaprotocol/ui-toolkit';
 import { useContracts } from '../../config/contracts/contracts-context';
-import type { FormEvent } from 'react';
-import type {
-  AddSignerBundle,
-  AddSignerBundleVariables,
+import { type FormEvent } from 'react';
+import {
+  type AddSignerBundle,
+  type AddSignerBundleVariables,
 } from '../__generated__/AddSignerBundle';
-import type { MultisigControl } from '@vegaprotocol/smart-contracts';
+import { type MultisigControl } from '@vegaprotocol/smart-contracts';
 
 export const ADD_SIGNER_QUERY = gql`
   query AddSignerBundle($nodeId: ID!) {
diff --git a/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx b/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx
index a6628430a..b0e5154b5 100644
--- a/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx
+++ b/apps/multisig-signer/src/app/components/remove-signer-form/remove-signer-form.tsx
@@ -11,12 +11,12 @@ import {
   Loader,
 } from '@vegaprotocol/ui-toolkit';
 import { useContracts } from '../../config/contracts/contracts-context';
-import type { FormEvent } from 'react';
-import type {
-  RemoveSignerBundle,
-  RemoveSignerBundleVariables,
+import { type FormEvent } from 'react';
+import {
+  type RemoveSignerBundle,
+  type RemoveSignerBundleVariables,
 } from '../__generated__/RemoveSignerBundle';
-import type { MultisigControl } from '@vegaprotocol/smart-contracts';
+import { type MultisigControl } from '@vegaprotocol/smart-contracts';
 
 const REMOVE_SIGNER_QUERY = gql`
   query RemoveSignerBundle($nodeId: ID!) {
diff --git a/apps/multisig-signer/src/app/config/contracts/contracts-provider.tsx b/apps/multisig-signer/src/app/config/contracts/contracts-provider.tsx
index 2e873e96a..5d726e07e 100644
--- a/apps/multisig-signer/src/app/config/contracts/contracts-provider.tsx
+++ b/apps/multisig-signer/src/app/config/contracts/contracts-provider.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import { MultisigControl } from '@vegaprotocol/smart-contracts';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import type { ContractsContextShape } from './contracts-context';
+import { type ContractsContextShape } from './contracts-context';
 import { ContractsContext } from './contracts-context';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useEnvironment } from '@vegaprotocol/environment';
diff --git a/libs/accounts/src/lib/accounts-data-provider.ts b/libs/accounts/src/lib/accounts-data-provider.ts
index 5eec79ec3..22beff01b 100644
--- a/libs/accounts/src/lib/accounts-data-provider.ts
+++ b/libs/accounts/src/lib/accounts-data-provider.ts
@@ -6,22 +6,18 @@ import {
   makeDerivedDataProvider,
 } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';
-import type { Market } from '@vegaprotocol/markets';
+import { type Market } from '@vegaprotocol/markets';
 import produce from 'immer';
-
+import { type IterableElement } from 'type-fest';
 import {
   AccountEventsDocument,
   AccountsDocument,
-} from './__generated__/Accounts';
-
-import type { IterableElement } from 'type-fest';
-import type {
   AccountFieldsFragment,
   AccountsQuery,
   AccountEventsSubscription,
   AccountsQueryVariables,
 } from './__generated__/Accounts';
-import type { Asset } from '@vegaprotocol/assets';
+import { type Asset } from '@vegaprotocol/assets';
 
 const AccountType = Schema.AccountType;
 
diff --git a/libs/accounts/src/lib/accounts-manager.tsx b/libs/accounts/src/lib/accounts-manager.tsx
index a05a74094..2a551d2eb 100644
--- a/libs/accounts/src/lib/accounts-manager.tsx
+++ b/libs/accounts/src/lib/accounts-manager.tsx
@@ -2,16 +2,16 @@ import { useRef, memo, useState, useCallback } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 import {
   aggregatedAccountsDataProvider,
   aggregatedAccountDataProvider,
 } from './accounts-data-provider';
-import type { PinnedAsset } from './accounts-table';
+import { type PinnedAsset } from './accounts-table';
 import { AccountTable } from './accounts-table';
 import { Dialog } from '@vegaprotocol/ui-toolkit';
 import BreakdownTable from './breakdown-table';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
+import { type useDataGridEvents } from '@vegaprotocol/datagrid';
 
 const AccountBreakdown = ({
   assetId,
@@ -37,10 +37,10 @@ const AccountBreakdown = ({
 
   return (
     <div
-      className="h-[35vh] w-full m-auto flex flex-col"
+      className="m-auto flex h-[35vh] w-full flex-col"
       data-testid="usage-breakdown"
     >
-      <h1 className="text-xl mb-4">
+      <h1 className="mb-4 text-xl">
         {data?.asset?.symbol} {t('usage breakdown')}
       </h1>
       {data && (
diff --git a/libs/accounts/src/lib/breakdown-table.tsx b/libs/accounts/src/lib/breakdown-table.tsx
index cd7df26bf..7c88645eb 100644
--- a/libs/accounts/src/lib/breakdown-table.tsx
+++ b/libs/accounts/src/lib/breakdown-table.tsx
@@ -5,12 +5,12 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { Intent, TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
-import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
-import type { AccountFields } from './accounts-data-provider';
+import { type AgGridReact, type AgGridReactProps } from 'ag-grid-react';
+import { type AccountFields } from './accounts-data-provider';
 import { AccountTypeMapping } from '@vegaprotocol/types';
-import type {
-  VegaValueFormatterParams,
-  VegaICellRendererParams,
+import {
+  type VegaValueFormatterParams,
+  type VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
 import { ProgressBarCell } from '@vegaprotocol/datagrid';
 import { AgGrid, PriceCell } from '@vegaprotocol/datagrid';
diff --git a/libs/accounts/src/lib/margin-data-provider.ts b/libs/accounts/src/lib/margin-data-provider.ts
index 7e59da2f2..54c0c1572 100644
--- a/libs/accounts/src/lib/margin-data-provider.ts
+++ b/libs/accounts/src/lib/margin-data-provider.ts
@@ -7,12 +7,10 @@ import {
 import {
   MarginsSubscriptionDocument,
   MarginsDocument,
-} from './__generated__/Margins';
-import type {
-  MarginsQuery,
-  MarginFieldsFragment,
-  MarginsSubscriptionSubscription,
-  MarginsQueryVariables,
+  type MarginsQuery,
+  type MarginFieldsFragment,
+  type MarginsSubscriptionSubscription,
+  type MarginsQueryVariables,
 } from './__generated__/Margins';
 
 const update = (
diff --git a/libs/assets/src/lib/asset-data-provider.ts b/libs/assets/src/lib/asset-data-provider.ts
index 9c9018860..1bc29ade4 100644
--- a/libs/assets/src/lib/asset-data-provider.ts
+++ b/libs/assets/src/lib/asset-data-provider.ts
@@ -1,9 +1,9 @@
 import { makeDataProvider, useDataProvider } from '@vegaprotocol/data-provider';
 
-import type {
-  AssetQuery,
-  AssetFieldsFragment,
-  AssetQueryVariables,
+import {
+  type AssetQuery,
+  type AssetQueryVariables,
+  type AssetFieldsFragment,
 } from './__generated__/Asset';
 import { AssetDocument } from './__generated__/Asset';
 
diff --git a/libs/assets/src/lib/assets-data-provider.ts b/libs/assets/src/lib/assets-data-provider.ts
index 09a01c3b0..7a9f5c57f 100644
--- a/libs/assets/src/lib/assets-data-provider.ts
+++ b/libs/assets/src/lib/assets-data-provider.ts
@@ -3,10 +3,9 @@ import {
   makeDerivedDataProvider,
 } from '@vegaprotocol/data-provider';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { AssetsDocument } from './__generated__/Assets';
+import { AssetsDocument, type AssetsQuery } from './__generated__/Assets';
 import { AssetStatus } from '@vegaprotocol/types';
-import type { AssetsQuery } from './__generated__/Assets';
-import type { Asset } from './asset-data-provider';
+import { type Asset } from './asset-data-provider';
 import { DENY_LIST } from './constants';
 
 export interface BuiltinAssetSource {
diff --git a/libs/candles-chart/src/lib/candles-menu.tsx b/libs/candles-chart/src/lib/candles-menu.tsx
index 06d83fbb3..55bd36ea5 100644
--- a/libs/candles-chart/src/lib/candles-menu.tsx
+++ b/libs/candles-chart/src/lib/candles-menu.tsx
@@ -20,7 +20,7 @@ import {
   TradingDropdownTrigger,
   Icon,
 } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@blueprintjs/icons';
+import { type IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
 import { t } from '@vegaprotocol/i18n';
 import { useCandlesChartSettings } from './use-candles-chart-settings';
diff --git a/libs/candles-chart/src/lib/data-source.ts b/libs/candles-chart/src/lib/data-source.ts
index 21de68c79..2bdb0441e 100644
--- a/libs/candles-chart/src/lib/data-source.ts
+++ b/libs/candles-chart/src/lib/data-source.ts
@@ -1,29 +1,33 @@
-import type { ApolloClient } from '@apollo/client';
-import type { Duration } from 'date-fns';
+import { type ApolloClient } from '@apollo/client';
+import { type Duration } from 'date-fns';
 import {
   add,
   differenceInDays,
   differenceInHours,
   differenceInMinutes,
 } from 'date-fns';
-import type { Candle, DataSource, PriceMonitoringBounds } from 'pennant';
+import {
+  type Candle,
+  type DataSource,
+  type PriceMonitoringBounds,
+} from 'pennant';
 import { Interval as PennantInterval } from 'pennant';
-
 import { addDecimal } from '@vegaprotocol/utils';
-import { ChartDocument } from './__generated__/Chart';
-import type { ChartQuery, ChartQueryVariables } from './__generated__/Chart';
+import {
+  ChartDocument,
+  type ChartQuery,
+  type ChartQueryVariables,
+} from './__generated__/Chart';
 import {
   CandlesDocument,
   CandlesEventsDocument,
+  type CandlesQuery,
+  type CandlesQueryVariables,
+  type CandlesEventsSubscription,
+  type CandlesEventsSubscriptionVariables,
+  type CandleFieldsFragment,
 } from './__generated__/Candles';
-import type {
-  CandlesQuery,
-  CandlesQueryVariables,
-  CandleFieldsFragment,
-  CandlesEventsSubscription,
-  CandlesEventsSubscriptionVariables,
-} from './__generated__/Candles';
-import type { Subscription } from 'zen-observable-ts';
+import { type Subscription } from 'zen-observable-ts';
 import * as Schema from '@vegaprotocol/types';
 
 const INTERVAL_TO_PENNANT_MAP = {
diff --git a/libs/data-provider/src/generic-data-provider.spec.ts b/libs/data-provider/src/generic-data-provider.spec.ts
index 3bf82bd50..c4f349ae8 100644
--- a/libs/data-provider/src/generic-data-provider.spec.ts
+++ b/libs/data-provider/src/generic-data-provider.spec.ts
@@ -3,29 +3,29 @@ import {
   makeDerivedDataProvider,
   defaultAppend,
 } from './generic-data-provider';
-import type {
-  CombineDerivedData,
-  CombineDerivedDelta,
-  CombineInsertionData,
-  Query,
-  UpdateCallback,
-  Update,
-  PageInfo,
-  Reload,
-  Load,
+import {
+  type CombineDerivedData,
+  type CombineDerivedDelta,
+  type CombineInsertionData,
+  type UpdateCallback,
+  type Update,
+  type Query,
+  type PageInfo,
+  type Reload,
+  type Load,
 } from './generic-data-provider';
-import type {
-  ApolloClient,
-  FetchResult,
-  SubscriptionOptions,
-  OperationVariables,
-  ApolloQueryResult,
-  QueryOptions,
+import {
+  type FetchResult,
+  type SubscriptionOptions,
+  type OperationVariables,
+  type ApolloQueryResult,
+  type QueryOptions,
+  type ApolloClient,
 } from '@apollo/client';
 import { ApolloError } from '@apollo/client';
 import type { GraphQLErrors } from '@apollo/client/errors';
 import { GraphQLError } from 'graphql';
-import type { Subscription, Observable } from 'zen-observable-ts';
+import { Subscription, Observable } from 'zen-observable-ts';
 import { waitFor } from '@testing-library/react';
 
 type Item = {
diff --git a/libs/data-provider/src/pagination.ts b/libs/data-provider/src/pagination.ts
index be9686b11..1e4d19cbe 100644
--- a/libs/data-provider/src/pagination.ts
+++ b/libs/data-provider/src/pagination.ts
@@ -1,5 +1,10 @@
 import type { IGetRowsParams } from 'ag-grid-community';
-import type { Load, DerivedPart, Node, Edge } from './generic-data-provider';
+import {
+  type Edge,
+  type Load,
+  type DerivedPart,
+  type Node,
+} from './generic-data-provider';
 import type { MutableRefObject } from 'react';
 
 const getLastRow = (
diff --git a/libs/data-provider/src/use-data-provider.spec.ts b/libs/data-provider/src/use-data-provider.spec.ts
index b999f89da..a137b012b 100644
--- a/libs/data-provider/src/use-data-provider.spec.ts
+++ b/libs/data-provider/src/use-data-provider.spec.ts
@@ -1,7 +1,10 @@
 import { renderHook, act } from '@testing-library/react';
-import { useDataProvider, useThrottledDataProvider } from './use-data-provider';
-import type { useDataProviderParams } from './use-data-provider';
-import type { Subscribe, UpdateCallback } from './generic-data-provider';
+import {
+  useDataProvider,
+  useThrottledDataProvider,
+  type useDataProviderParams,
+} from './use-data-provider';
+import { type Subscribe, type UpdateCallback } from './generic-data-provider';
 import { MockedProvider } from '@apollo/client/testing';
 
 type Data = number;
diff --git a/libs/data-provider/src/use-data-provider.ts b/libs/data-provider/src/use-data-provider.ts
index 6344d29d2..af5aee9d8 100644
--- a/libs/data-provider/src/use-data-provider.ts
+++ b/libs/data-provider/src/use-data-provider.ts
@@ -3,11 +3,11 @@ import throttle from 'lodash/throttle';
 import isEqualWith from 'lodash/isEqualWith';
 import { useApolloClient } from '@apollo/client';
 import type { OperationVariables } from '@apollo/client';
-import type {
-  Subscribe,
-  Load,
-  UpdateCallback,
-  PageInfo,
+import {
+  type UpdateCallback,
+  type PageInfo,
+  type Subscribe,
+  type Load,
 } from './generic-data-provider';
 import { variablesIsEqualCustomizer } from './generic-data-provider';
 
diff --git a/libs/datagrid/src/lib/ag-grid/ag-grid.tsx b/libs/datagrid/src/lib/ag-grid/ag-grid.tsx
index 2f0d99c1a..a2d0bdf21 100644
--- a/libs/datagrid/src/lib/ag-grid/ag-grid.tsx
+++ b/libs/datagrid/src/lib/ag-grid/ag-grid.tsx
@@ -1,5 +1,5 @@
 import { forwardRef } from 'react';
-import type { AgGridReactProps, AgGridReact } from 'ag-grid-react';
+import { type AgGridReactProps, type AgGridReact } from 'ag-grid-react';
 import { AgGridThemed } from './ag-grid-themed';
 
 type Props = AgGridReactProps & {
diff --git a/libs/datagrid/src/lib/filters/date-range-filter.tsx b/libs/datagrid/src/lib/filters/date-range-filter.tsx
index 364d8289f..48b1295e1 100644
--- a/libs/datagrid/src/lib/filters/date-range-filter.tsx
+++ b/libs/datagrid/src/lib/filters/date-range-filter.tsx
@@ -1,6 +1,6 @@
 import type { ChangeEvent } from 'react';
 import { useEffect, useMemo, useRef } from 'react';
-import type * as Schema from '@vegaprotocol/types';
+import { type DateRange } from '@vegaprotocol/types';
 import { forwardRef, useImperativeHandle, useState } from 'react';
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
 import {
@@ -17,9 +17,9 @@ import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { TradingInputError } from '@vegaprotocol/ui-toolkit';
 
-const defaultValue: Schema.DateRange = {};
+const defaultValue: DateRange = {};
 export interface DateRangeFilterProps extends IFilterParams {
-  defaultValue?: Schema.DateRange;
+  defaultValue?: DateRange;
   maxSubDays?: number;
   maxNextDays?: number;
   maxDaysRange?: number;
@@ -28,8 +28,8 @@ export interface DateRangeFilterProps extends IFilterParams {
 export const DateRangeFilter = forwardRef(
   (props: DateRangeFilterProps, ref) => {
     const defaultDates = props?.defaultValue || defaultValue;
-    const [value, setValue] = useState<Schema.DateRange>(defaultDates);
-    const valueRef = useRef<Schema.DateRange>(value);
+    const [value, setValue] = useState<DateRange>(defaultDates);
+    const valueRef = useRef<DateRange>(value);
     const [error, setError] = useState<string>('');
     const [minStartDate, maxStartDate, minEndDate, maxEndDate] = useMemo(() => {
       const minStartDate =
@@ -105,18 +105,14 @@ export const DateRangeFilter = forwardRef(
           return { value: valueRef.current };
         },
 
-        setModel(model?: { value: Schema.DateRange } | null) {
+        setModel(model?: { value: DateRange } | null) {
           valueRef.current =
             model?.value || props?.defaultValue || defaultValue;
           setValue(valueRef.current);
         },
       };
     });
-    const validate = (
-      name: string,
-      timeValue: Date,
-      update?: Schema.DateRange
-    ) => {
+    const validate = (name: string, timeValue: Date, update?: DateRange) => {
       if (
         props.maxSubDays !== undefined &&
         isBefore(new Date(timeValue), subDays(Date.now(), props.maxSubDays + 1))
@@ -209,7 +205,7 @@ export const DateRangeFilter = forwardRef(
         <div className="ag-filter-apply-panel">
           <fieldset className="ag-simple-filter-body-wrapper">
             <label className="block" key="start">
-              <span className="block mb-1">{t('Start')}</span>
+              <span className="mb-1 block">{t('Start')}</span>
               <input
                 type="datetime-local"
                 name="start"
@@ -222,7 +218,7 @@ export const DateRangeFilter = forwardRef(
           </fieldset>
           <fieldset className="ag-simple-filter-body-wrapper">
             <label className="block" key="end">
-              <span className="block mb-1">{t('End')}</span>
+              <span className="mb-1 block">{t('End')}</span>
               <input
                 type="datetime-local"
                 name="end"
diff --git a/libs/datagrid/src/lib/use-datagrid-events.spec.tsx b/libs/datagrid/src/lib/use-datagrid-events.spec.tsx
index fb2a51aa0..f9ce82193 100644
--- a/libs/datagrid/src/lib/use-datagrid-events.spec.tsx
+++ b/libs/datagrid/src/lib/use-datagrid-events.spec.tsx
@@ -3,7 +3,7 @@ import { useDataGridEvents } from './use-datagrid-events';
 import { AgGridThemed } from './ag-grid/ag-grid-themed';
 import type { MutableRefObject } from 'react';
 import { useRef } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 
 const gridProps = {
   rowData: [{ id: 1 }],
@@ -17,7 +17,7 @@ const gridProps = {
   style: { width: 500, height: 300 },
 };
 const GRID_EVENT_DEBOUNCE_TIME = 300;
-let gridRef: MutableRefObject<AgGridReact | null>;
+let gridRef: MutableRefObject<AgGridReact | null> | undefined;
 function TestComponent({
   hookParams,
 }: {
@@ -61,11 +61,11 @@ describe('useDataGridEvents', () => {
 
     // column state was not updated, so the default width provided by the
     // col def should be set
-    expect(gridRef.current?.columnApi.getColumnState()[0].width).toEqual(
+    expect(gridRef?.current?.columnApi.getColumnState()[0].width).toEqual(
       gridProps.columnDefs[0].width
     );
     // no filters set
-    expect(gridRef.current?.api.getFilterModel()).toEqual({});
+    expect(gridRef?.current?.api.getFilterModel()).toEqual({});
 
     // Set filter
     const idFilter = {
@@ -74,7 +74,7 @@ describe('useDataGridEvents', () => {
       type: 'equals',
     };
     await act(async () => {
-      gridRef.current?.api.setFilterModel({
+      gridRef?.current?.api.setFilterModel({
         id: idFilter,
       });
     });
@@ -90,7 +90,7 @@ describe('useDataGridEvents', () => {
       },
     });
     callback.mockClear();
-    expect(gridRef.current?.api.getFilterModel()['id']).toEqual(idFilter);
+    expect(gridRef?.current?.api.getFilterModel()['id']).toEqual(idFilter);
   });
 
   it('applies grid state on ready', async () => {
@@ -110,8 +110,8 @@ describe('useDataGridEvents', () => {
     setup(initialState, jest.fn());
 
     await waitFor(() => {
-      expect(gridRef.current?.api.getFilterModel()['id']).toEqual(idFilter);
-      expect(gridRef.current?.columnApi.getColumnState()[0]).toEqual(
+      expect(gridRef?.current?.api.getFilterModel()['id']).toEqual(idFilter);
+      expect(gridRef?.current?.columnApi.getColumnState()[0]).toEqual(
         expect.objectContaining(colState)
       );
     });
@@ -130,7 +130,7 @@ describe('useDataGridEvents', () => {
 
     // Set col width multiple times
     await act(async () => {
-      gridRef.current?.columnApi.setColumnWidth('id', newWidth);
+      gridRef?.current?.columnApi.setColumnWidth('id', newWidth);
     });
 
     expect(callback).not.toHaveBeenCalled();
@@ -150,13 +150,13 @@ describe('useDataGridEvents', () => {
     };
 
     const { rerender } = setup(initialState, callback, ['id']);
-    jest.spyOn(gridRef.current?.columnApi, 'autoSizeColumns');
+    jest.spyOn(gridRef?.current?.columnApi, 'autoSizeColumns');
     rerender(<TestComponent hookParams={[initialState, callback, ['id']]} />);
     act(() => {
-      gridRef.current?.api.setRowData([{ id: 'test-id' }]);
+      gridRef?.current?.api.setRowData([{ id: 'test-id' }]);
       jest.advanceTimersByTime(GRID_EVENT_DEBOUNCE_TIME);
     });
-    expect(gridRef.current?.columnApi.autoSizeColumns).toHaveBeenCalledWith([
+    expect(gridRef?.current?.columnApi.autoSizeColumns).toHaveBeenCalledWith([
       'id',
     ]);
   });
diff --git a/libs/datagrid/src/lib/use-datagrid-events.ts b/libs/datagrid/src/lib/use-datagrid-events.ts
index 70a850be0..42fd0f88e 100644
--- a/libs/datagrid/src/lib/use-datagrid-events.ts
+++ b/libs/datagrid/src/lib/use-datagrid-events.ts
@@ -1,12 +1,12 @@
-import type {
-  ColumnMovedEvent,
-  ColumnResizedEvent,
-  ColumnState,
-  ColumnVisibleEvent,
-  FilterChangedEvent,
-  FirstDataRenderedEvent,
-  SortChangedEvent,
-  GridReadyEvent,
+import {
+  type ColumnMovedEvent,
+  type ColumnResizedEvent,
+  type ColumnState,
+  type ColumnVisibleEvent,
+  type FilterChangedEvent,
+  type FirstDataRenderedEvent,
+  type SortChangedEvent,
+  type GridReadyEvent,
 } from 'ag-grid-community';
 import { useCallback } from 'react';
 
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx
index 32c9ec957..6c61b3448 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx
@@ -1,8 +1,8 @@
 import { useRef, useCallback, useEffect } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type {
-  OrderSubmissionBody,
-  StopOrdersSubmission,
+import {
+  type OrderSubmissionBody,
+  type StopOrdersSubmission,
 } from '@vegaprotocol/wallet';
 import {
   formatForInput,
@@ -11,7 +11,7 @@ import {
   toDecimal,
   validateAmount,
 } from '@vegaprotocol/utils';
-import type { Control, UseFormWatch } from 'react-hook-form';
+import { type Control, type UseFormWatch } from 'react-hook-form';
 import { useForm, Controller, useController } from 'react-hook-form';
 import * as Schema from '@vegaprotocol/types';
 import {
@@ -52,7 +52,7 @@ import {
   dealTicketTypeToOrderType,
   isStopOrderType,
 } from '../../hooks/use-form-values';
-import type { StopOrderFormValues } from '../../hooks/use-form-values';
+import { type StopOrderFormValues } from '../../hooks/use-form-values';
 import { mapFormValuesToStopOrdersSubmission } from '../../utils/map-form-values-to-submission';
 import { DealTicketFeeDetails } from './deal-ticket-fee-details';
 import { validateExpiration } from '../../utils';
@@ -542,7 +542,7 @@ const NotionalAndFees = ({
     market.positionDecimalPlaces
   );
   return (
-    <div className="mb-4 flex flex-col gap-2 w-full">
+    <div className="mb-4 flex w-full flex-col gap-2">
       <KeyValue
         label={t('Notional')}
         value={formatValue(notionalSize, market.decimalPlaces)}
@@ -909,7 +909,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
         marketPrice={marketPrice}
         decimalPlaces={market.decimalPlaces}
       />
-      <hr className="mb-4 border-vega-clight-500 dark:border-vega-cdark-500" />
+      <hr className="border-vega-clight-500 dark:border-vega-cdark-500 mb-4" />
       <Size
         control={control}
         sizeStep={sizeStep}
@@ -934,11 +934,11 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
         type={type}
       />
       <TimeInForce control={control} />
-      <div className="flex justify-end pb-3 gap-2">
+      <div className="flex justify-end gap-2 pb-3">
         <ReduceOnly />
       </div>
-      <hr className="mb-4 border-vega-clight-500 dark:border-vega-cdark-500" />
-      <div className="flex justify-between pb-2 gap-2">
+      <hr className="border-vega-clight-500 dark:border-vega-cdark-500 mb-4" />
+      <div className="flex justify-between gap-2 pb-2">
         <Controller
           name="oco"
           control={control}
@@ -1005,7 +1005,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
             decimalPlaces={market.decimalPlaces}
             oco
           />
-          <hr className="mb-2 border-vega-clight-500 dark:border-vega-cdark-500" />
+          <hr className="border-vega-clight-500 dark:border-vega-cdark-500 mb-2" />
           <Size
             control={control}
             sizeStep={sizeStep}
@@ -1034,7 +1034,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
             type={ocoType}
           />
           <TimeInForce control={control} oco />
-          <div className="flex justify-end mb-2 gap-2">
+          <div className="mb-2 flex justify-end gap-2">
             <ReduceOnly />
           </div>
         </>
diff --git a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
index 2090fa604..09e22558f 100644
--- a/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
+++ b/libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import type { FormEventHandler } from 'react';
+import { type FormEventHandler } from 'react';
 import { memo, useCallback, useEffect, useRef, useMemo } from 'react';
 import { Controller, useController, useForm } from 'react-hook-form';
 import {
@@ -11,7 +11,7 @@ import { ExpirySelector } from './expiry-selector';
 import { SideSelector } from './side-selector';
 import { TimeInForceSelector } from './time-in-force-selector';
 import { TypeSelector } from './type-selector';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { type OrderSubmission } from '@vegaprotocol/wallet';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { mapFormValuesToOrderSubmission } from '../../utils/map-form-values-to-submission';
 import {
@@ -66,7 +66,7 @@ import {
   useAccountBalance,
 } from '@vegaprotocol/accounts';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { OrderFormValues } from '../../hooks';
+import { type OrderFormValues } from '../../hooks';
 import {
   DealTicketType,
   dealTicketTypeToOrderType,
@@ -471,7 +471,7 @@ export const DealTicket = ({
           )}
         />
       )}
-      <div className="flex flex-col w-full mb-4 gap-2">
+      <div className="mb-4 flex w-full flex-col gap-2">
         <KeyValue
           label={t('Notional')}
           value={formatValue(notionalSize, market.decimalPlaces)}
@@ -545,7 +545,7 @@ export const DealTicket = ({
             )}
           />
         )}
-      <div className="flex justify-between pb-2 gap-2">
+      <div className="flex justify-between gap-2 pb-2">
         <Controller
           name="postOnly"
           control={control}
@@ -621,7 +621,7 @@ export const DealTicket = ({
       </div>
       {isLimitType && (
         <>
-          <div className="flex justify-between pb-2 gap-2">
+          <div className="flex justify-between gap-2 pb-2">
             <Controller
               name="iceberg"
               control={control}
diff --git a/libs/deal-ticket/src/hooks/use-position-estimate.ts b/libs/deal-ticket/src/hooks/use-position-estimate.ts
index faa972068..c91947681 100644
--- a/libs/deal-ticket/src/hooks/use-position-estimate.ts
+++ b/libs/deal-ticket/src/hooks/use-position-estimate.ts
@@ -1,6 +1,6 @@
-import type {
-  EstimatePositionQueryVariables,
-  EstimatePositionQuery,
+import {
+  type EstimatePositionQuery,
+  type EstimatePositionQueryVariables,
 } from '@vegaprotocol/positions';
 import { useEstimatePositionQuery } from '@vegaprotocol/positions';
 import { useEffect, useState } from 'react';
diff --git a/libs/deposits/src/lib/deposits-provider.ts b/libs/deposits/src/lib/deposits-provider.ts
index 2a08ad503..436264222 100644
--- a/libs/deposits/src/lib/deposits-provider.ts
+++ b/libs/deposits/src/lib/deposits-provider.ts
@@ -2,16 +2,14 @@ import uniqBy from 'lodash/uniqBy';
 import orderBy from 'lodash/orderBy';
 import { getEvents, removePaginationWrapper } from '@vegaprotocol/utils';
 import { makeDataProvider } from '@vegaprotocol/data-provider';
-import * as Schema from '@vegaprotocol/types';
+import { BusEventType } from '@vegaprotocol/types';
 import {
   DepositsDocument,
   DepositEventDocument,
-} from './__generated__/Deposit';
-import type {
-  DepositFieldsFragment,
-  DepositsQuery,
-  DepositEventSubscription,
-  DepositEventSubscriptionVariables,
+  type DepositFieldsFragment,
+  type DepositsQuery,
+  type DepositEventSubscription,
+  type DepositEventSubscriptionVariables,
 } from './__generated__/Deposit';
 
 export const depositsProvider = makeDataProvider<
@@ -38,7 +36,7 @@ export const depositsProvider = makeDataProvider<
       return data;
     }
     const incoming = getEvents<DepositFieldsFragment>(
-      Schema.BusEventType.Deposit,
+      BusEventType.Deposit,
       delta.busEvents
     );
     return uniqBy([...incoming, ...(data || [])], 'id');
diff --git a/libs/deposits/src/lib/deposits-table.tsx b/libs/deposits/src/lib/deposits-table.tsx
index 6f2e7fee1..9b07cf9bd 100644
--- a/libs/deposits/src/lib/deposits-table.tsx
+++ b/libs/deposits/src/lib/deposits-table.tsx
@@ -5,14 +5,14 @@ import {
   truncateByChars,
   isNumeric,
 } from '@vegaprotocol/utils';
-import type { ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
 import { AgGrid } from '@vegaprotocol/datagrid';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-  TypedDataAgGrid,
+import {
+  type VegaICellRendererParams,
+  type VegaValueFormatterParams,
+  type TypedDataAgGrid,
 } from '@vegaprotocol/datagrid';
-import type { DepositFieldsFragment } from './__generated__/Deposit';
+import { type DepositFieldsFragment } from './__generated__/Deposit';
 import { EtherscanLink } from '@vegaprotocol/environment';
 import { DepositStatusMapping } from '@vegaprotocol/types';
 
diff --git a/libs/environment/src/hooks/mocks/apollo-client.tsx b/libs/environment/src/hooks/mocks/apollo-client.tsx
index e4a85809a..a3c20b68e 100644
--- a/libs/environment/src/hooks/mocks/apollo-client.tsx
+++ b/libs/environment/src/hooks/mocks/apollo-client.tsx
@@ -1,14 +1,11 @@
 import {
   NodeCheckDocument,
   NodeCheckTimeUpdateDocument,
-} from '../../utils/__generated__/NodeCheck';
-import type {
-  NodeCheckQuery,
-  NodeCheckTimeUpdateSubscription,
+  type NodeCheckQuery,
+  type NodeCheckTimeUpdateSubscription,
 } from '../../utils/__generated__/NodeCheck';
 import { Networks } from '../../types';
-import type { RequestHandlerResponse } from 'mock-apollo-client';
-import { createMockClient } from 'mock-apollo-client';
+import { createMockClient, RequestHandlerResponse } from 'mock-apollo-client';
 
 export type MockRequestConfig = {
   hasError?: boolean;
diff --git a/libs/environment/src/hooks/use-environment.ts b/libs/environment/src/hooks/use-environment.ts
index 16bb6bd19..cf300af29 100644
--- a/libs/environment/src/hooks/use-environment.ts
+++ b/libs/environment/src/hooks/use-environment.ts
@@ -4,15 +4,17 @@ import { t } from '@vegaprotocol/i18n';
 import { useEffect } from 'react';
 import { create } from 'zustand';
 import { createClient } from '@vegaprotocol/apollo-client';
-import type {
-  NodeCheckTimeUpdateSubscription,
-  NodeCheckQuery,
-} from '../utils/__generated__/NodeCheck';
 import {
   NodeCheckDocument,
   NodeCheckTimeUpdateDocument,
+  type NodeCheckTimeUpdateSubscription,
+  type NodeCheckQuery,
 } from '../utils/__generated__/NodeCheck';
-import type { CosmicElevatorFlags, Environment, FeatureFlags } from '../types';
+import {
+  type CosmicElevatorFlags,
+  type Environment,
+  type FeatureFlags,
+} from '../types';
 import { Networks } from '../types';
 import { compileErrors } from '../utils/compile-errors';
 import { envSchema } from '../utils/validate-environment';
diff --git a/libs/environment/src/hooks/use-vega-releases.ts b/libs/environment/src/hooks/use-vega-releases.ts
index ef06714e1..7cc06cb41 100644
--- a/libs/environment/src/hooks/use-vega-releases.ts
+++ b/libs/environment/src/hooks/use-vega-releases.ts
@@ -1,6 +1,5 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
 import { useCallback, useEffect, useState } from 'react';
-import type { ReleasesState } from './use-releases';
+import { type ReleasesState } from './use-releases';
 import { ReleasesFeed } from './use-releases';
 import { fetchReleases } from './use-releases';
 
diff --git a/libs/fills/src/lib/fills-data-provider.ts b/libs/fills/src/lib/fills-data-provider.ts
index e32283ddf..fc796902f 100644
--- a/libs/fills/src/lib/fills-data-provider.ts
+++ b/libs/fills/src/lib/fills-data-provider.ts
@@ -1,20 +1,21 @@
 import orderBy from 'lodash/orderBy';
-import type { PageInfo, Cursor } from '@vegaprotocol/data-provider';
+import { type PageInfo, type Cursor } from '@vegaprotocol/data-provider';
 import {
   makeDataProvider,
   makeDerivedDataProvider,
   defaultAppend as append,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import { type Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import { FillsDocument, FillsEventDocument } from './__generated__/Fills';
-import type {
-  FillsQuery,
-  FillsQueryVariables,
-  FillFieldsFragment,
-  FillsEventSubscription,
-  FillUpdateFieldsFragment,
-  FillsEventSubscriptionVariables,
+import {
+  FillsDocument,
+  FillsEventDocument,
+  type FillsQuery,
+  type FillsQueryVariables,
+  type FillFieldsFragment,
+  type FillsEventSubscription,
+  type FillUpdateFieldsFragment,
+  type FillsEventSubscriptionVariables,
 } from './__generated__/Fills';
 
 export type Trade = Omit<FillFieldsFragment, 'market'> & {
diff --git a/libs/fills/src/lib/fills-manager.tsx b/libs/fills/src/lib/fills-manager.tsx
index a2ed220fc..6a94c3d74 100644
--- a/libs/fills/src/lib/fills-manager.tsx
+++ b/libs/fills/src/lib/fills-manager.tsx
@@ -1,11 +1,14 @@
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 import { useCallback, useRef, useState } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FillsTable } from './fills-table';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
+import { type useDataGridEvents } from '@vegaprotocol/datagrid';
 import { Pagination } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type * as Schema from '@vegaprotocol/types';
+import {
+  type TradesFilter,
+  type TradesSubscriptionFilter,
+} from '@vegaprotocol/types';
 import { fillsWithMarketProvider } from './fills-data-provider';
 
 interface FillsManagerProps {
@@ -20,7 +23,7 @@ export const FillsManager = ({
   gridProps,
 }: FillsManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
-  const filter: Schema.TradesFilter | Schema.TradesSubscriptionFilter = {
+  const filter: TradesFilter | TradesSubscriptionFilter = {
     partyIds: [partyId],
   };
   const [hasDisplayedRow, setHasDisplayedRow] = useState<boolean | undefined>(
@@ -38,7 +41,7 @@ export const FillsManager = ({
     variables: { filter },
   });
   return (
-    <div className="flex flex-col h-full">
+    <div className="flex h-full flex-col">
       <FillsTable
         ref={gridRef}
         rowData={data}
diff --git a/libs/fills/src/lib/fills-table.tsx b/libs/fills/src/lib/fills-table.tsx
index 718207f4f..300397b9f 100644
--- a/libs/fills/src/lib/fills-table.tsx
+++ b/libs/fills/src/lib/fills-table.tsx
@@ -1,10 +1,10 @@
 import { useMemo } from 'react';
-import type {
-  AgGridReact,
-  AgGridReactProps,
-  AgReactUiProps,
+import {
+  type AgGridReact,
+  type AgGridReactProps,
+  type AgReactUiProps,
 } from 'ag-grid-react';
-import type { ITooltipParams, ColDef } from 'ag-grid-community';
+import { type ITooltipParams, type ColDef } from 'ag-grid-community';
 import {
   addDecimal,
   addDecimalsFormatNumber,
@@ -22,16 +22,16 @@ import {
   COL_DEFS,
   DateRangeFilter,
 } from '@vegaprotocol/datagrid';
-import type {
-  VegaValueFormatterParams,
-  VegaICellRendererParams,
+import {
+  type VegaValueFormatterParams,
+  type VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
 import { forwardRef } from 'react';
 import BigNumber from 'bignumber.js';
-import type { Trade } from './fills-data-provider';
-import type {
-  FillFieldsFragment,
-  TradeFeeFieldsFragment,
+import { type Trade } from './fills-data-provider';
+import {
+  type FillFieldsFragment,
+  type TradeFeeFieldsFragment,
 } from './__generated__/Fills';
 import { FillActionsDropdown } from './fill-actions-dropdown';
 import { getAsset } from '@vegaprotocol/markets';
@@ -337,7 +337,7 @@ const FeesBreakdownTooltip = ({
   return (
     <div
       data-testid="fee-breakdown-tooltip"
-      className="z-20 max-w-sm px-4 py-2 text-sm text-black border rounded bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word dark:text-white"
+      className="bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word z-20 max-w-sm rounded border px-4 py-2 text-sm text-black dark:text-white"
     >
       {role === MAKER && (
         <>
@@ -361,20 +361,20 @@ const FeesBreakdownTooltip = ({
       )}
       <dl className="grid grid-cols-2 gap-x-1">
         <dt className="col-span-1">{t('Infrastructure fee')}</dt>
-        <dd className="text-right col-span-1">
+        <dd className="col-span-1 text-right">
           {addDecimalsFormatNumber(infrastructureFee, asset.decimals)}{' '}
           {asset.symbol}
         </dd>
         <dt className="col-span-1">{t('Liquidity fee')}</dt>
-        <dd className="text-right col-span-1">
+        <dd className="col-span-1 text-right">
           {addDecimalsFormatNumber(liquidityFee, asset.decimals)} {asset.symbol}
         </dd>
         <dt className="col-span-1">{t('Maker fee')}</dt>
-        <dd className="text-right col-span-1">
+        <dd className="col-span-1 text-right">
           {addDecimalsFormatNumber(makerFee, asset.decimals)} {asset.symbol}
         </dd>
         <dt className="col-span-1">{t('Total fees')}</dt>
-        <dd className="text-right col-span-1">
+        <dd className="col-span-1 text-right">
           {addDecimalsFormatNumber(totalFee, asset.decimals)} {asset.symbol}
         </dd>
       </dl>
@@ -394,7 +394,7 @@ const FeesDiscountBreakdownTooltipItem = ({
   value && value !== '0' ? (
     <>
       <dt className="col-span-1">{label}</dt>
-      <dd className="text-right col-span-1">
+      <dd className="col-span-1 text-right">
         {addDecimalsFormatNumber(value, asset.decimals)} {asset.symbol}
       </dd>
     </>
@@ -415,7 +415,7 @@ export const FeesDiscountBreakdownTooltip = ({
   return (
     <div
       data-testid="fee-discount-breakdown-tooltip"
-      className="max-w-sm bg-vega-light-100 dark:bg-vega-dark-100 border border-vega-light-200 dark:border-vega-dark-200 px-4 py-2 z-20 rounded text-sm break-word text-black dark:text-white"
+      className="bg-vega-light-100 dark:bg-vega-dark-100 border-vega-light-200 dark:border-vega-dark-200 break-word z-20 max-w-sm rounded border px-4 py-2 text-sm text-black dark:text-white"
     >
       <dl className="grid grid-cols-2 gap-x-1">
         {(fees.infrastructureFeeReferralDiscount || '0') !== '0' ||
diff --git a/libs/funding-payments/src/lib/funding-payments-data-provider.ts b/libs/funding-payments/src/lib/funding-payments-data-provider.ts
index 409cb21b0..66f9b8e69 100644
--- a/libs/funding-payments/src/lib/funding-payments-data-provider.ts
+++ b/libs/funding-payments/src/lib/funding-payments-data-provider.ts
@@ -1,4 +1,4 @@
-import type { PageInfo, Cursor } from '@vegaprotocol/data-provider';
+import { type PageInfo, type Cursor } from '@vegaprotocol/data-provider';
 import {
   makeDataProvider,
   makeDerivedDataProvider,
@@ -6,11 +6,11 @@ import {
 } from '@vegaprotocol/data-provider';
 import type { Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import { FundingPaymentsDocument } from './__generated__/FundingPayments';
-import type {
-  FundingPaymentsQuery,
-  FundingPaymentsQueryVariables,
-  FundingPaymentFieldsFragment,
+import {
+  FundingPaymentsDocument,
+  type FundingPaymentsQueryVariables,
+  type FundingPaymentFieldsFragment,
+  type FundingPaymentsQuery,
 } from './__generated__/FundingPayments';
 
 export type FundingPayment = Omit<FundingPaymentFieldsFragment, 'market'> & {
diff --git a/libs/funding-payments/src/lib/funding-payments-manager.tsx b/libs/funding-payments/src/lib/funding-payments-manager.tsx
index c8f890a09..381211a21 100644
--- a/libs/funding-payments/src/lib/funding-payments-manager.tsx
+++ b/libs/funding-payments/src/lib/funding-payments-manager.tsx
@@ -1,9 +1,9 @@
-import type { AgGridReact } from 'ag-grid-react';
+import { type AgGridReact } from 'ag-grid-react';
 import { useCallback, useRef, useState } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FundingPaymentsTable } from './funding-payments-table';
 import { Pagination } from '@vegaprotocol/datagrid';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
+import { type useDataGridEvents } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { fundingPaymentsWithMarketProvider } from './funding-payments-data-provider';
 
@@ -44,7 +44,7 @@ export const FundingPaymentsManager = ({
   });
 
   return (
-    <div className="flex flex-col h-full">
+    <div className="flex h-full flex-col">
       <FundingPaymentsTable
         ref={gridRef}
         rowData={data}
diff --git a/libs/funding-payments/src/lib/funding-payments-table.tsx b/libs/funding-payments/src/lib/funding-payments-table.tsx
index 7811fe42d..ef39c17c5 100644
--- a/libs/funding-payments/src/lib/funding-payments-table.tsx
+++ b/libs/funding-payments/src/lib/funding-payments-table.tsx
@@ -1,10 +1,10 @@
 import { useMemo } from 'react';
-import type {
-  AgGridReact,
-  AgGridReactProps,
-  AgReactUiProps,
+import {
+  type AgGridReact,
+  type AgGridReactProps,
+  type AgReactUiProps,
 } from 'ag-grid-react';
-import type { ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
 import {
   addDecimalsFormatNumber,
   getDateTimeFormat,
diff --git a/libs/liquidity/src/lib/liquidity-data-provider.ts b/libs/liquidity/src/lib/liquidity-data-provider.ts
index 6ab1744f8..a2ed95820 100644
--- a/libs/liquidity/src/lib/liquidity-data-provider.ts
+++ b/libs/liquidity/src/lib/liquidity-data-provider.ts
@@ -5,19 +5,15 @@ import {
 } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
-
 import {
   LiquidityProvidersDocument,
   LiquidityProvisionsDocument,
-} from './__generated__/MarketLiquidity';
-
-import type {
-  LiquidityProviderFieldsFragment,
-  LiquidityProvidersQuery,
-  LiquidityProvidersQueryVariables,
-  LiquidityProvisionFieldsFragment,
-  LiquidityProvisionsQuery,
-  LiquidityProvisionsQueryVariables,
+  type LiquidityProvidersQuery,
+  type LiquidityProvidersQueryVariables,
+  type LiquidityProvisionsQuery,
+  type LiquidityProvisionsQueryVariables,
+  type LiquidityProviderFieldsFragment,
+  type LiquidityProvisionFieldsFragment,
 } from './__generated__/MarketLiquidity';
 
 export type LiquidityProvisionFields = LiquidityProvisionFieldsFragment &
diff --git a/libs/liquidity/src/lib/markets-liquidity-provider.ts b/libs/liquidity/src/lib/markets-liquidity-provider.ts
index be2a909d3..2ea485e30 100644
--- a/libs/liquidity/src/lib/markets-liquidity-provider.ts
+++ b/libs/liquidity/src/lib/markets-liquidity-provider.ts
@@ -6,17 +6,18 @@ import {
   useDataProvider,
 } from '@vegaprotocol/data-provider';
 import { useYesterday } from '@vegaprotocol/react-helpers';
-import type {
-  MarketCandles,
-  MarketMaybeWithDataAndCandles,
-  MarketsCandlesQueryVariables,
+import {
+  type MarketsCandlesQueryVariables,
+  type MarketCandles,
+  type MarketMaybeWithDataAndCandles,
 } from '@vegaprotocol/markets';
 
 import { marketListProvider } from '@vegaprotocol/markets';
 
-import type { LiquidityProvisionMarketsQuery } from './__generated__/MarketsLiquidity';
-import { LiquidityProvisionMarketsDocument } from './__generated__/MarketsLiquidity';
-
+import {
+  LiquidityProvisionMarketsDocument,
+  type LiquidityProvisionMarketsQuery,
+} from './__generated__/MarketsLiquidity';
 import {
   calcDayVolume,
   getCandle24hAgo,
@@ -26,7 +27,7 @@ import {
   getFeeLevels,
   getTargetStake,
 } from './utils/liquidity-utils';
-import type { Provider, LiquidityProvisionMarket } from './utils';
+import { type Provider, type LiquidityProvisionMarket } from './utils';
 
 export interface FeeLevels {
   commitmentAmount: number;
diff --git a/libs/logger/src/hooks/use-logger.ts b/libs/logger/src/hooks/use-logger.ts
index e4837d579..f8c35e32f 100644
--- a/libs/logger/src/hooks/use-logger.ts
+++ b/libs/logger/src/hooks/use-logger.ts
@@ -1,5 +1,5 @@
 import { useRef } from 'react';
-import type { LocalLogger, LoggerConf } from '../lib/local-logger';
+import { type LocalLogger, type LoggerConf } from '../lib/local-logger';
 import { localLoggerFactory } from '../lib/local-logger';
 import { SentryInit } from '../lib/sentry-utils';
 
diff --git a/libs/market-depth/src/lib/depth-chart.tsx b/libs/market-depth/src/lib/depth-chart.tsx
index b1712e119..e4a2c20f0 100644
--- a/libs/market-depth/src/lib/depth-chart.tsx
+++ b/libs/market-depth/src/lib/depth-chart.tsx
@@ -8,13 +8,13 @@ import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
-import type { MarketData } from '@vegaprotocol/markets';
-import type {
-  MarketDepthQuery,
-  MarketDepthUpdateSubscription,
-  PriceLevelFieldsFragment,
+import { type MarketData } from '@vegaprotocol/markets';
+import {
+  type MarketDepthQuery,
+  type MarketDepthUpdateSubscription,
+  type PriceLevelFieldsFragment,
 } from './__generated__/MarketDepth';
-import type { DepthChartProps } from 'pennant';
+import { type DepthChartProps } from 'pennant';
 import { parseLevel, updateLevels } from './depth-chart-utils';
 
 interface DepthChartManagerProps {
@@ -238,7 +238,7 @@ export const DepthChartContainer = ({ marketId }: DepthChartManagerProps) => {
           volumeFormat={volumeFormat}
           priceFormat={priceFormat}
           notEnoughDataText={
-            <span className="text-xs text-center">{t('No open orders')}</span>
+            <span className="text-center text-xs">{t('No open orders')}</span>
           }
         />
       )}
diff --git a/libs/market-depth/src/lib/market-depth-provider.ts b/libs/market-depth/src/lib/market-depth-provider.ts
index 8393928d3..3c603a48d 100644
--- a/libs/market-depth/src/lib/market-depth-provider.ts
+++ b/libs/market-depth/src/lib/market-depth-provider.ts
@@ -1,4 +1,4 @@
-import type { Update } from '@vegaprotocol/data-provider';
+import { type Update } from '@vegaprotocol/data-provider';
 import { makeDataProvider } from '@vegaprotocol/data-provider';
 import { updateLevels } from './orderbook-data';
 import { captureException } from '@sentry/react';
@@ -6,11 +6,9 @@ import { captureException } from '@sentry/react';
 import {
   MarketDepthDocument,
   MarketDepthUpdateDocument,
-} from './__generated__/MarketDepth';
-import type {
-  MarketDepthQuery,
-  MarketDepthQueryVariables,
-  MarketDepthUpdateSubscription,
+  type MarketDepthQuery,
+  type MarketDepthQueryVariables,
+  type MarketDepthUpdateSubscription,
 } from './__generated__/MarketDepth';
 
 export const update: Update<
diff --git a/libs/market-depth/src/lib/orderbook-manager.tsx b/libs/market-depth/src/lib/orderbook-manager.tsx
index 5975e9687..d50fed01c 100644
--- a/libs/market-depth/src/lib/orderbook-manager.tsx
+++ b/libs/market-depth/src/lib/orderbook-manager.tsx
@@ -7,10 +7,10 @@ import {
   marketDataProvider,
   marketProvider,
 } from '@vegaprotocol/markets';
-import type {
-  MarketDepthQuery,
-  MarketDepthQueryVariables,
-  MarketDepthUpdateSubscription,
+import {
+  type MarketDepthQuery,
+  type MarketDepthQueryVariables,
+  type MarketDepthUpdateSubscription,
 } from './__generated__/MarketDepth';
 
 interface OrderbookManagerProps {
diff --git a/libs/markets/src/lib/components/market-info/market-info-data-provider.ts b/libs/markets/src/lib/components/market-info/market-info-data-provider.ts
index 0763f0d6c..cfb917d90 100644
--- a/libs/markets/src/lib/components/market-info/market-info-data-provider.ts
+++ b/libs/markets/src/lib/components/market-info/market-info-data-provider.ts
@@ -3,14 +3,16 @@ import {
   makeDerivedDataProvider,
   marketDataErrorPolicyGuard,
 } from '@vegaprotocol/data-provider';
-import type {
-  MarketInfoQuery,
-  MarketInfoQueryVariables,
+import {
+  MarketInfoDocument,
+  type MarketInfoQuery,
+  type MarketInfoQueryVariables,
 } from './__generated__/MarketInfo';
-import { marketDataProvider } from '../../market-data-provider';
-import type { MarketData } from '../../market-data-provider';
+import {
+  marketDataProvider,
+  type MarketData,
+} from '../../market-data-provider';
 import type { Candle } from '../../market-candles-provider';
-import { MarketInfoDocument } from './__generated__/MarketInfo';
 
 export type MarketInfo = NonNullable<MarketInfoQuery['market']>;
 export type MarketInfoWithData = MarketInfo & { data?: MarketData };
diff --git a/libs/markets/src/lib/hooks/use-market-oracle.spec.ts b/libs/markets/src/lib/hooks/use-market-oracle.spec.ts
index 0204bfcc3..a819b9c56 100644
--- a/libs/markets/src/lib/hooks/use-market-oracle.spec.ts
+++ b/libs/markets/src/lib/hooks/use-market-oracle.spec.ts
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react';
 import { useMarketOracle } from './use-market-oracle';
-import type { MarketFieldsFragment } from '../__generated__/markets';
-import type { Provider } from '../oracle-schema';
+import { type MarketFieldsFragment } from '../__generated__/markets';
+import { type Provider } from '../oracle-schema';
 
 const ORACLE_PROOFS_URL = 'ORACLE_PROOFS_URL';
 
@@ -51,15 +51,15 @@ const mockMarket = jest.fn<{ data: MarketFieldsFragment | null }, unknown[]>(
 const mockOracleProofs = jest.fn<{ data?: Provider[] }, unknown[]>(() => ({}));
 
 jest.mock('@vegaprotocol/environment', () => ({
-  useEnvironment: jest.fn((args) => mockEnvironment()),
+  useEnvironment: jest.fn(() => mockEnvironment()),
 }));
 
 jest.mock('../markets-provider', () => ({
-  useMarket: jest.fn((args) => mockMarket()),
+  useMarket: jest.fn(() => mockMarket()),
 }));
 
 jest.mock('./use-oracle-proofs', () => ({
-  useOracleProofs: jest.fn((args) => mockOracleProofs()),
+  useOracleProofs: jest.fn(() => mockOracleProofs()),
 }));
 
 const marketId = 'marketId';
diff --git a/libs/markets/src/lib/hooks/use-oracle-proofs.ts b/libs/markets/src/lib/hooks/use-oracle-proofs.ts
index 3669dd260..ae99b2233 100644
--- a/libs/markets/src/lib/hooks/use-oracle-proofs.ts
+++ b/libs/markets/src/lib/hooks/use-oracle-proofs.ts
@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import type { Provider } from '../oracle-schema';
+import { type Provider } from '../oracle-schema';
 import { providersSchema } from '../oracle-schema';
 
 export let cache: {
diff --git a/libs/markets/src/lib/market-candles-provider.ts b/libs/markets/src/lib/market-candles-provider.ts
index eb7090ed8..c1192f7a6 100644
--- a/libs/markets/src/lib/market-candles-provider.ts
+++ b/libs/markets/src/lib/market-candles-provider.ts
@@ -1,13 +1,11 @@
 import { makeDataProvider } from '@vegaprotocol/data-provider';
-import type {
-  MarketCandlesQuery,
-  MarketCandlesQueryVariables,
-  MarketCandlesUpdateSubscription,
-  MarketCandlesFieldsFragment,
-} from './__generated__/market-candles';
 import {
   MarketCandlesDocument,
   MarketCandlesUpdateDocument,
+  type MarketCandlesQuery,
+  type MarketCandlesQueryVariables,
+  type MarketCandlesUpdateSubscription,
+  type MarketCandlesFieldsFragment,
 } from './__generated__/market-candles';
 
 export type Candle = MarketCandlesFieldsFragment;
diff --git a/libs/markets/src/lib/market-data-provider.ts b/libs/markets/src/lib/market-data-provider.ts
index 9c712b523..9277928b7 100644
--- a/libs/markets/src/lib/market-data-provider.ts
+++ b/libs/markets/src/lib/market-data-provider.ts
@@ -7,13 +7,11 @@ import { useDataProvider } from '@vegaprotocol/data-provider';
 import {
   MarketDataDocument,
   MarketDataUpdateDocument,
-} from './__generated__/market-data';
-import type {
-  MarketDataQuery,
-  MarketDataFieldsFragment,
-  MarketDataUpdateSubscription,
-  MarketDataUpdateFieldsFragment,
-  MarketDataQueryVariables,
+  type MarketDataQuery,
+  type MarketDataFieldsFragment,
+  type MarketDataUpdateSubscription,
+  type MarketDataUpdateFieldsFragment,
+  type MarketDataQueryVariables,
 } from './__generated__/market-data';
 import { getMarketPrice } from './get-price';
 import { MarketTradingMode } from '@vegaprotocol/types';
diff --git a/libs/markets/src/lib/markets-candles-provider.ts b/libs/markets/src/lib/markets-candles-provider.ts
index 45d7ffb34..084ad7a7b 100644
--- a/libs/markets/src/lib/markets-candles-provider.ts
+++ b/libs/markets/src/lib/markets-candles-provider.ts
@@ -1,10 +1,10 @@
 import { makeDataProvider } from '@vegaprotocol/data-provider';
-import { MarketsCandlesDocument } from './__generated__/markets-candles';
-import type {
-  MarketsCandlesQuery,
-  MarketsCandlesQueryVariables,
+import {
+  MarketsCandlesDocument,
+  type MarketsCandlesQuery,
+  type MarketsCandlesQueryVariables,
 } from './__generated__/markets-candles';
-import type { Candle } from './market-candles-provider';
+import { type Candle } from './market-candles-provider';
 
 export interface MarketCandles {
   marketId: string;
diff --git a/libs/markets/src/lib/markets-data-provider.ts b/libs/markets/src/lib/markets-data-provider.ts
index 2fb40d022..ce72878d3 100644
--- a/libs/markets/src/lib/markets-data-provider.ts
+++ b/libs/markets/src/lib/markets-data-provider.ts
@@ -1,17 +1,17 @@
 import { marketDataErrorPolicyGuard } from '@vegaprotocol/data-provider';
 import { makeDataProvider } from '@vegaprotocol/data-provider';
-import type {
-  MarketsDataQuery,
-  MarketsDataQueryVariables,
+import {
+  MarketsDataDocument,
+  type MarketsDataQuery,
+  type MarketsDataQueryVariables,
 } from './__generated__/markets-data';
-import type {
-  MarketDataUpdateSubscription,
-  MarketDataUpdateFieldsFragment,
-  MarketDataUpdateSubscriptionVariables,
+import {
+  MarketDataUpdateDocument,
+  type MarketDataUpdateSubscription,
+  type MarketDataUpdateFieldsFragment,
+  type MarketDataUpdateSubscriptionVariables,
 } from './__generated__/market-data';
-import { MarketDataUpdateDocument } from './__generated__/market-data';
-import { MarketsDataDocument } from './__generated__/markets-data';
-import type { MarketData } from './market-data-provider';
+import { type MarketData } from './market-data-provider';
 
 const getData = (responseData: MarketsDataQuery | null): MarketData[] =>
   responseData?.marketsConnection?.edges
diff --git a/libs/markets/src/lib/markets-provider.ts b/libs/markets/src/lib/markets-provider.ts
index 71448acaf..5c8b5200e 100644
--- a/libs/markets/src/lib/markets-provider.ts
+++ b/libs/markets/src/lib/markets-provider.ts
@@ -5,29 +5,30 @@ import {
   marketDataErrorPolicyGuard,
   useDataProvider,
 } from '@vegaprotocol/data-provider';
-import type {
-  MarketsQuery,
-  MarketFieldsFragment,
+import {
+  MarketsDocument,
+  type MarketsQuery,
+  type MarketFieldsFragment,
 } from './__generated__/markets';
-import type { MarketsCandlesQueryVariables } from './__generated__/markets-candles';
+import { type MarketsCandlesQueryVariables } from './__generated__/markets-candles';
 
 import {
   marketsDataProvider,
   marketsLiveDataProvider,
   mapMarketDataUpdateToMarketData,
 } from './markets-data-provider';
-import { marketDataProvider } from './market-data-provider';
-import { marketsCandlesProvider } from './markets-candles-provider';
-import type { MarketData } from './market-data-provider';
-import type { MarketDataUpdateFieldsFragment } from './__generated__';
-import type { MarketCandles } from './markets-candles-provider';
+import { marketDataProvider, type MarketData } from './market-data-provider';
+import { type MarketDataUpdateFieldsFragment } from './__generated__';
+import {
+  marketsCandlesProvider,
+  type MarketCandles,
+} from './markets-candles-provider';
 import { useMemo } from 'react';
 import * as Schema from '@vegaprotocol/types';
 import {
   filterAndSortClosedMarkets,
   filterAndSortMarkets,
 } from './market-utils';
-import { MarketsDocument } from './__generated__/markets';
 import type { Candle } from './market-candles-provider';
 
 export type Market = MarketFieldsFragment;
diff --git a/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts b/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts
index b3917d921..766211c6c 100644
--- a/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts
+++ b/libs/orders/src/lib/components/order-data-provider/order-data-provider.ts
@@ -5,20 +5,21 @@ import {
   makeDerivedDataProvider,
   defaultAppend as append,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import { type Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import type { PageInfo, Edge, Cursor } from '@vegaprotocol/data-provider';
+import { Cursor, type PageInfo, type Edge } from '@vegaprotocol/data-provider';
 import { OrderStatus } from '@vegaprotocol/types';
-import type {
-  OrderFieldsFragment,
-  OrderUpdateFieldsFragment,
-  OrdersQuery,
-  OrdersUpdateSubscription,
-  OrdersQueryVariables,
-  OrdersUpdateSubscriptionVariables,
+import {
+  OrdersDocument,
+  OrdersUpdateDocument,
+  type OrderFieldsFragment,
+  type OrdersQuery,
+  type OrdersUpdateSubscription,
+  type OrdersQueryVariables,
+  type OrdersUpdateSubscriptionVariables,
+  type OrderUpdateFieldsFragment,
 } from './__generated__/Orders';
-import { OrdersDocument, OrdersUpdateDocument } from './__generated__/Orders';
-import type { ApolloClient } from '@apollo/client';
+import { type ApolloClient } from '@apollo/client';
 
 export type Order = Omit<OrderFieldsFragment, 'market'> & {
   market?: Market;
diff --git a/libs/orders/src/lib/components/order-data-provider/stop-orders-data-provider.ts b/libs/orders/src/lib/components/order-data-provider/stop-orders-data-provider.ts
index d903eb136..fc6d92233 100644
--- a/libs/orders/src/lib/components/order-data-provider/stop-orders-data-provider.ts
+++ b/libs/orders/src/lib/components/order-data-provider/stop-orders-data-provider.ts
@@ -2,14 +2,14 @@ import {
   makeDataProvider,
   makeDerivedDataProvider,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import { type Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import type {
-  StopOrderFieldsFragment,
-  StopOrdersQuery,
-  StopOrdersQueryVariables,
+import {
+  StopOrdersDocument,
+  type StopOrdersQuery,
+  type StopOrdersQueryVariables,
+  type StopOrderFieldsFragment,
 } from './__generated__/Orders';
-import { StopOrdersDocument } from './__generated__/Orders';
 
 export type StopOrder = StopOrderFieldsFragment & {
   market: Market;
diff --git a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx
index bcfef307a..c35a27989 100644
--- a/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx
+++ b/libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx
@@ -1,18 +1,17 @@
 import { t } from '@vegaprotocol/i18n';
 import { useCallback, useRef, useState, useEffect } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
-import { OrderListTable } from '../order-list';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { Pagination } from '@vegaprotocol/datagrid';
+import { type AgGridReact } from 'ag-grid-react';
+import { Pagination, type useDataGridEvents } from '@vegaprotocol/datagrid';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { ordersWithMarketProvider } from '../order-data-provider/order-data-provider';
 import { normalizeOrderAmendment } from '@vegaprotocol/wallet';
 import { useVegaTransactionStore } from '@vegaprotocol/web3';
 import type { OrderTxUpdateFieldsFragment } from '@vegaprotocol/web3';
 import { OrderEditDialog } from '../order-list/order-edit-dialog';
-import type { Order } from '../order-data-provider';
+import { type Order } from '../order-data-provider';
 import { OrderViewDialog } from '../order-list/order-view-dialog';
-import { Splash } from '@vegaprotocol/ui-toolkit';
+import { OrderListTable } from '../order-list';
+import { ordersWithMarketProvider } from '../order-data-provider/order-data-provider';
 
 export enum Filter {
   'Open' = 'Open',
@@ -91,7 +90,7 @@ export const OrderListManager = ({
 
   return (
     <>
-      <div className="relative flex flex-col h-full">
+      <div className="relative flex h-full flex-col">
         <OrderListTable
           rowData={data}
           ref={gridRef}
diff --git a/libs/orders/src/lib/components/order-list/order-list.stories.tsx b/libs/orders/src/lib/components/order-list/order-list.stories.tsx
index 3e03de129..0ea110c86 100644
--- a/libs/orders/src/lib/components/order-list/order-list.stories.tsx
+++ b/libs/orders/src/lib/components/order-list/order-list.stories.tsx
@@ -3,7 +3,7 @@ import { OrderListTable } from './order-list';
 import { useState } from 'react';
 import { generateOrdersArray } from '../mocks';
 import { OrderEditDialog } from './order-edit-dialog';
-import type { Order } from '../order-data-provider';
+import { type Order } from '../order-data-provider';
 
 export default {
   component: OrderListTable,
diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx
index 1e8018e97..152f0329f 100644
--- a/libs/orders/src/lib/components/order-list/order-list.tsx
+++ b/libs/orders/src/lib/components/order-list/order-list.tsx
@@ -1,3 +1,4 @@
+import { memo, forwardRef, useMemo, type ForwardedRef } from 'react';
 import {
   MAXGOINT64,
   addDecimalsFormatNumber,
@@ -15,8 +16,6 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import type { ForwardedRef } from 'react';
-import { memo, forwardRef, useMemo } from 'react';
 import {
   AgGrid,
   SetFilter,
@@ -26,17 +25,15 @@ import {
   MarketNameCell,
   OrderTypeCell,
   COL_DEFS,
+  type TypedDataAgGrid,
+  type VegaICellRendererParams,
+  type VegaValueFormatterParams,
+  type VegaValueGetterParams,
 } from '@vegaprotocol/datagrid';
-import type {
-  TypedDataAgGrid,
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-  VegaValueGetterParams,
-} from '@vegaprotocol/datagrid';
-import type { AgGridReact } from 'ag-grid-react';
-import type { Order } from '../order-data-provider';
+import { AgGridReact } from 'ag-grid-react';
+import { type Order } from '../order-data-provider';
 import { Filter } from '../order-list-manager/order-list-manager';
-import type { ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
 
 const defaultColDef = {
   resizable: true,
diff --git a/libs/orders/src/lib/components/stop-orders-manager/stop-orders-manager.tsx b/libs/orders/src/lib/components/stop-orders-manager/stop-orders-manager.tsx
index fbfc9787d..750dc7951 100644
--- a/libs/orders/src/lib/components/stop-orders-manager/stop-orders-manager.tsx
+++ b/libs/orders/src/lib/components/stop-orders-manager/stop-orders-manager.tsx
@@ -1,12 +1,15 @@
 import { t } from '@vegaprotocol/i18n';
 import { useCallback, useEffect, useState } from 'react';
 import { StopOrdersTable } from '../stop-orders-table/stop-orders-table';
-import type { useDataGridEvents } from '@vegaprotocol/datagrid';
-import type { StopOrder } from '../order-data-provider/stop-orders-data-provider';
+import { type useDataGridEvents } from '@vegaprotocol/datagrid';
+import { type StopOrder } from '../order-data-provider/stop-orders-data-provider';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { stopOrdersWithMarketProvider } from '../order-data-provider/stop-orders-data-provider';
 import { OrderViewDialog } from '../order-list/order-view-dialog';
-import type { Order, StopOrdersQueryVariables } from '../order-data-provider';
+import {
+  type Order,
+  type StopOrdersQueryVariables,
+} from '../order-data-provider';
 import { useVegaTransactionStore } from '@vegaprotocol/web3';
 
 export interface StopOrdersManagerProps {
diff --git a/libs/positions/src/lib/positions-data-providers.ts b/libs/positions/src/lib/positions-data-providers.ts
index bcedb8795..fd38d95b8 100644
--- a/libs/positions/src/lib/positions-data-providers.ts
+++ b/libs/positions/src/lib/positions-data-providers.ts
@@ -2,34 +2,35 @@ import isEqual from 'lodash/isEqual';
 import produce from 'immer';
 import BigNumber from 'bignumber.js';
 import sortBy from 'lodash/sortBy';
-import type { Account } from '@vegaprotocol/accounts';
+import { type Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
 import { toBigNum, removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   makeDataProvider,
   makeDerivedDataProvider,
 } from '@vegaprotocol/data-provider';
-import * as Schema from '@vegaprotocol/types';
-import type {
-  MarketMaybeWithData,
-  MarketDataQueryVariables,
-} from '@vegaprotocol/markets';
 import {
+  type MarketMaybeWithData,
+  type MarketDataQueryVariables,
   allMarketsWithLiveDataProvider,
   getAsset,
 } from '@vegaprotocol/markets';
-import type {
-  PositionsQuery,
-  PositionFieldsFragment,
-  PositionsSubscriptionSubscription,
-  PositionsQueryVariables,
-  PositionsSubscriptionSubscriptionVariables,
-} from './__generated__/Positions';
 import {
   PositionsDocument,
   PositionsSubscriptionDocument,
+  type PositionsQuery,
+  type PositionFieldsFragment,
+  type PositionsSubscriptionSubscription,
+  type PositionsQueryVariables,
+  type PositionsSubscriptionSubscriptionVariables,
 } from './__generated__/Positions';
-import type { PositionStatus, ProductType } from '@vegaprotocol/types';
+import {
+  AccountType,
+  MarketState,
+  type MarketTradingMode,
+  type PositionStatus,
+  type ProductType,
+} from '@vegaprotocol/types';
 
 export interface Position {
   assetId: string;
@@ -43,8 +44,8 @@ export interface Position {
   marketDecimalPlaces: number;
   marketId: string;
   marketCode: string;
-  marketTradingMode: Schema.MarketTradingMode;
-  marketState: Schema.MarketState;
+  marketTradingMode: MarketTradingMode;
+  marketState: MarketState;
   markPrice: string | undefined;
   notional: string | undefined;
   openVolume: string;
@@ -81,7 +82,7 @@ export const getMetrics = (
     const generalAccount = accounts?.find(
       (account) =>
         account.asset.id === asset.id &&
-        account.type === Schema.AccountType.ACCOUNT_TYPE_GENERAL
+        account.type === AccountType.ACCOUNT_TYPE_GENERAL
     );
 
     const { positionDecimalPlaces, decimalPlaces: marketDecimalPlaces } =
@@ -263,9 +264,9 @@ export const preparePositions = (metrics: Position[], showClosed: boolean) => {
 
     if (
       [
-        Schema.MarketState.STATE_ACTIVE,
-        Schema.MarketState.STATE_PENDING,
-        Schema.MarketState.STATE_SUSPENDED,
+        MarketState.STATE_ACTIVE,
+        MarketState.STATE_PENDING,
+        MarketState.STATE_SUSPENDED,
       ].includes(p.marketState)
     ) {
       return true;
diff --git a/libs/positions/src/lib/positions-table.tsx b/libs/positions/src/lib/positions-table.tsx
index 6607bbc19..5fd00fa24 100644
--- a/libs/positions/src/lib/positions-table.tsx
+++ b/libs/positions/src/lib/positions-table.tsx
@@ -1,12 +1,5 @@
-import { useMemo } from 'react';
-import type { CSSProperties, ReactNode } from 'react';
-import type { ColDef, ITooltipParams } from 'ag-grid-community';
-import type {
-  VegaValueFormatterParams,
-  VegaValueGetterParams,
-  TypedDataAgGrid,
-  VegaICellRendererParams,
-} from '@vegaprotocol/datagrid';
+import { useMemo, type CSSProperties, type ReactNode } from 'react';
+import { type ColDef, type ITooltipParams } from 'ag-grid-community';
 import {
   AgGrid,
   COL_DEFS,
@@ -16,6 +9,10 @@ import {
   ProgressBarCell,
   MarketProductPill,
   StackedCell,
+  type VegaValueFormatterParams,
+  type VegaValueGetterParams,
+  type TypedDataAgGrid,
+  type VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
 import {
   ButtonLink,
@@ -32,7 +29,7 @@ import {
   addDecimalsFormatNumberQuantum,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { Position } from './positions-data-providers';
+import { type Position } from './positions-data-providers';
 import {
   MarketTradingMode,
   PositionStatus,
@@ -557,7 +554,7 @@ const WarningCell = ({
           <VegaIcon name={VegaIconNames.EXCLAIMATION_MARK} size={12} />
         </span>
       )}
-      <span className="overflow-hidden whitespace-nowrap text-ellipsis">
+      <span className="overflow-hidden text-ellipsis whitespace-nowrap">
         {children}
       </span>
     </div>
diff --git a/libs/proposals/src/lib/proposals-data-provider/proposals-data-provider.tsx b/libs/proposals/src/lib/proposals-data-provider/proposals-data-provider.tsx
index 31c13075e..3d4901ee0 100644
--- a/libs/proposals/src/lib/proposals-data-provider/proposals-data-provider.tsx
+++ b/libs/proposals/src/lib/proposals-data-provider/proposals-data-provider.tsx
@@ -1,21 +1,19 @@
-import type { Update } from '@vegaprotocol/data-provider';
+import { type Update } from '@vegaprotocol/data-provider';
 import { makeDataProvider } from '@vegaprotocol/data-provider';
 import produce from 'immer';
 import * as Types from '@vegaprotocol/types';
-import type {
-  ProposalsListQuery,
-  ProposalsListQueryVariables,
-  ProposalListFieldsFragment,
-  MarketViewLiveProposalsSubscription,
-  MarketViewProposalFieldsFragment,
-  MarketViewProposalsQuery,
-  MarketViewProposalsQueryVariables,
-  MarketViewLiveProposalsSubscriptionVariables,
-} from './__generated__/Proposals';
 import {
   MarketViewLiveProposalsDocument,
   MarketViewProposalsDocument,
   ProposalsListDocument,
+  type ProposalsListQuery,
+  type ProposalsListQueryVariables,
+  type ProposalListFieldsFragment,
+  type MarketViewLiveProposalsSubscription,
+  type MarketViewProposalFieldsFragment,
+  type MarketViewProposalsQuery,
+  type MarketViewProposalsQueryVariables,
+  type MarketViewLiveProposalsSubscriptionVariables,
 } from './__generated__/Proposals';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 
diff --git a/libs/proposals/src/lib/proposals-hooks/use-proposal-event.ts b/libs/proposals/src/lib/proposals-hooks/use-proposal-event.ts
index 92042a445..07bbbe179 100644
--- a/libs/proposals/src/lib/proposals-hooks/use-proposal-event.ts
+++ b/libs/proposals/src/lib/proposals-hooks/use-proposal-event.ts
@@ -1,13 +1,13 @@
 import { useApolloClient } from '@apollo/client';
 import { useCallback, useEffect, useRef } from 'react';
-import { ProposalEventDocument } from './__generated__/Proposal';
-import type {
-  ProposalEventSubscriptionVariables,
-  ProposalEventSubscription,
-  ProposalEventFieldsFragment,
+import {
+  ProposalEventDocument,
+  type ProposalEventSubscriptionVariables,
+  type ProposalEventSubscription,
+  type ProposalEventFieldsFragment,
 } from './__generated__/Proposal';
-import type { Subscription } from 'zen-observable-ts';
-import type { VegaTxState } from '../proposals-hooks/use-vega-transaction';
+import { type Subscription } from 'zen-observable-ts';
+import { type VegaTxState } from '../proposals-hooks/use-vega-transaction';
 
 export const useProposalEvent = (transaction: VegaTxState) => {
   const client = useApolloClient();
diff --git a/libs/proposals/src/lib/proposals-hooks/use-proposal-submit.ts b/libs/proposals/src/lib/proposals-hooks/use-proposal-submit.ts
index bd39fa5cd..e6f844ee7 100644
--- a/libs/proposals/src/lib/proposals-hooks/use-proposal-submit.ts
+++ b/libs/proposals/src/lib/proposals-hooks/use-proposal-submit.ts
@@ -3,8 +3,8 @@ import * as Sentry from '@sentry/react';
 import { useVegaWallet, determineId } from '@vegaprotocol/wallet';
 import { useVegaTransaction } from './use-vega-transaction';
 import { useProposalEvent } from './use-proposal-event';
-import type { ProposalSubmission } from '@vegaprotocol/wallet';
-import type { ProposalEventFieldsFragment } from './__generated__/Proposal';
+import { type ProposalSubmission } from '@vegaprotocol/wallet';
+import { type ProposalEventFieldsFragment } from './__generated__/Proposal';
 
 export const useProposalSubmit = () => {
   const { pubKey } = useVegaWallet();
diff --git a/libs/proposals/src/lib/protocol-upgrade-proposals/use-block-rising.ts b/libs/proposals/src/lib/protocol-upgrade-proposals/use-block-rising.ts
index 60d7bdc9c..d0d7fa5e5 100644
--- a/libs/proposals/src/lib/protocol-upgrade-proposals/use-block-rising.ts
+++ b/libs/proposals/src/lib/protocol-upgrade-proposals/use-block-rising.ts
@@ -2,8 +2,10 @@ import { createClient } from '@vegaprotocol/apollo-client';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { useBlockInfo } from '@vegaprotocol/tendermint';
 import { useEffect, useMemo, useState } from 'react';
-import type { BlockStatisticsQuery } from './__generated__/BlockStatistics';
-import { BlockStatisticsDocument } from './__generated__/BlockStatistics';
+import {
+  BlockStatisticsDocument,
+  type BlockStatisticsQuery,
+} from './__generated__/BlockStatistics';
 import compact from 'lodash/compact';
 import max from 'lodash/max';
 
diff --git a/libs/proposals/src/lib/voting-hooks/use-vote-event.ts b/libs/proposals/src/lib/voting-hooks/use-vote-event.ts
index 8b5fec9c7..1e6289bbb 100644
--- a/libs/proposals/src/lib/voting-hooks/use-vote-event.ts
+++ b/libs/proposals/src/lib/voting-hooks/use-vote-event.ts
@@ -1,12 +1,12 @@
 import { useApolloClient } from '@apollo/client';
 import { useCallback, useEffect, useRef } from 'react';
-import { VoteEventDocument } from './__generated__/VoteSubsciption';
-import type { Subscription } from 'zen-observable-ts';
-import type { VegaTxState } from '../proposals-hooks/use-vega-transaction';
-import type {
-  VoteEventFieldsFragment,
-  VoteEventSubscription,
-  VoteEventSubscriptionVariables,
+import { type Subscription } from 'zen-observable-ts';
+import { type VegaTxState } from '../proposals-hooks/use-vega-transaction';
+import {
+  VoteEventDocument,
+  type VoteEventSubscription,
+  type VoteEventSubscriptionVariables,
+  type VoteEventFieldsFragment,
 } from './__generated__/VoteSubsciption';
 
 export const useVoteEvent = (transaction: VegaTxState) => {
diff --git a/libs/tendermint/src/lib/use-block-info.ts b/libs/tendermint/src/lib/use-block-info.ts
index ebc2cf091..8810cde74 100644
--- a/libs/tendermint/src/lib/use-block-info.ts
+++ b/libs/tendermint/src/lib/use-block-info.ts
@@ -1,6 +1,6 @@
 import { useEnvironment } from '@vegaprotocol/environment';
 import { useFetch } from '@vegaprotocol/react-helpers';
-import type { TendermintBlockResponse } from '../types';
+import { type TendermintBlockResponse } from '../types';
 
 export const useBlockInfo = (blockHeight?: number, canFetch = true) => {
   const { TENDERMINT_URL } = useEnvironment();
diff --git a/libs/trades/src/lib/trades-data-provider.ts b/libs/trades/src/lib/trades-data-provider.ts
index a448bce77..4ee1cee9c 100644
--- a/libs/trades/src/lib/trades-data-provider.ts
+++ b/libs/trades/src/lib/trades-data-provider.ts
@@ -1,21 +1,22 @@
+import orderBy from 'lodash/orderBy';
 import {
   makeDataProvider,
   makeDerivedDataProvider,
   defaultAppend as append,
 } from '@vegaprotocol/data-provider';
-import type { PageInfo, Cursor } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import { type PageInfo, type Cursor } from '@vegaprotocol/data-provider';
+import { type Market } from '@vegaprotocol/markets';
 import { marketsMapProvider } from '@vegaprotocol/markets';
-import type {
-  TradesQuery,
-  TradesQueryVariables,
-  TradeFieldsFragment,
-  TradesUpdateSubscription,
-  TradeUpdateFieldsFragment,
-  TradesUpdateSubscriptionVariables,
+import {
+  TradesDocument,
+  TradesUpdateDocument,
+  type TradesQuery,
+  type TradesQueryVariables,
+  type TradeFieldsFragment,
+  type TradesUpdateSubscription,
+  type TradeUpdateFieldsFragment,
+  type TradesUpdateSubscriptionVariables,
 } from './__generated__/Trades';
-import { TradesDocument, TradesUpdateDocument } from './__generated__/Trades';
-import orderBy from 'lodash/orderBy';
 
 export const MAX_TRADES = 500;
 
diff --git a/libs/trades/src/lib/trades-table.tsx b/libs/trades/src/lib/trades-table.tsx
index 02ec5750c..a93cf0852 100644
--- a/libs/trades/src/lib/trades-table.tsx
+++ b/libs/trades/src/lib/trades-table.tsx
@@ -1,20 +1,24 @@
 import { useMemo } from 'react';
-import type { ColDef } from 'ag-grid-community';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
+import {
+  AgGrid,
+  NumericCell,
+  type VegaICellRendererParams,
+  type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGrid, NumericCell } from '@vegaprotocol/datagrid';
 import {
   addDecimal,
   addDecimalsFormatNumber,
   getTimeFormat,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { IDatasource, IGetRowsParams } from 'ag-grid-community';
-import type { CellClassParams } from 'ag-grid-community';
-import type { AgGridReactProps } from 'ag-grid-react';
-import type { Trade } from './trades-data-provider';
+import {
+  type ColDef,
+  type CellClassParams,
+  type IDatasource,
+  type IGetRowsParams,
+} from 'ag-grid-community';
+import { type AgGridReactProps } from 'ag-grid-react';
+import { type Trade } from './trades-data-provider';
 import { Side } from '@vegaprotocol/types';
 
 export const BUY_CLASS = 'text-market-green-600 dark:text-market-green';
diff --git a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
index 314b699e6..2e7d92940 100644
--- a/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
+++ b/libs/ui-toolkit/src/components/dropdown-menu/dropdown-menu.tsx
@@ -1,6 +1,6 @@
 import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
-import type { ComponentProps, ReactNode } from 'react';
+import { type ComponentProps, type ReactNode } from 'react';
 import { forwardRef } from 'react';
 import { VegaIcon, VegaIconNames } from '../icon';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
diff --git a/libs/ui-toolkit/src/components/navigation/navigation-drawer.tsx b/libs/ui-toolkit/src/components/navigation/navigation-drawer.tsx
index 532923068..b81a5b550 100644
--- a/libs/ui-toolkit/src/components/navigation/navigation-drawer.tsx
+++ b/libs/ui-toolkit/src/components/navigation/navigation-drawer.tsx
@@ -1,9 +1,9 @@
 import classNames from 'classnames';
-import type { CSSProperties, HTMLAttributes } from 'react';
+import { type CSSProperties, type HTMLAttributes } from 'react';
 import { forwardRef } from 'react';
 import { createContext } from 'react';
 import { create } from 'zustand';
-import type { NavigationProps } from './navigation-utils';
+import { type NavigationProps } from './navigation-utils';
 
 export const NavigationDrawerContext = createContext<true | undefined>(
   undefined
@@ -36,7 +36,7 @@ export const BurgerIcon = ({
       y1={3.5}
       y2={3.5}
       className={classNames('transition-transform duration-75', {
-        'rotate-45 translate-y-[4px] origin-[8px_3.5px]': variant === 'close',
+        'origin-[8px_3.5px] translate-y-[4px] rotate-45': variant === 'close',
       })}
     />
     <line
@@ -45,7 +45,7 @@ export const BurgerIcon = ({
       y1={11.5}
       y2={11.5}
       className={classNames('transition-transform duration-75', {
-        'rotate-[-45deg] translate-y-[-4px] origin-[8px_11.5px]':
+        'origin-[8px_11.5px] translate-y-[-4px] rotate-[-45deg]':
           variant === 'close',
       })}
     />
@@ -99,8 +99,8 @@ export const NavigationDrawerContent = ({
       <div
         className={classNames(
           'drawer-content',
-          'border-l h-full relative overflow-auto',
-          'px-4 pb-8 font-alpha',
+          'relative h-full overflow-auto border-l',
+          'font-alpha px-4 pb-8',
           // text
           {
             'text-vega-light-300 dark:text-vega-dark-300':
diff --git a/libs/ui-toolkit/src/components/toast/toast.tsx b/libs/ui-toolkit/src/components/toast/toast.tsx
index 5c4b1c5c9..b5d5169c5 100644
--- a/libs/ui-toolkit/src/components/toast/toast.tsx
+++ b/libs/ui-toolkit/src/components/toast/toast.tsx
@@ -3,12 +3,17 @@ import styles from './toast.module.css';
 import type { IconName } from '@blueprintjs/icons';
 import { IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
-import type { HTMLAttributes, HtmlHTMLAttributes, ReactNode } from 'react';
-import { useState } from 'react';
-import { forwardRef, useEffect } from 'react';
-import { useCallback } from 'react';
-import { useLayoutEffect } from 'react';
-import { useRef } from 'react';
+import {
+  forwardRef,
+  useCallback,
+  useEffect,
+  useLayoutEffect,
+  useState,
+  useRef,
+  type HTMLAttributes,
+  type HtmlHTMLAttributes,
+  type ReactNode,
+} from 'react';
 import { Intent } from '../../utils/intent';
 import { Icon, VegaIcon, VegaIconNames } from '../icon';
 import { Loader } from '../loader';
@@ -58,8 +63,8 @@ export const Panel = forwardRef<HTMLDivElement, HTMLAttributes<HTMLDivElement>>(
         ref={ref}
         data-testid="toast-panel"
         className={classNames(
-          'p-2 rounded mt-[10px]',
-          'font-mono text-[12px] leading-[16px] font-normal',
+          'mt-[10px] rounded p-2',
+          'font-mono text-[12px] font-normal leading-[16px]',
           '[&>h4]:font-bold',
           className
         )}
@@ -87,8 +92,8 @@ export const CollapsiblePanel = forwardRef<
       data-test
       className={classNames(
         'relative',
-        'p-2 rounded mt-[10px]',
-        'font-mono text-[12px] leading-[16px] font-normal',
+        'mt-[10px] rounded p-2',
+        'font-mono text-[12px] font-normal leading-[16px]',
         '[&>h4]:font-bold',
         'overflow-auto',
         {
@@ -110,7 +115,7 @@ export const CollapsiblePanel = forwardRef<
           data-panel-curtain
           className={classNames(
             'bg-gradient-to-b from-transparent to-inherit',
-            'absolute bottom-0 left-0 h-8 w-full pointer-events-none'
+            'pointer-events-none absolute bottom-0 left-0 h-8 w-full'
           )}
         ></div>
       )}
@@ -120,7 +125,7 @@ export const CollapsiblePanel = forwardRef<
           'absolute bottom-0 right-0',
           'p-2',
           'rounded-tl',
-          'flex align-middle gap-1'
+          'flex gap-1 align-middle'
         )}
       >
         {actions}
@@ -150,7 +155,7 @@ export const ToastHeading = forwardRef<
 >(({ children, className, ...props }, ref) => (
   <h3
     ref={ref}
-    className={classNames('text-sm uppercase mb-1', className)}
+    className={classNames('mb-1 text-sm uppercase', className)}
     {...props}
   >
     {children}
@@ -237,7 +242,7 @@ export const Toast = ({
         }
       }}
       className={classNames(
-        'w-[320px] rounded-md overflow-hidden',
+        'w-[320px] overflow-hidden rounded-md',
         'shadow-[8px_8px_16px_0_rgba(0,0,0,0.4)]',
         'text-black dark:text-white',
         'font-alpha text-[14px] leading-[19px]',
@@ -289,7 +294,7 @@ export const Toast = ({
             intent === Intent.Danger,
         },
         // panels's progress bar colours
-        '[&_[data-progress-bar]]:mt-[10px] [&_[data-progress-bar]]:mb-[4px]',
+        '[&_[data-progress-bar]]:mb-[4px] [&_[data-progress-bar]]:mt-[10px]',
         {
           '[&_[data-progress-bar]]:bg-vega-light-200 [&_[data-progress-bar]]:dark:bg-vega-dark-200 ':
             intent === Intent.None,
@@ -322,7 +327,7 @@ export const Toast = ({
           type="button"
           data-testid="toast-close"
           onClick={closeToast}
-          className="absolute top-0 right-0 z-20 flex items-center p-2"
+          className="absolute right-0 top-0 z-20 flex items-center p-2"
         >
           <VegaIcon name={VegaIconNames.CROSS} size={12} />
         </button>
@@ -349,21 +354,21 @@ export const Toast = ({
           )}
         >
           {loader ? (
-            <div className="w-[15px] h-[15px]">
+            <div className="h-[15px] w-[15px]">
               <Loader size="small" forceTheme="dark" />
             </div>
           ) : (
             <Icon
               name={toastIconMapping[intent]}
               size={4}
-              className="!block !w-[14px] !h-[14px]"
+              className="!block !h-[14px] !w-[14px]"
             />
           )}
         </div>
         <div
           className={classNames(
             'relative',
-            'overflow-auto flex-1 p-4 pr-[40px] [&>p]:mb-[2.5px]'
+            'flex-1 overflow-auto p-4 pr-[40px] [&>p]:mb-[2.5px]'
           )}
           data-testid="toast-content"
         >
@@ -385,7 +390,7 @@ export const Toast = ({
                   'bg-vega-red-400 dark:bg-vega-red-600':
                     intent === Intent.Danger,
                 },
-                'absolute bottom-0 left-0 w-full h-[4px]',
+                'absolute bottom-0 left-0 h-[4px] w-full',
                 'animate-progress'
               )}
               style={{
diff --git a/libs/ui-toolkit/src/components/trading-button/trading-button.tsx b/libs/ui-toolkit/src/components/trading-button/trading-button.tsx
index 8ffe55cdc..7fe693eb4 100644
--- a/libs/ui-toolkit/src/components/trading-button/trading-button.tsx
+++ b/libs/ui-toolkit/src/components/trading-button/trading-button.tsx
@@ -1,9 +1,9 @@
 import classNames from 'classnames';
-import { forwardRef } from 'react';
-import type {
-  AnchorHTMLAttributes,
-  ButtonHTMLAttributes,
-  ReactNode,
+import {
+  forwardRef,
+  type AnchorHTMLAttributes,
+  type ReactNode,
+  type ButtonHTMLAttributes,
 } from 'react';
 import { Intent } from '../../utils/intent';
 import { Link } from 'react-router-dom';
@@ -74,14 +74,14 @@ const Content = ({
   children,
 }: Pick<TradingButtonProps, 'icon' | 'subLabel' | 'children'>) => (
   <>
-    <span data-label className="leading-none font-alpha" key="children">
+    <span data-label className="font-alpha leading-none" key="children">
       {children}
     </span>
     {icon}
     {subLabel && (
       <span
         data-sub-label
-        className="font-mono text-xs leading-tight mt-0.5"
+        className="mt-0.5 font-mono text-xs leading-tight"
         key="trading-button-sub-label"
       >
         {subLabel}
diff --git a/libs/ui-toolkit/src/components/trading-dropdown/trading-dropdown.tsx b/libs/ui-toolkit/src/components/trading-dropdown/trading-dropdown.tsx
index bd69975c6..4b52a2b34 100644
--- a/libs/ui-toolkit/src/components/trading-dropdown/trading-dropdown.tsx
+++ b/libs/ui-toolkit/src/components/trading-dropdown/trading-dropdown.tsx
@@ -1,7 +1,6 @@
 import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
-import type { ComponentProps, ReactNode } from 'react';
-import { forwardRef } from 'react';
+import { forwardRef, type ComponentProps, type ReactNode } from 'react';
 import { VegaIcon, VegaIconNames } from '../icon';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
 import CopyToClipboard from 'react-copy-to-clipboard';
diff --git a/libs/wallet/src/connect-dialog/connect-dialog.tsx b/libs/wallet/src/connect-dialog/connect-dialog.tsx
index d24f16612..58163c6ec 100644
--- a/libs/wallet/src/connect-dialog/connect-dialog.tsx
+++ b/libs/wallet/src/connect-dialog/connect-dialog.tsx
@@ -10,11 +10,10 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import type { ReactNode } from 'react';
-import { useCallback, useState } from 'react';
-import type { WalletClientError } from '@vegaprotocol/wallet-client';
+import { useCallback, useState, type ReactNode } from 'react';
+import { type WalletClientError } from '@vegaprotocol/wallet-client';
 import { t } from '@vegaprotocol/i18n';
-import type { Connectors, VegaConnector } from '../connectors';
+import { type Connectors, type VegaConnector } from '../connectors';
 import { DEFAULT_SNAP_VERSION } from '../connectors';
 import {
   DEFAULT_SNAP_ID,
@@ -32,10 +31,14 @@ import {
   ConnectDialogFooter,
   ConnectDialogTitle,
 } from './connect-dialog-elements';
-import type { Status as JsonRpcStatus } from '../use-json-rpc-connect';
-import { useJsonRpcConnect } from '../use-json-rpc-connect';
-import type { Status as InjectedStatus } from '../use-injected-connector';
-import { useInjectedConnector } from '../use-injected-connector';
+import {
+  useJsonRpcConnect,
+  type Status as JsonRpcStatus,
+} from '../use-json-rpc-connect';
+import {
+  useInjectedConnector,
+  type Status as InjectedStatus,
+} from '../use-injected-connector';
 import { useVegaWallet } from '../use-vega-wallet';
 import { InjectedConnectorForm } from './injected-connector-form';
 import { isBrowserWalletInstalled } from '../utils';
@@ -229,7 +232,7 @@ const ConnectorList = ({
 
   const extendedText = (
     <>
-      <div className="flex items-center justify-center w-full h-full text-base gap-1">
+      <div className="flex h-full w-full items-center justify-center gap-1 text-base">
         {t('Connect')}
       </div>
       <BrowserIcon
@@ -255,7 +258,7 @@ const ConnectorList = ({
           'Connect securely, deposit funds and approve or reject transactions with the Vega wallet'
         )}
       </p>
-      <div data-testid="connectors-list" className="flex flex-col mt-4 gap-2">
+      <div data-testid="connectors-list" className="mt-4 flex flex-col gap-2">
         {isBrowserWalletInstalled() ? (
           <ConnectionOptionWithDescription
             type="injected"
@@ -315,10 +318,10 @@ const ConnectorList = ({
                 )}
                 text={
                   <>
-                    <div className="flex items-center justify-center w-full h-full text-base gap-1">
+                    <div className="flex h-full w-full items-center justify-center gap-1 text-base">
                       {t('Connect via Vega MetaMask Snap')}
                     </div>
-                    <div className="absolute top-0 flex items-center h-8 right-1">
+                    <div className="absolute right-1 top-0 flex h-8 items-center">
                       <VegaIcon name={VegaIconNames.METAMASK} size={24} />
                     </div>
                   </>
@@ -344,10 +347,10 @@ const ConnectorList = ({
                   )}
                   text={
                     <>
-                      <div className="flex items-center justify-center w-full h-full text-base gap-1">
+                      <div className="flex h-full w-full items-center justify-center gap-1 text-base">
                         {t('Install Vega MetaMask Snap')}
                       </div>
-                      <div className="absolute top-0 flex items-center h-8 right-1">
+                      <div className="absolute right-1 top-0 flex h-8 items-center">
                         <VegaIcon name={VegaIconNames.METAMASK} size={24} />
                       </div>
                     </>
@@ -359,7 +362,7 @@ const ConnectorList = ({
                   }}
                 />
                 {snapStatus === SnapStatus.NOT_SUPPORTED ? (
-                  <p className="pt-1 text-xs leading-tight text-muted">
+                  <p className="text-muted pt-1 text-xs leading-tight">
                     {t('No MetaMask version that supports snaps detected.')}{' '}
                     {t('Learn more about')}{' '}
                     <ExternalLink href="https://metamask.io/snaps/">
@@ -372,7 +375,7 @@ const ConnectorList = ({
           </div>
         ) : null}
         <div>
-          <h1 className="mb-1 text-md">{t('Advanced / Other options...')}</h1>
+          <h1 className="text-md mb-1">{t('Advanced / Other options...')}</h1>
           <ConnectionOption
             type="view"
             text={t('View as party')}
@@ -482,7 +485,7 @@ export const GetWalletButton = ({
 
   const buttonContent = (
     <>
-      <div className="flex items-center justify-center text-base gap-1">
+      <div className="flex items-center justify-center gap-1 text-base">
         {t('Get the Vega Wallet')}
         <Pill size="xxs" intent={Intent.Info}>
           ALPHA
@@ -502,7 +505,7 @@ export const GetWalletButton = ({
       className={classNames(
         [
           'bg-vega-blue-350 hover:bg-vega-blue-400 dark:bg-vega-blue-650 dark:hover:bg-vega-blue-600',
-          'flex gap-2 items-center justify-center rounded h-8 px-3 relative',
+          'relative flex h-8 items-center justify-center gap-2 rounded px-3',
         ],
         className
       )}
@@ -544,7 +547,7 @@ const ConnectionOptionWithDescription = ({
   return (
     <div>
       <h1 className="text-md">{title}</h1>
-      <p className="mb-2 text-sm text-gray-60 text-muted">{description}</p>
+      <p className="text-gray-60 text-muted mb-2 text-sm">{description}</p>
       <ConnectionOption
         disabled={disabled}
         type={type}
@@ -600,10 +603,10 @@ const CustomUrlInput = ({
   const [urlInputExpanded, setUrlInputExpanded] = useState(false);
   return urlInputExpanded ? (
     <>
-      <div className="flex justify-between mb-1.5">
-        <p className="text-sm text-secondary">{t('Custom wallet location')}</p>
+      <div className="mb-1.5 flex justify-between">
+        <p className="text-secondary text-sm">{t('Custom wallet location')}</p>
         <button
-          className="text-sm text-muted"
+          className="text-muted text-sm"
           onClick={() => setUrlInputExpanded(false)}
         >
           <VegaIcon name={VegaIconNames.ARROW_LEFT} />{' '}
@@ -637,7 +640,7 @@ const CustomUrlInput = ({
         onClick={() => onSelect('jsonRpc')}
       />
       {isDesktopWalletRunning !== null && (
-        <div className="pt-1 mb-2 text-sm">
+        <div className="mb-2 pt-1 text-sm">
           {isDesktopWalletRunning ? (
             <button
               className="text-muted"
@@ -650,7 +653,7 @@ const CustomUrlInput = ({
               <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
             </button>
           ) : (
-            <p className="leading-tight text-muted">
+            <p className="text-muted leading-tight">
               <span className="text-xs">
                 {t(
                   'No running Desktop App/CLI detected. Open your app now to connect or enter a'
diff --git a/libs/wallet/src/provider.tsx b/libs/wallet/src/provider.tsx
index d0bf96ec6..d5d38df5c 100644
--- a/libs/wallet/src/provider.tsx
+++ b/libs/wallet/src/provider.tsx
@@ -1,12 +1,11 @@
 import { LocalStorage } from '@vegaprotocol/utils';
-import type { ReactNode } from 'react';
-import { useCallback, useMemo, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState, type ReactNode } from 'react';
 import { WalletClientError } from '@vegaprotocol/wallet-client';
-import type { VegaWalletContextShape } from '.';
-import type {
-  PubKey,
-  Transaction,
-  VegaConnector,
+import { type VegaWalletContextShape } from '.';
+import {
+  type PubKey,
+  type VegaConnector,
+  type Transaction,
 } from './connectors/vega-connector';
 import { VegaWalletContext } from './context';
 import { WALLET_KEY, WALLET_RISK_ACCEPTED_KEY } from './storage';
diff --git a/libs/web3/src/lib/use-ethereum-transaction-manager.spec.tsx b/libs/web3/src/lib/use-ethereum-transaction-manager.spec.tsx
index 761444a94..4c41bffe5 100644
--- a/libs/web3/src/lib/use-ethereum-transaction-manager.spec.tsx
+++ b/libs/web3/src/lib/use-ethereum-transaction-manager.spec.tsx
@@ -1,10 +1,10 @@
 import { useEthTransactionManager } from './use-ethereum-transaction-manager';
 import { renderHook } from '@testing-library/react';
 import waitForNextTick from 'flush-promises';
-import type { CollateralBridge } from '@vegaprotocol/smart-contracts';
-import type {
-  EthTransactionStore,
-  EthStoredTxState,
+import { type CollateralBridge } from '@vegaprotocol/smart-contracts';
+import {
+  type EthTransactionStore,
+  type EthStoredTxState,
 } from './use-ethereum-transaction-store';
 
 import { EthTxStatus } from './use-ethereum-transaction';
diff --git a/libs/web3/src/lib/use-ethereum-transaction-updater.spec.tsx b/libs/web3/src/lib/use-ethereum-transaction-updater.spec.tsx
index b608e4ef1..1d18ce135 100644
--- a/libs/web3/src/lib/use-ethereum-transaction-updater.spec.tsx
+++ b/libs/web3/src/lib/use-ethereum-transaction-updater.spec.tsx
@@ -1,16 +1,16 @@
 import { renderHook, waitFor } from '@testing-library/react';
-import type { MockedResponse } from '@apollo/client/testing';
+import { type MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 import { useEthTransactionUpdater } from './use-ethereum-transaction-updater';
 import { DepositBusEventDocument } from './__generated__/TransactionResult';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import type {
-  DepositBusEventSubscription,
-  DepositBusEventFieldsFragment,
+import {
+  type DepositBusEventSubscription,
+  type DepositBusEventFieldsFragment,
 } from './__generated__/TransactionResult';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import type { EthTransactionStore } from './use-ethereum-transaction-store';
+import { type VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { type EthTransactionStore } from './use-ethereum-transaction-store';
 import { DepositStatus } from '@vegaprotocol/types';
 
 const pubKey = 'pubKey';
diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx
index e3d127990..82b954e5b 100644
--- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx
+++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.spec.tsx
@@ -1,26 +1,26 @@
 import { useEthWithdrawApprovalsManager } from './use-ethereum-withdraw-approvals-manager';
 import { renderHook, waitFor } from '@testing-library/react';
-import type { MockedResponse } from '@apollo/client/testing';
-import type { ReactNode } from 'react';
+import { type MockedResponse } from '@apollo/client/testing';
+import { type ReactNode } from 'react';
 import { MockedProvider } from '@apollo/client/testing';
 import waitForNextTick from 'flush-promises';
 import * as Schema from '@vegaprotocol/types';
+import BigNumber from 'bignumber.js';
 import {
   ApprovalStatus,
   WithdrawalFailure,
+  type EthWithdrawApprovalStore,
+  type EthWithdrawalApprovalState,
 } from './use-ethereum-withdraw-approvals-store';
-import BigNumber from 'bignumber.js';
-import type {
-  EthWithdrawApprovalStore,
-  EthWithdrawalApprovalState,
-} from './use-ethereum-withdraw-approvals-store';
-import type { EthTransactionStore } from './use-ethereum-transaction-store';
-
-import { WithdrawalApprovalDocument } from './__generated__/WithdrawalApproval';
-import type { WithdrawalApprovalQuery } from './__generated__/WithdrawalApproval';
-
-import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { type EthTransactionStore } from './use-ethereum-transaction-store';
+import {
+  WithdrawalApprovalDocument,
+  type WithdrawalApprovalQuery,
+} from './__generated__/WithdrawalApproval';
+import {
+  NetworkParamsDocument,
+  type NetworkParamsQuery,
+} from '@vegaprotocol/network-parameters';
 
 const mockWeb3Provider = jest.fn();
 
diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx
index ca293f7e8..29504a166 100644
--- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx
+++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-manager.tsx
@@ -8,17 +8,13 @@ import { t } from '@vegaprotocol/i18n';
 import { localLoggerFactory } from '@vegaprotocol/logger';
 
 import { CollateralBridge } from '@vegaprotocol/smart-contracts';
-
 import { useEthereumConfig } from './use-ethereum-config';
 import { useWeb3React } from '@web3-react/core';
-
-import type {
-  WithdrawalApprovalQuery,
-  WithdrawalApprovalQueryVariables,
+import {
+  WithdrawalApprovalDocument,
+  type WithdrawalApprovalQuery,
+  type WithdrawalApprovalQueryVariables,
 } from './__generated__/WithdrawalApproval';
-
-import { WithdrawalApprovalDocument } from './__generated__/WithdrawalApproval';
-
 import { useEthTransactionStore } from './use-ethereum-transaction-store';
 import {
   ApprovalStatus,
diff --git a/libs/web3/src/lib/use-ethereum-withdraw-approvals-store.spec.tsx b/libs/web3/src/lib/use-ethereum-withdraw-approvals-store.spec.tsx
index bb5e6fec7..18fa9c9da 100644
--- a/libs/web3/src/lib/use-ethereum-withdraw-approvals-store.spec.tsx
+++ b/libs/web3/src/lib/use-ethereum-withdraw-approvals-store.spec.tsx
@@ -1,7 +1,9 @@
 import { useEthWithdrawApprovalsStore } from './use-ethereum-withdraw-approvals-store';
-import type { VegaStoredTxState } from './use-vega-transaction-store';
-import { ApprovalStatus } from './use-ethereum-withdraw-approvals-store';
-import type { EthWithdrawalApprovalState } from './use-ethereum-withdraw-approvals-store';
+import { type VegaStoredTxState } from './use-vega-transaction-store';
+import {
+  ApprovalStatus,
+  type EthWithdrawalApprovalState,
+} from './use-ethereum-withdraw-approvals-store';
 
 const mockFindVegaTransaction = jest.fn<VegaStoredTxState, []>();
 const mockDismissVegaTransaction = jest.fn();
diff --git a/libs/web3/src/lib/use-transaction-result.ts b/libs/web3/src/lib/use-transaction-result.ts
index 613c37741..b6fca514f 100644
--- a/libs/web3/src/lib/use-transaction-result.ts
+++ b/libs/web3/src/lib/use-transaction-result.ts
@@ -1,12 +1,12 @@
 import { useApolloClient } from '@apollo/client';
 import * as Schema from '@vegaprotocol/types';
 import { useCallback, useEffect, useRef } from 'react';
-import type { Subscription } from 'zen-observable-ts';
-import type {
-  TransactionEventSubscription,
-  TransactionEventSubscriptionVariables,
+import { type Subscription } from 'zen-observable-ts';
+import {
+  TransactionEventDocument,
+  type TransactionEventSubscription,
+  type TransactionEventSubscriptionVariables,
 } from './__generated__/TransactionResult';
-import { TransactionEventDocument } from './__generated__/TransactionResult';
 
 export interface TransactionResult {
   partyId: string;
diff --git a/libs/web3/src/lib/use-vega-transaction-manager.spec.tsx b/libs/web3/src/lib/use-vega-transaction-manager.spec.tsx
index 5e216174a..c68459554 100644
--- a/libs/web3/src/lib/use-vega-transaction-manager.spec.tsx
+++ b/libs/web3/src/lib/use-vega-transaction-manager.spec.tsx
@@ -1,11 +1,11 @@
 import { useVegaTransactionManager } from './use-vega-transaction-manager';
 import { renderHook } from '@testing-library/react';
 import waitForNextTick from 'flush-promises';
-import type { TransactionResponse } from '@vegaprotocol/wallet';
+import { type TransactionResponse } from '@vegaprotocol/wallet';
 import { VegaTxStatus } from './types';
-import type {
-  VegaTransactionStore,
-  VegaStoredTxState,
+import {
+  type VegaTransactionStore,
+  type VegaStoredTxState,
 } from './use-vega-transaction-store';
 
 const mockSendTx = jest.fn();
diff --git a/libs/web3/src/lib/use-vega-transaction-updater.spec.tsx b/libs/web3/src/lib/use-vega-transaction-updater.spec.tsx
index 1989bf7ca..5965ecddc 100644
--- a/libs/web3/src/lib/use-vega-transaction-updater.spec.tsx
+++ b/libs/web3/src/lib/use-vega-transaction-updater.spec.tsx
@@ -1,23 +1,21 @@
 import { renderHook, waitFor } from '@testing-library/react';
-import type { MockedResponse } from '@apollo/client/testing';
+import { type MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type { ReactNode } from 'react';
+import { type ReactNode } from 'react';
 import { useVegaTransactionUpdater } from './use-vega-transaction-updater';
 import {
   OrderTxUpdateDocument,
   TransactionEventDocument,
   WithdrawalBusEventDocument,
-} from './__generated__/TransactionResult';
-import type {
-  OrderTxUpdateSubscription,
-  OrderTxUpdateFieldsFragment,
-  WithdrawalBusEventSubscription,
-  WithdrawalBusEventFieldsFragment,
-  TransactionEventSubscription,
-  TransactionEventFieldsFragment,
+  type OrderTxUpdateSubscription,
+  type OrderTxUpdateFieldsFragment,
+  type WithdrawalBusEventSubscription,
+  type WithdrawalBusEventFieldsFragment,
+  type TransactionEventSubscription,
+  type TransactionEventFieldsFragment,
 } from './__generated__/TransactionResult';
 
-import type { VegaTransactionStore } from './use-vega-transaction-store';
+import { type VegaTransactionStore } from './use-vega-transaction-store';
 import {
   AssetStatus,
   BusEventType,
diff --git a/libs/web3/src/lib/wait-for-withdrawal-approval.ts b/libs/web3/src/lib/wait-for-withdrawal-approval.ts
index 84f5f0787..79eb0ce89 100644
--- a/libs/web3/src/lib/wait-for-withdrawal-approval.ts
+++ b/libs/web3/src/lib/wait-for-withdrawal-approval.ts
@@ -1,10 +1,10 @@
-import type { ApolloClient } from '@apollo/client';
-import type { VegaStoredTxState } from './use-vega-transaction-store';
-import type {
-  WithdrawalApprovalQuery,
-  WithdrawalApprovalQueryVariables,
+import { type ApolloClient } from '@apollo/client';
+import { type VegaStoredTxState } from './use-vega-transaction-store';
+import {
+  WithdrawalApprovalDocument,
+  type WithdrawalApprovalQuery,
+  type WithdrawalApprovalQueryVariables,
 } from './__generated__/WithdrawalApproval';
-import { WithdrawalApprovalDocument } from './__generated__/WithdrawalApproval';
 
 export const waitForWithdrawalApproval = (
   withdrawalId: string,
diff --git a/libs/withdraws/src/lib/use-complete-withdraw.ts b/libs/withdraws/src/lib/use-complete-withdraw.ts
index d5932b002..35616a3e1 100644
--- a/libs/withdraws/src/lib/use-complete-withdraw.ts
+++ b/libs/withdraws/src/lib/use-complete-withdraw.ts
@@ -1,5 +1,5 @@
 import { useApolloClient } from '@apollo/client';
-import type { CollateralBridge } from '@vegaprotocol/smart-contracts';
+import { type CollateralBridge } from '@vegaprotocol/smart-contracts';
 import {
   EthTxStatus,
   useBridgeContract,
@@ -7,13 +7,15 @@ import {
 } from '@vegaprotocol/web3';
 import { useCallback, useEffect, useState } from 'react';
 import { localLoggerFactory } from '@vegaprotocol/logger';
-import { Erc20ApprovalDocument } from './__generated__/Erc20Approval';
-import type {
-  Erc20ApprovalQuery,
-  Erc20ApprovalQueryVariables,
+import {
+  Erc20ApprovalDocument,
+  type Erc20ApprovalQuery,
+  type Erc20ApprovalQueryVariables,
 } from './__generated__/Erc20Approval';
-import { PendingWithdrawalFragmentDoc } from './__generated__/Withdrawal';
-import type { PendingWithdrawalFragment } from './__generated__/Withdrawal';
+import {
+  PendingWithdrawalFragmentDoc,
+  PendingWithdrawalFragment,
+} from './__generated__/Withdrawal';
 
 export const useCompleteWithdraw = () => {
   const { query, cache } = useApolloClient();
diff --git a/libs/withdraws/src/lib/use-verify-withdrawal.ts b/libs/withdraws/src/lib/use-verify-withdrawal.ts
index 0f3e3bfca..48e89a64b 100644
--- a/libs/withdraws/src/lib/use-verify-withdrawal.ts
+++ b/libs/withdraws/src/lib/use-verify-withdrawal.ts
@@ -8,12 +8,12 @@ import {
   useGetWithdrawDelay,
   useGetWithdrawThreshold,
 } from '@vegaprotocol/web3';
-import type { WithdrawalFieldsFragment } from './__generated__/Withdrawal';
-import type {
-  Erc20ApprovalQuery,
-  Erc20ApprovalQueryVariables,
+import { type WithdrawalFieldsFragment } from './__generated__/Withdrawal';
+import {
+  Erc20ApprovalDocument,
+  type Erc20ApprovalQuery,
+  type Erc20ApprovalQueryVariables,
 } from './__generated__/Erc20Approval';
-import { Erc20ApprovalDocument } from './__generated__/Erc20Approval';
 import { useApolloClient } from '@apollo/client';
 
 export interface VerifyState {
diff --git a/libs/withdraws/src/lib/use-withdrawal-approval.ts b/libs/withdraws/src/lib/use-withdrawal-approval.ts
index 0f3fa87cc..8398adb43 100644
--- a/libs/withdraws/src/lib/use-withdrawal-approval.ts
+++ b/libs/withdraws/src/lib/use-withdrawal-approval.ts
@@ -1,9 +1,9 @@
 import { useApolloClient } from '@apollo/client';
 import { useCallback, useEffect, useRef } from 'react';
-import { Erc20ApprovalDocument } from './__generated__/Erc20Approval';
-import type {
-  Erc20ApprovalQuery,
-  Erc20ApprovalQueryVariables,
+import {
+  Erc20ApprovalDocument,
+  type Erc20ApprovalQuery,
+  type Erc20ApprovalQueryVariables,
 } from './__generated__/Erc20Approval';
 
 type WaitForApproval = (
diff --git a/libs/withdraws/src/lib/use-withdrawal-event.ts b/libs/withdraws/src/lib/use-withdrawal-event.ts
index ebfa7bee4..7a7939bc0 100644
--- a/libs/withdraws/src/lib/use-withdrawal-event.ts
+++ b/libs/withdraws/src/lib/use-withdrawal-event.ts
@@ -1,12 +1,12 @@
 import { useApolloClient } from '@apollo/client';
-import type { VegaTxState } from '@vegaprotocol/web3';
+import { type VegaTxState } from '@vegaprotocol/web3';
 import { useCallback, useEffect, useRef } from 'react';
-import type { Subscription } from 'zen-observable-ts';
-import { WithdrawalEventDocument } from './__generated__/Withdrawal';
-import type {
-  WithdrawalEventSubscription,
-  WithdrawalEventSubscriptionVariables,
-  WithdrawalFieldsFragment,
+import { type Subscription } from 'zen-observable-ts';
+import {
+  WithdrawalEventDocument,
+  type WithdrawalEventSubscription,
+  type WithdrawalEventSubscriptionVariables,
+  type WithdrawalFieldsFragment,
 } from './__generated__/Withdrawal';
 
 type WaitForWithdrawalEvent = (
diff --git a/libs/withdraws/src/lib/withdrawals-provider.ts b/libs/withdraws/src/lib/withdrawals-provider.ts
index d52cea6d5..249162323 100644
--- a/libs/withdraws/src/lib/withdrawals-provider.ts
+++ b/libs/withdraws/src/lib/withdrawals-provider.ts
@@ -5,12 +5,10 @@ import * as Schema from '@vegaprotocol/types';
 import {
   WithdrawalsDocument,
   WithdrawalEventDocument,
-} from './__generated__/Withdrawal';
-import type {
-  WithdrawalsQuery,
-  WithdrawalFieldsFragment,
-  WithdrawalEventSubscription,
-  WithdrawalEventSubscriptionVariables,
+  type WithdrawalsQuery,
+  type WithdrawalFieldsFragment,
+  type WithdrawalEventSubscription,
+  type WithdrawalEventSubscriptionVariables,
 } from './__generated__/Withdrawal';
 
 const sortWithdrawals = (data: WithdrawalFieldsFragment[]) =>
diff --git a/libs/withdraws/src/lib/withdrawals-table.tsx b/libs/withdraws/src/lib/withdrawals-table.tsx
index 53d66c632..b37a55db6 100644
--- a/libs/withdraws/src/lib/withdrawals-table.tsx
+++ b/libs/withdraws/src/lib/withdrawals-table.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState, useMemo } from 'react';
-import type { ColDef } from 'ag-grid-community';
+import { type ColDef } from 'ag-grid-community';
 import {
   addDecimalsFormatNumber,
   convertToCountdownString,
@@ -15,20 +15,20 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import type {
-  TypedDataAgGrid,
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
+import {
+  type TypedDataAgGrid,
+  type VegaICellRendererParams,
+  type VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { AgGrid } from '@vegaprotocol/datagrid';
 import { EtherscanLink } from '@vegaprotocol/environment';
-import type { WithdrawalFieldsFragment } from './__generated__/Withdrawal';
+import { type WithdrawalFieldsFragment } from './__generated__/Withdrawal';
 import {
   useEthWithdrawApprovalsStore,
   useWithdrawalApprovalDialog,
 } from '@vegaprotocol/web3';
 import * as Schema from '@vegaprotocol/types';
-import type { TimestampedWithdrawals } from './use-ready-to-complete-withdrawals-toast';
+import { type TimestampedWithdrawals } from './use-ready-to-complete-withdrawals-toast';
 import classNames from 'classnames';
 
 export const WithdrawalsTable = ({