chore: fix candles queries

Merge remote-tracking branch 'origin/develop' into feat/subscriptions-update
chore: fix market-selector tests
2022-09-19 13:12:13 -07:00 · 2022-09-19 15:48:20 +02:00 · 2022-09-19 14:29:49 +02:00 · 2022-09-19 14:12:39 +02:00 · 2022-09-19 12:05:36 +00:00 · 2022-09-19 12:21:38 +01:00
542 changed files with 13293 additions and 12450 deletions
@@ -51,8 +51,7 @@
            "ul": ["list"],
            "ol": ["list"]
          }
-        ],
-        "curly": "warn"
+        ]
      }
    },
    {
@@ -75,7 +74,8 @@
            "prefer": "type-imports",
            "disallowTypeAnnotations": true
          }
-        ]
+        ],
+        "curly": ["error", "multi-line"]
      }
    },
    {
@@ -78,7 +78,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: vegaprotocol/vega
-          ref: v0.54.0
+          ref: v0.55.0
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
          path: './vega'

@@ -133,13 +133,14 @@ jobs:
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_INCLUDE_FLOWS: ${{ github.event.inputs.includeFlows }}
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
      ## Upload logs
@@ -62,7 +62,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: vegaprotocol/vega
-          ref: v0.54.0
+          ref: v0.55.0
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
          path: './vega'

@@ -117,7 +117,7 @@ jobs:
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
@@ -125,6 +125,7 @@ jobs:
          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_NIGHTLY_RUN: true
          CYPRESS_INCLUDE_FLOWS: true
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
      ## Upload logs
@@ -51,7 +51,7 @@ jobs:
        uses: actions/checkout@v2
        with:
          repository: vegaprotocol/vegacapsule
-          ref: v0.2.3
+          ref: main
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
          path: './capsule'

@@ -120,23 +120,24 @@ jobs:
      ######

      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v2
        with:
          working-directory: frontend-monorepo
-          main-branch-name: main
+          main-branch-name: master

      - name: Install root dependencies
        run: yarn install
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }}
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_INCLUDE_FLOWS: false
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
      ## Upload logs
@@ -22,9 +22,9 @@ jobs:
          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v2
        with:
-          main-branch-name: main
+          main-branch-name: master
      - name: Use Node.js 16
        id: Node
        uses: actions/setup-node@v3
@@ -53,9 +53,9 @@ jobs:
        with:
          fetch-depth: 0
      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
+        uses: nrwl/nx-set-shas@v2
        with:
-          main-branch-name: main
+          main-branch-name: develop
      - name: Use Node.js 16
        id: Node
        uses: actions/setup-node@v3
@@ -23,5 +23,4 @@ NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL

 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
-NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
@@ -1,14 +1,19 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
+import type { Markets } from '@vegaprotocol/market-list';
 import {
  generateLongListMarkets,
  generateSimpleMarkets,
+  generateMarketsData,
+  generateMarketsCandles,
 } from '../support/mocks/generate-markets';

 describe('market list', () => {
  describe('simple url', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
+        aliasQuery(req, 'Markets', generateSimpleMarkets());
+        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
+        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
      });
      cy.visit('/markets');
    });
@@ -62,7 +67,7 @@ describe('market list', () => {
  describe('url params should select filters', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
+        aliasQuery(req, 'Markets', generateSimpleMarkets());
      });
    });

@@ -73,10 +78,11 @@ describe('market list', () => {

    it('last asset (if exists)', () => {
      cy.visit('/markets');
-      cy.wait('@SimpleMarkets').then((filters) => {
-        if (filters?.response?.body?.data?.markets?.length) {
+      cy.wait('@Markets').then((filters) => {
+        const data: Markets | undefined = filters?.response?.body?.data;
+        if (data.marketsConnection.edges.length) {
          const asset =
-            filters.response.body.data.markets[0].tradableInstrument.instrument
+            data.marketsConnection.edges[0].node.tradableInstrument.instrument
              .product.settlementAsset.symbol;
          cy.visit(`/markets/Suspended/Future/${asset}`);
          cy.getByTestId('market-assets-menu')
@@ -98,7 +104,9 @@ describe('market list', () => {
    it('handles 1000 markets', () => {
      cy.viewport(1440, 900);
      cy.mockGQL((req) => {
-        aliasQuery(req, 'SimpleMarkets', generateLongListMarkets(1000));
+        aliasQuery(req, 'Markets', generateLongListMarkets(1000));
+        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
+        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
      });
      performance.mark('start-1k');
      cy.visit('/markets');
@@ -1,6 +1,10 @@
 import { connectVegaWallet } from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
-import { generateSimpleMarkets } from '../support/mocks/generate-markets';
+import {
+  generateMarketsCandles,
+  generateMarketsData,
+  generateSimpleMarkets,
+} from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -9,12 +13,16 @@ import { generatePartyBalance } from '../support/mocks/generate-party-balance';
 import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketNames } from '../support/mocks/generate-market-names';
+import { generateMarketDepth } from '../support/mocks/generate-market-depth';
+import type { Market, Markets } from '@vegaprotocol/market-list';

 describe('market selector', () => {
-  let markets;
+  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
-      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
+      aliasQuery(req, 'Markets', generateSimpleMarkets());
+      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
      aliasQuery(req, 'DealTicketQuery', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
@@ -23,12 +31,14 @@ describe('market selector', () => {
      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketNames', generateMarketNames());
+      aliasQuery(req, 'MarketDepth', generateMarketDepth());
    });

    cy.visit('/markets');
-    cy.wait('@SimpleMarkets').then((response) => {
-      if (response.response.body.data?.markets?.length) {
-        markets = response.response.body.data.markets;
+    cy.wait('@Markets').then((response) => {
+      const data: Markets | undefined = response?.response?.body?.data;
+      if (data.marketsConnection.edges.length) {
+        markets = data.marketsConnection.edges.map((edge) => edge.node);
      }
    });
  });
@@ -114,7 +124,7 @@ describe('market selector', () => {
    }
  });

-  it('mobile view', () => {
+  it.only('mobile view', () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
@@ -126,7 +136,7 @@ describe('market selector', () => {
      cy.getByTestId('market-pane')
        .children()
        .find('[role="button"]')
-        .should('have.length', 3);
+        .should('have.length', 9);
      cy.get('div[role="dialog"]').should('have.class', 'w-screen');
      cy.getByTestId('dialog-close').click();
      cy.get('input[placeholder="Search"]').should(
@@ -1,5 +1,9 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import { generateSimpleMarkets } from '../support/mocks/generate-markets';
+import {
+  generateSimpleMarkets,
+  generateMarketsCandles,
+  generateMarketsData,
+} from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -9,11 +13,15 @@ import { generatePartyMarketData } from '../support/mocks/generate-party-market-
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import { connectVegaWallet } from '../support/connect-wallet';
+import type { Markets, Market } from '@vegaprotocol/market-list';

 describe('Market trade', () => {
-  let markets;
+  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
+      aliasQuery(req, 'Markets', generateSimpleMarkets());
+      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
      aliasQuery(req, 'DealTicketQuery', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
@@ -25,9 +33,10 @@ describe('Market trade', () => {
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
    });
    cy.visit('/markets');
-    cy.wait('@SimpleMarkets').then((response) => {
-      if (response.response.body.data?.markets?.length) {
-        markets = response.response.body.data.markets;
+    cy.wait('@Markets').then((response) => {
+      const data: Markets | undefined = response?.response?.body?.data;
+      if (data.marketsConnection.edges.length) {
+        markets = data.marketsConnection.edges.map((edge) => edge.node);
      }
    });
  });
@@ -1,4 +1,7 @@
-const protoCandles = [
+import type { Market } from '@vegaprotocol/market-list';
+import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
+
+export const protoCandles = [
  { open: '9556163', close: '9587028', __typename: 'Candle' },
  {
    open: '9587028',
@@ -73,11 +76,29 @@ const protoCandles = [
  },
 ];

-export const protoMarket = {
+export const protoMarket: Market = {
  id: 'first-btcusd-id',
-  state: 'STATE_ACTIVE',
+  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+  state: MarketState.STATE_ACTIVE,
+  decimalPlaces: 5,
+  positionDecimalPlaces: 0,
+  marketTimestamps: {
+    __typename: 'MarketTimestamps',
+    close: '',
+    open: '',
+  },
+  fees: {
+    __typename: 'Fees',
+    factors: {
+      __typename: 'FeeFactors',
+      makerFee: '',
+      infrastructureFee: '',
+      liquidityFee: '',
+    },
+  },
  tradableInstrument: {
    instrument: {
+      id: '',
      code: 'AAVEDAI.MF21',
      name: 'AAVEDAI Monthly (30 Jun 2022)',
      metadata: {
@@ -94,12 +115,11 @@ export const protoMarket = {
      product: {
        __typename: 'Future',
        quoteName: 'DAI',
-        settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
+        settlementAsset: { symbol: 'tDAI', __typename: 'Asset', decimals: 5 },
      },
      __typename: 'Instrument',
    },
    __typename: 'TradableInstrument',
  },
-  candles: protoCandles,
  __typename: 'Market',
 };
@@ -1,24 +1,15 @@
-export const generateMarketDepth = () => {
-  return {
+import merge from 'lodash/merge';
+import type { PartialDeep } from 'type-fest';
+// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
+import type { MarketDepth } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';
+
+export const generateMarketDepth = (
+  override?: PartialDeep<MarketDepth>
+): MarketDepth => {
+  const defaultResult: MarketDepth = {
    market: {
      id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
-      decimalPlaces: 5,
-      positionDecimalPlaces: 0,
-      data: {
-        staticMidPrice: '9893006',
-        marketTradingMode: 'TRADING_MODE_CONTINUOUS',
-        indicativeVolume: '0',
-        indicativePrice: '0',
-        bestStaticBidPrice: '9893006',
-        bestStaticOfferPrice: '9893006',
-        market: {
-          id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
-          __typename: 'Market',
-        },
-        __typename: 'MarketData',
-      },
      depth: {
-        lastTrade: { price: '9893006', __typename: 'Trade' },
        sell: [
          {
            price: '9893007',
@@ -215,4 +206,5 @@ export const generateMarketDepth = () => {
      __typename: 'Market',
    },
  };
+  return merge(defaultResult, override);
 };
@@ -1,4 +1,3 @@
 # App configuration variables
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=LOCAL
-NX_VEGA_REST=http://localhost:3029
@@ -2,7 +2,6 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
-NX_VEGA_REST=https://api.n04.d.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io
@@ -2,7 +2,6 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
-NX_VEGA_REST=https://api.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
@@ -2,7 +2,6 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
-NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io
 NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz
@@ -2,7 +2,6 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
-NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
 NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://ropsten.etherscan.io
@@ -1,4 +1,5 @@
 import '@testing-library/jest-dom';
+import 'jest-canvas-mock';
 import { defaultFallbackInView } from 'react-intersection-observer';
 import ResizeObserver from 'resize-observer-polyfill';

@@ -26,7 +26,7 @@ export interface MarketTags_market_tradableInstrument_instrument {
 export interface MarketTags_market_tradableInstrument {
  __typename: "TradableInstrument";
  /**
-   * An instance of or reference to a fully specified instrument.
+   * An instance of, or reference to, a fully specified instrument.
   */
  instrument: MarketTags_market_tradableInstrument_instrument;
 }
@@ -34,14 +34,14 @@ export interface MarketTags_market_tradableInstrument {
 export interface MarketTags_market {
  __typename: "Market";
  /**
-   * An instance of or reference to a tradable instrument.
+   * An instance of, or reference to, a tradable instrument.
   */
  tradableInstrument: MarketTags_market_tradableInstrument;
 }

 export interface MarketTags {
  /**
-   * An instrument that is trading on the VEGA network
+   * An instrument that is trading on the Vega network
   */
  market: MarketTags_market | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
+import { AccountType } from "@vegaprotocol/types";

 // ====================================================
 // GraphQL query operation: PartyBalanceQuery
@@ -12,7 +12,7 @@ import { AccountType } from "./../../../../../../../libs/types/src/__generated__
 export interface PartyBalanceQuery_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The id of the asset
+   * The ID of the asset
   */
  id: string;
  /**
@@ -24,7 +24,7 @@ export interface PartyBalanceQuery_party_accounts_asset {
   */
  name: string;
  /**
-   * The precision of the asset
+   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
   */
  decimals: number;
 }
@@ -55,7 +55,7 @@ export interface PartyBalanceQuery_party {

 export interface PartyBalanceQuery {
  /**
-   * An entity that is trading on the VEGA network
+   * An entity that is trading on the Vega network
   */
  party: PartyBalanceQuery_party | null;
 }
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AssetStatus } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
+import { AssetStatus } from "@vegaprotocol/types";

 // ====================================================
 // GraphQL query operation: Deposits
@@ -16,7 +16,7 @@ export interface Deposits_assetsConnection_edges_node_source_BuiltinAsset {
 export interface Deposits_assetsConnection_edges_node_source_ERC20 {
  __typename: "ERC20";
  /**
-   * The address of the erc20 contract
+   * The address of the ERC20 contract
   */
  contractAddress: string;
 }
@@ -26,7 +26,7 @@ export type Deposits_assetsConnection_edges_node_source = Deposits_assetsConnect
 export interface Deposits_assetsConnection_edges_node {
  __typename: "Asset";
  /**
-   * The id of the asset
+   * The ID of the asset
   */
  id: string;
  /**
@@ -38,15 +38,15 @@ export interface Deposits_assetsConnection_edges_node {
   */
  symbol: string;
  /**
-   * The precision of the asset
+   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
   */
  decimals: number;
  /**
-   * The status of the asset in the vega network
+   * The status of the asset in the Vega network
   */
  status: AssetStatus;
  /**
-   * The origin source of the asset (e.g: an erc20 asset)
+   * The origin source of the asset (e.g: an ERC20 asset)
   */
  source: Deposits_assetsConnection_edges_node_source;
 }
@@ -66,7 +66,7 @@ export interface Deposits_assetsConnection {

 export interface Deposits {
  /**
-   * The list of all assets in use in the vega network or the specified asset if id is provided
+   * The list of all assets in use in the Vega network or the specified asset if ID is provided
   */
-  assetsConnection: Deposits_assetsConnection;
+  assetsConnection: Deposits_assetsConnection | null;
 }
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type DepositsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type DepositsQuery = { __typename?: 'Query', assetsConnection: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, source: { __typename?: 'BuiltinAsset' } | { __typename?: 'ERC20', contractAddress: string } } } | null> | null } };
+export type DepositsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, source: { __typename?: 'BuiltinAsset' } | { __typename?: 'ERC20', contractAddress: string } } } | null> | null } | null };


 export const DepositsDocument = gql`
@@ -8,7 +8,7 @@ interface TabBarProps {
 export const TabBar = ({ className }: TabBarProps) => (
  <div role="group" aria-label="Tab Bar Navigation Menu" className={className}>
    <div role="presentation" className="py-[42px]" />
-    <div className="md:hidden fixed bottom-0 left-0 right-0 bg-black py-4 border-t border-neutral-300 dark:border-neutral-700">
+    <div className="md:hidden fixed bottom-0 left-0 right-0 bg-black py-4 border-t border-neutral-300 dark:border-neutral-600">
      <Nav tabs className="flex justify-evenly items-center" />
    </div>
  </div>
@@ -1,5 +0,0 @@
-subscription CandleLive($marketId: ID!) {
-  candles(marketId: $marketId, interval: INTERVAL_I1H) {
-    close
-  }
-}
@@ -1,44 +0,0 @@
-fragment SimpleMarketDataFields on MarketData {
-  market {
-    id
-    state
-  }
-}
-
-query SimpleMarkets($CandleSince: String!) {
-  markets {
-    id
-    name
-    state
-    data {
-      ...SimpleMarketDataFields
-    }
-    tradableInstrument {
-      instrument {
-        code
-        metadata {
-          tags
-        }
-        product {
-          __typename
-          ... on Future {
-            quoteName
-            settlementAsset {
-              symbol
-            }
-          }
-        }
-      }
-    }
-    candles(interval: INTERVAL_I1H, since: $CandleSince) {
-      open
-      close
-    }
-  }
-}
-
-subscription SimpleMarketDataSub {
-  marketData {
-    ...SimpleMarketDataFields
-  }
-}
@@ -1,30 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-import { MarketState } from "@vegaprotocol/types";
-
-// ====================================================
-// GraphQL fragment: SimpleMarketDataFields
-// ====================================================
-
-export interface SimpleMarketDataFields_market {
-  __typename: "Market";
-  /**
-   * Market ID
-   */
-  id: string;
-  /**
-   * Current state of the market
-   */
-  state: MarketState;
-}
-
-export interface SimpleMarketDataFields {
-  __typename: "MarketData";
-  /**
-   * market ID of the associated mark price
-   */
-  market: SimpleMarketDataFields_market;
-}
@@ -1,37 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-import { MarketState } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
-
-// ====================================================
-// GraphQL subscription operation: SimpleMarketDataSub
-// ====================================================
-
-export interface SimpleMarketDataSub_marketData_market {
-  __typename: "Market";
-  /**
-   * Market ID
-   */
-  id: string;
-  /**
-   * Current state of the market
-   */
-  state: MarketState;
-}
-
-export interface SimpleMarketDataSub_marketData {
-  __typename: "MarketData";
-  /**
-   * market id of the associated mark price
-   */
-  market: SimpleMarketDataSub_marketData_market;
-}
-
-export interface SimpleMarketDataSub {
-  /**
-   * Subscribe to the mark price changes
-   */
-  marketData: SimpleMarketDataSub_marketData;
-}
@@ -1,109 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-import { MarketState } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
-
-// ====================================================
-// GraphQL query operation: SimpleMarkets
-// ====================================================
-
-export interface SimpleMarkets_markets_tradableInstrument_instrument_metadata {
-  __typename: "InstrumentMetadata";
-  /**
-   * An arbitrary list of tags to associated to associate to the Instrument (string list)
-   */
-  tags: string[] | null;
-}
-
-export interface SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset {
-  __typename: "Asset";
-  /**
-   * The symbol of the asset (e.g: GBP)
-   */
-  symbol: string;
-}
-
-export interface SimpleMarkets_markets_tradableInstrument_instrument_product {
-  __typename: "Future";
-  /**
-   * String representing the quote (e.g. BTCUSD -> USD is quote)
-   */
-  quoteName: string;
-  /**
-   * The name of the asset (string)
-   */
-  settlementAsset: SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset;
-}
-
-export interface SimpleMarkets_markets_tradableInstrument_instrument {
-  __typename: "Instrument";
-  /**
-   * A short non necessarily unique code used to easily describe the instrument (e.g: FX:BTCUSD/DEC18) (string)
-   */
-  code: string;
-  /**
-   * Full and fairly descriptive name for the instrument
-   */
-  name: string;
-  /**
-   * Metadata for this instrument
-   */
-  metadata: SimpleMarkets_markets_tradableInstrument_instrument_metadata;
-  /**
-   * A reference to or instance of a fully specified product, including all required product parameters for that product (Product union)
-   */
-  product: SimpleMarkets_markets_tradableInstrument_instrument_product;
-}
-
-export interface SimpleMarkets_markets_tradableInstrument {
-  __typename: "TradableInstrument";
-  /**
-   * An instance of or reference to a fully specified instrument.
-   */
-  instrument: SimpleMarkets_markets_tradableInstrument_instrument;
-}
-
-export interface SimpleMarkets_markets_candles {
-  __typename: "Candle";
-  /**
-   * Open price (uint64)
-   */
-  open: string;
-  /**
-   * Close price (uint64)
-   */
-  close: string;
-}
-
-export interface SimpleMarkets_markets {
-  __typename: "Market";
-  /**
-   * Market ID
-   */
-  id: string;
-  /**
-   * Current state of the market
-   */
-  state: MarketState;
-  /**
-   * An instance of or reference to a tradable instrument.
-   */
-  tradableInstrument: SimpleMarkets_markets_tradableInstrument;
-  /**
-   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by params
-   */
-  candles: (SimpleMarkets_markets_candles | null)[] | null;
-}
-
-export interface SimpleMarkets {
-  /**
-   * One or more instruments that are trading on the VEGA network
-   */
-  markets: SimpleMarkets_markets[] | null;
-}
-
-export interface SimpleMarketsVariables {
-  CandleSince: string;
-}
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,117 +0,0 @@
-import * as Types from '@vegaprotocol/types/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type SimpleMarketDataFieldsFragment = { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } };
-
-export type SimpleMarketsQueryVariables = Types.Exact<{
-  CandleSince: Types.Scalars['String'];
-}>;
-
-
-export type SimpleMarketsQuery = { __typename?: 'Query', markets?: Array<{ __typename?: 'Market', id: string, name: string, state: Types.MarketState, data?: { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', symbol: string } } } }, candles?: Array<{ __typename?: 'Candle', open: string, close: string } | null> | null }> | null };
-
-export type SimpleMarketDataSubSubscriptionVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type SimpleMarketDataSubSubscription = { __typename?: 'Subscription', marketData: { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } } };
-
-export const SimpleMarketDataFieldsFragmentDoc = gql`
-    fragment SimpleMarketDataFields on MarketData {
-  market {
-    id
-    state
-  }
-}
-    `;
-export const SimpleMarketsDocument = gql`
-    query SimpleMarkets($CandleSince: String!) {
-  markets {
-    id
-    name
-    state
-    data {
-      ...SimpleMarketDataFields
-    }
-    tradableInstrument {
-      instrument {
-        code
-        metadata {
-          tags
-        }
-        product {
-          __typename
-          ... on Future {
-            quoteName
-            settlementAsset {
-              symbol
-            }
-          }
-        }
-      }
-    }
-    candles(interval: INTERVAL_I1H, since: $CandleSince) {
-      open
-      close
-    }
-  }
-}
-    ${SimpleMarketDataFieldsFragmentDoc}`;
-
-/**
- * __useSimpleMarketsQuery__
- *
- * To run a query within a React component, call `useSimpleMarketsQuery` and pass it any options that fit your needs.
- * When your component renders, `useSimpleMarketsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useSimpleMarketsQuery({
- *   variables: {
- *      CandleSince: // value for 'CandleSince'
- *   },
- * });
- */
-export function useSimpleMarketsQuery(baseOptions: Apollo.QueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
-      }
-export function useSimpleMarketsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
-        }
-export type SimpleMarketsQueryHookResult = ReturnType<typeof useSimpleMarketsQuery>;
-export type SimpleMarketsLazyQueryHookResult = ReturnType<typeof useSimpleMarketsLazyQuery>;
-export type SimpleMarketsQueryResult = Apollo.QueryResult<SimpleMarketsQuery, SimpleMarketsQueryVariables>;
-export const SimpleMarketDataSubDocument = gql`
-    subscription SimpleMarketDataSub {
-  marketData {
-    ...SimpleMarketDataFields
-  }
-}
-    ${SimpleMarketDataFieldsFragmentDoc}`;
-
-/**
- * __useSimpleMarketDataSubSubscription__
- *
- * To run a query within a React component, call `useSimpleMarketDataSubSubscription` and pass it any options that fit your needs.
- * When your component renders, `useSimpleMarketDataSubSubscription` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useSimpleMarketDataSubSubscription({
- *   variables: {
- *   },
- * });
- */
-export function useSimpleMarketDataSubSubscription(baseOptions?: Apollo.SubscriptionHookOptions<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useSubscription<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>(SimpleMarketDataSubDocument, options);
-      }
-export type SimpleMarketDataSubSubscriptionHookResult = ReturnType<typeof useSimpleMarketDataSubSubscription>;
-export type SimpleMarketDataSubSubscriptionResult = Apollo.SubscriptionResult<SimpleMarketDataSubSubscription>;
@@ -2,8 +2,8 @@ import { t } from '@vegaprotocol/react-helpers';
 import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
 import { MarketState } from '@vegaprotocol/types';
 import { IS_MARKET_TRADABLE } from '../../constants';
-import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
 import colors from 'tailwindcss/colors';
+import type { Market } from '@vegaprotocol/market-list';

 export const STATES_FILTER = [
  { value: 'all', text: t('All') },
@@ -192,7 +192,7 @@ export const agGridDarkVariables = `
 `;

 export const ROW_CLASS_RULES = {
-  'cursor-pointer': ({ data }: { data: SimpleMarkets_markets }) =>
+  'cursor-pointer': ({ data }: { data: Market }) =>
    IS_MARKET_TRADABLE(data || {}),
 };

@@ -1,94 +0,0 @@
-import produce from 'immer';
-import { gql } from '@apollo/client';
-import { makeDataProvider } from '@vegaprotocol/react-helpers';
-import type {
-  SimpleMarkets,
-  SimpleMarkets_markets,
-} from './__generated__/SimpleMarkets';
-import type {
-  SimpleMarketDataSub,
-  SimpleMarketDataSub_marketData,
-} from './__generated__/SimpleMarketDataSub';
-
-export const MARKETS_QUERY = gql`
-  query SimpleMarkets($CandleSince: String!) {
-    markets {
-      id
-      state
-      tradableInstrument {
-        instrument {
-          code
-          name
-          metadata {
-            tags
-          }
-          product {
-            __typename
-            ... on Future {
-              quoteName
-              settlementAsset {
-                symbol
-              }
-            }
-          }
-        }
-      }
-      candles(interval: I1H, since: $CandleSince) {
-        open
-        close
-      }
-    }
-  }
-`;
-
-const MARKET_DATA_SUB = gql`
-  subscription SimpleMarketDataSub {
-    marketData {
-      market {
-        id
-        state
-      }
-    }
-  }
-`;
-
-export const CANDLE_SUB = gql`
-  subscription CandleLive($marketId: ID!) {
-    candles(marketId: $marketId, interval: I1H) {
-      close
-    }
-  }
-`;
-
-const update = (
-  data: SimpleMarkets_markets[],
-  delta: SimpleMarketDataSub_marketData
-) => {
-  return produce(data, (draft) => {
-    const index = draft.findIndex((m) => m.id === delta.market.id);
-    if (index !== -1) {
-      draft[index].state = delta.market.state;
-    }
-    // @TODO - else push new market to draft
-  });
-};
-
-const getData = (responseData: SimpleMarkets) => responseData.markets;
-const getDelta = (
-  subscriptionData: SimpleMarketDataSub
-): SimpleMarketDataSub_marketData => subscriptionData.marketData;
-
-export const dataProvider = makeDataProvider<
-  SimpleMarkets,
-  SimpleMarkets_markets[],
-  SimpleMarketDataSub,
-  SimpleMarketDataSub_marketData
->({
-  query: MARKETS_QUERY,
-  subscriptionQuery: MARKET_DATA_SUB,
-  update,
-  getData,
-  getDelta,
-});
-
-export default dataProvider;
@@ -4,21 +4,14 @@ import {
  render,
  screen,
  waitFor,
-  cleanup,
  getAllByRole,
  fireEvent,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
 import { BrowserRouter } from 'react-router-dom';
 import { MarketState } from '@vegaprotocol/types';
 import SimpleMarketList from './simple-market-list';
-import { MARKETS_QUERY } from './data-provider';
-import type {
-  SimpleMarkets_markets,
-  SimpleMarkets,
-} from './__generated__/SimpleMarkets';
-import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';
+import type { Market } from '@vegaprotocol/market-list';

 const mockedNavigate = jest.fn();

@@ -28,20 +21,9 @@ jest.mock('react-router-dom', () => ({
  useParams: () => ({}),
 }));

-jest.mock('date-fns', () => ({
-  subDays: () => new Date('2022-06-02T11:11:21.721Z'),
-}));
-
-let updateMock: ({
-  delta,
-}: {
-  delta: SimpleMarketDataSub_marketData;
-}) => boolean;
-
-let mockData = [
+let marketsMock = [
  {
-    id: '1',
-    name: 'Market 1',
+    id: 'MARKET_A',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
@@ -57,8 +39,7 @@ let mockData = [
    },
  },
  {
-    id: '2',
-    name: 'Market 2',
+    id: 'MARKET_B',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
@@ -73,20 +54,24 @@ let mockData = [
      },
    },
  },
-] as unknown as SimpleMarkets_markets[];
+] as unknown as Market[];

-const mockUseDataProvider = ({ update }: { update: () => boolean }) => {
-  updateMock = update;
-  return { data: mockData, loading: false, error: false };
+const LIB = '@vegaprotocol/market-list';
+const useMarketList = () => {
+  return {
+    data: {
+      markets: marketsMock,
+    },
+    loading: false,
+    error: false,
+  };
 };
-
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
-  useDataProvider: jest.fn((args) => mockUseDataProvider(args)),
+jest.mock(LIB, () => ({
+  ...jest.requireActual(LIB),
+  useMarketList: jest.fn(() => useMarketList()),
 }));

 const mockIsTradable = jest.fn((_arg) => true);
-
 jest.mock('../../constants', () => ({
  ...jest.requireActual('../../constants'),
  IS_MARKET_TRADABLE: jest.fn((arg) => mockIsTradable(arg)),
@@ -95,25 +80,11 @@ jest.mock('../../constants', () => ({
 describe('SimpleMarketList', () => {
  afterEach(() => {
    jest.clearAllMocks();
-    cleanup();
  });
-
-  const mocks: MockedResponse<SimpleMarkets> = {
-    request: {
-      query: MARKETS_QUERY,
-      variables: {
-        CandleSince: '2022-06-02T11:11:21.721Z',
-      },
-    },
-    result: {
-      data: { markets: mockData },
-    },
-  };
-
  it('should be properly rendered with some data', async () => {
    await act(async () => {
      render(
-        <MockedProvider mocks={[mocks]}>
+        <MockedProvider mocks={[]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
@@ -124,95 +95,49 @@ describe('SimpleMarketList', () => {
      expect(
        document.querySelector('.ag-center-cols-container')
      ).toBeInTheDocument();
-    });
-    await waitFor(() => {
      const container = document.querySelector('.ag-center-cols-container');
      expect(getAllByRole(container as HTMLDivElement, 'row')).toHaveLength(2);
    });
  });

-  it('update should return proper boolean value', async () => {
-    await act(async () => {
-      render(
-        <MockedProvider mocks={[mocks]}>
-          <SimpleMarketList />
-        </MockedProvider>,
-        { wrapper: BrowserRouter }
-      );
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-    await waitFor(() => {
-      expect(
-        document.querySelector('.ag-center-cols-container')
-      ).toBeInTheDocument();
-    });
-
-    await expect(
-      updateMock({
-        delta: {
-          __typename: 'MarketData',
-          market: {
-            __typename: 'Market',
-            id: '2',
-            state: MarketState.STATE_ACTIVE,
-          },
-        },
-      })
-    ).toEqual(true);
-
-    await expect(
-      updateMock({
-        delta: {
-          __typename: 'MarketData',
-          market: {
-            __typename: 'Market',
-            id: '2',
-            state: MarketState.STATE_SUSPENDED,
-          },
-        },
-      })
-    ).toEqual(false);
-  });
-
  it('click on row should be properly handled', async () => {
    await act(async () => {
      render(
-        <MockedProvider mocks={[mocks]}>
+        <MockedProvider mocks={[]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
      );
-      await new Promise((resolve) => setTimeout(resolve, 0));
-    });
-    await waitFor(() => {
-      expect(
-        document.querySelector('.ag-center-cols-container')
-      ).toBeInTheDocument();
    });
    mockIsTradable.mockClear();
    const container = document.querySelector('.ag-center-cols-container');
    const firstRow = getAllByRole(container as HTMLDivElement, 'row')[0];
-    expect(firstRow).toHaveAttribute('row-id', '1');
-    fireEvent.click(firstRow);
+    expect(firstRow).toHaveAttribute('row-id', marketsMock[0].id);
+    await act(async () => {
+      fireEvent.click(firstRow);
+    });
    await waitFor(() => {
-      expect(mockIsTradable).toHaveBeenCalledWith({
-        ...mockData[0],
-        percentChange: '-',
-      });
-      expect(mockedNavigate).toHaveBeenCalledWith(`/trading/${mockData[0].id}`);
+      expect(mockIsTradable).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: marketsMock[0].id,
+          percentChange: '-',
+        })
+      );
+      expect(mockedNavigate).toHaveBeenCalledWith(
+        `/trading/${marketsMock[0].id}`
+      );
    });
  });

  it('should be properly renderer as empty', async () => {
-    mockData = [];
+    marketsMock = [];
    await act(async () => {
      render(
-        <MockedProvider mocks={[mocks]}>
+        <MockedProvider mocks={[]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
      );
-      await new Promise((resolve) => setTimeout(resolve, 0));
    });
    await waitFor(() => {
      expect(screen.getByText('No data to display')).toBeInTheDocument();
@@ -1,29 +1,16 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useRef,
-} from 'react';
+import { useCallback, useContext, useEffect, useMemo, useRef } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
-import { subDays } from 'date-fns';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit';
-import {
-  useDataProvider,
-  useScreenDimensions,
-} from '@vegaprotocol/react-helpers';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { t } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ThemeContext } from '@vegaprotocol/react-helpers';
 import type { MarketState } from '@vegaprotocol/types';
 import useMarketsFilterData from '../../hooks/use-markets-filter-data';
 import useColumnDefinitions from '../../hooks/use-column-definitions';
-import dataProvider from './data-provider';
 import * as constants from './constants';
 import SimpleMarketToolbar from './simple-market-toolbar';
-import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
-import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';
 import { IS_MARKET_TRADABLE } from '../../constants';
 import type {
  CellKeyDownEvent,
@@ -33,8 +20,10 @@ import type {
  GetRowIdParams,
  TabToNextCellParams,
 } from 'ag-grid-community/dist/lib/entities/iCallbackParams';
+import type { Market, MarketsListData } from '@vegaprotocol/market-list';
+import { useMarketList } from '@vegaprotocol/market-list';

-export type SimpleMarketsType = SimpleMarkets_markets & {
+export type MarketWithPercentChange = Market & {
  percentChange?: number | '-';
 };

@@ -51,27 +40,9 @@ const SimpleMarketList = () => {
  const theme = useContext(ThemeContext);
  const statusesRef = useRef<Record<string, MarketState | ''>>({});
  const gridRef = useRef<AgGridReact | null>(null);
-  const variables = useMemo(
-    () => ({
-      CandleSince: subDays(Date.now(), 1).toJSON(),
-    }),
-    []
-  );
-  const update = useCallback(
-    ({ delta }: { delta: SimpleMarketDataSub_marketData }) =>
-      statusesRef.current[delta.market.id] === delta.market.state,
-    [statusesRef]
-  );

-  const { data, error, loading } = useDataProvider({
-    dataProvider,
-    update,
-    variables,
-  });
-  const localData: Array<SimpleMarketsType> = useMarketsFilterData(
-    data || [],
-    params
-  );
+  const { data, error, loading } = useMarketList();
+  const localData = useMarketsFilterData(data as MarketsListData, params);

  const handleOnGridReady = useCallback(() => {
    gridRef.current?.api?.sizeColumnsToFit();
@@ -79,7 +50,7 @@ const SimpleMarketList = () => {

  useEffect(() => {
    const statuses: Record<string, MarketState | ''> = {};
-    data?.forEach((market) => {
+    data?.markets?.forEach((market) => {
      statuses[market.id] = market.state || '';
    });
    statusesRef.current = statuses;
@@ -95,7 +66,7 @@ const SimpleMarketList = () => {
  const getRowId = useCallback(({ data }: GetRowIdParams) => data.id, []);

  const handleRowClicked = useCallback(
-    ({ data }: { data: SimpleMarketsType }) => {
+    ({ data }: { data: Market }) => {
      if (IS_MARKET_TRADABLE(data)) {
        navigate(`/trading/${data.id}`);
      }
@@ -135,7 +106,7 @@ const SimpleMarketList = () => {

  return (
    <div className="h-full p-4 md:p-6 grid grid-rows-[min-content,1fr]">
-      <SimpleMarketToolbar data={data || []} />
+      <SimpleMarketToolbar data={data?.markets || []} />
      <AsyncRenderer loading={loading} error={error} data={localData}>
        <AgGrid
          className="mb-32 min-h-[300px]"
@@ -2,10 +2,10 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import SimpleMarketPercentChange from './simple-market-percent-change';
-import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';
+import type { Candle } from '@vegaprotocol/market-list';

 describe('SimpleMarketPercentChange should parse proper change', () => {
-  let candles: (SimpleMarkets_markets_candles | null)[] | null;
+  let candles: (Candle | null)[] | null;
  const setValue = () => undefined;
  it('empty array', () => {
    candles = [];
@@ -34,11 +34,7 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
    expect(screen.getByText('-')).toBeInTheDocument();
  });
  it('an appreciated one', () => {
-    candles = [
-      { open: '50' } as SimpleMarkets_markets_candles,
-      { close: '100' } as SimpleMarkets_markets_candles,
-      null,
-    ];
+    candles = [{ open: '50' } as Candle, { close: '100' } as Candle, null];
    render(
      <MockedProvider>
        <SimpleMarketPercentChange
@@ -54,11 +50,7 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
    );
  });
  it('a depreciated one', () => {
-    candles = [
-      { open: '100' } as SimpleMarkets_markets_candles,
-      { close: '50' } as SimpleMarkets_markets_candles,
-      null,
-    ];
+    candles = [{ open: '100' } as Candle, { close: '50' } as Candle, null];
    render(
      <MockedProvider>
        <SimpleMarketPercentChange
@@ -1,26 +1,20 @@
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import { InView } from 'react-intersection-observer';
-import { useSubscription } from '@apollo/client';
-import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';
-import type {
-  CandleLive,
-  CandleLiveVariables,
-} from './__generated__/CandleLive';
-import { CANDLE_SUB } from './data-provider';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import type { Candle } from '@vegaprotocol/market-list';
+import { marketCandlesProvider } from '@vegaprotocol/market-list';
+import { Interval } from '@vegaprotocol/types';

 interface Props {
-  candles: (SimpleMarkets_markets_candles | null)[] | null;
+  candles: (Candle | null)[] | null;
  marketId: string;
  setValue: (arg: unknown) => void;
 }

 const EMPTY_VALUE = ' - ';

-const getChange = (
-  candles: (SimpleMarkets_markets_candles | null)[] | null,
-  lastClose?: string
-) => {
+const getChange = (candles: (Candle | null)[] | null, lastClose?: string) => {
  if (candles) {
    const first = parseInt(candles.find((item) => item?.open)?.open || '-1');
    const last =
@@ -74,11 +68,14 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => {
 };

 const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
-  const { data: { candles: { close = undefined } = {} } = {} } =
-    useSubscription<CandleLive, CandleLiveVariables>(CANDLE_SUB, {
-      variables: { marketId },
-    });
-  const change = getChange(candles, close);
+  const { data } = useDataProvider({
+    dataProvider: marketCandlesProvider,
+    variables: { marketId, interval: Interval.INTERVAL_I1D },
+  });
+
+  const close = data?.map((m) => m.close);
+
+  const change = getChange(candles, close?.[0]);
  const colorClasses = getClassColor(change);
  useEffect(() => {
    const value = parseFloat(change);
@@ -1,36 +1,36 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import { MarketState } from '@vegaprotocol/types';
 import MarketNameRenderer from './simple-market-renderer';
+import type { Market } from '@vegaprotocol/market-list';

 describe('SimpleMarketRenderer', () => {
  const market = {
-    id: 'marketId',
+    id: 'MARKET_A',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
-        code: 'Market code',
-        name: 'Market Name',
+        code: 'MARKET_A_CODE',
+        name: 'MARKET_A_NAME',
        product: {
-          quoteName: 'Quote name',
+          quoteName: 'MARKET_A_QUOTE_NAME',
        },
        metadata: {
          tags: null,
        },
      },
    },
-  } as MarketNames_markets;
+  } as Market;

  it('should properly render not mobile', () => {
    render(<MarketNameRenderer market={market} isMobile={false} />);
-    expect(screen.getByText('Market Name')).toBeInTheDocument();
-    expect(screen.getByText('Quote name')).toBeInTheDocument();
+    expect(screen.getByText('MARKET_A_NAME')).toBeInTheDocument();
+    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
  });

  it('should properly render mobile', () => {
    render(<MarketNameRenderer market={market} isMobile={true} />);
-    expect(screen.getByText('Market code')).toBeInTheDocument();
-    expect(screen.getByText('Quote name')).toBeInTheDocument();
+    expect(screen.getByText('MARKET_A_CODE')).toBeInTheDocument();
+    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
  });
 });
@@ -1,10 +1,9 @@
-import React from 'react';
 import classNames from 'classnames';
-import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import SimpleMarketExpires from './simple-market-expires';
+import type { Market } from '@vegaprotocol/market-list';

 interface Props {
-  market: MarketNames_markets;
+  market: Market;
  isMobile?: boolean;
 }

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useNavigate, useParams, Link } from 'react-router-dom';
 import {
@@ -17,10 +17,10 @@ import {
 import { MarketState } from '@vegaprotocol/types';
 import useMarketFiltersData from '../../hooks/use-markets-filter';
 import { STATES_FILTER } from './constants';
-import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
+import type { Markets_marketsConnection_edges_node } from '@vegaprotocol/market-list';

 interface Props {
-  data: SimpleMarkets_markets[];
+  data: Markets_marketsConnection_edges_node[];
 }

 const SimpleMarketToolbar = ({ data }: Props) => {
@@ -98,7 +98,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
          </Link>
        </li>
        {products.map((product, i) => (
-          <li key={product} className="mx-2 whitespace-nowrap">
+          <li key={`${product}-${i}`} className="mx-2 whitespace-nowrap">
            <Link
              to={`/markets/${
                params.state || MarketState.STATE_ACTIVE
@@ -1,6 +1,6 @@
-import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
 import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/react-helpers';
+import type { Market } from '@vegaprotocol/market-list';

 export const DATE_FORMAT = 'dd MMMM yyyy HH:mm';
 export const EXPIRE_DATE_FORMAT = 'MMM dd';
@@ -9,7 +9,7 @@ export const TRADABLE_STATES = {
  [MarketState.STATE_ACTIVE]: true,
 };

-export const IS_MARKET_TRADABLE = (market: SimpleMarkets_markets) =>
+export const IS_MARKET_TRADABLE = (market: Market) =>
  Boolean((market.state ?? '') in TRADABLE_STATES && market?.id);

 export const MARKET_STATES_MAP: Record<MarketState | '', string> = {
@@ -10,7 +10,7 @@
 export interface MarketMarkPrice_market_data {
  __typename: "MarketData";
  /**
-   * the mark price (actually an unsigned int)
+   * the mark price (an unsigned integer)
   */
  markPrice: string;
 }
@@ -19,7 +19,7 @@ export interface MarketMarkPrice_market {
  __typename: "Market";
  /**
   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
-   * number denominated in the currency of the Market. (uint64)
+   * number denominated in the currency of the market. (uint64)
   * 
   * Examples:
   * Currency     Balance  decimalPlaces  Real Balance
@@ -42,7 +42,7 @@ export interface MarketMarkPrice_market {

 export interface MarketMarkPrice {
  /**
-   * An instrument that is trading on the VEGA network
+   * An instrument that is trading on the Vega network
   */
  market: MarketMarkPrice_market | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "./../../../../../../libs/types/src/__generated__/globalTypes";
+import { AccountType } from "@vegaprotocol/types";

 // ====================================================
 // GraphQL query operation: PartyMarketData
@@ -12,11 +12,11 @@ import { AccountType } from "./../../../../../../libs/types/src/__generated__/gl
 export interface PartyMarketData_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The id of the asset
+   * The ID of the asset
   */
  id: string;
  /**
-   * The precision of the asset
+   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
   */
  decimals: number;
 }
@@ -64,15 +64,15 @@ export interface PartyMarketData_party_marginsConnection_edges_node {
   */
  market: PartyMarketData_party_marginsConnection_edges_node_market;
  /**
-   * this is the minimal margin required for a party to place a new order on the network (unsigned int actually)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
  /**
-   * minimal margin for the position to be maintained in the network (unsigned int actually)
+   * minimal margin for the position to be maintained in the network (unsigned integer)
   */
  maintenanceLevel: string;
  /**
-   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned int actually)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
   */
  searchLevel: string;
 }
@@ -101,14 +101,14 @@ export interface PartyMarketData_party {
   */
  accounts: PartyMarketData_party_accounts[] | null;
  /**
-   * Margin level for a market
+   * Margin levels for a market
   */
-  marginsConnection: PartyMarketData_party_marginsConnection;
+  marginsConnection: PartyMarketData_party_marginsConnection | null;
 }

 export interface PartyMarketData {
  /**
-   * An entity that is trading on the VEGA network
+   * An entity that is trading on the Vega network
   */
  party: PartyMarketData_party | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { Side, OrderTimeInForce, OrderType } from "./../../../../../../libs/types/src/__generated__/globalTypes";
+import { Side, OrderTimeInForce, OrderType } from "@vegaprotocol/types";

 // ====================================================
 // GraphQL query operation: EstimateOrder
@@ -12,15 +12,15 @@ import { Side, OrderTimeInForce, OrderType } from "./../../../../../../libs/type
 export interface EstimateOrder_estimateOrder_fee {
  __typename: "TradeFee";
  /**
-   * The maker fee, aggressive party to the other party (the one who had an order in the book)
+   * The maker fee, paid by the aggressive party to the other party (the one who had an order in the book)
   */
  makerFee: string;
  /**
-   * The infrastructure fee, a fee paid to the node runner to maintain the vega network
+   * The infrastructure fee, a fee paid to the validators to maintain the Vega network
   */
  infrastructureFee: string;
  /**
-   * The fee paid to the market makers to provide liquidity in the market
+   * The fee paid to the liquidity providers that committed liquidity to the market
   */
  liquidityFee: string;
 }
@@ -28,7 +28,7 @@ export interface EstimateOrder_estimateOrder_fee {
 export interface EstimateOrder_estimateOrder_marginLevels {
  __typename: "MarginLevels";
  /**
-   * this is the minimal margin required for a party to place a new order on the network (unsigned int actually)
+   * this is the minimum margin required for a party to place a new order on the network (unsigned integer)
   */
  initialLevel: string;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "./../../../../../../libs/types/src/__generated__/globalTypes";
+import { AccountType } from "@vegaprotocol/types";

 // ====================================================
 // GraphQL query operation: MarketPositions
@@ -12,7 +12,7 @@ import { AccountType } from "./../../../../../../libs/types/src/__generated__/gl
 export interface MarketPositions_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The precision of the asset
+   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
   */
  decimals: number;
 }
@@ -91,12 +91,12 @@ export interface MarketPositions_party {
  /**
   * Trading positions relating to a party
   */
-  positionsConnection: MarketPositions_party_positionsConnection;
+  positionsConnection: MarketPositions_party_positionsConnection | null;
 }

 export interface MarketPositions {
  /**
-   * An entity that is trading on the VEGA network
+   * An entity that is trading on the Vega network
   */
  party: MarketPositions_party | null;
 }
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -8,7 +8,7 @@ export type MarketPositionsQueryVariables = Types.Exact<{
 }>;


-export type MarketPositionsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, positionsConnection: { __typename?: 'PositionConnection', edges?: Array<{ __typename?: 'PositionEdge', node: { __typename?: 'Position', openVolume: string, market: { __typename?: 'Market', id: string } } }> | null } } | null };
+export type MarketPositionsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, positionsConnection?: { __typename?: 'PositionConnection', edges?: Array<{ __typename?: 'PositionEdge', node: { __typename?: 'Position', openVolume: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };


 export const MarketPositionsDocument = gql`
@@ -1,4 +1,4 @@
-import * as Types from '@vegaprotocol/types/types';
+import { Schema as Types } from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -8,7 +8,7 @@ export type PartyMarketDataQueryVariables = Types.Exact<{
 }>;


-export type PartyMarketDataQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, marginsConnection: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', initialLevel: string, maintenanceLevel: string, searchLevel: string, market: { __typename?: 'Market', id: string } } }> | null } } | null };
+export type PartyMarketDataQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', initialLevel: string, maintenanceLevel: string, searchLevel: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };


 export const PartyMarketDataDocument = gql`
@@ -64,6 +64,15 @@ jest.mock('@vegaprotocol/market-depth', () => ({
  useOrderBookData: jest.fn(() => mockOrderBookData),
 }));

+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useDataProvider: jest.fn(() => ({
+    data: {
+      marketsConnection: [],
+    },
+  })),
+}));
+
 describe('useCalculateSlippage Hook', () => {
  describe('calculate proper result', () => {
    afterEach(() => {
@@ -1,9 +1,15 @@
 import { useMemo } from 'react';
 import { Side } from '@vegaprotocol/types';
 import { useOrderBookData } from '@vegaprotocol/market-depth';
+import { marketProvider } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/market-list';
 import type { Order } from '@vegaprotocol/orders';
 import { BigNumber } from 'bignumber.js';
-import { formatNumber, toBigNum } from '@vegaprotocol/react-helpers';
+import {
+  formatNumber,
+  toBigNum,
+  useDataProvider,
+} from '@vegaprotocol/react-helpers';

 interface Props {
  marketId: string;
@@ -16,11 +22,16 @@ const useCalculateSlippage = ({ marketId, order }: Props) => {
    variables,
    throttleMilliseconds: 5000,
  });
+  const { data: market } = useDataProvider<Market, never>({
+    dataProvider: marketProvider,
+    noUpdate: true,
+    variables,
+  });
  const volPriceArr =
    data?.depth[order.side === Side.SIDE_BUY ? 'sell' : 'buy'] || [];
-  if (volPriceArr.length) {
-    const decimals = data?.decimalPlaces ?? 0;
-    const positionDecimals = data?.positionDecimalPlaces ?? 0;
+  if (volPriceArr.length && market) {
+    const decimals = market.decimalPlaces ?? 0;
+    const positionDecimals = market.positionDecimalPlaces ?? 0;
    const bestPrice = toBigNum(volPriceArr[0].price, decimals);
    const { size } = order;
    let descSize = new BigNumber(size);
@@ -1,14 +1,13 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import classNames from 'classnames';
 import { t } from '@vegaprotocol/react-helpers';
-import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
 import MarketNameRenderer from '../components/simple-market-list/simple-market-renderer';
 import SimpleMarketPercentChange from '../components/simple-market-list/simple-market-percent-change';
 import { Icon } from '@vegaprotocol/ui-toolkit';
 import type { ValueSetterParams } from 'ag-grid-community';
-import type { SimpleMarketsType } from '../components/simple-market-list/simple-market-list';
 import { IconNames } from '@blueprintjs/icons';
 import { IS_MARKET_TRADABLE, MARKET_STATES_MAP } from '../constants';
+import type { Candle, Market } from '@vegaprotocol/market-list';

 interface Props {
  isMobile: boolean;
@@ -24,7 +23,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
        minWidth: isMobile ? 160 : 350,
        field: 'tradableInstrument.instrument.name',
        cellClass: 'overflow-visible',
-        cellRenderer: ({ data }: { data: SimpleMarketsType }) => (
+        cellRenderer: ({ data }: { data: Market }) => (
          <MarketNameRenderer market={data} isMobile={isMobile} />
        ),
      },
@@ -35,7 +34,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
        minWidth: isMobile ? 50 : 80,
        cellClass: 'uppercase flex h-full items-center',
        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({ data }: { data: SimpleMarketsType }) => (
+        cellRenderer: ({ data }: { data: Market }) => (
          <div
            className="grid h-full items-center text-center"
            title={
@@ -70,7 +69,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
          data,
          setValue,
        }: {
-          data: SimpleMarketsType;
+          data: { id: string; candles: Candle[] };
          setValue: (arg: unknown) => void;
        }) => (
          <SimpleMarketPercentChange
@@ -96,7 +95,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
        field: 'state',
        headerClass: 'uppercase',
        minWidth: 100,
-        cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => (
+        cellRenderer: ({ data }: { data: Market }) => (
          <div className="uppercase flex h-full items-center justify-center">
            <div className="border text-center px-2 md:px-6 leading-4 md:leading-6">
              {MARKET_STATES_MAP[data.state || '']}
@@ -110,7 +109,7 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
        headerClass: 'uppercase',
        sortable: false,
        width: isMobile ? 35 : 100,
-        cellRenderer: ({ data }: { data: SimpleMarkets_markets }) => (
+        cellRenderer: ({ data }: { data: Market }) => (
          <div className="h-full flex h-full items-center justify-end">
            <div className="uppercase text-center pr-2">
              {!isMobile && t('Trade')}
@@ -1,37 +1,52 @@
-import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
+import { useMemo } from 'react';
 import type { RouterParams } from '../components/simple-market-list/simple-market-list';
 import { MarketState } from '@vegaprotocol/types';
+import type { MarketsListData } from '@vegaprotocol/market-list';

-const useMarketsFilterData = (
-  data: SimpleMarkets_markets[] = [],
-  params: RouterParams
-) => {
-  return data.filter((item) => {
-    if (
-      params.product &&
-      params.product !== item.tradableInstrument.instrument.product.__typename
-    ) {
-      return false;
-    }
-    if (
-      params.asset &&
-      params.asset !== 'all' &&
-      params.asset !==
-        item.tradableInstrument.instrument.product.settlementAsset.symbol
-    ) {
-      return false;
-    }
-    const state =
-      params.state === 'all'
-        ? ''
-        : params.state
-        ? params.state
-        : MarketState.STATE_ACTIVE;
-    if (state && state !== item.state) {
-      return false;
-    }
-    return true;
-  });
+const useMarketsFilterData = (data: MarketsListData, params: RouterParams) => {
+  return useMemo(() => {
+    const markets =
+      data?.markets?.filter((item) => {
+        if (
+          params.product &&
+          params.product !==
+            item.tradableInstrument.instrument.product.__typename
+        ) {
+          return false;
+        }
+        if (
+          params.asset &&
+          params.asset !== 'all' &&
+          params.asset !==
+            item.tradableInstrument.instrument.product.settlementAsset.symbol
+        ) {
+          return false;
+        }
+        const state =
+          params.state === 'all'
+            ? ''
+            : params.state
+            ? params.state
+            : MarketState.STATE_ACTIVE;
+        if (state && state !== item.state) {
+          return false;
+        }
+        return true;
+      }) || [];
+
+    return markets.map((market) => ({
+      ...market,
+      candles: (data?.marketsCandles || [])
+        .filter((c) => c.marketId === market.id)
+        .map((c) => c.candles),
+    }));
+  }, [
+    data?.marketsCandles,
+    data?.markets,
+    params.product,
+    params.asset,
+    params.state,
+  ]);
 };

 export default useMarketsFilterData;
@@ -1,7 +1,7 @@
+import type { Market } from '@vegaprotocol/market-list';
 import { useEffect, useState } from 'react';
-import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';

-const useMarketFilters = (data: SimpleMarkets_markets[]) => {
+const useMarketFilters = (data: Market[]) => {
  const [products, setProducts] = useState<string[]>([]);
  const [assetsPerProduct, setAssetsPerProduct] = useState<
    Record<string, string[]>
@@ -74,7 +74,7 @@ const useOrderCloseOut = ({ order, market, partyData }: Props): string => {

  const marginMaintenanceLevel = new BigNumber(
    addDecimal(
-      data?.party?.marginsConnection.edges?.find(
+      data?.party?.marginsConnection?.edges?.find(
        (nodes) => nodes.node.market.id === market.id
      )?.node.maintenanceLevel || 0,
      market.decimalPlaces
@@ -38,6 +38,9 @@ export function createClient(base?: string) {
      Node: {
        keyFields: false,
      },
+      Instrument: {
+        keyFields: false,
+      },
    },
  });

@@ -3,7 +3,6 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=CUSTOM
-NX_VEGA_REST=http://localhost:3029
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/capsule-network.json

 CYPRESS_VEGA_TENDERMINT_URL=http://localhost:26617
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
-NX_VEGA_REST=https://api.n04.d.vega.xyz

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -12,7 +11,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=1
+NX_EXPLORER_TXS_LIST=0
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
-NX_VEGA_REST=https://api.vega.xyz/

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
-NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -12,7 +11,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=1
+NX_EXPLORER_TXS_LIST=0
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
-NX_VEGA_REST=https://api.n11.testnet.vega.xyz

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -12,7 +11,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=1
+NX_EXPLORER_TXS_LIST=0
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
@@ -1,148 +1,20 @@
-context('Asset page', { tags: '@regression' }, function () {
-  before('gather system asset information', function () {
-    cy.get_asset_information().as('assetsInfo');
-  });
+import '../support/common.functions';

+context('Asset page', function () {
  describe('Verify elements on page', function () {
    const assetsNavigation = 'a[href="/assets"]';
    const assetHeader = '[data-testid="asset-header"]';
-    const jsonSection = '.language-json';

-    before('Navigate to assets page', function () {
+    it('Assets page is displayed', function () {
      cy.visit('/');
      cy.get(assetsNavigation).click();
-
-      // Check we have enough enough assets
-      const assetNames = Object.keys(this.assetsInfo);
-      assert.isAtLeast(
-        assetNames.length,
-        5,
-        'Ensuring we have at least 5 assets to test'
-      );
+      cy.common_validate_blocks_data_displayed(assetHeader);
    });

-    it('should be able to see assets page sections', function () {
-      const assetNames = Object.keys(this.assetsInfo);
-      assetNames.forEach((assetName) => {
-        cy.get(assetHeader)
-          .contains(assetName)
-          .should('be.visible')
-          .next()
-          .within(() => {
-            cy.get(jsonSection).should('not.be.empty');
-          });
-      });
-    });
-
-    it('should be able to see all asset details displayed in JSON', function () {
-      const assetNames = Object.keys(this.assetsInfo);
-      assetNames.forEach((assetName) => {
-        cy.get(assetHeader)
-          .contains(assetName)
-          .next()
-          .within(() => {
-            cy.get(jsonSection)
-              .invoke('text')
-              .convert_string_json_to_js_object()
-              .then((assetsListedInJson) => {
-                const assetInfo = this.assetsInfo[assetName];
-
-                assert.equal(assetsListedInJson.name, assetInfo.name);
-                assert.equal(assetsListedInJson.id, assetInfo.id);
-                assert.equal(assetsListedInJson.decimals, assetInfo.decimals);
-                assert.equal(assetsListedInJson.symbol, assetInfo.symbol);
-                assert.equal(
-                  assetsListedInJson.source.__typename,
-                  assetInfo.source.__typename
-                );
-
-                if (assetInfo.source.__typename == 'ERC20') {
-                  assert.equal(
-                    assetsListedInJson.source.contractAddress,
-                    assetInfo.source.contractAddress
-                  );
-                }
-
-                if (assetInfo.source.__typename == 'BuiltinAsset') {
-                  assert.equal(
-                    assetsListedInJson.source.maxFaucetAmountMint,
-                    assetInfo.source.maxFaucetAmountMint
-                  );
-                }
-
-                let knownAssetTypes = ['BuiltinAsset', 'ERC20'];
-                assert.include(
-                  knownAssetTypes,
-                  assetInfo.source.__typename,
-                  `Checking that current asset type of ${assetInfo.source.__typename} /
-                  is one of: ${knownAssetTypes}: /
-                  If fail then we need to add extra tests for un-encountered asset types`
-                );
-              });
-          });
-      });
-    });
-
-    it('should be able to switch assets between light and dark mode', function () {
-      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
-      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
-      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
-      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
-      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
-      const themeSwitcher = '[data-testid="theme-switcher"]';
-      const jsonFields = '.hljs';
-      const sideMenuBackground = '.absolute';
-
-      // Engage dark mode if not allready set
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .then((background_color) => {
-          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
-            cy.get(themeSwitcher).click();
-        });
-
-      // Engage white mode
-      cy.get(themeSwitcher).click();
-
-      // White Mode
-      cy.get(assetsNavigation)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSideMenuBackgroundColor);
-
-      // Dark Mode
-      cy.get(themeSwitcher).click();
-      cy.get(assetsNavigation)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSideMenuBackgroundColor);
-    });
-
-    it('should be able to see assets page displayed in mobile', function () {
+    it('Assets page displayed in mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.get(assetsNavigation).click();
-
-      const assetNames = Object.keys(this.assetsInfo);
-      assetNames.forEach((assetName) => {
-        cy.get(assetHeader)
-          .contains(assetName)
-          .should('be.visible')
-          .next()
-          .within(() => {
-            cy.get(jsonSection).should('not.be.empty');
-          });
-      });
+      cy.common_validate_blocks_data_displayed(assetHeader);
    });
  });
 });
@@ -1,267 +1,35 @@
-context('Network parameters page', { tags: '@smoke' }, function () {
-  before('navigate to network parameter page', function () {
-    cy.fixture('net_parameter_format_lookup').as('networkParameterFormat');
+import '../support/common.functions';
+
+context('Network parameters page', function () {
+  before('visit token home page', function () {
+    cy.visit('/');
  });

  describe('Verify elements on page', function () {
    const networkParametersNavigation = 'a[href="/network-parameters"]';
-    const networkParametersHeader = '[data-testid="network-param-header"]';
-    const tableRows = '[data-testid="key-value-table-row"]';

-    before('navigate to network parameter page', function () {
-      cy.visit('/');
+    beforeEach('Navigate to network parameter page', function () {
      cy.get(networkParametersNavigation).click();
    });

-    it('should show network parameter heading at top of page', function () {
-      cy.get(networkParametersHeader)
-        .should('have.text', 'Network Parameters')
-        .and('be.visible');
+    it('Network paremeter page is displayed', function () {
+      verifyNetworkParametersPageDisplayed();
    });

-    it('should list each of the network parameters available', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        const numberOfNetworkParametersInSystem =
-          Object.keys(network_parameters).length;
-        cy.get(tableRows).should(
-          'have.length',
-          numberOfNetworkParametersInSystem
-        );
-      });
-    });
-
-    it('should list each network parameter displayed with json - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.json.includes(parameterName)) {
-            cy.get(tableRows)
-              .contains(parameterName)
-              .should('be.visible')
-              .next()
-              .invoke('text')
-              .convert_string_json_to_js_object()
-              .then((jsonOnPage) => {
-                cy.wrap(parameterValue, { log: false })
-                  .convert_string_json_to_js_object()
-                  .then((jsonInSystem) =>
-                    assert.deepEqual(
-                      jsonOnPage,
-                      jsonInSystem,
-                      `Checking ${parameterName} has the correct value of ${jsonInSystem}`
-                    )
-                  );
-              });
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as a percentage - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.percentage.includes(parameterName)) {
-            const formattedPercentageParameter =
-              (parseFloat(parameterValue) * 100).toFixed(0) + '%';
-            cy.get(tableRows)
-              .contains(parameterName)
-              .should('be.visible')
-              .next()
-              .invoke('text')
-              .then((parameterValueOnPage) => {
-                assert.equal(
-                  parameterValueOnPage,
-                  formattedPercentageParameter,
-                  `Checking ${parameterName} has the correct value of ${formattedPercentageParameter}`
-                );
-                cy.contains(parameterValueOnPage).should('be.visible');
-              });
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as an id - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.id.includes(parameterName)) {
-            cy.get(tableRows)
-              .contains(parameterName)
-              .should('be.visible')
-              .next()
-              .should('contain', parameterValue)
-              .and('be.visible')
-              .invoke('text');
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as a date - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.date.includes(parameterName)) {
-            cy.get(tableRows)
-              .contains(parameterName)
-              .should('be.visible')
-              .next()
-              .should('contain', parameterValue)
-              .and('be.visible');
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as a duration - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.duration.includes(parameterName)) {
-            cy.get(tableRows)
-              .contains(parameterName)
-              .should('be.visible')
-              .next()
-              .should('contain', parameterValue)
-              .and('be.visible');
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (this.networkParameterFormat.fiveDecimal.includes(parameterName)) {
-            cy.convert_number_to_four_decimal(parameterValue)
-              .add_commas_to_number_if_large_enough()
-              .then((parameterValueFormatted) => {
-                cy.get(tableRows)
-                  .contains(parameterName)
-                  .should('be.visible')
-                  .next()
-                  .invoke('text')
-                  .then((parameterValueOnPage) => {
-                    assert.equal(
-                      parameterValueOnPage,
-                      parameterValueFormatted,
-                      `Checking ${parameterName} has the correct value of ${parameterValueFormatted}`
-                    );
-                    cy.contains(parameterValueOnPage).should('be.visible');
-                  });
-              });
-          }
-        });
-      });
-    });
-
-    it('should list each network parameter displayed as a currency value with eighteen decimals - in the correct format', function () {
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          const parameterValue = network_parameter[1];
-          if (
-            this.networkParameterFormat.eighteenDecimal.includes(parameterName)
-          ) {
-            cy.convert_number_to_eighteen_decimal(parameterValue)
-              .add_commas_to_number_if_large_enough()
-              .then((parameterValueFormatted) => {
-                cy.get(tableRows)
-                  .contains(parameterName)
-                  .should('be.visible')
-                  .next()
-                  .invoke('text')
-                  .then((parameterValueOnPage) => {
-                    assert.equal(
-                      parameterValueOnPage,
-                      parameterValueFormatted,
-                      `Checking ${parameterName} has the correct value of ${parameterValueFormatted}`
-                    );
-                    cy.contains(parameterValueOnPage).should('be.visible');
-                  });
-              });
-          }
-        });
-      });
-    });
-
-    it('should be able to switch network parameter page - between light and dark mode', function () {
-      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
-      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
-      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
-      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
-      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
-      const themeSwitcher = '[data-testid="theme-switcher"]';
-      const jsonFields = '.hljs';
-      const sideMenuBackground = '.absolute';
-
-      // Engage dark mode if not allready set
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .then((background_color) => {
-          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
-            cy.get(themeSwitcher).click();
-        });
-
-      // Engage white mode
-      cy.get(themeSwitcher).click();
-
-      // White Mode
-      cy.get(networkParametersNavigation)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSideMenuBackgroundColor);
-
-      // Dark Mode
-      cy.get(themeSwitcher).click();
-      cy.get(networkParametersNavigation)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSideMenuBackgroundColor);
-    });
-
-    it('should be able to see network parameters - on mobile', function () {
+    it('Network parameter page displayed on mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.get(networkParametersNavigation).click();
-      cy.get_network_parameters().then((network_parameters) => {
-        network_parameters = Object.entries(network_parameters);
-        network_parameters.forEach((network_parameter) => {
-          const parameterName = network_parameter[0];
-          cy.get(tableRows)
-            .contains(parameterName)
-            .should('be.visible')
-            .next()
-            .should('not.be.empty')
-            .and('be.visible');
-        });
-      });
+      verifyNetworkParametersPageDisplayed();
    });
  });
+
+  function verifyNetworkParametersPageDisplayed() {
+    cy.get('[data-testid="network-param-header"]').should(
+      'have.text',
+      'Network Parameters'
+    );
+    cy.common_verify_json_parameters(18);
+    cy.common_verify_json_string_values(6);
+    cy.common_verify_json_int_values(7);
+  }
 });
@@ -1,264 +0,0 @@
-const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
-const partiesMenuHeader = 'a[href="/parties"]';
-const partiesSearchBox = '[data-testid="party-input"]';
-const partiesSearchAction = '[data-testid="go-submit"]';
-const partiesJsonSection = '[data-testid="parties-json"]';
-const txTimeout = Cypress.env('txTimeout');
-
-let assetData = {
-  fUSDC: { id: 'fUSDC', name: 'USDC (fake)', amount: '10' },
-  fBTC: { id: 'fBTC', name: 'BTC (fake)', amount: '6' },
-  fEURO: { id: 'fEURO', name: 'EURO (fake)', amount: '8' },
-  fDAI: { id: 'fDAI', name: 'DAI (fake)', amount: '2' },
-};
-
-const assetsInTest = Object.keys(assetData);
-
-context('Parties page', { tags: '@regression' }, function () {
-  before('send-faucet assets to connected vega wallet', function () {
-    cy.vega_wallet_import();
-    assetsInTest.forEach((asset) => {
-      cy.vega_wallet_receive_fauceted_asset(
-        assetData[asset].name,
-        assetData[asset].amount,
-        vegaWalletPublicKey
-      );
-    });
-    cy.visit('/');
-  });
-
-  describe('Verify parties page content', function () {
-    before('navigate to parties page and search for party', function () {
-      cy.get(partiesMenuHeader).click();
-      // Deliberate slow entry of party id/key - enabling transactions to sync
-      cy.get(partiesSearchBox).type(vegaWalletPublicKey, { delay: 120 });
-      cy.get(partiesSearchAction).click();
-      cy.get_connected_parties_accounts().as('party_accounts');
-
-      // Ensure balance of each party asset is correct
-      cy.get('@party_accounts').then((accounts) => {
-        assetsInTest.forEach((asset) => {
-          cy.get_asset_decimals(assetData[asset].id).then((assetDecimals) => {
-            assert.equal(
-              accounts[assetData[asset].id].balance,
-              assetData[asset].amount + assetDecimals,
-              `Checking ${assetData[asset].id} faucet was successfull`
-            );
-          });
-        });
-      });
-    });
-
-    it('should see party address id - having searched', function () {
-      cy.getByTestId('parties-header')
-        .siblings()
-        .contains(vegaWalletPublicKey.substring(0, 14))
-        .should('be.visible');
-    });
-
-    it('should see each asset and balance - within asset data section', function () {
-      assetsInTest.forEach((asset) => {
-        cy.contains(assetData[asset].name, txTimeout).should('be.visible');
-        cy.contains(assetData[asset].name)
-          .siblings()
-          .contains(assetData[asset].id)
-          .should('be.visible');
-        cy.contains(assetData[asset].name, txTimeout)
-          .parent()
-          .siblings()
-          .within(() => {
-            cy.get_asset_decimals(asset).then((assetDecimals) => {
-              cy.contains_exactly(
-                assetData[asset].amount + '.' + assetDecimals
-              ).should('be.visible');
-            });
-          });
-      });
-    });
-
-    it(
-      'should be able to copy the party address id',
-      { browser: 'chrome' },
-      function () {
-        cy.monitor_clipboard().as('clipboard');
-        cy.getByTestId('parties-header')
-          .next()
-          .within(() => {
-            cy.get('button').click();
-          });
-        cy.get('@clipboard')
-          .get_copied_text_from_clipboard()
-          .should('equal', vegaWalletPublicKey);
-      }
-    );
-
-    it(
-      'should be able to copy an asset id',
-      { browser: 'chrome' },
-      function () {
-        cy.monitor_clipboard().as('clipboard');
-
-        cy.contains(assetData.fDAI.name, txTimeout).should('be.visible');
-        cy.contains(assetData.fDAI.name)
-          .parent()
-          .parent()
-          .siblings()
-          .within(() => {
-            cy.get('[data-state="closed"]').last().click({ force: true });
-          });
-
-        cy.get('@clipboard')
-          .get_copied_text_from_clipboard()
-          .should('equal', assetData.fDAI.id);
-      }
-    );
-
-    it('should be able to see JSON of each asset containing correct balance and decimals', function () {
-      cy.get(partiesJsonSection).should('be.visible');
-
-      assetsInTest.forEach((assetInTest) => {
-        cy.get(partiesJsonSection)
-          .invoke('text')
-          .convert_string_json_to_js_object()
-          .get_party_accounts_data_from_js_object()
-          .then((accountsListedInJson) => {
-            cy.get_asset_information().then((assetsInfo) => {
-              const assetInfo =
-                assetsInfo[accountsListedInJson[assetInTest].asset.name];
-
-              assert.equal(
-                accountsListedInJson[assetInTest].asset.name,
-                assetInfo.name
-              );
-              assert.equal(
-                accountsListedInJson[assetInTest].asset.id,
-                assetInfo.id
-              );
-              assert.equal(
-                accountsListedInJson[assetInTest].asset.decimals,
-                assetInfo.decimals
-              );
-              assert.equal(
-                accountsListedInJson[assetInTest].asset.symbol,
-                assetInfo.symbol
-              );
-              assert.equal(
-                accountsListedInJson[assetInTest].asset.source.__typename,
-                assetInfo.source.__typename
-              );
-              cy.get_asset_decimals(assetInTest).then((assetDecimals) => {
-                assert.equal(
-                  accountsListedInJson[assetInTest].balance,
-                  assetData[assetInTest].amount + assetDecimals
-                );
-              });
-            });
-          });
-      });
-    });
-
-    it('should be able to switch parties page between light and dark mode', function () {
-      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
-      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
-      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
-      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
-      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
-      const themeSwitcher = '[data-testid="theme-switcher"]';
-      const jsonFields = '.hljs';
-      const sideMenuBackground = '.absolute';
-
-      // Engage dark mode if not allready set
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .then((background_color) => {
-          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
-            cy.get(themeSwitcher).click();
-        });
-
-      // Engage white mode
-      cy.get(themeSwitcher).click();
-
-      // White Mode
-      cy.get(partiesMenuHeader)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSideMenuBackgroundColor);
-
-      // Dark Mode
-      cy.get(themeSwitcher).click();
-      cy.get(partiesMenuHeader)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSideMenuBackgroundColor);
-    });
-
-    after(
-      'teardown environment to prevent test data bleeding into other tests',
-      function () {
-        if (Cypress.env('TEARDOWN_NETWORK_AFTER_FLOWS')) {
-          cy.restart_vegacapsule_network();
-        }
-      }
-    );
-
-    Cypress.Commands.add('get_asset_decimals', (assetID) => {
-      cy.get_asset_information().then((assetsInfo) => {
-        const assetDecimals = assetsInfo[assetData[assetID].name].decimals;
-        let decimals = '';
-        for (let i = 0; i < assetDecimals; i++) decimals += '0';
-        return decimals;
-      });
-    });
-
-    Cypress.Commands.add('get_connected_parties_accounts', () => {
-      const mutation =
-        '{partiesConnection {edges{node{accountsConnection{edges{node{\
-          balance type asset {id symbol decimals}}}}}}}}';
-      cy.request({
-        method: 'POST',
-        url: `http://localhost:3028/query`,
-        body: {
-          query: mutation,
-        },
-        headers: { 'content-type': 'application/json' },
-      })
-        .its(
-          `body.data.partiesConnection.edges.1.node.accountsConnection.edges`
-        )
-        .then(function (response) {
-          let accounts = {};
-          response.forEach((account) => {
-            accounts[account.node.asset.id] = account.node;
-          });
-          return accounts;
-        });
-    });
-
-    Cypress.Commands.add(
-      'get_party_accounts_data_from_js_object',
-      { prevSubject: true },
-      (jsObject) => {
-        const accounts = jsObject.party.accounts.reduce(function (
-          account,
-          entry
-        ) {
-          account[entry.asset.id] = entry;
-          return account;
-        },
-        {});
-        return accounts;
-      }
-    );
-  });
-});
@@ -1,300 +1,27 @@
-context('Validator page', { tags: '@smoke' }, function () {
-  const validatorMenuHeading = 'a[href="/validators"]';
-  const tendermintDataHeader = '[data-testid="tendermint-header"]';
-  const vegaDataHeader = '[data-testid="vega-header"]';
-  const jsonSection = '.language-json';
-
-  before('Visit validators page and obtain data', function () {
-    cy.visit('/');
-    cy.get(validatorMenuHeading).click();
-    cy.get_validators().as('validators');
-    cy.get_nodes().as('nodes');
-  });
+import '../support/common.functions';

+context('Validator page', function () {
  describe('Verify elements on page', function () {
-    before('Ensure at least two validators are present', function () {
-      assert.isAtLeast(
-        this.validators.length,
-        2,
-        'Ensuring at least two validators exist'
-      );
+    const validatorNavigation = 'a[href="/validators"]';
+
+    it('Validator page is displayed', function () {
+      cy.visit('/');
+      cy.get(validatorNavigation).click();
+      validateValidatorsDisplayed();
    });

-    it('should be able to see validator page sections', function () {
-      cy.get(vegaDataHeader)
-        .contains('Vega data')
-        .and('is.visible')
-        .next()
-        .within(() => {
-          cy.get(jsonSection).should('not.be.empty');
-        });
-
-      cy.get(tendermintDataHeader)
-        .contains('Tendermint data')
-        .and('is.visible')
-        .next()
-        .within(() => {
-          cy.get(jsonSection).should('not.be.empty');
-        });
-    });
-
-    it('should be able to see relevant validator information in tendermint section', function () {
-      cy.get(tendermintDataHeader)
-        .contains('Tendermint data')
-        .next()
-        .within(() => {
-          cy.get(jsonSection)
-            .invoke('text')
-            .convert_string_json_to_js_object()
-            .then((validatorsInJson) => {
-              this.validators.forEach((validator, index) => {
-                const validatorInJson =
-                  validatorsInJson.result.validators[index];
-
-                assert.equal(
-                  validatorInJson.address,
-                  validator.address,
-                  `Checking that validator address shown in json matches system data`
-                );
-                cy.contains(validator.address).should('be.visible');
-
-                assert.equal(
-                  validatorInJson.pub_key.type,
-                  validator.pub_key.type,
-                  `Checking that validator public key type shown in json matches system data`
-                );
-                cy.contains(validator.pub_key.type).should('be.visible');
-
-                assert.equal(
-                  validatorInJson.pub_key.value,
-                  validator.pub_key.value,
-                  `Checking that validator public key value shown in json matches system data`
-                );
-                cy.contains(validator.pub_key.value).should('be.visible');
-
-                assert.equal(
-                  validatorInJson.voting_power,
-                  validator.voting_power,
-                  `Checking that validator voting power in json matches system data`
-                );
-                cy.contains(validator.voting_power).should('be.visible');
-
-                // Proposer priority can change frequently mid test
-                // Therefore only checking the field name is present.
-                cy.contains('proposer_priority').should('be.visible');
-              });
-            });
-        });
-    });
-
-    it('should be able to see relevant node information in vega data section', function () {
-      cy.get(vegaDataHeader)
-        .contains('Vega data')
-        .next()
-        .within(() => {
-          cy.get(jsonSection)
-            .invoke('text')
-            .convert_string_json_to_js_object()
-            .then((nodesInJson) => {
-              this.nodes.forEach((node, index) => {
-                const nodeInJson = nodesInJson.nodes[index];
-
-                // Vegacapsule shows no info or null for following fields:
-                // name, infoURL, avatarUrl, location, epoch data
-                // Therefore, these values remain unchecked.
-
-                assert.equal(
-                  nodeInJson.__typename,
-                  node.__typename,
-                  `Checking that node __typename shown in json matches system data`
-                );
-                cy.contains(node.__typename).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.id,
-                  node.id,
-                  `Checking that node id shown in json matches system data`
-                );
-                cy.contains(node.id).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.pubkey,
-                  node.pubkey,
-                  `Checking that node pubkey shown in json matches system data`
-                );
-                cy.contains(node.pubkey).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.tmPubkey,
-                  node.tmPubkey,
-                  `Checking that node tmPubkey shown in json matches system data`
-                );
-                cy.contains(node.tmPubkey).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.ethereumAddress,
-                  node.ethereumAddress,
-                  `Checking that node ethereumAddress shown in json matches system data`
-                );
-                cy.contains(node.ethereumAddress).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.stakedByOperator,
-                  node.stakedByOperator,
-                  `Checking that node stakedByOperator value shown in json matches system data`
-                );
-                cy.contains(node.stakedByOperator).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.stakedByDelegates,
-                  node.stakedByDelegates,
-                  `Checking that node stakedByDelegates value shown in json matches system data`
-                );
-                cy.contains(node.stakedByDelegates).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.stakedTotal,
-                  node.stakedTotal,
-                  `Checking that node stakedTotal shown in json matches system data`
-                );
-                cy.contains(node.stakedTotal).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.pendingStake,
-                  node.pendingStake,
-                  `Checking that node pendingStake shown in json matches system data`
-                );
-                cy.contains(node.pendingStake).should('be.visible');
-
-                assert.equal(
-                  nodeInJson.status,
-                  node.status,
-                  `Checking that node status shown in json matches system data`
-                );
-                cy.contains(node.status).should('be.visible');
-              });
-            });
-        });
-    });
-
-    it('should be able to see validator page displayed on mobile', function () {
+    it('Validator page is displayed on mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
-      cy.get(validatorMenuHeading).click();
-      cy.get(vegaDataHeader)
-        .contains('Vega data')
-        .and('is.visible')
-        .next()
-        .within(() => {
-          cy.get(jsonSection).should('not.be.empty');
-        });
-
-      cy.get(tendermintDataHeader)
-        .contains('Tendermint data')
-        .and('is.visible')
-        .next()
-        .within(() => {
-          cy.get(jsonSection).should('not.be.empty');
-        });
-
-      cy.get(tendermintDataHeader)
-        .contains('Tendermint data')
-        .next()
-        .within(() => {
-          this.validators.forEach((validator) => {
-            cy.contains(validator.address).should('be.visible');
-            cy.contains(validator.pub_key.type).should('be.visible');
-            cy.contains(validator.pub_key.value).should('be.visible');
-            cy.contains(validator.voting_power).should('be.visible');
-            // Proposer priority can change frequently mid test
-            // Therefore only checking the field name is present.
-            cy.contains('proposer_priority').should('be.visible');
-          });
-        });
+      cy.get(validatorNavigation).click();
+      validateValidatorsDisplayed();
    });

-    it('should be able to switch validator page between light and dark mode', function () {
-      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
-      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
-      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
-      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
-      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
-      const themeSwitcher = '[data-testid="theme-switcher"]';
-      const jsonFields = '.hljs';
-      const sideMenuBackground = '.absolute';
-
-      // Engage dark mode if not allready set
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .then((background_color) => {
-          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
-            cy.get(themeSwitcher).click();
-        });
-
-      // Engage white mode
-      cy.get(themeSwitcher).click();
-
-      // White Mode
-      cy.get(validatorMenuHeading)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', whiteThemeSideMenuBackgroundColor);
-
-      // Dark Mode
-      cy.get(themeSwitcher).click();
-      cy.get(validatorMenuHeading)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSelectedMenuOptionColor);
-      cy.get(jsonFields)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeJsonFieldBackColor);
-      cy.get(sideMenuBackground)
-        .should('have.css', 'background-color')
-        .and('include', darkThemeSideMenuBackgroundColor);
-    });
-
-    Cypress.Commands.add('get_validators', () => {
-      cy.request({
-        method: 'GET',
-        url: `http://localhost:26617/validators`,
-        headers: { 'content-type': 'application/json' },
-      })
-        .its(`body.result.validators`)
-        .then(function (response) {
-          let validators = [];
-          response.forEach((account, index) => {
-            validators[index] = account;
-          });
-          return validators;
-        });
-    });
-
-    Cypress.Commands.add('get_nodes', () => {
-      const mutation =
-        '{nodes { id name infoUrl avatarUrl pubkey tmPubkey ethereumAddress \
-          location stakedByOperator stakedByDelegates stakedTotal pendingStake \
-          epochData { total offline online __typename } status name __typename}}';
-      cy.request({
-        method: 'POST',
-        url: `http://localhost:3028/query`,
-        body: {
-          query: mutation,
-        },
-        headers: { 'content-type': 'application/json' },
-      })
-        .its(`body.data.nodes`)
-        .then(function (response) {
-          let nodes = [];
-          response.forEach((node) => {
-            nodes.push(node);
-          });
-          return nodes;
-        });
-    });
+    function validateValidatorsDisplayed() {
+      cy.get('[data-testid="tendermint-header"]').should(
+        'have.text',
+        'Tendermint data'
+      );
+      cy.get('[data-testid="tendermint-data"]').should('not.be.empty');
+    }
  });
 });
@@ -2,11 +2,9 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp
 NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_BLOCK_EXPLORER=

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -3,7 +3,7 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3028/query
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=CUSTOM
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

@@ -13,7 +13,7 @@ NX_EXPLORER_GENESIS=1
 NX_EXPLORER_GOVERNANCE=1
 NX_EXPLORER_MARKETS=1
 NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=1
+NX_EXPLORER_TXS_LIST=0
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=DEVNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
@@ -1,13 +1,9 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://be.explorer.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz
+NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=MAINNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
-
-# 0.53.0 misreports total nodes, including ex-validators
-NX_HACK_53_TOTAL_NODES=2
@@ -1,20 +0,0 @@
-# App configuration variables
-NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=https://tm.be.mainnet-mirror.vega.xyz
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mirror-network.json
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_ENV=MIRROR
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-
-# App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1
-NX_EXPLORER_MARKETS=0
-NX_EXPLORER_ORACLES=0
-NX_EXPLORER_TXS_LIST=1
@@ -1,11 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-NX_VEGA_ENV=SANDBOX
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
-NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
-NX_TENDERMINT_URL=https://tm.n01.sandbox.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.sandbox.vega.xyz/websocket
@@ -1,13 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
@@ -4,7 +4,6 @@ NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://blockexplorer.n01.stagnet3.vega.xyz/rest
@@ -1,10 +1,8 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz
-NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n07.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
-NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
@@ -5,4 +5,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_URL=http://localhost:3003/query
 NX_VEGA_ENV=CUSTOM
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=
@@ -14,8 +14,5 @@
      "files": ["*.js", "*.jsx"],
      "rules": {}
    }
-  ],
-  "env": {
-    "jest": true
-  }
+  ]
 }
@@ -45,7 +45,7 @@ function App() {
              menuOpen && 'h-[100vh] overflow-hidden'
            } antialiased m-0 bg-white dark:bg-black text-black dark:text-white`}
          >
-            <div className="grid grid-rows-[repeat(2,_auto)_1fr] grid-cols-[1fr] md:grid-rows-[auto_minmax(700px,_1fr)] md:grid-cols-[300px_1fr] border-neutral-700 dark:border-neutral-300 lg:border-l lg:border-r mx-auto">
+            <div className="min-h-[100vh] max-w-[1300px] grid grid-rows-[repeat(2,_auto)_1fr] grid-cols-[1fr] md:grid-rows-[auto_minmax(700px,_1fr)] md:grid-cols-[300px_1fr] border-neutral-700 dark:border-neutral-300 lg:border-l lg:border-r mx-auto">
              <Header
                theme={theme}
                toggleTheme={toggleTheme}
@@ -14,12 +14,7 @@ jest.mock('../search', () => ({

 const renderComponent = () => (
  <MemoryRouter>
-    <Header
-      theme="dark"
-      toggleTheme={jest.fn()}
-      menuOpen={false}
-      setMenuOpen={jest.fn()}
-    />
+    <Header />
  </MemoryRouter>
 );

@@ -24,15 +24,14 @@ export const Header = ({
    'md:col-span-2',
    'grid grid-rows-2 md:grid-rows-1 grid-cols-[1fr_auto] md:grid-cols-[auto_1fr_auto] items-center',
    'p-4 gap-2 md:gap-4',
-    'border-b border-neutral-700 dark:border-neutral-300 bg-black',
-    'dark text-white'
+    'border-b border-neutral-700 dark:border-neutral-300'
  );
  return (
    <header className={headerClasses}>
      <div className="flex h-full items-center sm:items-stretch gap-4">
        <Link to={Routes.HOME}>
          <h1
-            className="text-white text-3xl font-alpha uppercase calt mb-0"
+            className="text-3xl font-alpha uppercase calt mb-0"
            data-testid="explorer-header"
          >
            {t('Vega Explorer')}
@@ -42,13 +41,13 @@ export const Header = ({
      </div>
      <button
        data-testid="open-menu"
-        className="md:hidden text-white"
+        className="md:hidden"
        onClick={() => setMenuOpen(!menuOpen)}
      >
        <Icon name={menuOpen ? 'cross' : 'menu'} />
      </button>
      <Search />
-      <ThemeSwitcher theme={theme} onToggle={toggleTheme} className="-my-4" />
+      <ThemeSwitcher theme={theme} onToggle={toggleTheme} />
    </header>
  );
 };
@@ -1 +0,0 @@
-export * from './info-block';
@@ -1,29 +0,0 @@
-import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
-import React from 'react';
-
-export interface InfoBlockProps {
-  title: string;
-  subtitle: string;
-  tooltipInfo: string;
-}
-
-export const InfoBlock = ({ title, subtitle, tooltipInfo }: InfoBlockProps) => {
-  return (
-    <div className="flex flex-col text-center	">
-      <h3 className="text-4xl">{title}</h3>
-      <p className="text-zinc-800 dark:text-zinc-300">
-        {subtitle}
-        {tooltipInfo ? (
-          <Tooltip description={tooltipInfo} align="center">
-            <span>
-              <Icon
-                name="info-sign"
-                className="ml-2 text-zinc-400 dark:text-zinc-600"
-              />
-            </span>
-          </Tooltip>
-        ) : undefined}
-      </p>
-    </div>
-  );
-};
@@ -1 +0,0 @@
-export * from './info-panel';
@@ -1,81 +0,0 @@
-import React, { useMemo } from 'react';
-import type { ReactNode } from 'react';
-import { Panel } from '../panel';
-import {
-  CopyWithTooltip,
-  Icon,
-  Intent,
-  Lozenge,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import { TruncateInline } from '../truncate/truncate';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-
-interface InfoPanelProps {
-  children?: ReactNode | ReactNode[];
-  title: string;
-  id: string;
-  type?: string;
-  copy?: boolean;
-}
-
-export const InfoPanel = ({
-  children,
-  title,
-  id,
-  type,
-  copy = true,
-}: InfoPanelProps) => {
-  const { screenSize } = useScreenDimensions();
-  const isTruncated = useMemo(
-    () => ['xs', 'sm', 'md', 'lg'].includes(screenSize),
-    [screenSize]
-  );
-  const isDesktop = useMemo(() => ['lg'].includes(screenSize), [screenSize]);
-  const visibleChars = useMemo(() => (isDesktop ? 20 : 10), [isDesktop]);
-  return (
-    <Panel>
-      <section className="flex justify-between items-center items-center">
-        <div>
-          <div className="flex gap-3 items-center">
-            <h3 className="text-lg font-medium">{title}</h3>
-            {isTruncated ? (
-              <TruncateInline
-                text={id}
-                startChars={visibleChars}
-                endChars={visibleChars}
-                className="text-black dark:text-zinc-200"
-              />
-            ) : (
-              <p
-                title={id}
-                className="text-black dark:text-zinc-200 truncate ..."
-              >
-                {id}
-              </p>
-            )}
-
-            {type && (
-              <Lozenge
-                className="text-xs leading-relaxed cursor-auto"
-                variant={Intent.None}
-              >
-                <Tooltip side="top" description={type} align="center">
-                  <span>{type}</span>
-                </Tooltip>
-              </Lozenge>
-            )}
-          </div>
-          <div>{children}</div>
-        </div>
-        {copy && (
-          <CopyWithTooltip text={id}>
-            <button className="bg-zinc-100 dark:bg-zinc-900 rounded-sm py-2 px-3">
-              <Icon name="duplicate" />
-            </button>
-          </CopyWithTooltip>
-        )}
-      </section>
-    </Panel>
-  );
-};
@@ -1 +0,0 @@
-export * from './nested-data-list';
@@ -1,110 +0,0 @@
-import { render, waitFor } from '@testing-library/react';
-import {
-  BORDER_COLOURS,
-  NestedDataList,
-  sortNestedDataByChildren,
-} from './nested-data-list';
-import userEvent from '@testing-library/user-event';
-
-const mockData = {
-  nonce: '5980890939790185837',
-  validatorHeartbeat: {
-    nodeId: 'e07d2cd299659590c16ec1cc1c69936ad747083c379ea6b6cfeaa6e22c8af0cb',
-    ethereumSignature: {
-      value:
-        '8b157cb43a716ad541065f643e38cd92d7b1857c7beeb7d81e878be4f9a48f5a346be973e478eba3c18907888678625ba6700b086f65406d5ce0af0cae1d419300',
-      algo: 'eth',
-      version: 0,
-    },
-    vegaSignature: {
-      value:
-        'abffba6ddf07b3a732214dd780c35c94f7f0aeb9c5e9ce7d1a3ee641926a6ac568a2ecf0160c859633d327712c7a1b1590db4245d40646559a1ab2cc44d6fa01',
-      algo: 'vega/ed25519',
-      version: 0,
-    },
-  },
-  blockHeight: '174534',
-};
-
-describe('NestedDataList', () => {
-  it('should display the parent as a button', () => {
-    const tree = render(<NestedDataList data={mockData} />);
-    const { getAllByRole } = tree;
-    expect(getAllByRole('button')[0]).toHaveTextContent('Validator Heartbeat');
-  });
-
-  it('should display the children when a row is clicked', async () => {
-    const tree = render(<NestedDataList data={mockData} />);
-    const user = userEvent.setup();
-    const { getAllByRole } = tree;
-
-    const parent = getAllByRole('listitem', { name: 'Validator Heartbeat' });
-    const nestedContainer = parent[0].querySelector('[aria-hidden]');
-    const expandBtn = parent[0].querySelector('button');
-    expect(nestedContainer).toHaveAttribute('aria-hidden', 'true');
-    await user.click(expandBtn as HTMLButtonElement);
-    await waitFor(() => nestedContainer);
-    expect(nestedContainer).toHaveAttribute('aria-hidden', 'false');
-  });
-
-  it('add border to the title of the parent', () => {
-    const tree = render(<NestedDataList data={mockData} />);
-    const { getAllByRole } = tree;
-    const parent = getAllByRole('listitem', { name: 'Validator Heartbeat' });
-    expect(parent[0]).toHaveClass('pl-4 border-l-4');
-  });
-
-  it('add a border the children with the same colour', () => {
-    const tree = render(<NestedDataList data={mockData} />);
-    const { getAllByRole } = tree;
-    const parent = getAllByRole('listitem', { name: 'Validator Heartbeat' });
-    expect(parent[0].querySelector('li')).toHaveClass('pl-4 border-l-4 pt-2');
-  });
-
-  it('should repeat the border colours in the correct order', () => {
-    const colourMockData = {
-      t0: {
-        t1: {
-          t2: {
-            t3: {
-              t4: {
-                t5: {
-                  t6: {
-                    t7: {
-                      t8: {
-                        hello: 'world',
-                      },
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-    const tree = render(<NestedDataList data={colourMockData} />);
-    const { getByTestId } = tree;
-
-    for (let i = 0; i < 8; i++) {
-      const item = getByTestId(`T${i}`);
-      const expected = BORDER_COLOURS.dark[i % 5];
-      expect(item.style.borderColor.toUpperCase()).toBe(expected);
-    }
-  });
-
-  it('should sort the data by values with children', () => {
-    const mockData = {
-      nonce: '5980890939790185837',
-      validatorHeartbeat: {
-        nodeId:
-          'e07d2cd299659590c16ec1cc1c69936ad747083c379ea6b6cfeaa6e22c8af0cb',
-        someArray: ['0', '1', '2'],
-      },
-      blockHeight: '174534',
-    };
-    const expected = ['nonce', 'blockHeight', 'validatorHeartbeat'];
-    const result = sortNestedDataByChildren(mockData);
-    expect(result).toStrictEqual(expected);
-  });
-});
@@ -1,178 +0,0 @@
-import React, { useCallback, useContext, useMemo, useState } from 'react';
-import classNames from 'classnames';
-import isObject from 'lodash/isObject';
-import { ThemeContext } from '@vegaprotocol/react-helpers';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import { IconNames } from '@blueprintjs/icons';
-import { VegaColours } from '@vegaprotocol/tailwindcss-config';
-import isArray from 'lodash/isArray';
-
-export type UnknownObject = Record<string, unknown>;
-export type UnknownArray = unknown[];
-
-interface NestedDataListProps {
-  data: UnknownObject | UnknownArray;
-  level?: number;
-}
-
-interface NestedDataListItemProps {
-  label: string;
-  value: unknown;
-  index: number;
-}
-
-export const BORDER_COLOURS = {
-  dark: [
-    VegaColours.pink.dark,
-    VegaColours.purple.dark,
-    VegaColours.green.dark,
-    VegaColours.blue.dark,
-    VegaColours.yellow.dark,
-  ],
-  light: [
-    VegaColours.pink.DEFAULT,
-    VegaColours.purple.DEFAULT,
-    VegaColours.green.DEFAULT,
-    VegaColours.blue.DEFAULT,
-    VegaColours.yellow.DEFAULT,
-  ],
-};
-
-const camelToTitle = (text: string) => {
-  const result = text.replace(/([A-Z])/g, ' $1');
-  return result.charAt(0).toUpperCase() + result.slice(1);
-};
-
-const getBorderColour = (index: number, theme: keyof typeof BORDER_COLOURS) => {
-  const colours = BORDER_COLOURS[theme];
-  const length = colours.length;
-  const modulo = index % length;
-  return colours[modulo];
-};
-
-const NestedDataListItem = ({
-  label,
-  value,
-  index,
-}: NestedDataListItemProps) => {
-  const [isCollapsed, setCollapsed] = useState(true);
-  const toggleVisible = useCallback(
-    (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
-      event.stopPropagation();
-      setCollapsed(!isCollapsed);
-    },
-    [isCollapsed]
-  );
-  const hasChildren = isObject(value) && !!Object.keys(value).length;
-  const title = useMemo(() => camelToTitle(label), [label]);
-  const theme = useContext(ThemeContext);
-  const currentLevelBorder = useMemo(
-    () => getBorderColour(index, theme),
-    [index, theme]
-  );
-  const nextLevelBorder = useMemo(
-    () => getBorderColour(index + 1, theme),
-    [index, theme]
-  );
-  const isArr = isArray(value);
-
-  const listItemClasses = classNames('pl-4 border-l-4', {
-    'pt-10 last:pb-0': hasChildren,
-    'first:pt-0': hasChildren && !index,
-    'pt-2': !hasChildren && index,
-  });
-
-  const titleClasses = classNames({
-    'text-xl pl-4 border-l-4 font-alpha': hasChildren,
-    'text-base font-medium whitespace-nowrap': !hasChildren,
-  });
-
-  return (
-    <li
-      data-testid={title}
-      title={title}
-      className={listItemClasses}
-      style={{ borderColor: currentLevelBorder }}
-    >
-      <div className="flex flex-wrap">
-        <h4 className={titleClasses} style={{ borderColor: nextLevelBorder }}>
-          {hasChildren ? (
-            <button
-              className="flex items-center gap-2"
-              type="button"
-              onClick={toggleVisible}
-            >
-              <span className="">{title}</span>
-              <small className="px-1 text-sm rounded bg-vega-light-200 dark:bg-vega-dark-200">
-                {isArr ? 'array' : typeof value}
-              </small>
-              <Icon
-                name={
-                  isCollapsed ? IconNames.CHEVRON_DOWN : IconNames.CHEVRON_UP
-                }
-              />
-            </button>
-          ) : (
-            <span className="mr-2">{title}:</span>
-          )}
-        </h4>
-        {!hasChildren && (
-          <code className="text-vega-light-400 mb-2 last:mb-0 dark:text-vega-dark-400 break-all">
-            {JSON.stringify(value, null, '  ')}
-          </code>
-        )}
-      </div>
-      {hasChildren && (
-        <div aria-hidden={isCollapsed} className={isCollapsed ? 'hidden' : ''}>
-          <NestedDataList
-            data={value as UnknownObject | UnknownArray}
-            level={index + 1}
-          />
-        </div>
-      )}
-    </li>
-  );
-};
-
-export const sortNestedDataByChildren = (data: UnknownObject | UnknownArray) =>
-  Object.keys(data)
-    .filter((key) => key)
-    .sort((a, b) => {
-      const isArr = isArray(data);
-      const valA = isArr ? data[+a] : data[a];
-      const valB = isArr ? data[+b] : data[b];
-      const hasChildrenA = isObject(valA) && !!Object.keys(valA).length;
-      const hasChildrenB = isObject(valB) && !!Object.keys(valB).length;
-
-      if (hasChildrenA && !hasChildrenB) {
-        return 1;
-      }
-
-      if (!hasChildrenA && hasChildrenB) {
-        return -1;
-      }
-
-      return 0;
-    });
-
-export const NestedDataList = ({ data, level = 0 }: NestedDataListProps) => {
-  const nestedItems = useMemo(() => {
-    const sortedData = sortNestedDataByChildren(data);
-    const isArr = isArray(data);
-
-    if (sortedData.length) {
-      return sortedData.map((key) => (
-        <NestedDataListItem
-          key={key}
-          label={key}
-          value={isArr ? data[Number(key)] : data[key]}
-          index={level}
-        />
-      ));
-    }
-
-    return null;
-  }, [data, level]);
-
-  return <ul className="list-none">{nestedItems}</ul>;
-};
@@ -1 +0,0 @@
-export * from './page-header';
@@ -1,49 +0,0 @@
-import React from 'react';
-import type { ReactNode } from 'react';
-import { TruncateInline } from '../truncate/truncate';
-import { CopyWithTooltip, Icon } from '@vegaprotocol/ui-toolkit';
-
-interface PageHeaderProps {
-  title: string;
-  truncateStart?: number;
-  truncateEnd?: number;
-  copy?: boolean;
-  prefix?: string | ReactNode;
-  className?: string;
-}
-
-export const PageHeader = ({
-  prefix,
-  title,
-  truncateStart,
-  truncateEnd,
-  copy = false,
-  className,
-}: PageHeaderProps) => {
-  const titleClasses = 'text-4xl xl:text-5xl uppercase font-alpha';
-  return (
-    <header className={className}>
-      <span className={`${titleClasses} block`}>{prefix}</span>
-      <div className="flex items-center gap-x-4">
-        <h2 className={titleClasses}>
-          {truncateStart && truncateEnd ? (
-            <TruncateInline
-              text={title}
-              startChars={truncateStart}
-              endChars={truncateEnd}
-            />
-          ) : (
-            title
-          )}
-        </h2>
-        {copy && (
-          <CopyWithTooltip data-testid="copy-to-clipboard" text={title}>
-            <button className="bg-zinc-100 dark:bg-zinc-900 rounded-sm py-2 px-3">
-              <Icon name="duplicate" className="" />
-            </button>
-          </CopyWithTooltip>
-        )}
-      </div>
-    </header>
-  );
-};
@@ -1 +0,0 @@
-export * from './panel';
@@ -1,17 +0,0 @@
-import classNames from 'classnames';
-import type { ReactNode } from 'react';
-
-interface PanelProps {
-  children: ReactNode;
-  className?: string;
-}
-export const Panel = ({ children, className }: PanelProps) => (
-  <div
-    className={classNames(
-      'border border-zinc-200 dark:border-zinc-800 rounded-md p-5 mb-5',
-      className
-    )}
-  >
-    {children}
-  </div>
-);
@@ -14,7 +14,7 @@ export const RouteTitle = ({
 }: RouteTitleProps) => {
  const classes = classnames(
    'font-alpha',
-    'text-4xl',
+    'text-2xl',
    'uppercase',
    'mb-8',
    className
@@ -1,189 +0,0 @@
-import {
-  detectTypeByFetching,
-  detectTypeFromQuery,
-  getSearchType,
-  isBlock,
-  isHexadecimal,
-  isNetworkParty,
-  isNonHex,
-  SearchTypes,
-  toHex,
-  toNonHex,
-} from './detect-search';
-import { DATA_SOURCES } from '../../config';
-
-global.fetch = jest.fn();
-
-describe('Detect Search', () => {
-  it("should detect that it's a hexadecimal", () => {
-    const expected = true;
-    const testString =
-      '0x073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
-    const actual = isHexadecimal(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect that it's not hexadecimal", () => {
-    const expected = true;
-    const testString =
-      '073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
-    const actual = isNonHex(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect that it's a network party", () => {
-    const expected = true;
-    const testString = 'network';
-    const actual = isNetworkParty(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect that it's a block", () => {
-    const expected = true;
-    const testString = '3188';
-    const actual = isBlock(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it('should convert from non-hex to hex', () => {
-    const expected = '0x123';
-    const testString = '123';
-    const actual = toHex(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it('should convert from hex to non-hex', () => {
-    const expected = '123';
-    const testString = '0x123';
-    const actual = toNonHex(testString);
-    expect(actual).toBe(expected);
-  });
-
-  it("should detect type client side from query if it's a hexadecimal", () => {
-    const expected = [SearchTypes.Party, SearchTypes.Transaction];
-    const testString =
-      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a non hex", () => {
-    const expected = [SearchTypes.Party, SearchTypes.Transaction];
-    const testString =
-      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a network party", () => {
-    const expected = [SearchTypes.Party];
-    const testString = 'network';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("should detect type client side from query if it's a block (number)", () => {
-    const expected = [SearchTypes.Block];
-    const testString = '23432';
-    const actual = detectTypeFromQuery(testString);
-    expect(actual).toStrictEqual(expected);
-  });
-
-  it("detectTypeByFetching should call fetch with non-hex query it's a transaction", async () => {
-    const query = '0xabc';
-    const type = SearchTypes.Transaction;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              transaction: {
-                hash: query,
-              },
-            }),
-        })
-      )
-    );
-    const result = await detectTypeByFetching(query);
-    expect(fetch).toHaveBeenCalledWith(
-      `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(query)}`
-    );
-    expect(result).toBe(type);
-  });
-
-  it("detectTypeByFetching should call fetch with non-hex query it's a party", async () => {
-    const query = 'abc';
-    const type = SearchTypes.Party;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: false,
-        })
-      )
-    );
-    const result = await detectTypeByFetching(query);
-    expect(result).toBe(type);
-  });
-
-  it('getSearchType should return party from fetch response', async () => {
-    const query =
-      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const expected = SearchTypes.Party;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: false,
-        })
-      )
-    );
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return transaction from fetch response', async () => {
-    const query =
-      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
-    const expected = SearchTypes.Transaction;
-    // @ts-ignore issue related to polyfill
-    fetch.mockImplementation(
-      jest.fn(() =>
-        Promise.resolve({
-          ok: true,
-          json: () =>
-            Promise.resolve({
-              transaction: {
-                hash: query,
-              },
-            }),
-        })
-      )
-    );
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return undefined from transaction response', async () => {
-    const query = 'u';
-    const expected = undefined;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return block if query is number', async () => {
-    const query = '123';
-    const expected = SearchTypes.Block;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-
-  it('getSearchType should return party if query is network', async () => {
-    const query = 'network';
-    const expected = SearchTypes.Party;
-    const result = await getSearchType(query);
-    expect(result).toBe(expected);
-  });
-});
@@ -1,143 +0,0 @@
-import { DATA_SOURCES } from '../../config';
-import type { BlockExplorerTransaction } from '../../routes/types/block-explorer-response';
-
-export enum SearchTypes {
-  Transaction = 'transaction',
-  Party = 'party',
-  Block = 'block',
-  Order = 'order',
-}
-
-export const TX_LENGTH = 64;
-
-export const isHexadecimal = (search: string) =>
-  search.startsWith('0x') && search.length === 2 + TX_LENGTH;
-
-export const isNonHex = (search: string) =>
-  !search.startsWith('0x') && search.length === TX_LENGTH;
-
-export const isBlock = (search: string) => !Number.isNaN(Number(search));
-
-export const isNetworkParty = (search: string) => search === 'network';
-
-export const toHex = (query: string) =>
-  isHexadecimal(query) ? query : `0x${query}`;
-
-export const toNonHex = (query: string) =>
-  isNonHex(query) ? query : `${query.replace('0x', '')}`;
-
-export const detectTypeFromQuery = (
-  query: string
-): SearchTypes[] | undefined => {
-  const i = query.toLowerCase();
-
-  if (isHexadecimal(i) || isNonHex(i)) {
-    return [SearchTypes.Party, SearchTypes.Transaction];
-  } else if (isNetworkParty(i)) {
-    return [SearchTypes.Party];
-  } else if (isBlock(i)) {
-    return [SearchTypes.Block];
-  }
-
-  return undefined;
-};
-
-export const detectTypeByFetching = async (
-  query: string
-): Promise<SearchTypes | undefined> => {
-  const hash = toNonHex(query);
-  const request = await fetch(
-    `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
-  );
-
-  if (request?.ok) {
-    const body: BlockExplorerTransaction = await request.json();
-
-    if (body?.transaction) {
-      return SearchTypes.Transaction;
-    }
-  }
-
-  return SearchTypes.Party;
-};
-
-// Code commented out because the current solution to detect a hex is temporary (by process of elimination)
-// export const detectTypeByFetching = async (
-//   query: string,
-//   type: SearchTypes
-// ): Promise<SearchTypes | undefined> => {
-//   const TYPES = [SearchTypes.Party, SearchTypes.Transaction];
-//
-//   if (!TYPES.includes(type)) {
-//     throw new Error('Search type provided not recognised');
-//   }
-//
-//   if (type === SearchTypes.Transaction) {
-//     const hash = toNonHex(query);
-//     const request = await fetch(
-//       `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
-//     );
-//
-//     if (request?.ok) {
-//       const body: BlockExplorerTransaction = await request.json();
-//
-//       if (body?.transaction) {
-//         return SearchTypes.Transaction;
-//       }
-//     }
-//   } else if (type === SearchTypes.Party) {
-//     const party = toNonHex(query);
-//
-//     const request = await fetch(
-//       `${DATA_SOURCES.blockExplorerUrl}/transactions?limit=1&filters[tx.submitter]=${party}`
-//     );
-//
-//     if (request.ok) {
-//       const body: BlockExplorerTransactions = await request.json();
-//
-//       if (body?.transactions?.length) {
-//         return SearchTypes.Party;
-//       }
-//     }
-//   }
-//
-//   return undefined;
-// };
-
-// export const getSearchType = async (
-//   query: string
-// ): Promise<SearchTypes | undefined> => {
-//   const searchTypes = detectTypeFromQuery(query);
-//   const hasResults = searchTypes?.length;
-//
-//   if (hasResults) {
-//     if (hasResults > 1) {
-//       const promises = searchTypes.map((type) =>
-//         detectTypeByFetching(query, type)
-//       );
-//       const results = await Promise.all(promises);
-//       return results.find((result) => result !== undefined);
-//     }
-//
-//     return searchTypes[0];
-//   }
-//
-//   return undefined;
-// };
-
-export const getSearchType = async (
-  query: string
-): Promise<SearchTypes | undefined> => {
-  const searchTypes = detectTypeFromQuery(query);
-  const hasResults = searchTypes?.length;
-
-  if (hasResults) {
-    if (hasResults > 1) {
-      return await detectTypeByFetching(query);
-    }
-
-    return searchTypes[0];
-  }
-
-  return undefined;
-};
@@ -2,23 +2,14 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { Search } from './search';
 import { MemoryRouter } from 'react-router-dom';
 import { Routes } from '../../routes/route-names';
-import { SearchTypes, getSearchType } from './detect-search';

 const mockedNavigate = jest.fn();
-const mockGetSearchType = getSearchType as jest.MockedFunction<
-  typeof getSearchType
->;

 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
  useNavigate: () => mockedNavigate,
 }));

-jest.mock('./detect-search', () => ({
-  ...jest.requireActual('./detect-search'),
-  getSearchType: jest.fn(),
-}));
-
 beforeEach(() => {
  mockedNavigate.mockClear();
 });
@@ -48,10 +39,9 @@ describe('Search', () => {
    fireEvent.click(button);

    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Transaction type is not recognised'
+      "Something doesn't look right"
    );
  });
-
  it('should render error if no input is given', async () => {
    render(renderComponent());
    const { button } = getInputs();
@@ -59,14 +49,47 @@ describe('Search', () => {
    fireEvent.click(button);

    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Search query required'
+      'Search required'
+    );
+  });
+
+  it('should render error if transaction is not hex', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    fireEvent.change(input, {
+      target: {
+        value:
+          '0x123456789012345678901234567890123456789012345678901234567890123Q',
+      },
+    });
+
+    fireEvent.click(button);
+
+    expect(await screen.findByTestId('search-error')).toHaveTextContent(
+      'Transaction is not hexadecimal'
+    );
+  });
+
+  it('should render error if transaction is not hex and does not have leading 0x', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    fireEvent.change(input, {
+      target: {
+        value:
+          '123456789012345678901234567890123456789012345678901234567890123Q',
+      },
+    });
+
+    fireEvent.click(button);
+
+    expect(await screen.findByTestId('search-error')).toHaveTextContent(
+      'Transaction is not hexadecimal'
    );
  });

  it('should redirect to transactions page', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
    fireEvent.change(input, {
      target: {
        value:
@@ -85,7 +108,6 @@ describe('Search', () => {
  it('should redirect to transactions page without proceeding 0x', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
    fireEvent.change(input, {
      target: {
        value:
@@ -101,48 +123,9 @@ describe('Search', () => {
    });
  });

-  it('should redirect to parties page', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '0x1234567890123456789012345678901234567890123456789012345678901234',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
-  it('should redirect to parties page without proceeding 0x', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
-    fireEvent.change(input, {
-      target: {
-        value:
-          '1234567890123456789012345678901234567890123456789012345678901234',
-      },
-    });
-
-    fireEvent.click(button);
-    await waitFor(() => {
-      expect(mockedNavigate).toBeCalledWith(
-        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
-      );
-    });
-  });
-
  it('should redirect to blocks page if passed a number', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
-    mockGetSearchType.mockResolvedValue(SearchTypes.Block);
    fireEvent.change(input, {
      target: {
        value: '123',
@@ -1,54 +1,55 @@
-import React, { useCallback, useState } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import { Button, Input, InputError } from '@vegaprotocol/ui-toolkit';
+import { Input, InputError, Button } from '@vegaprotocol/ui-toolkit';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
-import { getSearchType, SearchTypes, toHex } from './detect-search';
 import { Routes } from '../../routes/route-names';

+const TX_LENGTH = 64;
+
 interface FormFields {
  search: string;
 }

+const isPrependedTransaction = (search: string) =>
+  search.startsWith('0x') && search.length === 2 + TX_LENGTH;
+
+const isTransaction = (search: string) =>
+  !search.startsWith('0x') && search.length === TX_LENGTH;
+
+const isBlock = (search: string) => !Number.isNaN(Number(search));
+
 export const Search = () => {
  const { register, handleSubmit } = useForm<FormFields>();
  const navigate = useNavigate();
-  const [error, setError] = useState<Error | null>(null);
-
-  const onSubmit = useCallback(
-    async (fields: FormFields) => {
+  const [error, setError] = React.useState<Error | null>(null);
+  const onSubmit = React.useCallback(
+    (fields: FormFields) => {
      setError(null);

-      const query = fields.search;
-
-      if (!query) {
-        return setError(new Error(t('Search query required')));
-      }
-
-      const result = await getSearchType(query);
-      const urlAsHex = toHex(query);
-      const unrecognisedError = new Error(
-        t('Transaction type is not recognised')
-      );
-
-      if (result) {
-        switch (result) {
-          case SearchTypes.Party:
-            return navigate(`${Routes.PARTIES}/${urlAsHex}`);
-          case SearchTypes.Transaction:
-            return navigate(`${Routes.TX}/${urlAsHex}`);
-          case SearchTypes.Block:
-            return navigate(`${Routes.BLOCKS}/${Number(query)}`);
-          default:
-            return setError(unrecognisedError);
+      const search = fields.search;
+      if (!search) {
+        setError(new Error(t('Search required')));
+      } else if (isPrependedTransaction(search)) {
+        if (Number.isNaN(Number(search))) {
+          setError(new Error(t('Transaction is not hexadecimal')));
+        } else {
+          navigate(`${Routes.TX}/${search}`);
        }
+      } else if (isTransaction(search)) {
+        if (Number.isNaN(Number(`0x${search}`))) {
+          setError(new Error(t('Transaction is not hexadecimal')));
+        } else {
+          navigate(`${Routes.TX}/0x${search}`);
+        }
+      } else if (isBlock(search)) {
+        navigate(`${Routes.BLOCKS}/${Number(search)}`);
+      } else {
+        setError(new Error(t("Something doesn't look right")));
      }
-
-      return setError(unrecognisedError);
    },
    [navigate]
  );
-
  return (
    <form
      onSubmit={handleSubmit(onSubmit)}
@@ -58,24 +59,21 @@ export const Search = () => {
        {t('Search by block number or transaction hash')}
      </label>
      <div className="flex items-stretch gap-2">
-        <div className="flex grow relative">
-          <Input
-            {...register('search')}
-            id="search"
-            data-testid="search"
-            className="text-white"
-            hasError={Boolean(error?.message)}
-            type="text"
-            placeholder={t('Enter block number, party id or transaction hash')}
-          />
-          {error?.message && (
-            <div className="bg-white border border-t-0 border-accent absolute top-[100%] flex-1 w-full pb-2 px-2 rounded-b">
-              <InputError data-testid="search-error" intent="danger">
-                {error.message}
-              </InputError>
-            </div>
-          )}
-        </div>
+        <Input
+          {...register('search')}
+          id="search"
+          data-testid="search"
+          hasError={Boolean(error?.message)}
+          type="text"
+          placeholder={t('Enter block number or transaction hash')}
+        />
+        {error?.message && (
+          <div className="absolute top-[100%] flex-1 w-full">
+            <InputError data-testid="search-error" intent="danger">
+              {error.message}
+            </InputError>
+          </div>
+        )}
        <Button type="submit" size="sm" data-testid="search-button">
          {t('Search')}
        </Button>
@@ -20,7 +20,7 @@ export const TruncatedLink = ({
        text={text}
        startChars={startChars}
        endChars={endChars}
-        className="underline uppercase underline-offset-2"
+        className="font-mono font-bold underline"
      />
    </Link>
  );
@@ -1,35 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-// ====================================================
-// GraphQL query operation: TxsStats
-// ====================================================
-
-export interface TxsStats_statistics {
-  __typename: "Statistics";
-  /**
-   * Average number of orders added per blocks
-   */
-  averageOrdersPerBlock: string;
-  /**
-   * Number of orders per seconds
-   */
-  ordersPerSecond: string;
-  /**
-   * Number of transaction processed per block
-   */
-  txPerBlock: string;
-  /**
-   * Number of the trades per seconds
-   */
-  tradesPerSecond: string;
-}
-
-export interface TxsStats {
-  /**
-   * Get statistics about the Vega node
-   */
-  statistics: TxsStats_statistics;
-}
@@ -3,4 +3,3 @@ export { BlockTxsData } from './block-txs-data';
 export { TxOrderType } from './tx-order-type';
 export { TxsInfiniteList } from './txs-infinite-list';
 export { TxsInfiniteListItem } from './txs-infinite-list-item';
-export { TxsStatsInfo } from './txs-stats-info';
@@ -1,3 +1,5 @@
+import { Lozenge, Intent } from '@vegaprotocol/ui-toolkit';
+
 interface TxOrderTypeProps {
  orderType: string;
  className?: string;
@@ -32,13 +34,10 @@ const displayString: StringMap = {
  ValidatorHeartbeat: 'Validator Heartbeat',
 };

-export const TxOrderType = ({ orderType }: TxOrderTypeProps) => {
+export const TxOrderType = ({ orderType, className }: TxOrderTypeProps) => {
  return (
-    <div
-      data-testid="tx-type"
-      className="text-sm rounded-md leading-none px-2 py-2 inline-block text-white dark:text-white bg-zinc-800	dark:bg-zinc-800	"
-    >
+    <Lozenge data-testid="tx-type" variant={Intent.None} className={className}>
      {displayString[orderType] || orderType}
-    </div>
+    </Lozenge>
  );
 };
--- a/Show More
+++ b/Show More