test: update selectors

feat: use markets with data provider
feat: fix liquidity data provider tests
2023-06-14 12:55:39 +02:00 · 2023-06-14 10:42:01 +02:00 · 2023-06-14 09:48:40 +02:00 · 2023-06-13 19:03:55 +02:00 · 2023-06-13 19:01:28 +02:00 · 2023-06-13 18:51:39 +02:00
104 changed files with 2099 additions and 4058 deletions
@@ -9,11 +9,6 @@ jobs:
    runs-on: ubuntu-22.04
    timeout-minutes: 30
    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2

@@ -32,16 +27,14 @@ jobs:

      - name: resolve ipfs hashes for release
        run: |
+          echo "Tag name: ${{ github.event.release.tag_name }}"
          echo "Name: ${{ github.event.release.name }}"
          echo "Description: ${{ github.event.release.body }}"
-          echo "Tag: ${{ github.event.release.tag_name }}"
-          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
-          echo "Commit: $commit"
-          until docker pull vegaprotocol/trading:$commit; do
+          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
            echo "Image not pushed yet, waiting 60 seconds"
            sleep 60
          done
-          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
+          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
          tar -xzf kubo.tgz
          export PATH="$PATH:$PWD/kubo"
@@ -6,6 +6,8 @@ on:
      - release/*
      - develop
      - main
+    tags:
+      - v*
  pull_request:
    types:
      - opened
@@ -134,33 +136,19 @@ jobs:
            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
          fi
          projects="$(echo $projects_e2e | sed 's|-e2e||g')"
-          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
-              # tools are only applicable to check previews or deploy from develop to mainnet
+          if echo "$affected" | grep -q multisig-signer; then
+            echo "Tools are affected"
+            # tools are only applicable to check previews or deploy from develop to mainnet
+            if [[ "${{ github.event_name }}" = "pull_request" ]]; then
              echo "Deploying tools on preview"
              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
              projects+=' "multisig-signer" '
            fi
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
-              # tools are only applicable to check previews or deploy from develop to mainnet
+            if [[ "${{ github.ref }}" =~ .*develop$ ]]; then
              echo "Deploying tools on s3"
              projects+=' "multisig-signer" '
            fi
-            if echo "$affected" | grep -q static; then
-              echo "static is affected"
-              echo "Deploying static on s3"
-              projects+=' "static" '
-            fi
-            if echo "$affected" | grep -q ui-toolkit; then
-              echo "ui-toolkit is affected"
-              echo "Deploying ui-toolkit on s3"
-              projects+=' "ui-toolkit" '
-            fi
          fi
-
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
          projects=[${projects// /,}]
@@ -31,7 +31,6 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: Log in to the Container registry (ghcr)
-        if: ${{ github.event_name == 'pull_request' }}
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
@@ -40,7 +39,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
        with:
          # registry: registry.hub.docker.com
          username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -75,16 +74,10 @@ jobs:
              envName="mainnet"
              bucketName="tools.vega.xyz"
            fi
-            if [[ "${{ matrix.app }}" = "static" ]]; then
-              envName="mainnet"
-              bucketName="static.vega.xyz"
-            fi
-            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
-              envName="mainnet"
-              bucketName="ui.vega.rocks"
-            fi
          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
            envName="mainnet"
+          elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
+            envName="mainnet"
          fi

          if [[ "${envName}" = "mainnet" ]]; then
@@ -113,15 +106,14 @@ jobs:
        run: |
          flags=""
          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            flags="--env=${{ env.ENV_NAME }}"
+            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
+              flags="--env=${{ env.ENV_NAME }}"
+            fi
          fi

          if [ "${{ matrix.app }}" = "trading" ]; then
            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
            DIST_LOCATION=dist/apps/trading/exported
-          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
-            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
-            DIST_LOCATION=dist/storybook/ui-toolkit
          else
            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
            DIST_LOCATION=dist/apps/${{ matrix.app }}
@@ -156,9 +148,7 @@ jobs:

      - name: Publish dist as docker image (ghcr)
        uses: docker/build-push-action@v3
-        continue-on-error: true
-        id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -171,9 +161,7 @@ jobs:

      - name: Publish dist as docker image (docker hub)
        uses: docker/build-push-action@v3
-        continue-on-error: true
-        id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -182,41 +170,13 @@ jobs:
            APP=${{ matrix.app }}
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
-
-      - name: Publish dist as docker image (ghcr - retry)
-        uses: docker/build-push-action@v3
-        if: ${{ steps.ghcr-push.outcome == 'failure' }}
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Publish dist as docker image (docker hub - retry)
-        uses: docker/build-push-action@v3
-        if: ${{ steps.dockerhub-push.outcome == 'failure' }}
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
+            vegaprotocol/${{ matrix.app }}:mainnet

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
        uses: jakejarvis/s3-sync-action@master
-        # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -234,38 +194,22 @@ jobs:
          number: ${{ github.event.number }}

      - name: Trigger fleek deployment
-        # release to ipfs happens only on mainnet (represented by main branch) for trading
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        run: |
-          if echo ${{ github.ref }} | grep -q main; then
-            # display info about app
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
+          # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+            https://api.fleek.co/graphql

-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-              https://api.fleek.co/graphql
-
-          elif echo ${{ github.ref }} | grep -q release/testnet; then
-            # display info about app
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
-
-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id status}}"}' \
-              https://api.fleek.co/graphql
-          fi
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            https://api.fleek.co/graphql

      - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        uses: actions/checkout@v3
        with:
          repository: 'vegaprotocol/ipfs-redirect'
@@ -274,7 +218,7 @@ jobs:
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      - name: Update console.vega.xyz DNS to redirect to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'main') }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        run: |
@@ -311,38 +255,26 @@ jobs:
            gh pr merge "${pr_url}" --delete-branch --squash --admin
          )

-      - name: Update console.fairground.wtf DNS to redirect to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && endsWith(github.ref, 'testnet') }}
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
+          # # Generate console URL
+          # new_console_url_type=ipfs
+          # # new_console_url_type=ipns
+          # new_console_url_domain=cf-ipfs.com
+          # # new_console_url_domain=dweb.link
+          # new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          # echo "new_console_url=${new_console_url}"

-          # Generate console URL
+          # # Update record in DNSimple
+          # # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
+          # dnsimple_account_id=84895
+          # dnsimple_zone_name=console.vega.xyz
+          # dnsimple_record_id=44409591
+          # # see: https://dnsimple.com/a/84895/domains/console.vega.xyz/records/44409591/edit

-          new_console_url_type=ipfs
-          # new_console_url_type=ipns
-
-          new_console_url_domain=cf-ipfs.com
-          # new_console_url_domain=dweb.link
-
-          new_console_url="http://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          echo "new_console_url=${new_console_url}"
-
-          # Update record in DNSimple
-          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          dnsimple_account_id=84895
-          dnsimple_zone_name=fairground.wtf
-          dnsimple_record_id=45300615
-          # see: https://dnsimple.com/a/84895/domains/fairground.wtf/records/45300615/edit
-          curl --fail -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-                -H 'Accept: application/json' \
-                -H 'Content-Type: application/json' \
-                -X PATCH \
-                -d "{
-                      \"content\": \"${new_console_url}\"
-                }" \
-                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
+          # curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
+          #       -H 'Accept: application/json' \
+          #       -H 'Content-Type: application/json' \
+          #       -X PATCH \
+          #       -d "{
+          #             \"content\": \"${new_console_url}\"
+          #       }" \
+          #       https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
@@ -5,7 +5,7 @@ NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
-NX_BLOCK_EXPLORER=https://be.vega.community/rest
+NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -70,7 +70,7 @@
      "executor": "@nrwl/workspace:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.71.4/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.67.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -1,13 +1,29 @@
 import WS from 'jest-websocket-mock';
-import { render, screen } from '@testing-library/react';
+import useWebSocket from 'react-use-websocket';
+import {
+  render,
+  screen,
+  fireEvent,
+  act,
+  waitFor,
+} from '@testing-library/react';
+import { TendermintWebsocketContext } from '../../contexts/websocket/tendermint-websocket-context';
 import { BlocksRefetch } from './blocks-refetch';

 const BlocksRefetchInWebsocketProvider = ({
  callback,
+  mocketLocation,
 }: {
  callback: () => null;
+  mocketLocation: string;
 }) => {
-  return <BlocksRefetch refetch={callback} />;
+  const contextShape = useWebSocket(mocketLocation);
+
+  return (
+    <TendermintWebsocketContext.Provider value={{ ...contextShape }}>
+      <BlocksRefetch refetch={callback} />
+    </TendermintWebsocketContext.Provider>
+  );
 };

 describe('Blocks refetch', () => {
@@ -16,8 +32,111 @@ describe('Blocks refetch', () => {
    const mocket = new WS(mocketLocation, { jsonProtocol: true });
    new WebSocket(mocketLocation);

-    render(<BlocksRefetchInWebsocketProvider callback={() => null} />);
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('new blocks');
    expect(screen.getByTestId('refresh')).toBeInTheDocument();
    mocket.close();
  });
+
+  it('should initiate callback when the button is clicked', async () => {
+    const mocketLocation = 'wss:localhost:3003';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+
+    const callback = jest.fn();
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={callback}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+    const button = screen.getByTestId('refresh');
+
+    act(() => {
+      fireEvent.click(button);
+    });
+
+    expect(callback.mock.calls.length).toEqual(1);
+    mocket.close();
+  });
+
+  it('should show new blocks as websocket is correctly updated', async () => {
+    const mocketLocation = 'wss:localhost:3004';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+
+    // Ensuring we send an ID equal to the one the client subscribed with.
+    await waitFor(() => expect(mocket.messages.length).toEqual(1));
+    // @ts-ignore id on messages
+    const id = mocket.messages[0].id;
+
+    const newBlockMessage = {
+      id,
+      result: {
+        query: "tm.event = 'NewBlock'",
+      },
+    };
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessage);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('1 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessage);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('2 new blocks');
+    mocket.close();
+  });
+
+  it('will not show new blocks if websocket has wrong ID', async () => {
+    const mocketLocation = 'wss:localhost:3005';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+
+    // Ensuring we send an ID equal to the one the client subscribed with.
+    await waitFor(() => expect(mocket.messages.length).toEqual(1));
+
+    const newBlockMessageBadId = {
+      id: 'blahblahblah',
+      result: {
+        query: "tm.event = 'NewBlock'",
+      },
+    };
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessageBadId);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+    mocket.close();
+  });
 });
@@ -1,19 +1,36 @@
+import { useState, useEffect } from 'react';
+import { useTendermintWebsocket } from '../../hooks/use-tendermint-websocket';
 import { t } from '@vegaprotocol/i18n';
-import { Button, Icon } from '@vegaprotocol/ui-toolkit';
+import { ButtonLink } from '@vegaprotocol/ui-toolkit';

 interface BlocksRefetchProps {
  refetch: () => void;
 }

 export const BlocksRefetch = ({ refetch }: BlocksRefetchProps) => {
+  const [blocksToLoad, setBlocksToLoad] = useState<number>(0);
+
+  const { messages } = useTendermintWebsocket({
+    query: "tm.event = 'NewBlock'",
+  });
+
+  useEffect(() => {
+    if (messages.length > 0) {
+      setBlocksToLoad((prev) => prev + 1);
+    }
+  }, [messages]);
+
  const refresh = () => {
    refetch();
+    setBlocksToLoad(0);
  };

  return (
-    <Button onClick={refresh} data-testid="refresh" size="xs">
-      <Icon name="refresh" className="!align-baseline mr-2" size={3} />
-      {t('Load new')}
-    </Button>
+    <div className="mb-4">
+      <span data-testid="new-blocks">{blocksToLoad} new blocks - </span>
+      <ButtonLink onClick={refresh} data-testid="refresh">
+        {t('refresh to see latest')}
+      </ButtonLink>
+    </div>
  );
 };
@@ -1,24 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-export interface FilterLabelProps {
-  filters: Set<string>;
-}
-
-/**
- * Renders the list (currently limited to 1) of filters set by the
- * Transaction Filter
- */
-export function FilterLabel({ filters }: FilterLabelProps) {
-  if (!filters || filters.size !== 1) {
-    return <span className="uppercase">{t('Filter')}</span>;
-  }
-
-  return (
-    <div>
-      <span className="uppercase">{t('Filters')}:</span>&nbsp;
-      <code className="bg-vega-light-150 px-2 rounded-md capitalize">
-        {Array.from(filters)[0]}
-      </code>
-    </div>
-  );
-}
@@ -1,164 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuItemIndicator,
-  DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubTrigger,
-  DropdownMenuTrigger,
-  DropdownMenuSubContent,
-  Icon,
-  Button,
-} from '@vegaprotocol/ui-toolkit';
-import type { Dispatch, SetStateAction } from 'react';
-import { FilterLabel } from './tx-filter-label';
-
-// All possible transaction types. Should be generated.
-export type FilterOption =
-  | 'Amend LiquidityProvision Order'
-  | 'Amend Order'
-  | 'Batch Market Instructions'
-  | 'Cancel LiquidityProvision Order'
-  | 'Cancel Order'
-  | 'Cancel Transfer Funds'
-  | 'Chain Event'
-  | 'Delegate'
-  | 'Ethereum Key Rotate Submission'
-  | 'Issue Signatures'
-  | 'Key Rotate Submission'
-  | 'Liquidity Provision Order'
-  | 'Node Signature'
-  | 'Node Vote'
-  | 'Proposal'
-  | 'Protocol Upgrade'
-  | 'Register new Node'
-  | 'State Variable Proposal'
-  | 'Submit Oracle Data'
-  | 'Submit Order'
-  | 'Transfer Funds'
-  | 'Undelegate'
-  | 'Validator Heartbeat'
-  | 'Vote on Proposal'
-  | 'Withdraw';
-
-// Alphabetised list of transaction types to appear at the top level
-export const PrimaryFilterOptions: FilterOption[] = [
-  'Amend LiquidityProvision Order',
-  'Amend Order',
-  'Batch Market Instructions',
-  'Cancel LiquidityProvision Order',
-  'Cancel Order',
-  'Cancel Transfer Funds',
-  'Delegate',
-  'Liquidity Provision Order',
-  'Proposal',
-  'Submit Oracle Data',
-  'Submit Order',
-  'Transfer Funds',
-  'Undelegate',
-  'Vote on Proposal',
-  'Withdraw',
-];
-
-// Alphabetised list of transaction types to nest under a 'More...' submenu
-export const SecondaryFilterOptions: FilterOption[] = [
-  'Chain Event',
-  'Ethereum Key Rotate Submission',
-  'Issue Signatures',
-  'Key Rotate Submission',
-  'Node Signature',
-  'Node Vote',
-  'Protocol Upgrade',
-  'Register new Node',
-  'State Variable Proposal',
-  'Validator Heartbeat',
-];
-
-export const AllFilterOptions: FilterOption[] = [
-  ...PrimaryFilterOptions,
-  ...SecondaryFilterOptions,
-];
-
-export interface TxFilterProps {
-  filters: Set<FilterOption>;
-  setFilters: Dispatch<SetStateAction<Set<FilterOption>>>;
-}
-
-/**
- * Renders a structured dropdown menu of all of the available transaction
- * types. It allows a user to select one transaction type to view. Later
- * it will support multiple selection, but until the API supports that it is
- * one or all.
- * @param filters null or Set of tranaction types
- * @param setFilters A function to update the filters prop
- * @returns
- */
-export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
-  return (
-    <DropdownMenu
-      modal={false}
-      trigger={
-        <DropdownMenuTrigger className="ml-2">
-          <Button size="xs">
-            <FilterLabel filters={filters} />
-          </Button>
-        </DropdownMenuTrigger>
-      }
-    >
-      <DropdownMenuContent>
-        {filters.size > 1 ? null : (
-          <>
-            <DropdownMenuCheckboxItem
-              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
-            >
-              {t('Clear filters')} <Icon name="cross" />
-            </DropdownMenuCheckboxItem>
-            <DropdownMenuSeparator />
-          </>
-        )}
-        {PrimaryFilterOptions.map((f) => (
-          <DropdownMenuCheckboxItem
-            key={f}
-            checked={filters.has(f)}
-            onCheckedChange={() => {
-              // NOTE: These act like radio buttons until the API supports multiple filters
-              setFilters(new Set([f]));
-            }}
-            id={`radio-${f}`}
-          >
-            {f}
-            <DropdownMenuItemIndicator>
-              <Icon name="tick-circle" />
-            </DropdownMenuItemIndicator>
-          </DropdownMenuCheckboxItem>
-        ))}
-        <DropdownMenuSub>
-          <DropdownMenuSubTrigger>
-            {t('More Types')}
-            <Icon name="chevron-right" />
-          </DropdownMenuSubTrigger>
-          <DropdownMenuSubContent>
-            {SecondaryFilterOptions.map((f) => (
-              <DropdownMenuCheckboxItem
-                key={f}
-                checked={filters.has(f)}
-                onCheckedChange={(checked) => {
-                  // NOTE: These act like radio buttons until the API supports multiple filters
-                  setFilters(new Set([f]));
-                }}
-                id={`radio-${f}`}
-              >
-                {f}
-                <DropdownMenuItemIndicator>
-                  <Icon name="tick-circle" className="inline" />
-                </DropdownMenuItemIndicator>
-              </DropdownMenuCheckboxItem>
-            ))}
-          </DropdownMenuSubContent>
-        </DropdownMenuSub>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React from 'react';
 import { FixedSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/i18n';
@@ -69,17 +69,6 @@ export const TxsInfiniteList = ({
 }: TxsInfiniteListProps) => {
  const { screenSize } = useScreenDimensions();
  const isStacked = ['xs', 'sm'].includes(screenSize);
-  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
-  const hasMountedRef = useRef(false);
-
-  useEffect(() => {
-    if (hasMountedRef.current) {
-      if (infiniteLoaderRef.current) {
-        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
-      }
-    }
-    hasMountedRef.current = true;
-  }, [loadMoreTxs]);

  if (!txs) {
    if (!areTxsLoading) {
@@ -121,7 +110,6 @@ export const TxsInfiniteList = ({
          isItemLoaded={isItemLoaded}
          itemCount={itemCount}
          loadMoreItems={loadMoreItems}
-          ref={infiniteLoaderRef}
        >
          {({ onItemsRendered, ref }) => (
            <List
@@ -33,7 +33,7 @@ export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
  // Hacky fix for param as array
  let urlAsString = url.toString();
  if (filters) {
-    urlAsString += '&' + filters.replace(' ', '%20');
+    urlAsString += '&' + filters;
  }

  return urlAsString;
@@ -65,14 +65,6 @@ export const useTxsData = ({ limit, filters }: IUseTxsData) => {
    }
  }, [setTxsState, data]);

-  useEffect(() => {
-    setTxsState((prev) => ({
-      txsData: [],
-      hasMoreTxs: true,
-      lastCursor: '',
-    }));
-  }, [filters]);
-
  const loadTxs = useCallback(() => {
    return refetch({
      limit: limit,
@@ -5,43 +5,17 @@ import { TxsInfiniteList } from '../../../components/txs';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

-import { useState } from 'react';
-import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-
-const BE_TXS_PER_REQUEST = 15;
+const BE_TXS_PER_REQUEST = 20;

 export const TxsList = () => {
  useDocumentTitle(['Transactions']);

-  return (
-    <section className="md:p-2 lg:p-4 xl:p-6 relative">
-      <RouteTitle>{t('Transactions')}</RouteTitle>
-      <TxsListFiltered />
-    </section>
-  );
-};
-
-export const TxsListFiltered = () => {
-  const [filters, setFilters] = useState(new Set(AllFilterOptions));
-
-  const f =
-    filters && filters.size === 1
-      ? `filters[cmd.type]=${Array.from(filters)[0]}`
-      : '';
-
  const { hasMoreTxs, loadTxs, error, txsData, refreshTxs, loading } =
-    useTxsData({
-      limit: BE_TXS_PER_REQUEST,
-      filters: f,
-    });
-
+    useTxsData({ limit: BE_TXS_PER_REQUEST });
  return (
-    <>
-      <menu className="mb-2">
-        <BlocksRefetch refetch={refreshTxs} />
-        <TxsFilter filters={filters} setFilters={setFilters} />
-      </menu>
-
+    <section className="md:p-2 lg:p-4 xl:p-6">
+      <RouteTitle>{t('Transactions')}</RouteTitle>
+      <BlocksRefetch refetch={refreshTxs} />
      <TxsInfiniteList
        hasMoreTxs={hasMoreTxs}
        areTxsLoading={loading}
@@ -50,6 +24,6 @@ export const TxsListFiltered = () => {
        error={error}
        className="mb-28"
      />
-    </>
+    </section>
  );
 };
@@ -49,7 +49,7 @@ module.exports = defineConfig({
    vegaTokenContractAddress: '0xF41bD86d462D36b997C0bbb4D97a0a3382f205B7',
    vegaTokenAddress: '0x67175Da1D5e966e40D11c4B2519392B2058373de',
    txTimeout: { timeout: 70000 },
-    epochTimeout: { timeout: 10000 },
+    epochTimeout: { timeout: 6000 },
    blockConfirmations: 3,
    grepTags: '@regression @smoke @slow',
    grepFilterSpecs: true,
@@ -205,33 +205,29 @@ context(
    });

    // 3003-PMAN-001
-    it(
-      'Able to submit valid new market proposal',
-      { tags: '@smoke' },
-      function () {
-        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.get(newProposalTitle).type('Test new market proposal');
-        cy.get(newProposalDescription).type('E2E test for proposals');
-        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-          const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.get(newProposalTerms).type(newMarketPayload, {
-            parseSpecialCharSequences: false,
-            delay: 2,
+    it('Able to submit valid new market proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.get(newProposalTitle).type('Test new market proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+        const newMarketPayload = JSON.stringify(newMarketProposal);
+        cy.get(newProposalTerms).type(newMarketPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
          });
        });
-        cy.get(proposalDownloadBtn)
-          .should('be.visible')
-          .click()
-          .then(() => {
-            cy.wrap(
-              getDownloadedProposalJsonPath('vega-new-market-proposal-')
-            ).then((filePath) => {
-              goToMakeNewProposal(governanceProposalType.RAW);
-              submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
-            });
-          });
-      }
-    );
+    });

    it('Unable to submit new market proposal with missing/invalid fields', function () {
      const errorMsg =
@@ -54,7 +54,7 @@ context(
  'Staking Tab - with eth and vega wallets connected',
  { tags: '@slow' },
  function () {
-    // 1002-STKE-002, 1002-STKE-032
+    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
      cy.visit('/');
      ethereumWalletConnect();
@@ -63,7 +63,7 @@ context(
      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

-    describe('Eth wallet - contains VEGA tokens', function () {
+    describe.skip('Eth wallet - contains VEGA tokens', function () {
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
@@ -77,41 +77,25 @@ context(
        }
      );

-      // 1002-STKE-035 1002-STKE-036
-      it('Unable to stake against a validator with less than minimum and more than associated amount', function () {
-        ensureSpecifiedUnstakedTokensAreAssociated('3');
-        verifyUnstakedBalance(3.0);
-        verifyEthWalletTotalAssociatedBalance('3.0');
-        verifyEthWalletAssociatedBalance('3.0');
-        cy.get('button').contains('Select a validator to nominate').click();
-        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeAddStakeRadioButton, epochTimeout).click({
-          force: true,
-        });
-        cy.getByTestId(stakeTokenAmountInputBox).type('0.001');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-        cy.getByTestId(stakeTokenAmountInputBox).clear().type('4');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-      });
      it('Able to stake against a validator - using vega from wallet', function () {
        ensureSpecifiedUnstakedTokensAreAssociated('3');
        verifyUnstakedBalance(3.0);
        verifyEthWalletTotalAssociatedBalance('3.0');
        verifyEthWalletAssociatedBalance('3.0');
        cy.get('button').contains('Select a validator to nominate').click();
-        // 1002-STKE-031
+        // 2001-STKE-031
        clickOnValidatorFromList(0);
-        // 1002-STKE-033, 1002-STKE-034, 1002-STKE-037
+        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
        stakingValidatorPageAddStake('2');
        verifyUnstakedBalance(1.0);
-        // 1002-STKE-039
+        // 2001-STKE-039
        verifyStakedBalance(2.0);
-        verifyNextEpochValue(2.0); // 1002-STKE-016 1002-STKE-038
-        verifyThisEpochValue(2.0); // 1002-STKE-013
+        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
+        verifyThisEpochValue(2.0); // 2001-STKE-013
        closeStakingDialog();
        navigateTo(navigation.validators);

-        // 2002-SINC-007 1002-STKE-015 1002-STKE-017 1002-STKE-052
+        // 2002-SINC-007
        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
      });

@@ -234,7 +218,7 @@ context(
          });
      });

-      // 1002-STKE-041 1002-STKE-053
+      // 2001-STKE-041
      it(
        'Able to remove part of a stake against a validator',
        { tags: '@smoke' },
@@ -247,11 +231,11 @@ context(
          verifyUnstakedBalance(1.0);
          closeStakingDialog();
          navigateTo(navigation.validators);
-          // 1002-STKE-040
+          // 2001-STKE-040
          clickOnValidatorFromList(0);
-          // 1002-STKE-044, 1002-STKE-048
+          // 2001-STKE-044, 2001-STKE-048
          stakingValidatorPageRemoveStake('1');
-          // 1002-STKE-049
+          // 2001-STKE-049
          verifyNextEpochValue(2.0);
          verifyUnstakedBalance(2.0);
          verifyStakedBalance(2.0);
@@ -271,7 +255,7 @@ context(
        }
      );

-      // 1002-STKE-045
+      // 2001-STKE-045
      it('Able to remove a full stake against a validator', function () {
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
@@ -319,7 +303,6 @@ context(
          .and('be.visible');
      });

-      // 1002-STKE-046 1002-STKE-047
      it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
@@ -398,8 +381,6 @@ context(

      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
        vegaWalletSetSpecifiedApprovalAmount('1000');
-        cy.reload();
-        ethereumWalletConnect();
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -422,7 +403,7 @@ context(
      });

      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
        stakingPageAssociateTokens('3');
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -436,7 +417,7 @@ context(
      });

      it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
        stakingPageAssociateTokens('3', { type: 'contract' });
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -450,7 +431,7 @@ context(
      });

      it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
        stakingPageAssociateTokens('3', { type: 'wallet' });
        verifyUnstakedBalance(3.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -464,7 +445,7 @@ context(
      });

      it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
        stakingPageAssociateTokens('6');
        verifyUnstakedBalance(6.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -517,7 +498,7 @@ context(
      }

      function verifyThisEpochValue(amount: number) {
-        cy.getByTestId('stake-this-epoch', epochTimeout) // 1002-STKE-013
+        cy.getByTestId('stake-this-epoch', epochTimeout) // 2001-STKE-013
          .contains(amount, epochTimeout)
          .should('be.visible');
      }
@@ -64,38 +64,31 @@ context(
        }
      );

-      it(
-        'Able to associate tokens - from wallet',
-        { tags: '@smoke' },
-        function () {
-          //1004-ASSO-003
-          //1004-ASSO-005
-          //1004-ASSO-009
-          //1004-ASSO-030
-          //1004-ASSO-012
-          //1004-ASSO-013
-          //1004-ASSO-014
-          //1004-ASSO-015
-          //1004-ASSO-030
-          //0005-ETXN-006
-          //0005-ETXN-003
-          //0005-ETXN-005
-          stakingPageAssociateTokens('2', { skipConfirmation: true });
-          validateWalletCurrency('Associated', '0.00');
-          validateWalletCurrency('Pending association', '2.00');
-          validateWalletCurrency('Total associated after pending', '2.00');
-          // 0005-ETXN-002
-          verifyEthWalletAssociatedBalance('2.0');
-          verifyEthWalletTotalAssociatedBalance('2.0');
-          cy.get(vegaWallet).within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-        }
-      );
+      it('Able to associate tokens - from wallet', function () {
+        //1004-ASSO-003
+        //1004-ASSO-005
+        //1004-ASSO-009
+        //1004-ASSO-030
+        //1004-ASSO-012
+        //1004-ASSO-013
+        //1004-ASSO-014
+        //1004-ASSO-015
+        //1004-ASSO-030
+        //0005-ETXN-006
+        //0005-ETXN-003
+        //0005-ETXN-005
+        stakingPageAssociateTokens('2', { skipConfirmation: true });
+        validateWalletCurrency('Associated', '0.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '2.00');
+        // 0005-ETXN-002
+        verifyEthWalletAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('2.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+      });

      it('Able to disassociate all associated tokens - manually', function () {
        // 1004-ASSO-025
@@ -55,10 +55,6 @@ context(
      navigateTo(navigation.withdraw);
      cy.connectVegaWallet();
      ethereumWalletConnect();
-      cy.getByTestId('currency-title', txTimeout).should(
-        'contain.text',
-        usdtName
-      );
    });

    it('Able to open withdrawal form with vega wallet connected', function () {
@@ -73,10 +69,7 @@ context(
    it('Unable to submit withdrawal with invalid fields', function () {
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(submitWithdrawalButton).click();
        cy.getByTestId(formValidationError).should('have.length', 1);
@@ -96,75 +89,68 @@ context(
      });
    });

-    it(
-      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
-      { tags: '@smoke' },
-      function () {
-        // fill in withdrawal form
-        cy.getByTestId(withdraw).should('be.visible').click();
-        cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-          cy.getByTestId('select-asset').click();
-          cy.get('select')
-            .select(usdtSelectValue, { force: true })
-            .should('have.value', usdtSelectValue);
-          cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-          cy.getByTestId(withdrawalThreshold).should(
-            'have.text',
-            '100,000.00000T'
+    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
+      // fill in withdrawal form
+      cy.getByTestId(withdraw).should('be.visible').click();
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(withdrawalThreshold).should(
+          'have.text',
+          '100,000.00000T'
+        );
+        cy.getByTestId(delayTime).should('have.text', 'None');
+        cy.getByTestId(amountInput).click().type('120');
+        cy.getByTestId(submitWithdrawalButton).click();
+      });
+      // assert withdrawal request
+      cy.getByTestId(toast)
+        .first(txTimeout)
+        .should('contain.text', 'Funds unlocked')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
+          cy.getByTestId(toastPanel).should(
+            'contain.text',
+            'Withdraw 120.00 tUSDC'
          );
-          cy.getByTestId(delayTime).should('have.text', 'None');
-          cy.getByTestId(amountInput).click().type('120');
-          cy.getByTestId(submitWithdrawalButton).click();
+          cy.getByTestId(toastCompleteWithdrawal).click();
+          cy.getByTestId(toastClose).click();
        });
-        // assert withdrawal request
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'Funds unlocked')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-            cy.getByTestId(toastCompleteWithdrawal).click();
-            cy.getByTestId(toastClose).click();
-          });
-        // withdrawal complete
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'The withdrawal has been approved.')
-          .within(() => {
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-          });
-        cy.getByTestId(toast)
-          .last(txTimeout)
-          .should('contain.text', 'Transaction confirmed')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-          });
-        // withdrawal history for complete withdrawal displayed
-        cy.get(tableWithdrawnStatus)
-          .eq(1, txTimeout)
-          .should('have.text', 'Completed')
-          .parent()
-          .within(() => {
-            cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-            cy.get(tableAmount).should('have.text', '120.00');
-            cy.get(tableReceiverAddress)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/address/');
-            cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-            cy.get(tableTxHash)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/tx/');
-          });
-      }
-    );
+      // withdrawal complete
+      cy.getByTestId(toast)
+        .first(txTimeout)
+        .should('contain.text', 'The withdrawal has been approved.')
+        .within(() => {
+          cy.getByTestId(toastPanel).should(
+            'contain.text',
+            'Withdraw 120.00 tUSDC'
+          );
+        });
+      cy.getByTestId(toast)
+        .last(txTimeout)
+        .should('contain.text', 'Transaction confirmed')
+        .within(() => {
+          cy.getByTestId('external-link').should('exist');
+        });
+      // withdrawal history for complete withdrawal displayed
+      cy.get(tableWithdrawnStatus)
+        .eq(1, txTimeout)
+        .should('have.text', 'Completed')
+        .parent()
+        .within(() => {
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '120.00');
+          cy.get(tableReceiverAddress)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/address/');
+          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
+          cy.get(tableTxHash)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/tx/');
+        });
+    });

    it('Able to withdraw asset: -eth wallet not connected', function () {
      const ethWalletAddress = Cypress.env('ethWalletPublicKey');
@@ -173,10 +159,7 @@ context(
      // fill in withdrawal form
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(ethAddressInput).should('be.empty');
        cy.getByTestId(amountInput).click().type('110');
        cy.getByTestId(submitWithdrawalButton).click();
@@ -236,10 +219,7 @@ context(
    it('Should be able to see withdrawal details from toast', function () {
      cy.getByTestId(withdraw).click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(withdrawalThreshold).should(
          'have.text',
@@ -294,10 +274,7 @@ context(
      cy.connectPublicKey(vegaWalletPubKey);
      cy.getByTestId(withdraw).should('be.visible').click();
      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
        cy.getByTestId(amountInput).click().type('100');
        cy.pause();
@@ -5,10 +5,7 @@ import {
  verifyPageHeader,
  verifyTabHighlighted,
 } from '../../support/common.functions';
-import {
-  clickOnValidatorFromList,
-  waitForBeginningOfEpoch,
-} from '../../support/staking.functions';
+import { clickOnValidatorFromList } from '../../support/staking.functions';

 const guideLink = '[data-testid="staking-guide-link"]';
 const validatorTitle = '[data-testid="validator-node-title"]';
@@ -40,213 +37,206 @@ context('Validators Page - verify elements on page', function () {
  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    it('Should have validators tab highlighted', function () {
-      verifyTabHighlighted(navigation.validators);
+    describe('description section', function () {
+      it('Should have validators tab highlighted', function () {
+        verifyTabHighlighted(navigation.validators);
+      });
+
+      it('Should have validators ON VEGA header visible', function () {
+        verifyPageHeader('Validators');
+      });
+
+      it('Should have Staking Guide link visible', function () {
+        // 2001-STKE-003
+        cy.get(guideLink)
+          .should('be.visible')
+          .and('have.text', 'Read more about staking on Vega')
+          .and(
+            'have.attr',
+            'href',
+            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+          );
+      });
    });
-
-    it('Should have validators ON VEGA header visible', function () {
-      verifyPageHeader('Validators');
-    });
-
-    it('Should have Staking Guide link visible', function () {
-      // 1002-STKE-003
-      cy.get(guideLink)
-        .should('be.visible')
-        .and('have.text', 'Read more about staking on Vega')
-        .and(
-          'have.attr',
-          'href',
-          'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-        );
-    });
-
-    // 1002-STKE-032
-    it('Should have button to connect vega wallet in validator page', function () {
-      clickOnValidatorFromList(0);
-      cy.getByTestId('connect-to-vega-wallet-btn').should('be.visible');
-      cy.visit('/validators');
-    });
-  });
-  // 1002-STKE-020 1002-STKE-021 1002-STKE-022 1002-STKE-023 1002-STKE-024
-  describe(
-    'Should be able to see validator list from the staking page',
-    { tags: '@regression' },
-    function () {
-      // 1002-STKE-050
-      it('Should be able to see validator names', function () {
-        cy.get('[col-id="validator"] > div > span')
-          .should('have.length.at.least', 1)
-          .each(($name) => {
-            cy.wrap($name).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake', function () {
-        cy.getByTestId('total-stake')
-          .should('have.length.at.least', 1)
-          .each(($stake) => {
-            cy.wrap($stake).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-stake').first().realHover();
-
-        cy.get(stakedByOperatorToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by operator: 3,000.00');
-        cy.get(stakedByDelegatesToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by delegates: 0.00');
-        cy.get(totalStakedToolTip)
-          .invoke('text')
-          .should('contain', 'Total stake: 3,000.00');
-      });
-
-      it('Should be able to see validator normalised voting power', function () {
-        cy.getByTestId('normalised-voting-power')
-          .should('have.length.at.least', 1)
-          .each(($vPower) => {
-            cy.wrap($vPower).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator normalised voting power tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('normalised-voting-power').first().realHover();
-
-        cy.get(unnormalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Unnormalised voting power: 20.00%');
-        cy.get(normalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Normalised voting power: 50.00%');
-      });
-
-      // 2002-SINC-018
-      it('Should be able to see validator total penalties', function () {
-        cy.getByTestId('total-penalty')
-          .should('have.length.at.least', 1)
-          .each(($penalties) => {
-            cy.wrap($penalties).should('contain.text', '0%');
-          });
-      });
-
-      it('Should be able to see validator penalties tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-penalty').realHover();
-
-        cy.get(performancePenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Performance penalty: 0.00%');
-        cy.get(overstakedPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
-        cy.get(totalPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Total penalties: 60.00%');
-      });
-
-      it('Should be able to see validator pending stake', function () {
-        cy.getByTestId('total-pending-stake')
-          .should('have.length.at.least', 1)
-          .each(($pendingStake) => {
-            cy.wrap($pendingStake).should('contain.text', '0.00');
-          });
-      });
-    }
-  );
-
-  // 1002-STKE-050
-  describe(
-    'Should be able to see static information about a validator',
-    { tags: '@smoke' },
-    function () {
-      before('connect wallets and click on validator', function () {
-        cy.connectVegaWallet();
-        clickOnValidatorFromList(0);
-      });
-
-      // 1002-STKE-006
-      it('Should be able to see validator name', function () {
-        cy.get(validatorTitle).should('not.be.empty');
-      });
-
-      // 1002-STKE-007
-      it('Should be able to see validator id', function () {
-        cy.get(validatorId).should('not.be.empty');
-      });
-
-      // 1002-STKE-008
-      it('Should be able to see validator public key', function () {
-        cy.get(validatorPubKey).should('not.be.empty');
-      });
-
-      // 1002-STKE-010
-      it('Should be able to see Ethereum address', function () {
-        cy.get(ethAddressLink).should('not.be.empty').and('have.attr', 'href');
-      });
-      // TODO validators missing url for more information about them 1002-STKE-09
-
-      it('Should be able to see validator status', function () {
-        cy.get(validatorStatus).should('have.text', 'Consensus');
-      });
-
-      // 1002-STKE-012
-      it('Should be able to see total stake', function () {
-        cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see pending stake', function () {
-        cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by operator', function () {
-        cy.get(stakedByOperator)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by delegates', function () {
-        cy.get(stakedByDelegates)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      // 1002-STKE-051
-      it('Should be able to see stake share in percentage', function () {
-        cy.get(stakeShare)
-          .invoke('text')
-          .then(($stakePercentage) => {
-            // The pattern must start at a word boundary (\b).
-            // The pattern cannot be immediately preceded by a dot ((?<!\.)).
-            // The pattern can be one of the following:
-            // A percentage value of zero (0%), or
-            // A non-zero percentage value that can be:
-            // A single digit (\d) between 0 and 9, or
-            // A two-digit number between 0 and 99 (\d{1,2}), or
-            // The number 100.
-            // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
-            // The pattern must end with a percentage sign (%).
-
-            cy.wrap($stakePercentage).should(
-              'match',
-              /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
-            );
-          });
-      });
-
-      // 1002-STKE-011 2002-SINC-001 2002-SINC-002
-      it('Should be able to see epoch information', function () {
-        const epochTitle = 'h3';
-        const nextEpochInfo = 'p';
-
-        cy.get(epochCountDown).within(() => {
-          cy.get(epochTitle).should('not.be.empty');
-          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+    describe(
+      'Should be able to see validator list from the staking page',
+      { tags: '@regression' },
+      function () {
+        // 2001-STKE-050
+        it('Should be able to see validator names', function () {
+          cy.get('[col-id="validator"] > div > span')
+            .should('have.length.at.least', 1)
+            .each(($name) => {
+              cy.wrap($name).should('not.be.empty');
+            });
        });
-      });
-    }
-  );
+
+        it('Should be able to see validator stake', function () {
+          cy.getByTestId('total-stake')
+            .should('have.length.at.least', 1)
+            .each(($stake) => {
+              cy.wrap($stake).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator stake tooltip', function () {
+          cy.getByTestId('total-stake').first().realHover();
+
+          cy.get(stakedByOperatorToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by operator: 3,000.00');
+          cy.get(stakedByDelegatesToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by delegates: 0.00');
+          cy.get(totalStakedToolTip)
+            .invoke('text')
+            .should('contain', 'Total stake: 3,000.00');
+        });
+
+        it('Should be able to see validator normalised voting power', function () {
+          cy.getByTestId('normalised-voting-power')
+            .should('have.length.at.least', 1)
+            .each(($vPower) => {
+              cy.wrap($vPower).should('not.be.empty');
+            });
+        });
+
+        it('Should be able to see validator normalised voting power tooltip', function () {
+          cy.getByTestId('normalised-voting-power').first().realHover();
+
+          cy.get(unnormalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Unnormalised voting power: 20.00%');
+          cy.get(normalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Normalised voting power: 50.00%');
+        });
+
+        // 2002-SINC-018
+        it('Should be able to see validator total penalties', function () {
+          cy.getByTestId('total-penalty')
+            .should('have.length.at.least', 1)
+            .each(($penalties) => {
+              cy.wrap($penalties).should('contain.text', '0%');
+            });
+        });
+
+        it('Should be able to see validator penalties tooltip', function () {
+          cy.getByTestId('total-penalty').realHover();
+
+          cy.get(performancePenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Performance penalty: 0.00%');
+          cy.get(overstakedPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+          cy.get(totalPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Total penalties: 60.00%');
+        });
+
+        it('Should be able to see validator pending stake', function () {
+          cy.getByTestId('total-pending-stake')
+            .should('have.length.at.least', 1)
+            .each(($pendingStake) => {
+              cy.wrap($pendingStake).should('contain.text', '0.00');
+            });
+        });
+      }
+    );
+
+    // 2001-STKE-050
+    describe(
+      'Should be able to see static information about a validator',
+      { tags: '@smoke' },
+      function () {
+        before('connect wallets and click on validator', function () {
+          cy.connectVegaWallet();
+          clickOnValidatorFromList(0);
+        });
+
+        // 2001-STKE-006
+        it('Should be able to see validator name', function () {
+          cy.get(validatorTitle).should('not.be.empty');
+        });
+
+        // 2001-STKE-007
+        it('Should be able to see validator id', function () {
+          cy.get(validatorId).should('not.be.empty');
+        });
+
+        // 2001-STKE-008
+        it('Should be able to see validator public key', function () {
+          cy.get(validatorPubKey).should('not.be.empty');
+        });
+
+        // 2001-STKE-010
+        it('Should be able to see Ethereum address', function () {
+          cy.get(ethAddressLink)
+            .should('not.be.empty')
+            .and('have.attr', 'href');
+        });
+        // TODO validators missing url for more information about them 2001-STKE-09
+
+        it('Should be able to see validator status', function () {
+          cy.get(validatorStatus).should('have.text', 'Consensus');
+        });
+
+        // 2001-STKE-012
+        it('Should be able to see total stake', function () {
+          cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see pending stake', function () {
+          cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by operator', function () {
+          cy.get(stakedByOperator)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by delegates', function () {
+          cy.get(stakedByDelegates)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        // 2001-STKE-051
+        it('Should be able to see stake share in percentage', function () {
+          cy.get(stakeShare)
+            .invoke('text')
+            .then(($stakePercentage) => {
+              // The pattern must start at a word boundary (\b).
+              // The pattern cannot be immediately preceded by a dot ((?<!\.)).
+              // The pattern can be one of the following:
+              // A percentage value of zero (0%), or
+              // A non-zero percentage value that can be:
+              // A single digit (\d) between 0 and 9, or
+              // A two-digit number between 0 and 99 (\d{1,2}), or
+              // The number 100.
+              // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
+              // The pattern must end with a percentage sign (%).
+
+              cy.wrap($stakePercentage).should(
+                'match',
+                /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
+              );
+            });
+        });
+
+        // 2001-STKE-011 2002-SINC-001 2002-SINC-002
+        it('Should be able to see epoch information', function () {
+          const epochTitle = 'h3';
+          const nextEpochInfo = 'p';
+
+          cy.get(epochCountDown).within(() => {
+            cy.get(epochTitle).should('not.be.empty');
+            cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+          });
+        });
+      }
+    );
+  });
 });
@@ -337,7 +337,6 @@ context(
                .parent()
                .siblings()
                .invoke('text')
-                .should('have.length.at.least', 4)
                .then(parseFloat)
                .should('be.gte', parseFloat(expectedAmount));

@@ -824,7 +824,5 @@
  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App.",
  "multisigContractLink": "Ethereum Multisig Contract",
  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
-  "learnMore": "Learn more",
-  "AllValidators": "All validators",
-  "AllProposals": "All proposals"
+  "learnMore": "Learn more"
 }
@@ -1,4 +1,3 @@
-import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -42,35 +41,19 @@ jest.mock('../list-asset', () => ({
  ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));

-const renderComponent = (proposal: ProposalQuery['proposal']) => {
-  render(
-    <MemoryRouter>
-      <Proposal
-        restData={{}}
-        proposal={proposal as ProposalQuery['proposal']}
-      />
-    </MemoryRouter>
-  );
-};
-
 it('Renders with data-testid', async () => {
  const proposal = generateProposal();
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
  expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });

-it('Renders with a link back to "all proposals"', async () => {
-  const proposal = generateProposal();
-  renderComponent(proposal);
-
-  expect(await screen.findByTestId('all-proposals-link')).toBeInTheDocument();
-});
-
 it('renders each section', async () => {
  const proposal = generateProposal();
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
  expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
  expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
@@ -97,7 +80,8 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
      },
    },
  });
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
  expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });
@@ -2,7 +2,7 @@ import {
  NetworkParams,
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
-import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -13,10 +13,6 @@ import { ProposalTerms } from '../proposal-terms';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
-import { Link } from 'react-router-dom';
-import Routes from '../../../routes';
-import React from 'react';
-import { useTranslation } from 'react-i18next';

 export enum ProposalType {
  PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -33,7 +29,6 @@ export interface ProposalProps {
 }

 export const Proposal = ({ proposal, restData }: ProposalProps) => {
-  const { t } = useTranslation();
  const { params, loading, error } = useNetworkParams([
    NetworkParams.governance_proposal_market_minVoterBalance,
    NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -86,15 +81,6 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
  return (
    <AsyncRenderer data={params} loading={loading} error={error}>
      <section data-testid="proposal">
-        <div
-          className="flex items-center gap-1"
-          data-testid="all-proposals-link"
-        >
-          <Icon name={'chevron-left'} />
-          <Link className="underline" to={Routes.PROPOSALS}>
-            {t('AllProposals')}
-          </Link>
-        </div>
        <ProposalHeader proposal={proposal} isListItem={false} />

        <div className="my-10">
@@ -116,8 +102,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
        </div>

        {proposal.terms.change.__typename !== 'NewMarket' &&
-          proposal.terms.change.__typename !== 'UpdateMarket' &&
-          proposal.terms.change.__typename !== 'NewFreeform' && (
+          proposal.terms.change.__typename !== 'UpdateMarket' && (
            <div className="mb-4">
              <ProposalTerms data={proposal.terms} />
            </div>
@@ -1,10 +1,11 @@
 import { captureMessage } from '@sentry/minimal';
+
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { FinalizedVote } from '@vegaprotocol/proposals';
+import { removePaginationWrapper } from '@vegaprotocol/utils';

 export enum VoteState {
  NotCast = 'NotCast',
@@ -44,23 +45,21 @@ export function useUserVote(
  );

  useEffect(() => {
-    if (finalizedVote?.vote.value && finalizedVote.pubKey === pubKey) {
+    if (finalizedVote?.vote.value) {
      setUserVote(finalizedVote);
-    } else if (data?.party?.votesConnection?.edges && pubKey) {
-      const vote = removePaginationWrapper(
-        data?.party?.votesConnection?.edges
-      ).find(({ proposalId: pId }) => proposalId === pId);
-
-      if (vote) {
-        setUserVote({ ...vote, pubKey });
-      }
+    } else if (data?.party?.votesConnection?.edges) {
+      // This sets the vote (if any) when the user first loads the page
+      setUserVote(
+        removePaginationWrapper(data?.party?.votesConnection?.edges).find(
+          ({ proposalId: pId }) => proposalId === pId
+        )
+      );
    }
  }, [
    finalizedVote?.vote.value,
    data?.party?.votesConnection?.edges,
    finalizedVote,
    proposalId,
-    pubKey,
  ]);

  // If user vote changes update the vote state
@@ -95,8 +94,6 @@ export function useUserVote(
  return {
    voteState,
    userVote,
-    voteDatetime: userVote?.vote?.datetime
-      ? new Date(userVote.vote.datetime)
-      : null,
+    voteDatetime: userVote ? new Date(userVote.vote.datetime) : null,
  };
 }
@@ -48,22 +48,15 @@ export const EpochIndividualRewards = ({
    return removePaginationWrapper(data.party.rewardsConnection.edges);
  }, [data]);

-  const epochRewardSummaries = useMemo(() => {
-    if (!data?.epochRewardSummaries) return [];
-
-    return removePaginationWrapper(data.epochRewardSummaries.edges);
-  }, [data]);
-
  const epochIndividualRewardSummaries = useMemo(() => {
    if (!data?.party) return [];
    return generateEpochIndividualRewardsList({
      rewards,
      epochId,
-      epochRewardSummaries,
      page,
      size: EPOCHS_PAGE_SIZE,
    });
-  }, [data?.party, epochId, epochRewardSummaries, page, rewards]);
+  }, [data?.party, epochId, page, rewards]);

  const refetchData = useCallback(
    async (toPage?: number) => {
@@ -65,11 +65,7 @@ describe('generateEpochIndividualRewardsList', () => {

  it('should return an empty array if no rewards are provided', () => {
    expect(
-      generateEpochIndividualRewardsList({
-        rewards: [],
-        epochId: 1,
-        epochRewardSummaries: [],
-      })
+      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
    ).toEqual([
      {
        epoch: 1,
@@ -82,7 +78,6 @@ describe('generateEpochIndividualRewardsList', () => {
    const result = generateEpochIndividualRewardsList({
      rewards: [rewardWrongType],
      epochId: 1,
-      epochRewardSummaries: [],
    });

    expect(result).toEqual([
@@ -97,15 +92,6 @@ describe('generateEpochIndividualRewardsList', () => {
    const result = generateEpochIndividualRewardsList({
      rewards: [reward1],
      epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '100000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
    });

    expect(result[0]).toEqual({
@@ -148,11 +134,7 @@ describe('generateEpochIndividualRewardsList', () => {

  it('should return an array sorted by epoch descending', () => {
    const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 2,
-      epochRewardSummaries: [],
-    });
+    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });

    expect(result1[0].epoch).toEqual(2);
    expect(result1[1].epoch).toEqual(1);
@@ -161,7 +143,6 @@ describe('generateEpochIndividualRewardsList', () => {
    const result2 = generateEpochIndividualRewardsList({
      rewards: reorderedRewards,
      epochId: 2,
-      epochRewardSummaries: [],
    });

    expect(result2[0].epoch).toEqual(2);
@@ -170,11 +151,7 @@ describe('generateEpochIndividualRewardsList', () => {

  it('correctly calculates the total value of rewards for an asset', () => {
    const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 1,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });

    expect(result[0].rewards[0].totalAmount).toEqual('200');
  });
@@ -182,11 +159,7 @@ describe('generateEpochIndividualRewardsList', () => {
  it('returns data in the expected shape', () => {
    // Just sanity checking the whole structure here
    const rewards = [reward1, reward2, reward3, reward4];
-    const result = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 2,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });

    expect(result).toEqual([
      {
@@ -300,7 +273,6 @@ describe('generateEpochIndividualRewardsList', () => {
    const resultPageOne = generateEpochIndividualRewardsList({
      rewards,
      epochId: 3,
-      epochRewardSummaries: [],
      page: 1,
      size: 2,
    });
@@ -414,7 +386,6 @@ describe('generateEpochIndividualRewardsList', () => {
    const resultPageTwo = generateEpochIndividualRewardsList({
      rewards,
      epochId: 3,
-      epochRewardSummaries: [],
      page: 2,
      size: 2,
    });
@@ -458,69 +429,4 @@ describe('generateEpochIndividualRewardsList', () => {
      },
    ]);
  });
-
-  it('correctly calculates the percentage of two or more rewards by referencing the total rewards amount', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [
-        // reward1 is 100 usd, which is 10% of the total rewards amount
-        reward1,
-        {
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-          amount: '200',
-          percentageOfTotal: '0.2',
-          receivedAt: new Date(),
-          asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
-          party: { id: 'blah' },
-          epoch: { id: '1' },
-        },
-      ],
-      epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '1000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
-    });
-
-    expect(result[0]).toEqual({
-      epoch: 1,
-      rewards: [
-        {
-          asset: 'USD',
-          decimals: 6,
-          totalAmount: '300',
-          rewardTypes: {
-            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-              amount: '300',
-              percentageOfTotal: '30',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-          },
-        },
-      ],
-    });
-  });
 });
@@ -1,9 +1,6 @@
 import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
-import type {
-  EpochRewardSummaryFieldsFragment,
-  RewardFieldsFragment,
-} from '../home/__generated__/Rewards';
+import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';

@@ -35,13 +32,11 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
 export const generateEpochIndividualRewardsList = ({
  rewards,
  epochId,
-  epochRewardSummaries,
  page = 1,
  size = 10,
 }: {
  rewards: RewardFieldsFragment[];
  epochId: number;
-  epochRewardSummaries: EpochRewardSummaryFieldsFragment[];
  page?: number;
  size?: number;
 }) => {
@@ -59,7 +54,6 @@ export const generateEpochIndividualRewardsList = ({
  const epochIndividualRewards = rewards.reduce((acc, reward) => {
    const epochId = reward.epoch.id;
    const assetName = reward.asset.name;
-    const assetId = reward.asset.id;
    const assetDecimals = reward.asset.decimals;
    const rewardType = reward.rewardType;
    const amount = reward.amount;
@@ -76,14 +70,6 @@ export const generateEpochIndividualRewardsList = ({

    const epoch = acc.get(epochId);

-    // matchingTotalReward is the total awarded for all users for the reward type in the epoch of the asset
-    const matchingTotalRewardAmount = epochRewardSummaries.find(
-      (summary) =>
-        summary.epoch === Number(epochId) &&
-        summary.assetId === assetId &&
-        summary.rewardType === rewardType
-    )?.amount;
-
    let asset = epoch?.rewards.find((r) => r.asset === assetName);

    if (!asset) {
@@ -100,24 +86,22 @@ export const generateEpochIndividualRewardsList = ({
      asset.rewardTypes[rewardType] = { amount, percentageOfTotal };
    } else {
      const previousAmount = asset.rewardTypes[rewardType]?.amount;
-      const newAmount = previousAmount
-        ? new BigNumber(previousAmount).plus(amount).toString()
-        : amount;
+      const previousPercentageOfTotal =
+        asset.rewardTypes[rewardType]?.percentageOfTotal;

      asset.rewardTypes[rewardType] = {
-        amount: newAmount,
-        percentageOfTotal: matchingTotalRewardAmount
-          ? new BigNumber(newAmount)
-              .dividedBy(matchingTotalRewardAmount)
-              .multipliedBy(100)
+        amount: previousAmount
+          ? new BigNumber(previousAmount).plus(amount).toString()
+          : amount,
+        percentageOfTotal: previousPercentageOfTotal
+          ? new BigNumber(previousPercentageOfTotal)
+              .plus(percentageOfTotal)
              .toString()
-          : // this should never be reached, if there's an individual reward there should
-            // always be a reward total from the api too, but set it as a fallback just in case
-            percentageOfTotal,
+          : percentageOfTotal,
      };
    }

-    // totalAmount is the sum of all individual rewardTypes amounts
+    // totalAmount is the sum of all rewardTypes amounts
    asset.totalAmount = Object.values(asset.rewardTypes).reduce(
      (sum, rewardType) => {
        return new BigNumber(sum).plus(rewardType.amount).toString();
@@ -22,13 +22,6 @@ fragment DelegationFields on Delegation {
  epoch
 }

-fragment EpochRewardSummaryFields on EpochRewardSummary {
-  epoch
-  assetId
-  amount
-  rewardType
-}
-
 query Rewards(
  $partyId: ID!
  $fromEpoch: Int
@@ -57,16 +50,13 @@ query Rewards(
      }
    }
  }
-  epochRewardSummaries(
-    filter: { fromEpoch: $fromEpoch, toEpoch: $toEpoch }
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
+}
+
+fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
 }

 query EpochAssetsRewards(
@@ -7,8 +7,6 @@ export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.Ac

 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };

-export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
-
 export type RewardsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
  fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
@@ -18,7 +16,9 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;


-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
+
+export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };

 export type EpochAssetsRewardsQueryVariables = Types.Exact<{
  epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
@@ -102,20 +102,9 @@ export const RewardsDocument = gql`
      }
    }
  }
-  epochRewardSummaries(
-    filter: {fromEpoch: $fromEpoch, toEpoch: $toEpoch}
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
 }
    ${RewardFieldsFragmentDoc}
-${DelegationFieldsFragmentDoc}
-${EpochRewardSummaryFieldsFragmentDoc}`;
+${DelegationFieldsFragmentDoc}`;

 /**
 * __useRewardsQuery__
@@ -107,7 +107,7 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
      <div className="flex items-center gap-1">
        <Icon name={'chevron-left'} />
        <Link className="underline" to={Routes.VALIDATORS}>
-          {t('AllValidators')}
+          {t('All validators')}
        </Link>
      </div>
      <Heading
@@ -1,5 +1,3 @@
 # Static

-A static CDN for Vega assets: `static.vega.xyz`
-
-prepare assets by running: `yarn nx build static`
+A static CDN for Vega assets
@@ -1,5 +1,5 @@
 // #region consts
-const assetColId = '[col-id="asset.symbol"]';
+const asset = 'asset';
 const assetDetailsDialog = 'dialog-content';
 const assetRow = 'key-value-table-row';
 const contractAddress = '7_value';
@@ -108,7 +108,7 @@ beforeEach(() => {

 const visitPortfolioAndClickAsset = (assetName: string) => {
  cy.visit('/#/portfolio');
-  cy.get(assetColId).contains(assetName).click();
+  cy.getByTestId(asset).contains(assetName).click();
 };

 const testTooltip = (index: number, testId: string, tooltip: string) => {
@@ -450,17 +450,3 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      .should('have.text', 'View on Explorer');
  });
 });
-
-describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Closed markets"]').click();
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-034
-    cy.getByTestId('tab-closed-markets').should('contain.text', 'No markets');
-  });
-});
@@ -1,10 +1,7 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import type { MarketsQuery } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';

 const rowSelector =
  '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
-const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';

 describe('markets all table', { tags: '@smoke' }, () => {
  beforeEach(() => {
@@ -63,7 +60,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
    // 6001-MARK-035
    cy.get(rowSelector)
      .first()
-      .find(colInstrumentCode)
+      .find('[col-id="tradableInstrument.instrument.code"]')
      .should('have.text', 'SOLUSD');

    //  6001-MARK-036
@@ -158,7 +155,6 @@ describe('markets all table', { tags: '@smoke' }, () => {
  });

  it('able to open and sort full market list - market page', () => {
-    // 6001-MARK-064
    const ExpectedSortedMarkets = [
      'AAPL.MF21',
      'BTCUSD.MF21',
@@ -171,38 +167,8 @@ describe('markets all table', { tags: '@smoke' }, () => {
    cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
    for (let i = 0; i < ExpectedSortedMarkets.length; i++) {
      cy.get(`[row-index=${i}]`)
-        .find(colInstrumentCode)
+        .find('[col-id="tradableInstrument.instrument.code"]')
        .should('have.text', ExpectedSortedMarkets[i]);
    }
  });
-
-  it('can drag and drop columns', () => {
-    // 6001-MARK-065
-    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
-    cy.get(colInstrumentCode)
-      .realMouseDown()
-      .realMouseMove(700, 15)
-      .realMouseUp();
-    cy.get(colInstrumentCode).should(($element) => {
-      const attributeValue = $element.attr('aria-colindex');
-      expect(attributeValue).not.to.equal('1');
-    });
-  });
-});
-
-describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    const markets: MarketsQuery = {};
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'Markets', markets);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-048
-    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
-  });
 });
@@ -102,6 +102,7 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {
    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
  });
+  // #4079
  it.skip('liquidity status column should be sorted properly', () => {
    // 5002-LIQP-003
    const liquidityColDefault = ['Active', 'Pending'];
@@ -25,7 +25,6 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.wait('@MarketsCandles');
  });

-  // 6001-MARK-066
  it('can toggle the sidebar', () => {
    cy.getByTestId('market-selector').should('be.visible');
    cy.getByTestId('sidebar-toggle').click();
@@ -68,7 +67,6 @@ describe('markets selector', { tags: '@smoke' }, () => {
      .each((item, i) => {
        const market = data[i];
        // 6001-MARK-021
-        // 6001-MARK-022
        expect(item.find('h3').text()).equals(market.code);
        expect(
          item.find('[data-testid="market-selector-data-row"]').eq(0).text()
@@ -86,19 +84,8 @@ describe('markets selector', { tags: '@smoke' }, () => {
      });
  });

-  it('can see all markets link', () => {
-    // 6001-MARK-026
-    cy.getByTestId('market-selector').within(() => {
-      cy.getByTestId('all-markets-link')
-        .should('be.visible')
-        .and('have.text', 'All markets')
-        .and('have.attr', 'href')
-        .and('contain', '#/markets/all');
-    });
-  });
-
+  // 6001-MARK-27
  it('can use the filter options', () => {
-    // 6001-MARK-027
    // product type
    cy.getByTestId('product-Spot').click();
    cy.getByTestId(list).contains('Spot markets coming soon.');
@@ -107,7 +94,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.getByTestId('product-Future').click();
    cy.getByTestId(list).find('a').should('have.length', 4);

-    // 6001-MARK-029
+    // 6001-MARK-29
    cy.getByTestId(searchInput).clear().type('btc');
    cy.getByTestId(list).find('a').should('have.length', 2);
    cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
@@ -116,29 +103,4 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.getByTestId(searchInput).clear();
    cy.getByTestId(list).find('a').should('have.length', 4);
  });
-
-  it('can sort by by top gaining and top losing market', () => {
-    // 6001-MARK-030
-    // 6001-MARK-031
-    // 6001-MARK-032
-    // 6001-MARK-033
-    cy.getByTestId(' sort-trigger').click();
-    cy.getByTestId('sort-item-Gained')
-      .contains('Top gaining')
-      .should('be.visible');
-    cy.getByTestId('sort-item-Lost')
-      .contains('Top losing')
-      .should('be.visible');
-    cy.getByTestId('sort-item-New')
-      .contains('New markets')
-      .should('be.visible');
-  });
-
-  it('can filter by settlement asset', () => {
-    // 6001-MARK-028
-    cy.getByTestId('asset-trigger').click();
-    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
-    cy.getByTestId(list).find('a').should('have.length', 1);
-    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
-  });
 });
@@ -1,16 +1,16 @@
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
-import type { ProposalsListQuery } from '@vegaprotocol/proposals';
+import { checkSorting } from '@vegaprotocol/cypress';

 const rowSelector =
  '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
-const colMarketId = '[col-id="market"]';

 describe('markets proposed table', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Proposed markets"]').click();
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/#/markets/all');
+      cy.get('[data-testid="Proposed markets"]').click();
+    });
  });

  it('can see table headers', () => {
@@ -35,7 +35,10 @@ describe('markets proposed table', { tags: '@smoke' }, () => {

  it('renders markets correctly', () => {
    // 6001-MARK-049
-    cy.get(rowSelector).first().find(colMarketId).should('have.text', 'ETHUSD');
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="market"]')
+      .should('have.text', 'ETHUSD');

    //  6001-MARK-050
    cy.get(rowSelector)
@@ -116,7 +119,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      );
  });
  it('proposed markets tab should be sorted properly', () => {
-    // 6001-MARK-062
    cy.get('[data-testid="Proposed markets"]').click({ force: true });
    const marketColDefault = [
      'ETHUSD',
@@ -194,31 +196,4 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
    ];
    checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
  });
-
-  it('can drag and drop columns', () => {
-    // 6001-MARK-063
-    cy.get(colMarketId).realMouseDown().realMouseMove(700, 15).realMouseUp();
-    cy.get(colMarketId).should(($element) => {
-      const attributeValue = $element.attr('aria-colindex');
-      expect(attributeValue).not.to.equal('1');
-    });
-  });
-});
-
-describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    const proposal: ProposalsListQuery = {};
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'ProposalsList', proposal);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Proposed markets"]').click();
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-061
-    cy.getByTestId('tab-proposed-markets').should('contain.text', 'No markets');
-  });
 });
@@ -1,102 +0,0 @@
-const orderbookTab = 'Orderbook';
-const orderbookTable = 'tab-orderbook';
-const askPrice = 'price-9894585';
-const bidPrice = 'price-9889001';
-const askVolume = 'ask-vol-9894585';
-const bidVolume = 'bid-vol-9889001';
-const askCumulative = 'cumulative-vol-9894585';
-const bidCumulative = 'cumulative-vol-9889001';
-const midPrice = 'middle-mark-price-4612690000';
-const priceResolution = 'resolution';
-const dealTicketPrice = 'order-price';
-const resPrice = 'price-990';
-
-describe('order book', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.mockTradingPage();
-  });
-
-  it('show order book', () => {
-    // 6003-ORDB-001
-    // 6003-ORDB-002
-    cy.getByTestId(orderbookTab).click();
-    cy.getByTestId(orderbookTable).should('be.visible');
-    cy.getByTestId(orderbookTable).should('not.be.empty');
-  });
-
-  it('show orders prices', () => {
-    // 6003-ORDB-003
-    cy.getByTestId(askPrice).should('have.text', '98.94585');
-    cy.getByTestId(bidPrice).should('have.text', '98.89001');
-  });
-
-  it('show prices volumes', () => {
-    // 6003-ORDB-004
-    cy.getByTestId(askVolume).should('have.text', '1');
-    cy.getByTestId(bidVolume).should('have.text', '1');
-  });
-
-  it('show prices cumulative volumes', () => {
-    // 6003-ORDB-005
-    cy.getByTestId(askCumulative).should('have.text', '39');
-    cy.getByTestId(bidCumulative).should('have.text', '7');
-  });
-
-  it('show mid price', () => {
-    // 6003-ORDB-006
-    cy.getByTestId(midPrice).should('have.text', '46,126.90');
-  });
-
-  it('sort prices descending', () => {
-    // 6003-ORDB-007
-    const prices: number[] = [];
-    cy.getByTestId(orderbookTable).within(() => {
-      cy.get('[data-testid*=price]')
-        .each(($el) => {
-          prices.push(Number($el.text()));
-        })
-        .then(() => {
-          expect(prices).to.deep.equal(prices.sort((a, b) => b - a));
-        });
-    });
-  });
-
-  it('copy price to deal ticket form', () => {
-    // 6003-ORDB-009
-    cy.getByTestId(askPrice).click();
-    cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
-  });
-
-  it('change price resolution', () => {
-    // 6003-ORDB-008
-    const resolutions = [
-      '0.00000',
-      '0.0000',
-      '0.000',
-      '0.00',
-      '0.0',
-      '0',
-      '10',
-      '100',
-      '1,000',
-      '10,000',
-    ];
-    cy.getByTestId(priceResolution)
-      .find('option')
-      .each(($el, index) => {
-        expect($el.text()).to.equal(resolutions[index]);
-      });
-
-    cy.getByTestId(priceResolution).select('0.0');
-    cy.getByTestId(resPrice).should('have.text', '99.0');
-    cy.getByTestId(askPrice).should('not.exist');
-    cy.getByTestId(bidPrice).should('not.exist');
-  });
-});
@@ -20,7 +20,6 @@ describe('accounts', { tags: '@smoke' }, () => {
    // 7001-COLL-006
    // 7001-COLL-007
    // 1003-TRAN-001
-    // 7001-COLL-012

    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();
@@ -35,23 +34,28 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="used"]')
-      .should('have.text', '1.01' + '1.00%');
+      .should('have.text', '1.010.00%');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="available"]')
-      .should('have.text', '100.00');
+      .should('have.text', '100,000.00');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="total"]')
-      .should('have.text', '101.01');
+      .should('have.text', '100,001.01');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="accounts-actions"]')
      .should('have.text', '');

+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '100,001.01');
+
    cy.getByTestId('tab-accounts')
      .get('[col-id="accounts-actions"]')
      .find('[data-testid="dropdown-menu"]')
@@ -97,7 +101,7 @@ describe('accounts', { tags: '@smoke' }, () => {
      'Liquidity provision fee reward account balance',
      'Market proposer reward account balance',
    ];
-    cy.get('[col-id="asset.symbol"]').contains('tEURO').click();
+    cy.getByTestId('asset').contains('tEURO').click();
    cy.get('[data-testid$="_label"]').should('have.length', 16);
    cy.get('[data-testid$="_label"]').each((element, index) => {
      cy.wrap(element).should('have.text', titles[index]);
@@ -108,8 +112,8 @@ describe('accounts', { tags: '@smoke' }, () => {

  it('should open usage breakdown dialog when clicked on used', () => {
    // 7001-COLL-009
-    cy.get('[col-id="used"]').contains('1.01').click();
-    const headers = ['Market', 'Account type', 'Balance', 'Margin health'];
+    cy.getByTestId('breakdown').contains('1.01').click();
+    const headers = ['Market', 'Account type', 'Balance'];
    cy.getByTestId('usage-breakdown').within(($headers) => {
      cy.wrap($headers)
        .get('.ag-header-cell-text')
@@ -129,12 +133,11 @@ describe('accounts', { tags: '@smoke' }, () => {
        });
      }
    });
-    // 7001-COLL-010
    it('sorting by asset', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];
      const marketsSortedAsc = ['tBTC', 'tBTC', 'tDAI', 'tEURO'];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
+      const marketsSortedDesc = ['tEURO', 'tDAI', 'tBTC', 'tBTC'];
      checkSorting(
        'asset.symbol',
        marketsSortedDefault,
@@ -146,14 +149,23 @@ describe('accounts', { tags: '@smoke' }, () => {
    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00',
+        '1,000.00002',
        '1,000.01',
        '1,000.00',
+        '1,000.00001',
+      ];
+      const marketsSortedAsc = [
+        '1,000.00',
+        '1,000.00001',
+        '1,000.00002',
+        '1,000.01',
+      ];
+      const marketsSortedDesc = [
+        '1,000.01',
+        '1,000.00002',
+        '1,000.00001',
        '1,000.00',
      ];
-      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-
      checkSorting(
        'total',
        marketsSortedDefault,
@@ -164,22 +176,24 @@ describe('accounts', { tags: '@smoke' }, () => {

    it('sorting by used', () => {
      cy.getByTestId('Collateral').click();
-      // concat actual value with percentage value
-      // as cypress will pick up the entire cell contes
-      // textContent
      const marketsSortedDefault = [
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
+        '0.000.00%',
+        '0.010.00%',
+        '0.000.00%',
+        '0.000.00%',
      ];
      const marketsSortedAsc = [
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.010.00%',
+      ];
+      const marketsSortedDesc = [
+        '0.010.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.000.00%',
      ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
      checkSorting(
        'used',
        marketsSortedDefault,
@@ -191,13 +205,23 @@ describe('accounts', { tags: '@smoke' }, () => {
    it('sorting by total', () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
-        '1,000.00',
+        '1,000.00002',
        '1,000.01',
        '1,000.00',
+        '1,000.00001',
+      ];
+      const marketsSortedAsc = [
+        '1,000.00',
+        '1,000.00001',
+        '1,000.00002',
+        '1,000.01',
+      ];
+      const marketsSortedDesc = [
+        '1,000.01',
+        '1,000.00002',
+        '1,000.00001',
        '1,000.00',
      ];
-      const marketsSortedAsc = ['1,000.00', '1,000.00', '1,000.00', '1,000.01'];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();

      checkSorting(
        'total',
@@ -81,7 +81,7 @@ describe(
          cy.visit('/#/markets/market-0');
        });
        it('must display that market is not accepting orders', function () {
-          cy.getByTestId('deal-ticket-error-message-summary').should(
+          cy.getByTestId('dealticket-error-message-summary').should(
            'have.text',
            `This market is ${marketState
              .split('_')
@@ -45,7 +45,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

      cy.getByTestId(placeOrderBtn).click();

-      cy.getByTestId('deal-ticket-error-message-expiry').should(
+      cy.getByTestId('dealticket-error-message-expiry').should(
        'have.text',
        'The expiry date that you have entered appears to be in the past'
      );
@@ -57,7 +57,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
      cy.getByTestId(orderSizeField).clear().type('1');
      cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId('deal-ticket-error-message-price-limit').should(
+      cy.getByTestId('dealticket-error-message-price-limit').should(
        'have.text',
        'Price accepts up to 5 decimal places'
      );
@@ -79,7 +79,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
      cy.getByTestId(orderSizeField).clear().type('1.234');
      // 7002-SORD-060
      cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size-market').should(
+      cy.getByTestId('dealticket-error-message-size-market').should(
        'have.text',
        'Size must be whole numbers for this market'
      );
@@ -88,7 +88,7 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
    it('must warn if order size is set to 0', function () {
      cy.getByTestId(orderSizeField).clear().type('0');
      cy.getByTestId(placeOrderBtn).should('be.enabled');
-      cy.getByTestId('deal-ticket-error-message-size-market').should(
+      cy.getByTestId('dealticket-error-message-size-market').should(
        'have.text',
        'Size cannot be lower than 1'
      );
@@ -96,29 +96,15 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {

    it('must have total margin available', () => {
      // 7001-COLL-011
-      cy.getByTestId('deal-ticket-fee-total-margin-available').within(() => {
-        cy.get('[data-state="closed"]').should(
-          'have.text',
-          'Total margin available100.01 tDAI'
-        );
-      });
-    });
-
-    it('must have current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('[data-state="closed"]:first').should(
-          'have.text',
-          'Current margin allocation'
-        );
-      });
-    });
-
-    it('should open usage breakdown dialog when clicked on current margin allocation', () => {
-      cy.getByTestId('deal-ticket-fee-current-margin-allocation').within(() => {
-        cy.get('button').click();
-      });
-      cy.getByTestId('usage-breakdown').should('exist');
-      cy.getByTestId('dialog-close').click();
+      cy.getByTestId('tab-ticket')
+        .find('.text-xs')
+        .eq(5)
+        .within(() => {
+          cy.get('[data-state="closed"]').should(
+            'have.text',
+            'Total margin available100,000.01 tDAI'
+          );
+        });
    });
  });
 });
@@ -1,10 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import {
-  accountsQuery,
-  amendGeneralAccountBalance,
-  amendMarginAccountBalance,
-} from '@vegaprotocol/mock';
+import { accountsQuery, amendGeneralAccountBalance } from '@vegaprotocol/mock';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
 import { createOrder } from '../support/create-order';

@@ -16,9 +12,8 @@ describe(
      beforeEach(() => {
        cy.setVegaWallet();
        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '0');
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '0');
        cy.mockGQL((req) => {
          aliasGQLQuery(req, 'Accounts', accounts);
        });
@@ -28,15 +23,10 @@ describe(
      });

      it('should show an error if your balance is zero', () => {
-        const accounts = accountsQuery();
-        amendMarginAccountBalance(accounts, 'market-0', '0');
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'Accounts', accounts);
-        });
        // 7002-SORD-060
        cy.getByTestId('place-order').should('be.enabled');
        // 7002-SORD-003
-        cy.getByTestId('deal-ticket-error-message-zero-balance').should(
+        cy.getByTestId('dealticket-error-message-zero-balance').should(
          'have.text',
          'You need ' +
            'tDAI' +
@@ -50,9 +40,8 @@ describe(
      beforeEach(() => {
        cy.setVegaWallet();
        cy.mockTradingPage();
-        let accounts = accountsQuery();
-        accounts = amendMarginAccountBalance(accounts, 'market-0', '1000');
-        accounts = amendGeneralAccountBalance(accounts, 'market-0', '1');
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '1');
        cy.mockGQL((req) => {
          aliasGQLQuery(req, 'Accounts', accounts);
        });
@@ -65,11 +54,11 @@ describe(
        // 7002-SORD-003

        // warning should show immediately
-        cy.getByTestId('deal-ticket-warning-margin').should(
+        cy.getByTestId('dealticket-warning-margin').should(
          'contain.text',
          'You may not have enough margin available to open this position'
        );
-        cy.getByTestId('deal-ticket-warning-margin').should(
+        cy.getByTestId('dealticket-warning-margin').should(
          'contain.text',
          'You may not have enough margin available to open this position. 5.00 tDAI is currently required. You have only 0.01001 tDAI available.'
        );
@@ -37,7 +37,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    // 7002-SORD-060
    cy.getByTestId(placeOrderBtn).should('be.enabled');
    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId('deal-ticket-error-message-type').should(
+    cy.getByTestId('dealticket-error-message-type').should(
      'have.text',
      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
    );
@@ -48,7 +48,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
    cy.getByTestId(orderPriceField).clear().type('0.1');
    cy.getByTestId(orderSizeField).clear().type('1');
    cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('deal-ticket-warning-auction').should(
+    cy.getByTestId('dealticket-warning-auction').should(
      'have.text',
      'Any orders placed now will not trade until the auction ends'
    );
@@ -60,7 +60,7 @@ describe('suspended market validation', { tags: '@regression' }, () => {
      TIFlist.filter((item) => item.code === 'FOK')[0].value
    );
    cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('deal-ticket-error-message-tif').should(
+    cy.getByTestId('dealticket-error-message-tif').should(
      'have.text',
      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
    );
@@ -293,36 +293,43 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
 });
 function validatePositionsDisplayed(multiKey = false) {
  cy.getByTestId('tab-positions').should('be.visible');
-  cy.getByTestId('tab-positions')
-    .get('.ag-center-cols-container .ag-row')
-    .first()
-    .within(() => {
-      cy.get('[col-id="marketName"]')
-        .should('be.visible')
-        .invoke('text')
-        .should('not.be.empty');
+  cy.getByTestId('tab-positions').within(() => {
+    cy.get('[col-id="marketName"]')
+      .should('be.visible')
+      .each(($marketSymbol) => {
+        cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
+      });

-      cy.get('[col-id="openVolume"]').should('not.be.empty');
-
-      // includes average entry price, mark price, realised PNL & leverage
-      cy.getByTestId('flash-cell').should('not.be.empty');
-
-      if (!multiKey) {
-        cy.get('[col-id="currentLeverage"]').should('contain.text', '2,767.3');
-        cy.get('[col-id="marginAccountBalance"]') // margin allocated
-          .should('contain.text', '0.01');
+    cy.get('.ag-center-cols-container [col-id="openVolume"]').each(
+      ($openVolume) => {
+        cy.wrap($openVolume).invoke('text').should('not.be.empty');
      }
+    );

-      cy.get('[col-id="unrealisedPNL"]').should('not.be.empty');
-      cy.get('[col-id="notional"]').should('contain.text', '276,761.40348'); // Total tDAI position
-      cy.get('[col-id="realisedPNL"]').should('contain.text', '2.30'); // Total Realised PNL
-      cy.get('[col-id="unrealisedPNL"]').should('contain.text', '8.95'); // Total Unrealised PNL
+    // includes average entry price, mark price, realised PNL & leverage
+    cy.getByTestId('flash-cell').each(($prices) => {
+      cy.wrap($prices).invoke('text').should('not.be.empty');
    });

-  cy.get('.ag-header-row [col-id="notional"]')
-    .should('contain.text', 'Notional')
-    .realHover();
-  cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
+    if (!multiKey) {
+      cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
+      cy.get('[col-id="marginAccountBalance"]') // margin allocated
+        .should('contain.text', '0.01');
+    }
+
+    cy.get('[col-id="unrealisedPNL"]').each(($unrealisedPnl) => {
+      cy.wrap($unrealisedPnl).invoke('text').should('not.be.empty');
+    });
+
+    cy.get('[col-id="notional"]').should('contain.text', '276,761.40348'); // Total tDAI position
+    cy.get('[col-id="realisedPNL"]').should('contain.text', '2.30'); // Total Realised PNL
+    cy.get('[col-id="unrealisedPNL"]').should('contain.text', '8.95'); // Total Unrealised PNL
+
+    cy.get('.ag-header-row [col-id="notional"]')
+      .should('contain.text', 'Notional')
+      .realHover();
+    cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
+  });

  cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
 }
@@ -1,79 +1,32 @@
-const colHeader = '.ag-header-cell-text';
-const colIdPrice = '[col-id=price]';
-const colIdSize = '[col-id=size]';
-const colIdCreatedAt = '[col-id=createdAt]';
-const tradesTab = 'Trades';
-const tradesTable = 'tab-trades';
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.visit('/#/markets/market-0');
+});

 describe('trades', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-  });
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.getByTestId(tradesTab).click();
-  });
+  const colIdPrice = 'price';
+  const colIdSize = 'size';
+  const colIdCreatedAt = 'createdAt';

-  it('show trades', () => {
-    // 6005-THIS-001
-    // 6005-THIS-002
-    cy.getByTestId(tradesTab).should('be.visible');
-    cy.getByTestId(tradesTable).should('be.visible');
-    cy.getByTestId(tradesTable).should('not.be.empty');
-  });
+  it('renders trades', () => {
+    cy.getByTestId('Trades').click();
+    cy.getByTestId('tab-trades').should('be.visible');

-  it('show trades prices', () => {
-    // 6005-THIS-003
-    cy.get(`${colIdPrice} ${colHeader}`).first().should('have.text', 'Price');
-    cy.get(colIdPrice).each(($tradePrice) => {
+    cy.get(`[col-id=${colIdPrice}]`).each(($tradePrice) => {
      cy.wrap($tradePrice).invoke('text').should('not.be.empty');
    });
-  });
-
-  it('show trades sizes', () => {
-    // 6005-THIS-004
-    cy.get(`${colIdSize} ${colHeader}`).first().should('have.text', 'Size');
-    cy.get(colIdSize).each(($tradeSize) => {
+    cy.get(`[col-id=${colIdSize}]`).each(($tradeSize) => {
      cy.wrap($tradeSize).invoke('text').should('not.be.empty');
    });
-  });

-  it('show trades date and time', () => {
-    // 6005-THIS-005
-    cy.get(`${colIdCreatedAt} ${colHeader}`).should('have.text', 'Created at');
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
-    cy.get(colIdCreatedAt).each(($tradeDateTime, index) => {
+    cy.get(`[col-id=${colIdCreatedAt}]`).each(($tradeDateTime, index) => {
      if (index != 0) {
        //ignore header
        cy.wrap($tradeDateTime).invoke('text').should('match', dateTimeRegex);
      }
    });
  });
-
-  it('trades are sorted descending by datetime', () => {
-    // 6005-THIS-006
-    const dateTimes: Date[] = [];
-    cy.get(colIdCreatedAt)
-      .each(($tradeDateTime, index) => {
-        if (index != 0) {
-          //ignore header
-          dateTimes.push(new Date($tradeDateTime.text()));
-        }
-      })
-      .then(() => {
-        expect(dateTimes).to.deep.equal(
-          dateTimes.sort((a, b) => b.getTime() - a.getTime())
-        );
-      });
-  });
-
-  it('copy price to deal ticket form', () => {
-    // 6005-THIS-007
-    cy.get(colIdPrice).last().click();
-    cy.getByTestId('order-price').should('have.value', '171.16898');
-  });
 });
@@ -151,11 +151,7 @@ export const MarketSelector = ({
      </div>
      <div className="px-4 py-2">
        <span className="inline-block border-b border-black dark:border-white">
-          <Link
-            to={'/markets/all'}
-            data-testid="all-markets-link"
-            className="flex items-center gap-x-2"
-          >
+          <Link to={'/markets/all'} className="flex items-center gap-x-2">
            {t('All markets')}
            <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
          </Link>
@@ -143,7 +143,7 @@ const MarketBottomPanel = memo(
                <VegaWalletContainer>
                  <TradingViews.collateral.component
                    pinnedAsset={pinnedAsset}
-                    onMarketClick={onMarketClick}
+                    noBottomPlaceholder
                    hideButtons
                    storeKey="marketCollateral"
                  />
@@ -224,7 +224,6 @@ const MarketBottomPanel = memo(
            <VegaWalletContainer>
              <TradingViews.collateral.component
                pinnedAsset={pinnedAsset}
-                onMarketClick={onMarketClick}
                hideButtons
                storeKey="marketCollateral"
              />
@@ -250,7 +249,6 @@ const MainGrid = memo(
    const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
      id: 'middle-1',
    });
-    const onMarketClick = useMarketClickHandler(true);

    return (
      <ResizableGrid vertical onChange={handleOnLayoutChange}>
@@ -269,7 +267,6 @@ const MainGrid = memo(
                  <Tab id="ticket" name={t('Ticket')}>
                    <TradingViews.ticket.component
                      marketId={marketId}
-                      onMarketClick={onMarketClick}
                      onClickCollateral={() => navigate('/portfolio')}
                    />
                  </Tab>
@@ -22,7 +22,7 @@ export const DepositsContainer = () => {
    <div className="h-full">
      <div className="h-full relative">
        <DepositsTable
-          rowData={data}
+          rowData={data || []}
          ref={gridRef}
          {...bottomPlaceholderProps}
          overlayNoRowsTemplate={error ? error.message : t('No deposits')}
@@ -92,10 +92,7 @@ export const Portfolio = () => {
            <Tabs storageKey="console-portfolio-bottom">
              <Tab id="collateral" name={t('Collateral')}>
                <VegaWalletContainer>
-                  <AccountsContainer
-                    storeKey="portfolioCollateral"
-                    onMarketClick={onMarketClick}
-                  />
+                  <AccountsContainer storeKey="portfolioCollateral" />
                </VegaWalletContainer>
              </Tab>
              <Tab id="deposits" name={t('Deposits')}>
@@ -12,13 +12,13 @@ import { useDepositDialog } from '@vegaprotocol/deposits';
 export const AccountsContainer = ({
  pinnedAsset,
  hideButtons,
+  noBottomPlaceholder,
  storeKey,
-  onMarketClick,
 }: {
  pinnedAsset?: PinnedAsset;
  hideButtons?: boolean;
+  noBottomPlaceholder?: boolean;
  storeKey?: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -48,9 +48,9 @@ export const AccountsContainer = ({
        onClickAsset={onClickAsset}
        onClickWithdraw={openWithdrawalDialog}
        onClickDeposit={openDepositDialog}
-        onMarketClick={onMarketClick}
        isReadOnly={isReadOnly}
        pinnedAsset={pinnedAsset}
+        noBottomPlaceholder={noBottomPlaceholder}
        storeKey={storeKey}
      />
      {!isReadOnly && !hideButtons && (
@@ -49,9 +49,6 @@ export const AppLoader = ({ children }: { children: ReactNode }) => {

 const cacheConfig: InMemoryCacheConfig = {
  typePolicies: {
-    Statistics: {
-      merge: true,
-    },
    Account: {
      keyFields: false,
      fields: {
@@ -83,6 +80,12 @@ const cacheConfig: InMemoryCacheConfig = {
    ERC20: {
      keyFields: ['contractAddress'],
    },
+    PositionUpdate: {
+      keyFields: false,
+    },
+    AccountUpdate: {
+      keyFields: false,
+    },
    Party: {
      keyFields: false,
    },
@@ -92,16 +95,8 @@ const cacheConfig: InMemoryCacheConfig = {
    Fees: {
      keyFields: false,
    },
-    // The folling types are cached by the data provider and not by apollo
-    PositionUpdate: {
-      keyFields: false,
-    },
-    TradeUpdate: {
-      keyFields: false,
-    },
-    AccountUpdate: {
-      keyFields: false,
-    },
+    // Don't cache order update as this subscription result gets merged into the main order cache
+    // We don't need to write these to the cache at all
    OrderUpdate: {
      keyFields: false,
    },
@@ -1,38 +0,0 @@
-fragment MarginFields on MarginLevels {
-  maintenanceLevel
-  searchLevel
-  initialLevel
-  collateralReleaseLevel
-  asset {
-    id
-  }
-  market {
-    id
-  }
-}
-
-query Margins($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    marginsConnection {
-      edges {
-        node {
-          ...MarginFields
-        }
-      }
-    }
-  }
-}
-
-subscription MarginsSubscription($partyId: ID!) {
-  margins(partyId: $partyId) {
-    marketId
-    asset
-    partyId
-    maintenanceLevel
-    searchLevel
-    initialLevel
-    collateralReleaseLevel
-    timestamp
-  }
-}
@@ -1,114 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type MarginFieldsFragment = { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } };
-
-export type MarginsQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type MarginsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
-
-export type MarginsSubscriptionSubscriptionVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type MarginsSubscriptionSubscription = { __typename?: 'Subscription', margins: { __typename?: 'MarginLevelsUpdate', marketId: string, asset: string, partyId: string, maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, timestamp: any } };
-
-export const MarginFieldsFragmentDoc = gql`
-    fragment MarginFields on MarginLevels {
-  maintenanceLevel
-  searchLevel
-  initialLevel
-  collateralReleaseLevel
-  asset {
-    id
-  }
-  market {
-    id
-  }
-}
-    `;
-export const MarginsDocument = gql`
-    query Margins($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    marginsConnection {
-      edges {
-        node {
-          ...MarginFields
-        }
-      }
-    }
-  }
-}
-    ${MarginFieldsFragmentDoc}`;
-
-/**
- * __useMarginsQuery__
- *
- * To run a query within a React component, call `useMarginsQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarginsQuery` 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 } = useMarginsQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useMarginsQuery(baseOptions: Apollo.QueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
-      }
-export function useMarginsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
-        }
-export type MarginsQueryHookResult = ReturnType<typeof useMarginsQuery>;
-export type MarginsLazyQueryHookResult = ReturnType<typeof useMarginsLazyQuery>;
-export type MarginsQueryResult = Apollo.QueryResult<MarginsQuery, MarginsQueryVariables>;
-export const MarginsSubscriptionDocument = gql`
-    subscription MarginsSubscription($partyId: ID!) {
-  margins(partyId: $partyId) {
-    marketId
-    asset
-    partyId
-    maintenanceLevel
-    searchLevel
-    initialLevel
-    collateralReleaseLevel
-    timestamp
-  }
-}
-    `;
-
-/**
- * __useMarginsSubscriptionSubscription__
- *
- * To run a query within a React component, call `useMarginsSubscriptionSubscription` and pass it any options that fit your needs.
- * When your component renders, `useMarginsSubscriptionSubscription` 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 } = useMarginsSubscriptionSubscription({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useMarginsSubscriptionSubscription(baseOptions: Apollo.SubscriptionHookOptions<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useSubscription<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>(MarginsSubscriptionDocument, options);
-      }
-export type MarginsSubscriptionSubscriptionHookResult = ReturnType<typeof useMarginsSubscriptionSubscription>;
-export type MarginsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<MarginsSubscriptionSubscription>;
@@ -94,7 +94,6 @@ export const accountsOnlyDataProvider = makeDataProvider<
  update,
  getData,
  getDelta,
-  fetchPolicy: 'no-cache',
 });

 export interface AccountFields extends Account {
@@ -1,39 +1,31 @@
-import { useRef, memo, useState, useCallback } from 'react';
+import { useRef, memo, useCallback, useState } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import { useBottomPlaceholder } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { AgGridReact } from 'ag-grid-react';
+import type { AccountFields } from './accounts-data-provider';
 import {
  aggregatedAccountsDataProvider,
  aggregatedAccountDataProvider,
 } from './accounts-data-provider';
 import type { PinnedAsset } from './accounts-table';
 import { AccountTable } from './accounts-table';
+import isEqual from 'lodash/isEqual';
 import { Dialog } from '@vegaprotocol/ui-toolkit';
 import BreakdownTable from './breakdown-table';

 const AccountBreakdown = ({
  assetId,
  partyId,
-  onMarketClick,
 }: {
  assetId: string;
  partyId: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
-  const gridRef = useRef<AgGridReact>(null);
  const { data } = useDataProvider({
    dataProvider: aggregatedAccountDataProvider,
    variables: { partyId, assetId },
-    update: ({ data }) => {
-      if (gridRef.current?.api && data?.breakdown) {
-        gridRef.current?.api.setRowData(data?.breakdown);
-        return true;
-      }
-      return false;
-    },
  });
-
  return (
    <div
      className="h-[35vh] w-full m-auto flex flex-col"
@@ -50,59 +42,19 @@ const AccountBreakdown = ({
          ])}
        </p>
      )}
-      <BreakdownTable
-        ref={gridRef}
-        data={data?.breakdown || null}
-        domLayout="autoHeight"
-        onMarketClick={onMarketClick}
-      />
+      <BreakdownTable data={data?.breakdown || null} domLayout="autoHeight" />
    </div>
  );
 };

-export const AccountBreakdownDialog = memo(
-  ({
-    assetId,
-    partyId,
-    onClose,
-    onMarketClick,
-  }: {
-    assetId?: string;
-    partyId: string;
-    onClose: () => void;
-    onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  }) => {
-    console.log('render');
-    return (
-      <Dialog
-        size="medium"
-        open={Boolean(assetId)}
-        onChange={(isOpen) => {
-          if (!isOpen) {
-            onClose();
-          }
-        }}
-      >
-        {assetId && (
-          <AccountBreakdown
-            assetId={assetId}
-            partyId={partyId}
-            onMarketClick={onMarketClick}
-          />
-        )}
-      </Dialog>
-    );
-  }
-);
-
 interface AccountManagerProps {
  partyId: string;
  onClickAsset: (assetId: string) => void;
  onClickWithdraw?: (assetId?: string) => void;
  onClickDeposit?: (assetId?: string) => void;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  isReadOnly: boolean;
  pinnedAsset?: PinnedAsset;
+  noBottomPlaceholder?: boolean;
  storeKey?: string;
 }

@@ -113,26 +65,49 @@ export const AccountManager = ({
  partyId,
  isReadOnly,
  pinnedAsset,
+  noBottomPlaceholder,
  storeKey,
-  onMarketClick,
 }: AccountManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const [breakdownAssetId, setBreakdownAssetId] = useState<string>();
+  const update = useCallback(
+    ({ data }: { data: AccountFields[] | null }) => {
+      if (!data || !gridRef.current?.api) {
+        return false;
+      }
+      const pinnedAssetRowData =
+        pinnedAsset && data.find((d) => d.asset.id === pinnedAsset.id);

+      if (pinnedAssetRowData) {
+        const pinnedTopRow = gridRef.current.api.getPinnedTopRow(0);
+        if (
+          pinnedTopRow?.data?.balance === '0' &&
+          pinnedAssetRowData.balance !== '0'
+        ) {
+          return false;
+        }
+        if (!isEqual(pinnedTopRow?.data, pinnedAssetRowData)) {
+          gridRef.current.api.setPinnedTopRowData([pinnedAssetRowData]);
+        }
+      }
+      gridRef.current.api.setRowData(
+        pinnedAssetRowData
+          ? data?.filter((d) => d !== pinnedAssetRowData)
+          : data
+      );
+      return true;
+    },
+    [gridRef, pinnedAsset]
+  );
  const { data, error } = useDataProvider({
    dataProvider: aggregatedAccountsDataProvider,
    variables: { partyId },
+    update,
+  });
+  const bottomPlaceholderProps = useBottomPlaceholder({
+    gridRef,
+    disabled: noBottomPlaceholder,
  });
-
-  const onMarketClickInternal = useCallback(
-    (...args: Parameters<NonNullable<typeof onMarketClick>>) => {
-      setBreakdownAssetId(undefined);
-      if (onMarketClick) {
-        onMarketClick(...args);
-      }
-    },
-    [onMarketClick]
-  );

  return (
    <div className="relative h-full">
@@ -146,14 +121,22 @@ export const AccountManager = ({
        isReadOnly={isReadOnly}
        pinnedAsset={pinnedAsset}
        storeKey={storeKey}
+        {...bottomPlaceholderProps}
        overlayNoRowsTemplate={error ? error.message : t('No accounts')}
      />
-      <AccountBreakdownDialog
-        assetId={breakdownAssetId}
-        partyId={partyId}
-        onClose={useCallback(() => setBreakdownAssetId(undefined), [])}
-        onMarketClick={onMarketClick ? onMarketClickInternal : undefined}
-      />
+      <Dialog
+        size="medium"
+        open={Boolean(breakdownAssetId)}
+        onChange={(isOpen) => {
+          if (!isOpen) {
+            setBreakdownAssetId(undefined);
+          }
+        }}
+      >
+        {breakdownAssetId && (
+          <AccountBreakdown assetId={breakdownAssetId} partyId={partyId} />
+        )}
+      </Dialog>
    </div>
  );
 };
@@ -1,7 +1,6 @@
 import { forwardRef, useMemo, useCallback } from 'react';
 import {
  addDecimalsFormatNumber,
-  addDecimalsFormatNumberQuantum,
  isNumeric,
  toBigNum,
 } from '@vegaprotocol/utils';
@@ -11,15 +10,21 @@ import type {
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { COL_DEFS } from '@vegaprotocol/datagrid';
-import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import {
+  ButtonLink,
+  Button,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';

 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridColumn } from 'ag-grid-react';
 import type {
+  IDatasource,
  IGetRowsParams,
  RowNode,
  RowHeightParams,
-  ColDef,
 } from 'ag-grid-community';
 import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
@@ -30,16 +35,29 @@ import classNames from 'classnames';
 import { AccountsActionsDropdown } from './accounts-actions-dropdown';

 const colorClass = (percentageUsed: number, neutral = false) => {
-  return classNames('text-right', {
+  return classNames({
    'text-neutral-500 dark:text-neutral-400': percentageUsed < 75 && !neutral,
    'text-vega-orange': percentageUsed >= 75 && percentageUsed < 90,
    'text-vega-pink': percentageUsed >= 90,
  });
 };

-export const percentageValue = (part: string, total: string) => {
-  total = !total || total === '0' ? '1' : total;
-  return new BigNumber(part).dividedBy(total).multipliedBy(100).toNumber();
+export const percentageValue = (part?: string, total?: string) =>
+  new BigNumber(part || 0)
+    .dividedBy(total || 1)
+    .multipliedBy(100)
+    .toNumber();
+
+const formatWithAssetDecimals = (
+  data: AccountFields | undefined,
+  value: string | undefined
+) => {
+  return (
+    data &&
+    data.asset &&
+    isNumeric(value) &&
+    addDecimalsFormatNumber(value, data.asset.decimals)
+  );
 };

 export const accountValuesComparator = (
@@ -63,10 +81,15 @@ export interface GetRowsParams extends Omit<IGetRowsParams, 'successCallback'> {
  successCallback(rowsThisBlock: AccountFields[], lastRow?: number): void;
 }

+export interface Datasource extends IDatasource {
+  getRows(params: GetRowsParams): void;
+}
+
 export type PinnedAsset = Pick<Asset, 'symbol' | 'name' | 'id' | 'decimals'>;

 export interface AccountTableProps extends AgGridReactProps {
  rowData?: AccountFields[] | null;
+  datasource?: Datasource;
  onClickAsset: (assetId: string) => void;
  onClickWithdraw?: (assetId: string) => void;
  onClickDeposit?: (assetId: string) => void;
@@ -125,55 +148,83 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(

    const showDepositButton = pinnedAsset?.balance === '0';

-    const colDefs = useMemo(() => {
-      const defs: ColDef[] = [
-        {
-          headerName: t('Asset'),
-          field: 'asset.symbol',
-          headerTooltip: t(
+    return (
+      <AgGrid
+        {...props}
+        style={{ width: '100%', height: '100%' }}
+        overlayNoRowsTemplate={t('No accounts')}
+        getRowId={({
+          data,
+        }: {
+          data: AccountFields & { isLastPlaceholder?: boolean; id?: string };
+        }) => (data.isLastPlaceholder && data.id ? data.id : data.asset.id)}
+        ref={ref}
+        tooltipShowDelay={500}
+        rowData={rowData?.filter(
+          (data) => data.asset.id !== props.pinnedAsset?.id
+        )}
+        defaultColDef={{
+          resizable: true,
+          tooltipComponent: TooltipCellComponent,
+          sortable: true,
+          comparator: accountValuesComparator,
+        }}
+        getRowHeight={getPinnedAssetRowHeight}
+        pinnedTopRowData={pinnedAsset ? [pinnedAsset] : undefined}
+      >
+        <AgGridColumn
+          headerName={t('Asset')}
+          field="asset.symbol"
+          headerTooltip={t(
            'Asset is the collateral that is deposited into the Vega protocol.'
-          ),
-          cellClass: 'underline',
-          onCellClicked: ({ data }) => {
-            if (data) {
-              onClickAsset(data.asset.id);
-            }
-          },
-        },
-        {
-          headerName: t('Used'),
-          type: 'rightAligned',
-          field: 'used',
-          headerTooltip: t(
+          )}
+          cellRenderer={({
+            value,
+            data,
+          }: VegaICellRendererParams<AccountFields, 'asset.symbol'>) => {
+            return (
+              <ButtonLink
+                data-testid="asset"
+                onClick={() => {
+                  if (data) {
+                    onClickAsset(data.asset.id);
+                  }
+                }}
+              >
+                {value}
+              </ButtonLink>
+            );
+          }}
+        />
+        <AgGridColumn
+          headerName={t('Used')}
+          type="rightAligned"
+          field="used"
+          headerTooltip={t(
            'Currently allocated to a market as margin or bond. Check the breakdown for details.'
-          ),
-          tooltipValueGetter: ({ value, data }) => {
-            if (!value || !data) return null;
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          },
-          onCellClicked: ({ data }) => {
-            if (!data || !onClickBreakdown) return;
-            onClickBreakdown(data.asset.id);
-          },
-          cellRenderer: ({
+          )}
+          cellRenderer={({
            data,
            value,
          }: VegaICellRendererParams<AccountFields, 'used'>) => {
-            if (!value || !data) return '-';
+            if (!data) return null;
            const percentageUsed = percentageValue(value, data.total);
-            const valueFormatted = addDecimalsFormatNumberQuantum(
-              value,
-              data.asset.decimals,
-              data.asset.quantum
-            );
+            const valueFormatted = formatWithAssetDecimals(data, value);

            return data.breakdown ? (
              <>
-                <span className="underline">{valueFormatted}</span>
+                <ButtonLink
+                  data-testid="breakdown"
+                  onClick={() => {
+                    onClickBreakdown && onClickBreakdown(data.asset.id);
+                  }}
+                >
+                  <span>{valueFormatted}</span>
+                </ButtonLink>
                <span
                  className={classNames(
                    colorClass(percentageUsed),
-                    'ml-1 inline-block w-14'
+                    'ml-2 inline-block w-14'
                  )}
                >
                  {percentageUsed.toFixed(2)}%
@@ -181,77 +232,59 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
              </>
            ) : (
              <>
-                <span className="underline">{valueFormatted}</span>
-                <span className="ml-2 inline-block w-14 text-vega-light-200 dark:text-vega-dark-200">
-                  {t('0.00%')}'
+                <span>{valueFormatted}</span>
+                <span className="ml-2 inline-block w-14 text-neutral-500 dark:text-neutral-400">
+                  0.00%
                </span>
              </>
            );
-          },
-        },
-        {
-          headerName: t('Available'),
-          field: 'available',
-          type: 'rightAligned',
-          headerTooltip: t(
+          }}
+        />
+        <AgGridColumn
+          headerName={t('Available')}
+          field="available"
+          type="rightAligned"
+          headerTooltip={t(
            'Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.'
-          ),
-          tooltipValueGetter: ({ value, data }) => {
-            if (!value || !data) return null;
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          },
-          cellClass: ({ data }) => {
+          )}
+          cellRenderer={({
+            value,
+            data,
+          }: VegaICellRendererParams<AccountFields, 'available'>) => {
            const percentageUsed = percentageValue(data?.used, data?.total);
-            return colorClass(percentageUsed, true);
-          },
-          valueFormatter: ({
-            value,
-            data,
-          }: VegaValueFormatterParams<AccountFields, 'available'>) => {
-            if (!value || !data) return '-';
-            return addDecimalsFormatNumberQuantum(
-              value,
-              data.asset.decimals,
-              data.asset.quantum
-            );
-          },
-        },

-        {
-          headerName: t('Total'),
-          type: 'rightAligned',
-          field: 'total',
-          headerTooltip: t(
-            'The total amount of each asset on this key. Includes used and available collateral.'
-          ),
-          tooltipValueGetter: ({ value, data }) => {
-            if (!value || !data) return null;
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          },
-          valueFormatter: ({
-            data,
-            value,
-          }: VegaValueFormatterParams<AccountFields, 'total'>) => {
-            if (!data || !value) return '-';
-            return addDecimalsFormatNumberQuantum(
-              value,
-              data.asset.decimals,
-              data.asset.quantum
+            return (
+              <span className={colorClass(percentageUsed, true)}>
+                {formatWithAssetDecimals(data, value)}
+              </span>
            );
-          },
-        },
-        {
-          colId: 'accounts-actions',
-          field: 'asset.id',
-          ...COL_DEFS.actions,
-          minWidth: showDepositButton ? 130 : COL_DEFS.actions.minWidth,
-          maxWidth: showDepositButton ? 130 : COL_DEFS.actions.maxWidth,
-          cellRenderer: ({
+          }}
+        />
+        <AgGridColumn
+          headerName={t('Total')}
+          type="rightAligned"
+          field="total"
+          headerTooltip={t(
+            'The total amount of each asset on this key. Includes used and available collateral.'
+          )}
+          valueFormatter={({
+            data,
+          }: VegaValueFormatterParams<AccountFields, 'total'>) =>
+            formatWithAssetDecimals(data, data?.total)
+          }
+        />
+        <AgGridColumn
+          colId="accounts-actions"
+          field="asset.id"
+          {...COL_DEFS.actions}
+          minWidth={showDepositButton ? 130 : COL_DEFS.actions.minWidth}
+          maxWidth={showDepositButton ? 130 : COL_DEFS.actions.maxWidth}
+          cellRenderer={({
            value: assetId,
            node,
          }: VegaICellRendererParams<AccountFields, 'asset.id'>) => {
            if (!assetId) return null;
-            if (node.rowPinned && node.data?.total === '0') {
+            if (node.rowPinned && node.data?.balance === '0') {
              return (
                <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
                  <Button
@@ -286,42 +319,9 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                }}
              />
            );
-          },
-        },
-      ];
-      return defs;
-    }, [
-      onClickAsset,
-      onClickBreakdown,
-      onClickDeposit,
-      onClickWithdraw,
-      props.isReadOnly,
-      showDepositButton,
-    ]);
-
-    const data = rowData?.filter(
-      (data) => data.asset.id !== props.pinnedAsset?.id
-    );
-
-    return (
-      <AgGrid
-        {...props}
-        style={{ width: '100%', height: '100%' }}
-        overlayNoRowsTemplate={t('No accounts')}
-        getRowId={({ data }: { data: AccountFields }) => data.asset.id}
-        ref={ref}
-        tooltipShowDelay={500}
-        rowData={data}
-        defaultColDef={{
-          resizable: true,
-          tooltipComponent: TooltipCellComponent,
-          sortable: true,
-          comparator: accountValuesComparator,
-        }}
-        columnDefs={colDefs}
-        getRowHeight={getPinnedAssetRowHeight}
-        pinnedTopRowData={pinnedAsset ? [pinnedAsset] : undefined}
-      />
+          }}
+        />
+      </AgGrid>
    );
  }
 );
@@ -35,7 +35,6 @@ export const accountFields: AccountFieldsFragment[] = [
    balance: '100000000',
    market: null,
    asset: {
-      // tEURO
      __typename: 'Asset',
      id: 'asset-id',
    },
@@ -45,7 +44,6 @@ export const accountFields: AccountFieldsFragment[] = [
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
    balance: '100000000',
    asset: {
-      // tDAI
      __typename: 'Asset',
      id: 'asset-id-2',
    },
@@ -59,7 +57,6 @@ export const accountFields: AccountFieldsFragment[] = [
      id: 'market-2',
    },
    asset: {
-      // tEURO
      __typename: 'Asset',
      id: 'asset-id',
    },
@@ -73,7 +70,6 @@ export const accountFields: AccountFieldsFragment[] = [
      id: 'market-0',
    },
    asset: {
-      // AST0
      __typename: 'Asset',
      id: 'asset-0',
    },
@@ -87,7 +83,6 @@ export const accountFields: AccountFieldsFragment[] = [
      id: 'market-3',
    },
    asset: {
-      // AST0
      __typename: 'Asset',
      id: 'asset-0',
    },
@@ -95,10 +90,9 @@ export const accountFields: AccountFieldsFragment[] = [
  {
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '10000000',
+    balance: '10000000000',
    market: null,
    asset: {
-      // AST0
      __typename: 'Asset',
      id: 'asset-0',
    },
@@ -110,7 +104,6 @@ export const accountFields: AccountFieldsFragment[] = [
    balance: '100000001',
    market: null,
    asset: {
-      // tBTC (sepolia)
      __typename: 'Asset',
      id: 'cee709223217281d7893b650850ae8ee8a18b7539b5658f9b4cc24de95dd18ad',
    },
@@ -121,7 +114,6 @@ export const accountFields: AccountFieldsFragment[] = [
    balance: '100000002',
    market: null,
    asset: {
-      // tBTC (test)
      __typename: 'Asset',
      id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
    },
@@ -151,53 +143,19 @@ export const amendGeneralAccountBalance = (
  marketId: string,
  balance: string
 ) => {
-  if (!accounts.party?.accountsConnection?.edges) {
-    return accounts;
-  }
-  const marginAccount = accounts.party?.accountsConnection?.edges?.find(
-    (edge) => edge?.node.market?.id === marketId
-  );
-  if (marginAccount) {
-    const edges = accounts.party.accountsConnection.edges.map((edge) =>
-      edge?.node.asset.id === marginAccount.node.asset.id && !edge?.node.market
-        ? { ...edge, node: { ...edge.node, balance } }
-        : edge
+  if (accounts.party?.accountsConnection?.edges) {
+    const marginAccount = accounts.party.accountsConnection.edges.find(
+      (edge) => edge?.node.market?.id === marketId
    );
-    return {
-      ...accounts,
-      party: {
-        ...accounts.party,
-        accountsConnection: {
-          ...accounts.party.accountsConnection,
-          edges,
-        },
-      },
-    };
+    if (marginAccount) {
+      const generalAccount = accounts.party.accountsConnection.edges.find(
+        (edge) =>
+          edge?.node.asset.id === marginAccount.node.asset.id &&
+          !edge?.node.market
+      );
+      if (generalAccount) {
+        generalAccount.node.balance = balance;
+      }
+    }
  }
-  return accounts;
-};
-
-export const amendMarginAccountBalance = (
-  accounts: AccountsQuery,
-  marketId: string,
-  balance: string
-) => {
-  if (!accounts.party?.accountsConnection?.edges) {
-    return accounts;
-  }
-  const edges = accounts.party?.accountsConnection?.edges?.map((edge) =>
-    edge?.node.market?.id === marketId
-      ? { ...edge, node: { ...edge?.node, balance } }
-      : edge
-  );
-  return {
-    ...accounts,
-    party: {
-      ...accounts.party,
-      accountsConnection: {
-        ...accounts.party.accountsConnection,
-        edges,
-      },
-    },
-  };
 };
@@ -4,14 +4,6 @@ import * as Types from '@vegaprotocol/types';
 import type { AccountFields } from './accounts-data-provider';
 import { getAccountData } from './accounts-data-provider';

-const marginHealthChartTestId = 'margin-health-chart';
-
-jest.mock('./margin-health-chart', () => ({
-  MarginHealthChart: () => {
-    return <div data-testid={marginHealthChartTestId}></div>;
-  },
-}));
-
 const singleRow = {
  __typename: 'AccountBalance',
  type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
@@ -45,10 +37,10 @@ describe('BreakdownTable', () => {
      render(<BreakdownTable data={singleRowData} />);
    });
    const headers = await screen.findAllByRole('columnheader');
-    expect(headers).toHaveLength(4);
+    expect(headers).toHaveLength(3);
    expect(
      headers.map((h) => h.querySelector('[ref="eText"]')?.textContent?.trim())
-    ).toEqual(['Market', 'Account type', 'Balance', 'Margin health']);
+    ).toEqual(['Market', 'Account type', 'Balance']);
  });

  it('should apply correct formatting', async () => {
@@ -63,27 +55,9 @@ describe('BreakdownTable', () => {
      '1,256.00',
      '1,256.00',
    ];
-    cells.slice(0, -1).forEach((cell, i) => {
+    cells.forEach((cell, i) => {
      expect(cell).toHaveTextContent(expectedValues[i]);
    });
-    expect(screen.getByTestId(marginHealthChartTestId)).toBeInTheDocument();
-  });
-
-  it('displays margin health chart only for margin account', async () => {
-    await act(async () => {
-      render(
-        <BreakdownTable
-          data={[
-            {
-              ...singleRow,
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              market: null,
-            },
-          ]}
-        />
-      );
-    });
-    expect(screen.queryByTestId(marginHealthChartTestId)).toBeNull();
  });

  it('should get correct account data', () => {
@@ -1,38 +1,67 @@
-import { forwardRef, useMemo } from 'react';
-import {
-  addDecimalsFormatNumber,
-  addDecimalsFormatNumberQuantum,
-} from '@vegaprotocol/utils';
+import { forwardRef } from 'react';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { Intent, TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
+import { Intent } from '@vegaprotocol/ui-toolkit';
+import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
 import { AccountTypeMapping } from '@vegaprotocol/types';
 import type {
+  ValueProps,
  VegaValueFormatterParams,
-  VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
-import { ProgressBarCell } from '@vegaprotocol/datagrid';
+import { progressBarCellRendererSelector } from '@vegaprotocol/datagrid';
 import { AgGridLazy as AgGrid, PriceCell } from '@vegaprotocol/datagrid';
-import type { ColDef } from 'ag-grid-community';
+import type { ValueFormatterParams } from 'ag-grid-community';
 import { accountValuesComparator } from './accounts-table';
-import { MarginHealthChart } from './margin-health-chart';
-import { MarketNameCell } from '@vegaprotocol/datagrid';
-import { AccountType } from '@vegaprotocol/types';
+
+export const progressBarValueFormatter = ({
+  data,
+  node,
+}: ValueFormatterParams): ValueProps['valueFormatted'] | undefined => {
+  if (!data || node?.rowPinned) {
+    return undefined;
+  }
+  const min = BigInt(data.used);
+  const mid = BigInt(data.available);
+  const max = BigInt(data.total);
+  const range = max > min ? max : min;
+  return {
+    low: addDecimalsFormatNumber(min.toString(), data.asset.decimals),
+    high: addDecimalsFormatNumber(mid.toString(), data.asset.decimals),
+    value: range ? Number((min * BigInt(100)) / range) : 0,
+    intent: Intent.Warning,
+  };
+};

 interface BreakdownTableProps extends AgGridReactProps {
  data: AccountFields[] | null;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }

 const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
  ({ data }, ref) => {
-    const coldefs = useMemo(() => {
-      const defs: ColDef[] = [
-        {
-          headerName: t('Market'),
-          field: 'market.tradableInstrument.instrument.name',
-          valueFormatter: ({
+    return (
+      <AgGrid
+        style={{ width: '100%', height: '100%' }}
+        overlayNoRowsTemplate={t('Collateral not used')}
+        rowData={data}
+        getRowId={({ data }: { data: AccountFields }) =>
+          `${data.asset.id}-${data.type}-${data.market?.id}`
+        }
+        ref={ref}
+        rowHeight={34}
+        components={{ PriceCell }}
+        tooltipShowDelay={500}
+        defaultColDef={{
+          flex: 1,
+          resizable: true,
+          sortable: true,
+        }}
+      >
+        <AgGridColumn
+          headerName={t('Market')}
+          field="market.tradableInstrument.instrument.name"
+          valueFormatter={({
            value,
          }: VegaValueFormatterParams<
            AccountFields,
@@ -40,101 +69,32 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
          >) => {
            if (!value) return 'None';
            return value;
-          },
-          minWidth: 200,
-        },
-        {
-          headerName: t('Account type'),
-          field: 'type',
-          maxWidth: 300,
-          valueFormatter: ({
+          }}
+          minWidth={200}
+        />
+        <AgGridColumn
+          headerName={t('Account type')}
+          field="type"
+          maxWidth={300}
+          valueFormatter={({
            value,
-          }: VegaValueFormatterParams<AccountFields, 'type'>) => {
-            return value
+          }: VegaValueFormatterParams<AccountFields, 'type'>) =>
+            value
              ? AccountTypeMapping[value as keyof typeof AccountTypeMapping]
-              : '';
-          },
-        },
-        {
-          headerName: t('Balance'),
-          field: 'used',
-          flex: 2,
-          maxWidth: 500,
-          type: 'rightAligned',
-          tooltipComponent: TooltipCellComponent,
-          tooltipValueGetter: ({ value, data }) => {
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          },
-          cellRenderer: ({
-            data,
-            node,
-          }: VegaICellRendererParams<AccountFields, 'used'>) => {
-            if (!data || node?.rowPinned) {
-              return undefined;
-            }
-            const min = BigInt(data.used);
-            const mid = BigInt(data.available);
-            const max = BigInt(data.total);
-            const range = max > min ? max : min;
-            const formattedData = {
-              low: addDecimalsFormatNumberQuantum(
-                min.toString(),
-                data.asset.decimals,
-                data.asset.quantum
-              ),
-              high: addDecimalsFormatNumberQuantum(
-                mid.toString(),
-                data.asset.decimals,
-                data.asset.quantum
-              ),
-              value: range ? Number((min * BigInt(100)) / range) : 0,
-              intent: Intent.Warning,
-            };
-            return <ProgressBarCell valueFormatted={formattedData} />;
-          },
-          comparator: accountValuesComparator,
-        },
-        {
-          headerName: t('Margin health'),
-          field: 'market.id',
-          flex: 2,
-          maxWidth: 500,
-          sortable: false,
-          cellRenderer: ({
-            data,
-          }: VegaICellRendererParams<AccountFields, 'market.id'>) =>
-            data?.market?.id &&
-            data.type === AccountType['ACCOUNT_TYPE_MARGIN'] &&
-            data?.asset.id ? (
-              <MarginHealthChart
-                marketId={data.market.id}
-                assetId={data.asset.id}
-              />
-            ) : null,
-        },
-      ];
-      return defs;
-    }, []);
+              : ''
+          }
+        />

-    return (
-      <AgGrid
-        style={{ width: '100%', height: '100%' }}
-        overlayNoRowsTemplate={t('Collateral not used')}
-        rowData={data}
-        getRowId={({ data }: { data: AccountFields }) =>
-          `${data.asset.id}:${data.type}:${data.market?.id}`
-        }
-        ref={ref}
-        rowHeight={34}
-        components={{ PriceCell, MarketNameCell, ProgressBarCell }}
-        tooltipShowDelay={500}
-        defaultColDef={{
-          flex: 1,
-          resizable: true,
-          sortable: true,
-        }}
-        columnDefs={coldefs}
-      />
+        <AgGridColumn
+          headerName={t('Balance')}
+          field="used"
+          flex={2}
+          maxWidth={500}
+          cellRendererSelector={progressBarCellRendererSelector}
+          valueFormatter={progressBarValueFormatter}
+          comparator={accountValuesComparator}
+        />
+      </AgGrid>
    );
  }
 );
@@ -8,6 +8,3 @@ export * from './use-account-balance';
 export * from './get-settlement-account';
 export * from './use-market-account-balance';
 export * from './transfer-dialog';
-export * from './__generated__/Margins';
-export { MarginHealthChart } from './margin-health-chart';
-export * from './margin-data-provider';
@@ -1,242 +0,0 @@
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { Tooltip, ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketMarginDataProvider } from './margin-data-provider';
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { t } from '@vegaprotocol/i18n';
-import { useAccountBalance } from './use-account-balance';
-import { useMarketAccountBalance } from './use-market-account-balance';
-
-const MarginHealthChartTooltipRow = ({
-  label,
-  value,
-  decimals,
-  href,
-}: {
-  label: string;
-  value: string;
-  decimals: number;
-  href?: string;
-}) => (
-  <>
-    <div
-      className="float-left clear-left"
-      key="label"
-      data-testid="margin-health-tooltip-label"
-    >
-      {href ? (
-        <ExternalLink href={href} target="_blank">
-          {label}
-        </ExternalLink>
-      ) : (
-        label
-      )}
-    </div>
-    <div
-      className="float-right"
-      key="value"
-      data-testid="margin-health-tooltip-value"
-    >
-      {addDecimalsFormatNumber(value, decimals)}
-    </div>
-  </>
-);
-
-export const MarginHealthChartTooltip = ({
-  maintenanceLevel,
-  searchLevel,
-  initialLevel,
-  collateralReleaseLevel,
-  decimals,
-  marginAccountBalance,
-}: {
-  maintenanceLevel: string;
-  searchLevel: string;
-  initialLevel: string;
-  collateralReleaseLevel: string;
-  decimals: number;
-  marginAccountBalance?: string;
-}) => {
-  const tooltipContent = [
-    <MarginHealthChartTooltipRow
-      key={'maintenance'}
-      label={t('maintenance level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-maintenance"
-      value={maintenanceLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'search'}
-      label={t('search level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-searching-for-collateral"
-      value={searchLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'initial'}
-      label={t('initial level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-initial"
-      value={initialLevel}
-      decimals={decimals}
-    />,
-    <MarginHealthChartTooltipRow
-      key={'release'}
-      label={t('release level')}
-      href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-releasing-collateral"
-      value={collateralReleaseLevel}
-      decimals={decimals}
-    />,
-  ];
-
-  if (marginAccountBalance) {
-    const balance = (
-      <MarginHealthChartTooltipRow
-        key={'balance'}
-        label={t('balance')}
-        value={marginAccountBalance}
-        decimals={decimals}
-      />
-    );
-    if (BigInt(marginAccountBalance) < BigInt(searchLevel)) {
-      tooltipContent.splice(1, 0, balance);
-    } else if (BigInt(marginAccountBalance) < BigInt(initialLevel)) {
-      tooltipContent.splice(2, 0, balance);
-    } else if (BigInt(marginAccountBalance) < BigInt(collateralReleaseLevel)) {
-      tooltipContent.splice(3, 0, balance);
-    } else {
-      tooltipContent.push(balance);
-    }
-  }
-  return (
-    <div className="overflow-hidden" data-testid="margin-health-tooltip">
-      {tooltipContent}
-    </div>
-  );
-};
-
-export const MarginHealthChart = ({
-  marketId,
-  assetId,
-}: {
-  marketId: string;
-  assetId: string;
-}) => {
-  const { data: assetsMap } = useAssetsMapProvider();
-  const { pubKey: partyId } = useVegaWallet();
-  const { data } = useDataProvider({
-    dataProvider: marketMarginDataProvider,
-    variables: { marketId, partyId: partyId ?? '' },
-    skip: !partyId,
-  });
-  const { accountBalance: rawGeneralAccountBalance } =
-    useAccountBalance(assetId);
-  const { accountBalance: rawMarginAccountBalance } =
-    useMarketAccountBalance(marketId);
-  const asset = assetsMap && assetsMap[assetId];
-  if (!data || !asset) {
-    return null;
-  }
-  const { decimals } = asset;
-
-  const collateralReleaseLevel = Number(data.collateralReleaseLevel);
-  const initialLevel = Number(data.initialLevel);
-  const maintenanceLevel = Number(data.maintenanceLevel);
-  const searchLevel = Number(data.searchLevel);
-  const marginAccountBalance = Number(rawMarginAccountBalance);
-  const generalAccountBalance = Number(rawGeneralAccountBalance);
-  const max = Math.max(
-    marginAccountBalance + generalAccountBalance,
-    collateralReleaseLevel
-  );
-
-  const red = maintenanceLevel / max;
-  const orange = (searchLevel - maintenanceLevel) / max;
-  const yellow = ((searchLevel + initialLevel) / 2 - searchLevel) / max;
-  const green = (collateralReleaseLevel - initialLevel) / max + yellow;
-  const balanceMarker = marginAccountBalance / max;
-
-  const tooltip = (
-    <MarginHealthChartTooltip
-      maintenanceLevel={data.maintenanceLevel}
-      searchLevel={data.searchLevel}
-      initialLevel={data.initialLevel}
-      collateralReleaseLevel={data.collateralReleaseLevel}
-      marginAccountBalance={rawMarginAccountBalance}
-      decimals={decimals}
-    />
-  );
-
-  return (
-    <div data-testid="margin-health-chart">
-      {addDecimalsFormatNumber(
-        (BigInt(marginAccountBalance) - BigInt(maintenanceLevel)).toString(),
-        decimals
-      )}{' '}
-      {t('above')}{' '}
-      <ExternalLink href="https://docs.vega.xyz/testnet/concepts/trading-on-vega/positions-margin#margin-level-maintenance">
-        {t('maintenance level')}
-      </ExternalLink>
-      <Tooltip description={tooltip}>
-        <div
-          data-testid="margin-health-chart-track"
-          className="relative bg-vega-green-650"
-          style={{
-            height: '6px',
-            marginBottom: '1px',
-            display: 'flex',
-          }}
-        >
-          <div
-            data-testid="margin-health-chart-red"
-            className="bg-vega-pink-550"
-            style={{
-              height: '100%',
-              width: `${red * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-orange"
-            className="bg-vega-orange"
-            style={{
-              height: '100%',
-              width: `${orange * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-yellow"
-            className="bg-vega-yellow"
-            style={{
-              height: '100%',
-              width: `${yellow * 100}%`,
-            }}
-          ></div>
-          <div
-            data-testid="margin-health-chart-green"
-            className="bg-vega-green-600"
-            style={{
-              height: '100%',
-              width: `${green * 100}%`,
-            }}
-          ></div>
-          {balanceMarker > 0 && balanceMarker < 100 && (
-            <div
-              data-testid="margin-health-chart-balance"
-              className="absolute bg-vega-blue"
-              style={{
-                height: '8px',
-                width: '8px',
-                top: '-1px',
-                transform: 'translate(-4px, 0px)',
-                borderRadius: '50%',
-                border: '1px solid white',
-                backgroundColor: 'blue',
-                left: `${balanceMarker * 100}%`,
-              }}
-            ></div>
-          )}
-        </div>
-      </Tooltip>
-    </div>
-  );
-};
@@ -1,154 +0,0 @@
-import {
-  MarginHealthChart,
-  MarginHealthChartTooltip,
-} from './margin-health-chart';
-import { act, render, screen } from '@testing-library/react';
-import type { MarginFieldsFragment } from './__generated__/Margins';
-import type { AssetFieldsFragment } from '@vegaprotocol/assets';
-
-const asset: AssetFieldsFragment = {
-  id: 'assetId',
-  decimals: 2,
-} as AssetFieldsFragment;
-const margins: MarginFieldsFragment = {
-  asset: {
-    id: 'assetId',
-  },
-  collateralReleaseLevel: '1000',
-  initialLevel: '800',
-  searchLevel: '600',
-  maintenanceLevel: '400',
-  market: {
-    id: 'marketId',
-  },
-};
-
-const getMargins = jest.fn(() => margins);
-const getBalance = jest.fn(() => '0');
-
-jest.mock('./margin-data-provider', () => ({}));
-
-jest.mock('@vegaprotocol/assets', () => ({
-  useAssetsMapProvider: () => {
-    return {
-      data: {
-        assetId: asset,
-      },
-    };
-  },
-}));
-
-jest.mock('@vegaprotocol/wallet', () => ({
-  useVegaWallet: () => {
-    return {
-      pubKey: 'partyId',
-    };
-  },
-}));
-
-jest.mock('@vegaprotocol/data-provider', () => ({
-  useDataProvider: () => {
-    return {
-      data: getMargins(),
-    };
-  },
-}));
-
-jest.mock('./use-account-balance', () => ({
-  useAccountBalance: () => {
-    return {
-      accountBalance: getBalance(),
-    };
-  },
-}));
-
-jest.mock('./use-market-account-balance', () => ({
-  useMarketAccountBalance: () => {
-    return {
-      accountBalance: '700',
-    };
-  },
-}));
-
-describe('MarginHealthChart', () => {
-  it('should render correct values', async () => {
-    render(<MarginHealthChart marketId="marketId" assetId="assetId" />);
-    const chart = screen.getByTestId('margin-health-chart');
-    expect(chart).toHaveTextContent('3.00 above maintenance level');
-    const red = screen.getByTestId('margin-health-chart-red');
-    const orange = screen.getByTestId('margin-health-chart-orange');
-    const yellow = screen.getByTestId('margin-health-chart-yellow');
-    const green = screen.getByTestId('margin-health-chart-green');
-    const balance = screen.getByTestId('margin-health-chart-balance');
-    expect(parseInt(red.style.width)).toBe(40);
-    expect(parseInt(orange.style.width)).toBe(20);
-    expect(parseInt(yellow.style.width)).toBe(10);
-    expect(parseInt(green.style.width)).toBe(30);
-    expect(parseInt(balance.style.left)).toBe(70);
-  });
-
-  it('should use correct scale', async () => {
-    getBalance.mockReturnValueOnce('1300');
-    await act(async () => {
-      render(<MarginHealthChart marketId="marketId" assetId="assetId" />);
-    });
-    await screen.findByTestId('margin-health-chart');
-    const red = screen.getByTestId('margin-health-chart-red');
-    expect(parseInt(red.style.width)).toBe(20);
-  });
-});
-
-describe('MarginHealthChartTooltip', () => {
-  it('renders correct values and labels', async () => {
-    await act(async () => {
-      render(
-        <MarginHealthChartTooltip
-          {...margins}
-          decimals={asset.decimals}
-          marginAccountBalance="500"
-        />
-      );
-    });
-    const labels = await screen.findAllByTestId('margin-health-tooltip-label');
-    const expectedLabels = [
-      'maintenance level',
-      'balance',
-      'search level',
-      'initial level',
-      'release level',
-    ];
-    labels.forEach((value, i) => {
-      expect(value).toHaveTextContent(expectedLabels[i]);
-    });
-    const values = await screen.findAllByTestId('margin-health-tooltip-value');
-    const expectedValues = ['4.00', '5.00', '6.00', '8.00', '10.00'];
-    values.forEach((value, i) => {
-      expect(value).toHaveTextContent(expectedValues[i]);
-    });
-  });
-
-  it('renders balance in correct place', async () => {
-    const { rerender } = render(
-      <MarginHealthChartTooltip
-        {...margins}
-        decimals={asset.decimals}
-        marginAccountBalance="700"
-      />
-    );
-
-    let values = await screen.findAllByTestId('margin-health-tooltip-value');
-    expect(values[2]).toHaveTextContent('7.00');
-
-    rerender(
-      <MarginHealthChartTooltip
-        {...margins}
-        decimals={asset.decimals}
-        marginAccountBalance="900"
-      />
-    );
-
-    values = await screen.findAllByTestId('margin-health-tooltip-value');
-    expect(values.length).toBe(5);
-    expect(values[3]).toHaveTextContent('9.00');
-  });
-});
@@ -23,6 +23,7 @@ export const useAccountBalance = (assetId?: string) => {
    },
    [assetId]
  );
+
  useDataProvider({
    dataProvider: accountsDataProvider,
    variables,
@@ -22,6 +22,7 @@ export const useMarketAccountBalance = (marketId: string) => {
    },
    [marketId]
  );
+
  useDataProvider({
    dataProvider: accountsDataProvider,
    variables: { partyId: pubKey || '' },
@@ -26,7 +26,6 @@ export const AgGridThemed = ({
    enableCellTextSelection: true,
    overlayLoadingTemplate: t('Loading...'),
    overlayNoRowsTemplate: t('No data'),
-    suppressCellFocus: true,
  };

  const wrapperClasses = classNames('vega-ag-grid', {
@@ -1,5 +1,9 @@
 import type { Intent } from '@vegaprotocol/ui-toolkit';
 import { ProgressBar } from '@vegaprotocol/ui-toolkit';
+import type {
+  CellRendererSelectorResult,
+  ICellRendererParams,
+} from 'ag-grid-community';

 export interface ValueProps {
  valueFormatted?: {
@@ -15,7 +19,7 @@ export const EmptyCell = () => '';
 export const ProgressBarCell = ({ valueFormatted }: ValueProps) => {
  return valueFormatted ? (
    <>
-      <div className="text-right leading-tight font-mono">
+      <div className="flex justify-between leading-tight font-mono">
        <div>
          {valueFormatted.low} ({valueFormatted.value}%)
        </div>
@@ -28,3 +32,11 @@ export const ProgressBarCell = ({ valueFormatted }: ValueProps) => {
    </>
  ) : null;
 };
+
+export const progressBarCellRendererSelector = (
+  params: ICellRendererParams
+): CellRendererSelectorResult => {
+  return {
+    component: ProgressBarCell,
+  };
+};
@@ -1,4 +1,4 @@
-import type { MouseEvent, ReactNode } from 'react';
+import type { MouseEvent } from 'react';
 import { useCallback } from 'react';
 import get from 'lodash/get';

@@ -7,7 +7,6 @@ interface MarketNameCellProps {
  data?: { id?: string; marketId?: string; market?: { id: string } };
  idPath?: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  defaultValue?: ReactNode;
 }

 export const MarketNameCell = ({
@@ -27,13 +26,10 @@ export const MarketNameCell = ({
    },
    [id, onMarketClick]
  );
-  if (!value || !data) return null;
-  return onMarketClick ? (
+  if (!data) return null;
+  return (
    <button onClick={handleOnClick} tabIndex={0}>
      {value}
    </button>
-  ) : (
-    // eslint-disable-next-line react/jsx-no-useless-fragment
-    <>{value}</>
  );
 };
@@ -18,7 +18,7 @@ export const MarginWarning = ({ margin, balance, asset }: Props) => {
  return (
    <Notification
      intent={Intent.Warning}
-      testId="deal-ticket-warning-margin"
+      testId="dealticket-warning-margin"
      message={`You may not have enough margin available to open this position. ${addDecimalsFormatNumber(
        margin,
        asset.decimals
@@ -18,7 +18,7 @@ export const ZeroBalanceError = ({
  return (
    <Notification
      intent={Intent.Warning}
-      testId="deal-ticket-error-message-zero-balance"
+      testId="dealticket-error-message-zero-balance"
      message={
        <>
          {t(
@@ -7,13 +7,11 @@ import { DealTicket } from './deal-ticket';

 export interface DealTicketContainerProps {
  marketId: string;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  onClickCollateral?: () => void;
 }

 export const DealTicketContainer = ({
  marketId,
-  onMarketClick,
  onClickCollateral,
 }: DealTicketContainerProps) => {
  const {
@@ -49,7 +47,6 @@ export const DealTicketContainer = ({
          marketData={marketData}
          submit={(orderSubmission) => create({ orderSubmission })}
          onClickCollateral={onClickCollateral}
-          onMarketClick={onMarketClick}
        />
      ) : (
        <Splash>
@@ -1,70 +1,14 @@
-import { useCallback, useState } from 'react';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import classnames from 'classnames';
 import type { ReactNode } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import { FeesBreakdown } from '@vegaprotocol/markets';
-import { useVegaWallet } from '@vegaprotocol/wallet';
+import { getFeeDetailsValues } from '../../hooks/use-fee-deal-ticket-details';
+import type { FeeDetails } from '../../hooks/use-fee-deal-ticket-details';

-import type { Market } from '@vegaprotocol/markets';
-import type { EstimatePositionQuery } from '@vegaprotocol/positions';
-import type { EstimateFeesQuery } from '../../hooks/__generated__/EstimateOrder';
-import { AccountBreakdownDialog } from '@vegaprotocol/accounts';
-
-import {
-  addDecimalsFormatNumber,
-  isNumeric,
-  addDecimalsFormatNumberQuantum,
-} from '@vegaprotocol/utils';
-import { marketMarginDataProvider } from '@vegaprotocol/accounts';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-
-import {
-  NOTIONAL_SIZE_TOOLTIP_TEXT,
-  MARGIN_DIFF_TOOLTIP_TEXT,
-  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
-  TOTAL_MARGIN_AVAILABLE,
-  LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
-  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
-  MARGIN_ACCOUNT_TOOLTIP_TEXT,
-} from '../../constants';
-
-const emptyValue = '-';
-
-export const formatValue = (
-  value: string | number | null | undefined,
-  formatDecimals: number,
-  quantum?: string
-): string => {
-  if (!isNumeric(value)) return emptyValue;
-  if (!quantum) return addDecimalsFormatNumber(value, formatDecimals);
-  return addDecimalsFormatNumberQuantum(value, formatDecimals, quantum);
-};
-
-export const formatRange = (
-  min: string | number | null | undefined,
-  max: string | number | null | undefined,
-  formatDecimals: number,
-  quantum?: string
-) => {
-  const minFormatted = formatValue(min, formatDecimals, quantum);
-  const maxFormatted = formatValue(max, formatDecimals, quantum);
-  if (minFormatted !== maxFormatted) {
-    return `${minFormatted} - ${maxFormatted}`;
-  }
-  if (minFormatted !== emptyValue) {
-    return minFormatted;
-  }
-  return maxFormatted;
-};
-export interface DealTicketFeeDetailPros {
+export interface DealTicketFeeDetailProps {
  label: string;
-  value?: string | null | undefined;
-  symbol: string;
-  indent?: boolean | undefined;
-  labelDescription?: ReactNode;
-  formattedValue?: string;
-  onClick?: () => void;
+  value?: string | number | null;
+  labelDescription?: string | ReactNode;
+  symbol?: string;
 }

 export const DealTicketFeeDetail = ({
@@ -72,322 +16,51 @@ export const DealTicketFeeDetail = ({
  value,
  labelDescription,
  symbol,
-  indent,
-  onClick,
-  formattedValue,
-}: DealTicketFeeDetailPros) => {
-  const displayValue = `${formattedValue ?? '-'} ${symbol || ''}`;
-  const valueElement = onClick ? (
-    <button
-      onClick={onClick}
-      className="text-neutral-500 dark:text-neutral-300"
-    >
-      {displayValue}
-    </button>
-  ) : (
-    <div className="text-neutral-500 dark:text-neutral-300">{displayValue}</div>
-  );
-  return (
-    <div
-      data-testid={
-        'deal-ticket-fee-' + label.toLocaleLowerCase().replace(/\s/g, '-')
-      }
-      key={typeof label === 'string' ? label : 'value-dropdown'}
-      className={classnames(
-        'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
-        { 'ml-2': indent }
-      )}
-    >
+}: DealTicketFeeDetailProps) => (
+  <div className="text-xs mt-2 flex justify-between items-center gap-4 flex-wrap">
+    <div>
      <Tooltip description={labelDescription}>
        <div>{label}</div>
      </Tooltip>
-      <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
-        {valueElement}
-      </Tooltip>
    </div>
-  );
-};
-
-export interface DealTicketFeeDetailsProps {
-  generalAccountBalance?: string;
-  marginAccountBalance?: string;
-  market: Market;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
-  assetSymbol: string;
-  notionalSize: string | null;
-  feeEstimate: EstimateFeesQuery['estimateFees'] | undefined;
-  positionEstimate: EstimatePositionQuery['estimatePosition'];
-}
-
-export const DealTicketFeeDetails = ({
-  marginAccountBalance,
-  generalAccountBalance,
-  assetSymbol,
-  feeEstimate,
-  market,
-  onMarketClick,
-  notionalSize,
-  positionEstimate,
-}: DealTicketFeeDetailsProps) => {
-  const [breakdownDialog, setBreakdownDialog] = useState(false);
-  const { pubKey: partyId } = useVegaWallet();
-  const { data: currentMargins } = useDataProvider({
-    dataProvider: marketMarginDataProvider,
-    variables: { marketId: market.id, partyId: partyId || '' },
-    skip: !partyId,
-  });
-  const liquidationEstimate = positionEstimate?.liquidation;
-  const marginEstimate = positionEstimate?.margin;
-  const totalBalance =
-    BigInt(generalAccountBalance || '0') + BigInt(marginAccountBalance || '0');
-  const { settlementAsset: asset } =
-    market.tradableInstrument.instrument.product;
-  const { decimals: assetDecimals, quantum } = asset;
-  let marginRequiredBestCase: string | undefined = undefined;
-  let marginRequiredWorstCase: string | undefined = undefined;
-  if (marginEstimate) {
-    if (currentMargins) {
-      marginRequiredBestCase = (
-        BigInt(marginEstimate.bestCase.initialLevel) -
-        BigInt(currentMargins.initialLevel)
-      ).toString();
-      if (marginRequiredBestCase.startsWith('-')) {
-        marginRequiredBestCase = '0';
-      }
-      marginRequiredWorstCase = (
-        BigInt(marginEstimate.worstCase.initialLevel) -
-        BigInt(currentMargins.initialLevel)
-      ).toString();
-      if (marginRequiredWorstCase.startsWith('-')) {
-        marginRequiredWorstCase = '0';
-      }
-    } else {
-      marginRequiredBestCase = marginEstimate.bestCase.initialLevel;
-      marginRequiredWorstCase = marginEstimate.worstCase.initialLevel;
-    }
-  }
-
-  const totalMarginAvailable = (
-    currentMargins
-      ? totalBalance - BigInt(currentMargins.maintenanceLevel)
-      : totalBalance
-  ).toString();
-
-  let deductionFromCollateral = null;
-  let projectedMargin = null;
-  if (marginAccountBalance) {
-    const deductionFromCollateralBestCase =
-      BigInt(marginEstimate?.bestCase.initialLevel ?? 0) -
-      BigInt(marginAccountBalance);
-
-    const deductionFromCollateralWorstCase =
-      BigInt(marginEstimate?.worstCase.initialLevel ?? 0) -
-      BigInt(marginAccountBalance);
-
-    deductionFromCollateral = (
-      <DealTicketFeeDetail
-        indent
-        label={t('Deduction from collateral')}
-        value={formatRange(
-          deductionFromCollateralBestCase > 0
-            ? deductionFromCollateralBestCase.toString()
-            : '0',
-          deductionFromCollateralWorstCase > 0
-            ? deductionFromCollateralWorstCase.toString()
-            : '0',
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          deductionFromCollateralBestCase > 0
-            ? deductionFromCollateralBestCase.toString()
-            : '0',
-          deductionFromCollateralWorstCase > 0
-            ? deductionFromCollateralWorstCase.toString()
-            : '0',
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT(assetSymbol)}
-      />
-    );
-    projectedMargin = (
-      <DealTicketFeeDetail
-        label={t('Projected margin')}
-        value={formatRange(
-          marginEstimate?.bestCase.initialLevel,
-          marginEstimate?.worstCase.initialLevel,
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          marginEstimate?.bestCase.initialLevel,
-          marginEstimate?.worstCase.initialLevel,
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={EST_TOTAL_MARGIN_TOOLTIP_TEXT}
-      />
-    );
-  }
-
-  let liquidationPriceEstimate = emptyValue;
-  let liquidationPriceEstimateFormatted;
-
-  if (liquidationEstimate) {
-    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
-      liquidationEstimate.bestCase.including_buy_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateBestCaseIncludingSellOrders = BigInt(
-      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateBestCase =
-      liquidationEstimateBestCaseIncludingBuyOrders >
-      liquidationEstimateBestCaseIncludingSellOrders
-        ? liquidationEstimateBestCaseIncludingBuyOrders
-        : liquidationEstimateBestCaseIncludingSellOrders;
-
-    const liquidationEstimateWorstCaseIncludingBuyOrders = BigInt(
-      liquidationEstimate.worstCase.including_buy_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateWorstCaseIncludingSellOrders = BigInt(
-      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
-    );
-    const liquidationEstimateWorstCase =
-      liquidationEstimateWorstCaseIncludingBuyOrders >
-      liquidationEstimateWorstCaseIncludingSellOrders
-        ? liquidationEstimateWorstCaseIncludingBuyOrders
-        : liquidationEstimateWorstCaseIncludingSellOrders;
-    liquidationPriceEstimate = formatRange(
-      (liquidationEstimateBestCase < liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      (liquidationEstimateBestCase > liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      assetDecimals
-    );
-    liquidationPriceEstimateFormatted = formatRange(
-      (liquidationEstimateBestCase < liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      (liquidationEstimateBestCase > liquidationEstimateWorstCase
-        ? liquidationEstimateBestCase
-        : liquidationEstimateWorstCase
-      ).toString(),
-      assetDecimals,
-      quantum
-    );
-  }
-
-  const onAccountBreakdownDialogClose = useCallback(
-    () => setBreakdownDialog(false),
-    []
-  );
+    <div className="text-neutral-500 dark:text-neutral-300">{`${value ?? '-'} ${
+      symbol || ''
+    }`}</div>
+  </div>
+);

+export const DealTicketFeeDetails = (props: FeeDetails) => {
+  const details = getFeeDetailsValues(props);
  return (
    <div>
-      <DealTicketFeeDetail
-        label={t('Notional')}
-        value={formatValue(notionalSize, assetDecimals)}
-        formattedValue={formatValue(notionalSize, assetDecimals, quantum)}
-        symbol={assetSymbol}
-        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(assetSymbol)}
-      />
-      <DealTicketFeeDetail
-        label={t('Fees')}
-        value={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
-        }
-        formattedValue={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
-        }
-        labelDescription={
-          <>
-            <span>
-              {t(
-                `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
-              )}
-            </span>
-            <FeesBreakdown
-              fees={feeEstimate?.fees}
-              feeFactors={market.fees.factors}
-              symbol={assetSymbol}
-              decimals={assetDecimals}
-            />
-          </>
-        }
-        symbol={assetSymbol}
-      />
-      <DealTicketFeeDetail
-        label={t('Margin required')}
-        value={formatRange(
-          marginRequiredBestCase,
-          marginRequiredWorstCase,
-          assetDecimals
-        )}
-        formattedValue={formatRange(
-          marginRequiredBestCase,
-          marginRequiredWorstCase,
-          assetDecimals,
-          quantum
-        )}
-        labelDescription={MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol)}
-        symbol={assetSymbol}
-      />
-      <DealTicketFeeDetail
-        label={t('Total margin available')}
-        indent
-        value={formatValue(totalMarginAvailable, assetDecimals)}
-        formattedValue={formatValue(
-          totalMarginAvailable,
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-        labelDescription={TOTAL_MARGIN_AVAILABLE(
-          formatValue(generalAccountBalance, assetDecimals, quantum),
-          formatValue(marginAccountBalance, assetDecimals, quantum),
-          formatValue(currentMargins?.maintenanceLevel, assetDecimals, quantum),
-          assetSymbol
-        )}
-      />
-      {deductionFromCollateral}
-      <DealTicketFeeDetail
-        label={t('Current margin allocation')}
-        indent
-        onClick={
-          generalAccountBalance ? () => setBreakdownDialog(true) : undefined
-        }
-        value={formatValue(marginAccountBalance, assetDecimals)}
-        symbol={assetSymbol}
-        labelDescription={MARGIN_ACCOUNT_TOOLTIP_TEXT}
-        formattedValue={formatValue(
-          marginAccountBalance,
-          assetDecimals,
-          quantum
-        )}
-      />
-      {projectedMargin}
-      <DealTicketFeeDetail
-        label={t('Liquidation price estimate')}
-        value={liquidationPriceEstimate}
-        formattedValue={liquidationPriceEstimateFormatted}
-        symbol={assetSymbol}
-        labelDescription={LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT}
-      />
-      {partyId && (
-        <AccountBreakdownDialog
-          assetId={breakdownDialog ? asset.id : undefined}
-          partyId={partyId}
-          onMarketClick={onMarketClick}
-          onClose={onAccountBreakdownDialogClose}
-        />
+      {details.map(
+        ({
+          label,
+          value,
+          labelDescription,
+          symbol,
+          indent,
+          formattedValue,
+        }) => (
+          <div
+            key={typeof label === 'string' ? label : 'value-dropdown'}
+            className={classnames(
+              'text-xs mt-2 flex justify-between items-center gap-4 flex-wrap',
+              { 'ml-2': indent }
+            )}
+          >
+            <div>
+              <Tooltip description={labelDescription}>
+                <div>{label}</div>
+              </Tooltip>
+            </div>
+            <Tooltip description={`${value ?? '-'} ${symbol || ''}`}>
+              <div className="text-neutral-500 dark:text-neutral-300">{`${
+                formattedValue ?? '-'
+              } ${symbol || ''}`}</div>
+            </Tooltip>
+          </div>
+        )
      )}
    </div>
  );
@@ -25,7 +25,7 @@ export const DealTicketLimitAmount = ({
  const renderError = () => {
    if (sizeError) {
      return (
-        <InputError testId="deal-ticket-error-message-size-limit">
+        <InputError testId="dealticket-error-message-size-limit">
          {sizeError}
        </InputError>
      );
@@ -33,7 +33,7 @@ export const DealTicketLimitAmount = ({

    if (priceError) {
      return (
-        <InputError testId="deal-ticket-error-message-price-limit">
+        <InputError testId="dealticket-error-message-price-limit">
          {priceError}
        </InputError>
      );
@@ -90,7 +90,7 @@ export const DealTicketMarketAmount = ({
      {sizeError && (
        <InputError
          intent="danger"
-          testId="deal-ticket-error-message-size-market"
+          testId="dealticket-error-message-size-market"
        >
          {sizeError}
        </InputError>
@@ -31,7 +31,7 @@ import {
 } from '@vegaprotocol/positions';
 import { toBigNum, removeDecimal } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
-import { useEstimateFees } from '../../hooks/use-estimate-fees';
+import { useEstimateFees } from '../../hooks/use-fee-deal-ticket-details';
 import { getDerivedPrice } from '../../utils/get-price';
 import type { OrderInfo } from '@vegaprotocol/types';

@@ -55,17 +55,17 @@ import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';

+import { marketMarginDataProvider } from '@vegaprotocol/positions';
+
 export interface DealTicketProps {
  market: Market;
  marketData: MarketData;
-  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  submit: (order: OrderSubmission) => void;
  onClickCollateral?: () => void;
 }

 export const DealTicket = ({
  market,
-  onMarketClick,
  marketData,
  submit,
  onClickCollateral,
@@ -176,6 +176,12 @@ export const DealTicket = ({
  const assetSymbol =
    market.tradableInstrument.instrument.product.settlementAsset.symbol;

+  const { data: currentMargins } = useDataProvider({
+    dataProvider: marketMarginDataProvider,
+    variables: { marketId: market.id, partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+
  useEffect(() => {
    if (!pubKey) {
      setError('summary', {
@@ -194,8 +200,7 @@ export const DealTicket = ({
      return;
    }

-    const hasNoBalance =
-      !BigInt(generalAccountBalance) && !BigInt(marginAccountBalance);
+    const hasNoBalance = !BigInt(generalAccountBalance);
    if (hasNoBalance) {
      setError('summary', {
        message: SummaryValidationType.NoCollateral,
@@ -219,7 +224,6 @@ export const DealTicket = ({
    marketState,
    marketTradingMode,
    generalAccountBalance,
-    marginAccountBalance,
    pubKey,
    setError,
    clearErrors,
@@ -483,7 +487,6 @@ export const DealTicket = ({
          }
        />
        <DealTicketFeeDetails
-          onMarketClick={onMarketClick}
          feeEstimate={feeEstimate}
          notionalSize={notionalSize}
          assetSymbol={assetSymbol}
@@ -491,6 +494,8 @@ export const DealTicket = ({
          generalAccountBalance={generalAccountBalance}
          positionEstimate={positionEstimate?.estimatePosition}
          market={market}
+          currentInitialMargin={currentMargins?.initialLevel}
+          currentMaintenanceMargin={currentMargins?.maintenanceLevel}
        />
      </form>
    </TinyScroll>
@@ -531,7 +536,7 @@ const SummaryMessage = memo(
    if (isReadOnly) {
      return (
        <div className="mb-2">
-          <InputError testId="deal-ticket-error-message-summary">
+          <InputError testId="dealticket-error-message-summary">
            {
              'You need to connect your own wallet to start trading on this market'
            }
@@ -580,7 +585,7 @@ const SummaryMessage = memo(
    if (errorMessage) {
      return (
        <div className="mb-2">
-          <InputError testId="deal-ticket-error-message-summary">
+          <InputError testId="dealticket-error-message-summary">
            {errorMessage}
          </InputError>
        </div>
@@ -608,7 +613,7 @@ const SummaryMessage = memo(
        <div className="mb-2">
          <Notification
            intent={Intent.Warning}
-            testId={'deal-ticket-warning-auction'}
+            testId={'dealticket-warning-auction'}
            message={t(
              'Any orders placed now will not trade until the auction ends'
            )}
@@ -31,7 +31,7 @@ export const ExpirySelector = ({
        min={minDate}
      />
      {errorMessage && (
-        <InputError testId="deal-ticket-error-message-expiry">
+        <InputError testId="dealticket-error-message-expiry">
          {errorMessage}
        </InputError>
      )}
@@ -108,7 +108,7 @@ export const TimeInForceSelector = ({
        ))}
      </Select>
      {errorMessage && (
-        <InputError testId="deal-ticket-error-message-tif">
+        <InputError testId="dealticket-error-message-tif">
          {renderError(errorMessage)}
        </InputError>
      )}
@@ -83,7 +83,7 @@ export const TypeSelector = ({
        onChange={(e) => onSelect(e.target.value as Schema.OrderType)}
      />
      {errorMessage && (
-        <InputError testId="deal-ticket-error-message-type">
+        <InputError testId="dealticket-error-message-type">
          {renderError(errorMessage as MarketModeValidationType)}
        </InputError>
      )}
@@ -1,2 +1,2 @@
 export * from './__generated__/EstimateOrder';
-export * from './use-estimate-fees';
+export * from './use-fee-deal-ticket-details';
@@ -1,25 +0,0 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-
-import { useEstimateFeesQuery } from './__generated__/EstimateOrder';
-
-export const useEstimateFees = (
-  order?: OrderSubmissionBody['orderSubmission']
-) => {
-  const { pubKey } = useVegaWallet();
-
-  const { data } = useEstimateFeesQuery({
-    variables: order && {
-      marketId: order.marketId,
-      partyId: pubKey || '',
-      price: order.price,
-      size: order.size,
-      side: order.side,
-      timeInForce: order.timeInForce,
-      type: order.type,
-    },
-    fetchPolicy: 'no-cache',
-    skip: !pubKey || !order?.size || !order?.price,
-  });
-  return data?.estimateFees;
-};
@@ -1,6 +1,6 @@
-import { formatRange, formatValue } from './deal-ticket-fee-details';
+import { formatRange, formatValue } from './use-fee-deal-ticket-details';

-describe('formatRange, formatValue', () => {
+describe('useFeeDealTicketDetails', () => {
  it.each([
    { v: 123000, d: 5, o: '1.23' },
    { v: 123000, d: 3, o: '123.00' },
@@ -0,0 +1,327 @@
+import { FeesBreakdown } from '@vegaprotocol/markets';
+import {
+  addDecimalsFormatNumber,
+  addDecimalsFormatNumberQuantum,
+  isNumeric,
+} from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import type { Market } from '@vegaprotocol/markets';
+import type { EstimatePositionQuery } from '@vegaprotocol/positions';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
+import {
+  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
+  NOTIONAL_SIZE_TOOLTIP_TEXT,
+  MARGIN_ACCOUNT_TOOLTIP_TEXT,
+  MARGIN_DIFF_TOOLTIP_TEXT,
+  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
+  TOTAL_MARGIN_AVAILABLE,
+  LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
+} from '../constants';
+
+import { useEstimateFeesQuery } from './__generated__/EstimateOrder';
+import type { EstimateFeesQuery } from './__generated__/EstimateOrder';
+
+export const useEstimateFees = (
+  order?: OrderSubmissionBody['orderSubmission']
+) => {
+  const { pubKey } = useVegaWallet();
+
+  const { data } = useEstimateFeesQuery({
+    variables: order && {
+      marketId: order.marketId,
+      partyId: pubKey || '',
+      price: order.price,
+      size: order.size,
+      side: order.side,
+      timeInForce: order.timeInForce,
+      type: order.type,
+    },
+    skip: !pubKey || !order?.size || !order?.price,
+    fetchPolicy: 'no-cache',
+  });
+  return data?.estimateFees;
+};
+
+export interface FeeDetails {
+  generalAccountBalance?: string;
+  marginAccountBalance?: string;
+  market: Market;
+  assetSymbol: string;
+  notionalSize: string | null;
+  feeEstimate: EstimateFeesQuery['estimateFees'] | undefined;
+  currentInitialMargin?: string;
+  currentMaintenanceMargin?: string;
+  positionEstimate: EstimatePositionQuery['estimatePosition'];
+}
+
+const emptyValue = '-';
+
+export const formatValue = (
+  value: string | number | null | undefined,
+  formatDecimals: number,
+  quantum?: string
+): string => {
+  if (!isNumeric(value)) return emptyValue;
+  if (!quantum) return addDecimalsFormatNumber(value, formatDecimals);
+  return addDecimalsFormatNumberQuantum(value, formatDecimals, quantum);
+};
+
+export const formatRange = (
+  min: string | number | null | undefined,
+  max: string | number | null | undefined,
+  formatDecimals: number,
+  quantum?: string
+) => {
+  const minFormatted = formatValue(min, formatDecimals, quantum);
+  const maxFormatted = formatValue(max, formatDecimals, quantum);
+  if (minFormatted !== maxFormatted) {
+    return `${minFormatted} - ${maxFormatted}`;
+  }
+  if (minFormatted !== emptyValue) {
+    return minFormatted;
+  }
+  return maxFormatted;
+};
+
+export const getFeeDetailsValues = ({
+  marginAccountBalance,
+  generalAccountBalance,
+  assetSymbol,
+  feeEstimate,
+  market,
+  notionalSize,
+  currentInitialMargin,
+  currentMaintenanceMargin,
+  positionEstimate,
+}: FeeDetails) => {
+  const liquidationEstimate = positionEstimate?.liquidation;
+  const marginEstimate = positionEstimate?.margin;
+  const totalBalance =
+    BigInt(generalAccountBalance || '0') + BigInt(marginAccountBalance || '0');
+  const assetDecimals =
+    market.tradableInstrument.instrument.product.settlementAsset.decimals;
+  const quantum =
+    market.tradableInstrument.instrument.product.settlementAsset.quantum;
+  const details: {
+    label: string;
+    value?: string | null;
+    formattedValue?: string | null;
+    symbol: string;
+    indent?: boolean;
+    labelDescription?: React.ReactNode;
+  }[] = [
+    {
+      label: t('Notional'),
+      value: formatValue(notionalSize, assetDecimals),
+      formattedValue: formatValue(notionalSize, assetDecimals, quantum),
+      symbol: assetSymbol,
+      labelDescription: NOTIONAL_SIZE_TOOLTIP_TEXT(assetSymbol),
+    },
+    {
+      label: t('Fees'),
+      value:
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`,
+      formattedValue:
+        feeEstimate?.totalFeeAmount &&
+        `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`,
+      labelDescription: (
+        <>
+          <span>
+            {t(
+              `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
+            )}
+          </span>
+          <FeesBreakdown
+            fees={feeEstimate?.fees}
+            feeFactors={market.fees.factors}
+            symbol={assetSymbol}
+            decimals={assetDecimals}
+          />
+        </>
+      ),
+      symbol: assetSymbol,
+    },
+  ];
+  let marginRequiredBestCase: string | undefined = undefined;
+  let marginRequiredWorstCase: string | undefined = undefined;
+  if (marginEstimate) {
+    if (currentInitialMargin) {
+      marginRequiredBestCase = (
+        BigInt(marginEstimate.bestCase.initialLevel) -
+        BigInt(currentInitialMargin)
+      ).toString();
+      if (marginRequiredBestCase.startsWith('-')) {
+        marginRequiredBestCase = '0';
+      }
+      marginRequiredWorstCase = (
+        BigInt(marginEstimate.worstCase.initialLevel) -
+        BigInt(currentInitialMargin)
+      ).toString();
+      if (marginRequiredWorstCase.startsWith('-')) {
+        marginRequiredWorstCase = '0';
+      }
+    } else {
+      marginRequiredBestCase = marginEstimate.bestCase.initialLevel;
+      marginRequiredWorstCase = marginEstimate.worstCase.initialLevel;
+    }
+  }
+  details.push({
+    label: t('Margin required'),
+    formattedValue: formatRange(
+      marginRequiredBestCase,
+      marginRequiredWorstCase,
+      assetDecimals,
+      quantum
+    ),
+    value: formatRange(
+      marginRequiredBestCase,
+      marginRequiredWorstCase,
+      assetDecimals
+    ),
+    symbol: assetSymbol,
+    labelDescription: MARGIN_DIFF_TOOLTIP_TEXT(assetSymbol),
+  });
+
+  const totalMarginAvailable = (
+    currentMaintenanceMargin
+      ? totalBalance - BigInt(currentMaintenanceMargin)
+      : totalBalance
+  ).toString();
+
+  details.push({
+    indent: true,
+    label: t('Total margin available'),
+    formattedValue: formatValue(totalMarginAvailable, assetDecimals, quantum),
+    value: formatValue(totalMarginAvailable, assetDecimals),
+    symbol: assetSymbol,
+    labelDescription: TOTAL_MARGIN_AVAILABLE(
+      formatValue(generalAccountBalance, assetDecimals, quantum),
+      formatValue(marginAccountBalance, assetDecimals, quantum),
+      formatValue(currentMaintenanceMargin, assetDecimals, quantum),
+      assetSymbol
+    ),
+  });
+
+  if (marginAccountBalance) {
+    const deductionFromCollateralBestCase =
+      BigInt(marginEstimate?.bestCase.initialLevel ?? 0) -
+      BigInt(marginAccountBalance);
+
+    const deductionFromCollateralWorstCase =
+      BigInt(marginEstimate?.worstCase.initialLevel ?? 0) -
+      BigInt(marginAccountBalance);
+
+    details.push({
+      indent: true,
+      label: t('Deduction from collateral'),
+      value: formatRange(
+        deductionFromCollateralBestCase > 0
+          ? deductionFromCollateralBestCase.toString()
+          : '0',
+        deductionFromCollateralWorstCase > 0
+          ? deductionFromCollateralWorstCase.toString()
+          : '0',
+        assetDecimals
+      ),
+      formattedValue: formatRange(
+        deductionFromCollateralBestCase > 0
+          ? deductionFromCollateralBestCase.toString()
+          : '0',
+        deductionFromCollateralWorstCase > 0
+          ? deductionFromCollateralWorstCase.toString()
+          : '0',
+        assetDecimals,
+        quantum
+      ),
+      symbol: assetSymbol,
+      labelDescription: DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT(assetSymbol),
+    });
+
+    details.push({
+      label: t('Projected margin'),
+      value: formatRange(
+        marginEstimate?.bestCase.initialLevel,
+        marginEstimate?.worstCase.initialLevel,
+        assetDecimals
+      ),
+      formattedValue: formatRange(
+        marginEstimate?.bestCase.initialLevel,
+        marginEstimate?.worstCase.initialLevel,
+        assetDecimals,
+        quantum
+      ),
+      symbol: assetSymbol,
+      labelDescription: EST_TOTAL_MARGIN_TOOLTIP_TEXT,
+    });
+  }
+  details.push({
+    label: t('Current margin allocation'),
+    value: formatValue(marginAccountBalance, assetDecimals),
+    symbol: assetSymbol,
+    labelDescription: MARGIN_ACCOUNT_TOOLTIP_TEXT,
+    formattedValue: formatValue(marginAccountBalance, assetDecimals, quantum),
+  });
+
+  let liquidationPriceEstimate = emptyValue;
+  let liquidationPriceEstimateFormatted;
+
+  if (liquidationEstimate) {
+    const liquidationEstimateBestCaseIncludingBuyOrders = BigInt(
+      liquidationEstimate.bestCase.including_buy_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateBestCaseIncludingSellOrders = BigInt(
+      liquidationEstimate.bestCase.including_sell_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateBestCase =
+      liquidationEstimateBestCaseIncludingBuyOrders >
+      liquidationEstimateBestCaseIncludingSellOrders
+        ? liquidationEstimateBestCaseIncludingBuyOrders
+        : liquidationEstimateBestCaseIncludingSellOrders;
+
+    const liquidationEstimateWorstCaseIncludingBuyOrders = BigInt(
+      liquidationEstimate.worstCase.including_buy_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateWorstCaseIncludingSellOrders = BigInt(
+      liquidationEstimate.worstCase.including_sell_orders.replace(/\..*/, '')
+    );
+    const liquidationEstimateWorstCase =
+      liquidationEstimateWorstCaseIncludingBuyOrders >
+      liquidationEstimateWorstCaseIncludingSellOrders
+        ? liquidationEstimateWorstCaseIncludingBuyOrders
+        : liquidationEstimateWorstCaseIncludingSellOrders;
+    liquidationPriceEstimate = formatRange(
+      (liquidationEstimateBestCase < liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      (liquidationEstimateBestCase > liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      assetDecimals
+    );
+    liquidationPriceEstimateFormatted = formatRange(
+      (liquidationEstimateBestCase < liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      (liquidationEstimateBestCase > liquidationEstimateWorstCase
+        ? liquidationEstimateBestCase
+        : liquidationEstimateWorstCase
+      ).toString(),
+      assetDecimals,
+      quantum
+    );
+  }
+
+  details.push({
+    label: t('Liquidation price estimate'),
+    value: liquidationPriceEstimate,
+    formattedValue: liquidationPriceEstimateFormatted,
+    symbol: assetSymbol,
+    labelDescription: LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
+  });
+  return details;
+};
@@ -6,6 +6,7 @@ import {
  truncateByChars,
  isNumeric,
 } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
@@ -24,6 +25,7 @@ export const DepositsTable = forwardRef<
  return (
    <AgGrid
      ref={ref}
+      overlayNoRowsTemplate={t('No deposits')}
      defaultColDef={{ resizable: true }}
      style={{ width: '100%', height: '100%' }}
      suppressCellFocus={true}
@@ -55,7 +55,7 @@ export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
      <AgGrid
        style={{ width: '100%', height: '100%' }}
        overlayNoRowsTemplate={t('No liquidity provisions')}
-        getRowId={({ data }) => `${data.party.id}-${data.status}`}
+        getRowId={({ data }) => data.id}
        ref={ref}
        tooltipShowDelay={500}
        defaultColDef={{
@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;
@@ -104,7 +104,9 @@ export const OracleFullProfile = ({
        <div className="mb-2">{message}</div>
        <div className="mb-2">
          <ReactMarkdown
-            className="[word-break:break-word]"
+            className="react-markdown-container [word-break:break-word]"
+            skipHtml={true}
+            disallowedElements={['img']}
            linkTarget="_blank"
          >
            {showMore
@@ -84,7 +84,7 @@ describe('useMarketOracle', () => {
            type: 'eth_address',
          },
        ],
-        oracle: { eth_address: 'eth_address' },
+        oracle: {},
      } as Provider,
      {
        proofs: [
@@ -93,7 +93,7 @@ describe('useMarketOracle', () => {
            type: 'eth_address',
          },
        ],
-        oracle: { eth_address: address },
+        oracle: {},
      } as Provider,
    ];
    mockOracleProofs.mockReturnValueOnce({
@@ -113,9 +113,7 @@ describe('useMarketOracle', () => {
            type: 'public_key',
          },
        ],
-        oracle: {
-          public_key: 'public_key',
-        },
+        oracle: {},
      } as Provider,
      {
        proofs: [
@@ -124,9 +122,7 @@ describe('useMarketOracle', () => {
            type: 'public_key',
          },
        ],
-        oracle: {
-          public_key: key,
-        },
+        oracle: {},
      } as Provider,
    ];
    mockOracleProofs.mockReturnValueOnce({
@@ -9,30 +9,32 @@ import type { DataSourceSpecFragment } from '../__generated__';
 export const getMatchingOracleProvider = (
  dataSourceSpec: DataSourceSpecFragment,
  providers: Provider[]
-) => {
-  return providers.find((provider) => {
-    let oracleSignature: string;
-    const oracle = provider.oracle;
-    if ('public_key' in oracle && oracle.public_key) {
-      oracleSignature = oracle.public_key;
-    } else if ('eth_address' in oracle && oracle.eth_address) {
-      oracleSignature = oracle.eth_address;
-    }
-
-    if (
-      dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
-    ) {
-      return dataSourceSpec.sourceType.sourceType.signers?.some(
-        (signer) =>
-          (signer.signer.__typename === 'ETHAddress' &&
-            signer.signer.address === oracleSignature) ||
-          (signer.signer.__typename === 'PubKey' &&
-            signer.signer.key === oracleSignature)
-      );
-    }
-    return false;
-  });
-};
+) =>
+  providers.find((provider) =>
+    provider.proofs.some((proof) => {
+      if (
+        proof.type === 'eth_address' &&
+        dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
+      ) {
+        return dataSourceSpec.sourceType.sourceType.signers?.some(
+          (signer) =>
+            signer.signer.__typename === 'ETHAddress' &&
+            signer.signer.address === proof.eth_address
+        );
+      }
+      if (
+        proof.type === 'public_key' &&
+        dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
+      ) {
+        return dataSourceSpec.sourceType.sourceType.signers?.some(
+          (signer) =>
+            signer.signer.__typename === 'PubKey' &&
+            signer.signer.key === proof.public_key
+        );
+      }
+      return false;
+    })
+  );

 export const useMarketOracle = (
  marketId: string,
@@ -1,676 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import type { Provider } from '../oracle-schema';
-import { useOracleMarkets } from './use-oracle-markets';
-const mockMarkets = jest.fn<{ data: unknown | null }, unknown[]>(() => ({
-  data: marketsData,
-}));
-
-jest.mock('../__generated__/OracleMarketsSpec', () => ({
-  useOracleMarketsSpecQuery: jest.fn((args) => mockMarkets()),
-}));
-
-describe('useOracleMarkets', () => {
-  it('returns undefined if no market data present', () => {
-    mockMarkets.mockReturnValueOnce({ data: null });
-    const { result } = renderHook(() => useOracleMarkets(mockProvider));
-    expect(result.current).toBeUndefined();
-  });
-
-  it('returns correct market list for the given provider', () => {
-    mockMarkets.mockReturnValueOnce({ data: marketsData });
-    const { result } = renderHook(() => useOracleMarkets(mockProvider));
-    console.log(JSON.stringify(result.current));
-    expect(result.current).toStrictEqual(oracleMarkets);
-  });
-});
-
-const mockProvider: Provider = {
-  name: 'Mock Oracle',
-  url: 'https://Mock.com',
-  description_markdown: 'mock oracle description',
-  oracle: {
-    status: 'GOOD',
-    status_reason: '',
-    first_verified: '2023-05-22T00:00:00.000Z',
-    last_verified: '2023-05-22T00:00:00.000Z',
-    type: 'eth_address',
-    eth_address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-  },
-  proofs: [
-    {
-      format: 'url',
-      available: true,
-      type: 'web',
-      url: 'https://web.archive.org/web/20200923175817/https://docs.pro.Mock.com/#oracle',
-    },
-  ],
-  github_link:
-    'https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/eth_address-0xaddress.toml',
-};
-
-const marketsData = {
-  marketsConnection: {
-    __typename: 'MarketConnection',
-    edges: [
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '2dca7baa5f7269b08d053668bca03f97f72e9a162327eebd941c54f1f9fb8f80',
-          state: 'STATE_ACTIVE',
-          tradingMode: 'TRADING_MODE_CONTINUOUS',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'BTC/USDT expiry 2023 June 30th',
-              code: 'BTC/USDT-230630',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: '6eb55cdb9e3d1697d9df2eb2d97c4560da3519652fdf7e542f5801fc0919c32d',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address: '0xaddress',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.BTC.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.BTC.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.BTC.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '84025e68387cf61c2b91228d768dcdd4f10a9ee5cd2824fdea35b259976f59c1',
-          state: 'STATE_ACTIVE',
-          tradingMode: 'TRADING_MODE_CONTINUOUS',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'LINK/USDT expiry 2023 June 30th',
-              code: 'LINK/USDT-230630',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: 'bd709a4e6820d8714241f4c9576dffa71108179663c1f8442c991121fa1b0251',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address: '0xaddress',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.LINK.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.LINK.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.LINK.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '4507930a8c508eef6731f1342720adfa5f46096a8ef7a5848450740132ab78ab',
-          state: 'STATE_ACTIVE',
-          tradingMode: 'TRADING_MODE_CONTINUOUS',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'ETH/USDT expiry 2023 June 30th',
-              code: 'ETH/USDT-230630',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: '2687518113f63219a0b7594688dc78be62c86936a8ce306f50032ec70bdce493',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address: '0xaddress',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.ETH.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.ETH.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.ETH.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '074c929bba8faeeeba352b2569fc5360a59e12cdcbf60f915b492c4ac228b566',
-          state: 'STATE_PROPOSED',
-          tradingMode: 'TRADING_MODE_NO_TRADING',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'LINK/USDT expiry 2023 Sept 30th',
-              code: 'LINK/USDT-230930',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: 'cda7643a04cb45f62fdb06851a6fea2dc18d94931f2eab58f6918c6c13352fb6',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address: '0xaddress',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.LINK.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.LINK.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.LINK.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '2c2ea995d7366e423be7604f63ce047aa7186eb030ecc7b77395eae2fcbffcc5',
-          state: 'STATE_PROPOSED',
-          tradingMode: 'TRADING_MODE_NO_TRADING',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'ETH/USDT expiry 2023 Sept 30th',
-              code: 'ETH/USDT-230930',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: 'bb59cbdfbe167abc714954bf474354ac80b2feb798b907d6d86554fdd551f804',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address:
-                                '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.ETH.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.ETH.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.ETH.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-      {
-        __typename: 'MarketEdge',
-        node: {
-          __typename: 'Market',
-          id: '5b05109662e7434fea498c4a1c91d3179b80e9b8950d6106cec60e1f342fc604',
-          state: 'STATE_PROPOSED',
-          tradingMode: 'TRADING_MODE_NO_TRADING',
-          tradableInstrument: {
-            __typename: 'TradableInstrument',
-            instrument: {
-              __typename: 'Instrument',
-              id: '',
-              name: 'BTC/USDT expiry 2023 Sept 30th',
-              code: 'BTC/USDT-230930',
-              product: {
-                __typename: 'Future',
-                dataSourceSpecForSettlementData: {
-                  __typename: 'DataSourceSpec',
-                  id: '99a1551b8cc7b75a3628a768e0772dde4c5a1ddf6c647507079c2e111d614a28',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionExternal',
-                      sourceType: {
-                        __typename: 'DataSourceSpecConfiguration',
-                        signers: [
-                          {
-                            __typename: 'Signer',
-                            signer: {
-                              __typename: 'ETHAddress',
-                              address:
-                                '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-                            },
-                          },
-                        ],
-                        filters: [
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.BTC.value',
-                              type: 'TYPE_INTEGER',
-                              numberDecimalPlaces: 6,
-                            },
-                          },
-                          {
-                            __typename: 'Filter',
-                            key: {
-                              __typename: 'PropertyKey',
-                              name: 'prices.BTC.timestamp',
-                              type: 'TYPE_TIMESTAMP',
-                              numberDecimalPlaces: null,
-                            },
-                          },
-                        ],
-                      },
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  __typename: 'DataSourceSpec',
-                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
-                  data: {
-                    __typename: 'DataSourceDefinition',
-                    sourceType: {
-                      __typename: 'DataSourceDefinitionInternal',
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  __typename: 'DataSourceSpecToFutureBinding',
-                  settlementDataProperty: 'prices.BTC.value',
-                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-                },
-              },
-            },
-          },
-        },
-      },
-    ],
-  },
-};
-
-const oracleMarkets = [
-  {
-    __typename: 'Market',
-    id: '2c2ea995d7366e423be7604f63ce047aa7186eb030ecc7b77395eae2fcbffcc5',
-    state: 'STATE_PROPOSED',
-    tradingMode: 'TRADING_MODE_NO_TRADING',
-    tradableInstrument: {
-      __typename: 'TradableInstrument',
-      instrument: {
-        __typename: 'Instrument',
-        id: '',
-        name: 'ETH/USDT expiry 2023 Sept 30th',
-        code: 'ETH/USDT-230930',
-        product: {
-          __typename: 'Future',
-          dataSourceSpecForSettlementData: {
-            __typename: 'DataSourceSpec',
-            id: 'bb59cbdfbe167abc714954bf474354ac80b2feb798b907d6d86554fdd551f804',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: {
-                __typename: 'DataSourceDefinitionExternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfiguration',
-                  signers: [
-                    {
-                      __typename: 'Signer',
-                      signer: {
-                        __typename: 'ETHAddress',
-                        address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-                      },
-                    },
-                  ],
-                  filters: [
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'prices.ETH.value',
-                        type: 'TYPE_INTEGER',
-                        numberDecimalPlaces: 6,
-                      },
-                    },
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'prices.ETH.timestamp',
-                        type: 'TYPE_TIMESTAMP',
-                        numberDecimalPlaces: null,
-                      },
-                    },
-                  ],
-                },
-              },
-            },
-          },
-          dataSourceSpecForTradingTermination: {
-            __typename: 'DataSourceSpec',
-            id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: { __typename: 'DataSourceDefinitionInternal' },
-            },
-          },
-          dataSourceSpecBinding: {
-            __typename: 'DataSourceSpecToFutureBinding',
-            settlementDataProperty: 'prices.ETH.value',
-            tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-          },
-        },
-      },
-    },
-  },
-  {
-    __typename: 'Market',
-    id: '5b05109662e7434fea498c4a1c91d3179b80e9b8950d6106cec60e1f342fc604',
-    state: 'STATE_PROPOSED',
-    tradingMode: 'TRADING_MODE_NO_TRADING',
-    tradableInstrument: {
-      __typename: 'TradableInstrument',
-      instrument: {
-        __typename: 'Instrument',
-        id: '',
-        name: 'BTC/USDT expiry 2023 Sept 30th',
-        code: 'BTC/USDT-230930',
-        product: {
-          __typename: 'Future',
-          dataSourceSpecForSettlementData: {
-            __typename: 'DataSourceSpec',
-            id: '99a1551b8cc7b75a3628a768e0772dde4c5a1ddf6c647507079c2e111d614a28',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: {
-                __typename: 'DataSourceDefinitionExternal',
-                sourceType: {
-                  __typename: 'DataSourceSpecConfiguration',
-                  signers: [
-                    {
-                      __typename: 'Signer',
-                      signer: {
-                        __typename: 'ETHAddress',
-                        address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
-                      },
-                    },
-                  ],
-                  filters: [
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'prices.BTC.value',
-                        type: 'TYPE_INTEGER',
-                        numberDecimalPlaces: 6,
-                      },
-                    },
-                    {
-                      __typename: 'Filter',
-                      key: {
-                        __typename: 'PropertyKey',
-                        name: 'prices.BTC.timestamp',
-                        type: 'TYPE_TIMESTAMP',
-                        numberDecimalPlaces: null,
-                      },
-                    },
-                  ],
-                },
-              },
-            },
-          },
-          dataSourceSpecForTradingTermination: {
-            __typename: 'DataSourceSpec',
-            id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
-            data: {
-              __typename: 'DataSourceDefinition',
-              sourceType: { __typename: 'DataSourceDefinitionInternal' },
-            },
-          },
-          dataSourceSpecBinding: {
-            __typename: 'DataSourceSpecToFutureBinding',
-            settlementDataProperty: 'prices.BTC.value',
-            tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
-          },
-        },
-      },
-    },
-  },
-];
@@ -5,14 +5,9 @@ import { useOracleMarketsSpecQuery } from '../__generated__/OracleMarketsSpec';
 export const useOracleMarkets = (
  provider: Provider
 ): OracleMarketSpecFieldsFragment[] | undefined => {
-  let oracleSignature: string;
-  const oracle = provider.oracle;
-  if ('public_key' in oracle && oracle.public_key) {
-    oracleSignature = oracle.public_key;
-  }
-  if ('eth_address' in oracle && oracle.eth_address) {
-    oracleSignature = oracle.eth_address;
-  }
+  const signedProofs = provider.proofs.filter(
+    (proof) => proof.format === 'signed_message' && proof.available === true
+  );

  const { data: markets } = useOracleMarketsSpecQuery();

@@ -25,16 +20,30 @@ export const useOracleMarkets = (
        return false;
      }
      const signers = sourceType?.sourceType.signers;
+
      const signerKeys = signers?.filter(Boolean).map((signer) => {
        if (signer.signer.__typename === 'ETHAddress') {
          return signer.signer.address;
        }
+
        if (signer.signer.__typename === 'PubKey') {
          return signer.signer.key;
        }
+
        return undefined;
      });
-      const key = signerKeys?.find((key) => key === oracleSignature);
+
+      const signedProofsKeys = signedProofs.map((proof) => {
+        if ('public_key' in proof && proof.public_key) {
+          return proof.public_key;
+        }
+        if ('eth_address' in proof && proof.eth_address) {
+          return proof.eth_address;
+        }
+        return undefined;
+      });
+
+      const key = signedProofsKeys.find((key) => signerKeys?.includes(key));
      return !!key;
    });
  return oracleMarkets;
@@ -1,6 +1,7 @@
 export * from './lib/__generated__/Positions';
 export * from './lib/positions-container';
 export * from './lib/positions-data-providers';
+export * from './lib/margin-data-provider';
 export * from './lib/positions-table';
 export * from './lib/use-market-margin';
 export * from './lib/use-open-volume';
@@ -38,6 +38,45 @@ subscription PositionsSubscription($partyId: ID!) {
  }
 }

+fragment MarginFields on MarginLevels {
+  maintenanceLevel
+  searchLevel
+  initialLevel
+  collateralReleaseLevel
+  asset {
+    id
+  }
+  market {
+    id
+  }
+}
+
+query Margins($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    marginsConnection {
+      edges {
+        node {
+          ...MarginFields
+        }
+      }
+    }
+  }
+}
+
+subscription MarginsSubscription($partyId: ID!) {
+  margins(partyId: $partyId) {
+    marketId
+    asset
+    partyId
+    maintenanceLevel
+    searchLevel
+    initialLevel
+    collateralReleaseLevel
+    timestamp
+  }
+}
+
 query EstimatePosition(
  $marketId: ID!
  $openVolume: String!
@@ -19,6 +19,22 @@ export type PositionsSubscriptionSubscriptionVariables = Types.Exact<{

 export type PositionsSubscriptionSubscription = { __typename?: 'Subscription', positions: Array<{ __typename?: 'PositionUpdate', realisedPNL: string, openVolume: string, unrealisedPNL: string, averageEntryPrice: string, updatedAt?: any | null, marketId: string, lossSocializationAmount: string, positionStatus: Types.PositionStatus, partyId: string }> };

+export type MarginFieldsFragment = { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } };
+
+export type MarginsQueryVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type MarginsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, asset: { __typename?: 'Asset', id: string }, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
+
+export type MarginsSubscriptionSubscriptionVariables = Types.Exact<{
+  partyId: Types.Scalars['ID'];
+}>;
+
+
+export type MarginsSubscriptionSubscription = { __typename?: 'Subscription', margins: { __typename?: 'MarginLevelsUpdate', marketId: string, asset: string, partyId: string, maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, timestamp: any } };
+
 export type EstimatePositionQueryVariables = Types.Exact<{
  marketId: Types.Scalars['ID'];
  openVolume: Types.Scalars['String'];
@@ -46,6 +62,20 @@ export const PositionFieldsFragmentDoc = gql`
  }
 }
    `;
+export const MarginFieldsFragmentDoc = gql`
+    fragment MarginFields on MarginLevels {
+  maintenanceLevel
+  searchLevel
+  initialLevel
+  collateralReleaseLevel
+  asset {
+    id
+  }
+  market {
+    id
+  }
+}
+    `;
 export const PositionsDocument = gql`
    query Positions($partyIds: [ID!]!) {
  positions(filter: {partyIds: $partyIds}) {
@@ -123,6 +153,85 @@ export function usePositionsSubscriptionSubscription(baseOptions: Apollo.Subscri
      }
 export type PositionsSubscriptionSubscriptionHookResult = ReturnType<typeof usePositionsSubscriptionSubscription>;
 export type PositionsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<PositionsSubscriptionSubscription>;
+export const MarginsDocument = gql`
+    query Margins($partyId: ID!) {
+  party(id: $partyId) {
+    id
+    marginsConnection {
+      edges {
+        node {
+          ...MarginFields
+        }
+      }
+    }
+  }
+}
+    ${MarginFieldsFragmentDoc}`;
+
+/**
+ * __useMarginsQuery__
+ *
+ * To run a query within a React component, call `useMarginsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useMarginsQuery` 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 } = useMarginsQuery({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function useMarginsQuery(baseOptions: Apollo.QueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
+      }
+export function useMarginsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarginsQuery, MarginsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<MarginsQuery, MarginsQueryVariables>(MarginsDocument, options);
+        }
+export type MarginsQueryHookResult = ReturnType<typeof useMarginsQuery>;
+export type MarginsLazyQueryHookResult = ReturnType<typeof useMarginsLazyQuery>;
+export type MarginsQueryResult = Apollo.QueryResult<MarginsQuery, MarginsQueryVariables>;
+export const MarginsSubscriptionDocument = gql`
+    subscription MarginsSubscription($partyId: ID!) {
+  margins(partyId: $partyId) {
+    marketId
+    asset
+    partyId
+    maintenanceLevel
+    searchLevel
+    initialLevel
+    collateralReleaseLevel
+    timestamp
+  }
+}
+    `;
+
+/**
+ * __useMarginsSubscriptionSubscription__
+ *
+ * To run a query within a React component, call `useMarginsSubscriptionSubscription` and pass it any options that fit your needs.
+ * When your component renders, `useMarginsSubscriptionSubscription` 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 } = useMarginsSubscriptionSubscription({
+ *   variables: {
+ *      partyId: // value for 'partyId'
+ *   },
+ * });
+ */
+export function useMarginsSubscriptionSubscription(baseOptions: Apollo.SubscriptionHookOptions<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useSubscription<MarginsSubscriptionSubscription, MarginsSubscriptionSubscriptionVariables>(MarginsSubscriptionDocument, options);
+      }
+export type MarginsSubscriptionSubscriptionHookResult = ReturnType<typeof useMarginsSubscriptionSubscription>;
+export type MarginsSubscriptionSubscriptionResult = Apollo.SubscriptionResult<MarginsSubscriptionSubscription>;
 export const EstimatePositionDocument = gql`
    query EstimatePosition($marketId: ID!, $openVolume: String!, $orders: [OrderInfo!], $collateralAvailable: String) {
  estimatePosition(
@@ -7,13 +7,13 @@ import {
 import {
  MarginsSubscriptionDocument,
  MarginsDocument,
-} from './__generated__/Margins';
+} from './__generated__/Positions';
 import type {
  MarginsQuery,
  MarginFieldsFragment,
  MarginsSubscriptionSubscription,
  MarginsQueryVariables,
-} from './__generated__/Margins';
+} from './__generated__/Positions';

 const update = (
  data: MarginFieldsFragment[] | null,
@@ -197,7 +197,6 @@ const positionsDataProvider = makeDataProvider<
  getDelta: (subscriptionData: PositionsSubscriptionSubscription) =>
    subscriptionData.positions,
  getSubscriptionVariables,
-  fetchPolicy: 'no-cache',
 });

 const positionDataProvider = makeDerivedDataProvider<
@@ -4,12 +4,9 @@ import type { PartialDeep } from 'type-fest';
 import type {
  PositionsQuery,
  PositionFieldsFragment,
-} from './__generated__/Positions';
-
-import type {
  MarginsQuery,
  MarginFieldsFragment,
-} from '@vegaprotocol/accounts';
+} from './__generated__/Positions';

 export const positionsQuery = (
  override?: PartialDeep<PositionsQuery>
@@ -1,8 +1,8 @@
 import { useCallback, useState } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marginsDataProvider } from '@vegaprotocol/accounts';
-import type { MarginFieldsFragment } from '@vegaprotocol/accounts';
+import { marginsDataProvider } from './margin-data-provider';
+import type { MarginFieldsFragment } from './__generated__/Positions';

 export const useMarketMargin = (marketId: string) => {
  const { pubKey } = useVegaWallet();
@@ -1,2 +1 @@
 export * from './use-vote-submit';
-export * from './__generated__/VoteSubsciption';
@@ -5,16 +5,15 @@ import { useVoteEvent } from './use-vote-event';
 import type { VoteValue } from '@vegaprotocol/types';
 import type { VoteEventFieldsFragment } from './__generated__/VoteSubsciption';

-export type FinalizedVote = VoteEventFieldsFragment & { pubKey: string };
+export type FinalizedVote = VoteEventFieldsFragment;

 export const useVoteSubmit = () => {
  const { pubKey } = useVegaWallet();
  const { send, transaction, setComplete, Dialog } = useVegaTransaction();
  const waitForVoteEvent = useVoteEvent(transaction);

-  const [finalizedVote, setFinalizedVote] = useState<FinalizedVote | null>(
-    null
-  );
+  const [finalizedVote, setFinalizedVote] =
+    useState<VoteEventFieldsFragment | null>(null);

  const submit = useCallback(
    async (voteValue: VoteValue, proposalId: string | null) => {
@@ -34,7 +33,7 @@ export const useVoteSubmit = () => {

        if (res) {
          waitForVoteEvent(proposalId, pubKey, (v) => {
-            setFinalizedVote({ ...v, pubKey });
+            setFinalizedVote(v);
            setComplete();
          });
        }
@@ -99,7 +99,6 @@ export const tradesProvider = makeDataProvider<
    append,
    first: MAX_TRADES,
  },
-  fetchPolicy: 'no-cache',
  getSubscriptionVariables: ({ marketId }) => ({ marketId }),
 });

@@ -53,10 +53,10 @@ export const tradesUpdateSubscription = (

 const trades: TradeFieldsFragment[] = [
  {
-    id: 'FFFFAD1BF47AA2853E5C375B6B3A62375F62D5B10807583D32EF3119CC455CD1',
-    price: '17106734',
-    size: '18',
-    createdAt: '2022-04-07T17:56:47.997938583Z',
+    id: 'FFFFBC80005C517A10ACF481F7E6893769471098E696D0CC407F18134044CB16',
+    price: '17116898',
+    size: '24',
+    createdAt: '2022-04-06T16:19:42.692598951Z',
    aggressor: Side.SIDE_BUY,
    market: {
      id: 'market-0',
@@ -77,10 +77,10 @@ const trades: TradeFieldsFragment[] = [
    __typename: 'Trade',
  },
  {
-    id: 'FFFFBC80005C517A10ACF481F7E6893769471098E696D0CC407F18134044CB16',
-    price: '17116898',
-    size: '24',
-    createdAt: '2022-04-06T16:19:42.692598951Z',
+    id: 'FFFFAD1BF47AA2853E5C375B6B3A62375F62D5B10807583D32EF3119CC455CD1',
+    price: '17106734',
+    size: '18',
+    createdAt: '2022-04-07T17:56:47.997938583Z',
    aggressor: Side.SIDE_BUY,
    market: {
      id: 'market-0',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dariusz Majcherczyk	813839cee9	test: update selectors	2023-06-14 12:55:39 +02:00
Bartłomiej Głownia	e348f0501c	feat: use markets with data provider	2023-06-14 10:42:01 +02:00
Bartłomiej Głownia	c033439606	feat: fix liquidity data provider tests	2023-06-14 09:48:40 +02:00
Dariusz Majcherczyk	ae6899872e	test: improve scroll	2023-06-13 19:03:55 +02:00
Dariusz Majcherczyk	487035c469	test: added scroll	2023-06-13 19:01:28 +02:00
Dariusz Majcherczyk	190c05716c	test: update wait	2023-06-13 18:51:39 +02:00
Dariusz Majcherczyk	2e9191e0da	test: update structure	2023-06-13 18:26:11 +02:00
Dariusz Majcherczyk	a04be9b293	test: remove only	2023-06-13 17:36:14 +02:00
Dariusz Majcherczyk	c81cb2d668	test: add acs for liquidity	2023-06-13 17:27:11 +02:00