fix(3562): use default jsonrpc connector when the provider from useWeb3React is for a different network

test(ci): capsule update v0.71.1 (#3559 )
chore: update tranches
2023-04-27 16:36:00 +01:00 · 2023-04-27 14:37:55 +01:00 · 2023-04-27 12:09:22 +00:00 · 2023-04-27 09:21:05 +00:00 · 2023-04-27 08:53:28 +00:00 · 2023-04-27 09:47:18 +01:00
130 changed files with 2418 additions and 515 deletions
@@ -105,19 +105,44 @@ jobs:
          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
          echo -n "Affected projects: $affected"

+          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
          projects_e2e=""
-          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
-          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          preview_governance="not deployed"
+          preview_trading="not deployed"
+          preview_explorer="not deployed"
+          if [[ -z "$projects_e2e" ]]; then
+            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
+          fi
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
+          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
+          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV

    outputs:
      projects: ${{ env.PROJECTS }}
      projects-e2e: ${{ env.PROJECTS_E2E }}
+      preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
+      preview_trading: ${{ env.PREVIEW_TRADING }}
+      preview_explorer: ${{ env.PREVIEW_EXPLORER }}

  cypress:
    needs: lint-test-build
@@ -140,7 +165,9 @@ jobs:

  dist-check:
    runs-on: ubuntu-latest
-    needs: publish-dist
+    needs:
+      - publish-dist
+      - lint-test-build
    if: ${{ github.event_name == 'pull_request' }}
    name: '(CD) comment preview links'
    steps:
@@ -151,22 +178,16 @@ jobs:
          issue-number: ${{ github.event.pull_request.number }}
          body-includes: Previews

-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
      - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
        uses: peter-evans/create-or-update-comment@v3
+        if: ${{ steps.fc.outputs.comment-id == 0 }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
+            Previews:
+            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
+            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
+            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}

  cypress-check:
    name: '(CI) cypress - check'
@@ -91,7 +91,11 @@ jobs:
      - uses: actions/upload-artifact@v3
        if: ${{ failure() }}
        with:
-          name: test-report-and-logs-${{ matrix.project }}
-          path: |
-            /home/runner/.vegacapsule/testnet/logs
-            frontend-monorepo/apps/trading-e2e/cypress/reports
+          name: logs-${{ matrix.project }}
+          path: /home/runner/.vegacapsule/testnet/logs
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: test-report-${{ matrix.project }}
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports
@@ -1,20 +1,2 @@
@Library('vega-shared-library') _
-
-def commitHash = 'UNKNOWN'
-
-pipeline {
-  agent any
-  options {
-    skipDefaultCheckout true
-    parallelsAlwaysFailFast()
-  }
-  stages {
-    stage('approbation') {
-      steps {
-        sh 'printenv'
-        checkout scm
-        runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
-      }
-    }
-  }
-}
+runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
@@ -72,7 +72,7 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<
 In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.

 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n07.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```

@@ -1,7 +1,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_CONFIG_URL=

@@ -18,4 +18,4 @@ NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

 CYPRESS_VEGA_WALLET_API_TOKEN=
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest

@@ -25,7 +25,7 @@ module.exports = defineConfig({
  },
  env: {
    environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3028/query',
+    networkQueryUrl: 'http://localhost:3008/graphql',
    ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    commitHash: 'dev',
    tsConfig: 'tsconfig.json',
@@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node';
 context.skip('Node switcher', { tags: '@regression' }, function () {
  beforeEach('visit home page', function () {
    cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', {
-      hosts: ['http://localhost:3028/query'],
+      hosts: ['http://localhost:3008/graphql'],
    }).as('nodeData');
    cy.visit('/');
    cy.wait('@nodeData');
@@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () {
          balance type asset {id symbol decimals}}}}}}}}';
      cy.request({
        method: 'POST',
-        url: `http://localhost:3028/query`,
+        url: `http://localhost:3008/graphql`,
        body: {
          query: mutation,
        },
@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}

-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -20,7 +20,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
@@ -31,6 +31,5 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -50,6 +50,8 @@ const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
 const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
+const fUSDCId =
+  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

@@ -264,7 +266,7 @@ context(
    it('Unable to submit update market proposal without minimum amount of tokens', function () {
      vegaWalletTeardown();
      vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
        '1000000',
        vegaWalletPublicKey
      );
@@ -290,7 +292,7 @@ context(
    // 3001-VOTE-092 3004-PMAC-001
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
        '1000000',
        vegaWalletPublicKey
      );
@@ -55,7 +55,6 @@ context(
  function () {
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
@@ -67,6 +66,7 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
+          cy.clearAllLocalStorage();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        .within(() => {
          cy.get('span')
            .first()
-            .should('have.text', 'http://localhost:3028/query');
+            .should('have.text', 'http://localhost:3008/graphql');
          cy.getByTestId('link').should('exist');
        });
    });
@@ -17,10 +17,15 @@ const banner = 'view-banner';

 context('View functionality with public key', { tags: '@smoke' }, function () {
  before('send asset to wallet', function () {
-    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
+    vegaWalletFaucetAssetsWithoutCheck(
+      '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+      '1000000',
+      vegaWalletPubKey
+    );
  });

  beforeEach('visit home page', function () {
+    cy.clearLocalStorage();
    cy.visit('/');
    waitForSpinner();
    cy.connectPublicKey(vegaWalletPubKey);
@@ -13,6 +13,7 @@ context(
  { tags: '@regression' },
  function () {
    before('navigate to rewards page', function () {
+      cy.clearLocalStorage();
      cy.visit('/');
      navigateTo(navigation.rewards);
    });
@@ -282,26 +282,30 @@ context(
      describe('Vega wallet with assets', function () {
        const assets = [
          {
-            id: 'fUSDC',
+            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
            name: 'USDC (fake)',
+            symbol: 'fUSDC',
            amount: '1000000',
            expectedAmount: '10.00',
          },
          {
-            id: 'fDAI',
+            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
            name: 'DAI (fake)',
+            symbol: 'fDAI',
            amount: '200000',
            expectedAmount: '2.00',
          },
          {
-            id: 'fBTC',
+            id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
            name: 'BTC (fake)',
+            symbol: 'fBTC',
            amount: '600000',
            expectedAmount: '6.00',
          },
          {
-            id: 'fEURO',
+            id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
            name: 'EURO (fake)',
+            symbol: 'fEURO',
            amount: '800000',
            expectedAmount: '8.00',
          },
@@ -322,15 +326,15 @@ context(
          });
        });

-        for (const { id, name, expectedAmount } of assets) {
-          it(`should see ${id} within vega wallet`, () => {
+        for (const { name, symbol, expectedAmount } of assets) {
+          it(`should see ${name} within vega wallet`, () => {
            cy.get(walletContainer).within(() => {
              cy.get(vegaWalletCurrencyTitle)
-                .contains(id, txTimeout)
+                .contains(name, txTimeout)
                .should('be.visible');

              cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                .parent()
                .siblings()
                .invoke('text')
@@ -338,9 +342,9 @@ context(
                .should('be.gte', parseFloat(expectedAmount));

              cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                .parent()
-                .contains(name);
+                .contains(symbol);
            });
          });
        }
@@ -54,6 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
    .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
    .and('be.visible')
    .click();
+  cy.contains('been removed from validator', txTimeout).should('be.visible');
  closeDialog();
 }

@@ -184,7 +185,7 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
  cy.contains('Loading...', epochTimeout).should('not.exist');
  waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]:visible`)
+  cy.get(`[row-id="${positionOnList}"]`)
    .eq(1)
    .within(() => {
      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
@@ -220,12 +221,12 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }

 export function closeStakingDialog() {
-  cy.get('[data-testid="dialog-title"]:visible').should(
+  cy.getByTestId('dialog-title').should(
    'contain.text',
    'At the beginning of the next epoch'
  );
-  cy.get('[data-testid="dialog-content"]:visible')
-    .first()
+  cy.getByTestId('dialog-content')
+    .last()
    .within(() => {
      cy.get('a').should('have.text', 'Back to Staking').click();
    });
@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';

 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -105,25 +105,24 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('currency-value')
-          .invoke('text')
-          .then(($associatedAmount) => {
-            cy.wrap(
-              stakingBridgeContract.remove_stake(
-                String(stakeBalance),
-                vegaWalletPubKey
-              ),
-              { timeout: transactionTimeout, log: false }
-            );
-            cy.get("[data-testid='currency-value']")
-              .first()
-              .invoke('text', {
+      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
+        () => {
+          cy.get(associatedAmountInWallet)
+            .invoke('text')
+            .then(($walletAmount) => {
+              cy.wrap(
+                stakingBridgeContract.remove_stake(
+                  String(stakeBalance),
+                  vegaWalletPubKey
+                ),
+                { timeout: transactionTimeout, log: false }
+              );
+              cy.get(associatedAmountInWallet, {
                timeout: transactionTimeout,
-              })
-              .should('not.eq', $associatedAmount);
-          });
-      });
+              }).should('not.have.text', $walletAmount);
+            });
+        }
+      );
    }
  });
 }
@@ -8,7 +8,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''

-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -3,7 +3,7 @@ import './i18n';
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -149,6 +149,20 @@ const Web3Container = ({
  );
 };

+const ScrollToTop = () => {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
+    document.documentElement.scrollTo({
+      top: 0,
+      left: 0,
+    });
+  }, [pathname]);
+
+  return null;
+};
+
 const AppContainer = () => {
  const { config, loading, error } = useEthereumConfig();
  const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -183,6 +197,7 @@ const AppContainer = () => {

  return (
    <Router>
+      <ScrollToTop />
      <AppStateProvider>
        <div className="grid min-h-full text-white">
          <AsyncRenderer<EthereumConfig | null>
@@ -14,13 +14,17 @@ import { ContractsContext } from './contracts-context';
 import { createDefaultProvider } from '../../lib/web3-connectors';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { ENV } from '../../config/env';
+import { ENV } from '../../config';

 /**
 * Provides Vega Ethereum contract instances to its children.
 */
 export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
-  const { provider: activeProvider, account } = useWeb3React();
+  const {
+    provider: activeProvider,
+    account,
+    chainId: activeChainId,
+  } = useWeb3React();
  const { config } = useEthereumConfig();
  const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
  const [contracts, setContracts] =
@@ -39,7 +43,11 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
          ETHEREUM_PROVIDER_URL,
          Number(config.chain_id)
        );
-        const provider = activeProvider ? activeProvider : defaultProvider;
+
+        const provider =
+          activeProvider && activeChainId === Number(config.chain_id)
+            ? activeProvider
+            : defaultProvider;

        if (
          account &&
@@ -84,7 +92,14 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
      //  TODO: hacky quick fix for release to prevent race condition, find a better fix for this.
      cancelled = true;
    };
-  }, [activeProvider, account, config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);
+  }, [
+    activeProvider,
+    activeChainId,
+    account,
+    config,
+    VEGA_ENV,
+    ETHEREUM_PROVIDER_URL,
+  ]);

  if (!contracts) {
    return (
@@ -6,6 +6,7 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { ENV } from '../../../config';

 export const EpochData = () => {
  // errorPolicy due to vegaprotocol/vega issue 5898
@@ -14,11 +15,23 @@ export const EpochData = () => {
    data: nodesData,
    error: nodesError,
    loading: nodesLoading,
-    refetch,
+    refetch: nodesRefetch,
  } = useNodesQuery();
-  const { data: userStakingData } = useStakingQuery({
+
+  const { delegationsPagination } = ENV;
+  const {
+    data: userStakingData,
+    error: userStakingError,
+    loading: userStakingLoading,
+    refetch: userStakingRefetch,
+  } = useStakingQuery({
    variables: {
      partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
    },
  });
  const { data: previousEpochData } = usePreviousEpochQuery({
@@ -28,10 +41,17 @@ export const EpochData = () => {
    skip: !nodesData?.epoch.id,
  });

-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, () => {
+    nodesRefetch();
+    userStakingRefetch();
+  });

  return (
-    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
+    <AsyncRenderer
+      loading={nodesLoading || userStakingLoading}
+      error={nodesError || userStakingError}
+      data={nodesData}
+    >
      {nodesData?.epoch &&
        nodesData.epoch.timestamps.start &&
        nodesData?.epoch.timestamps.expiry && (
@@ -211,7 +211,7 @@ export const ConsensusValidatorsTable = ({
              : undefined,
            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
              : undefined,
          };
        }
@@ -59,9 +59,9 @@ export const addUserDataToValidator = (
      : undefined,
    [ValidatorFields.USER_STAKE_SHARE]:
      currentEpochUserStaking && Number(currentEpochUserStaking.amount) > 0
-        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
-            new BigNumber(currentUserStakeAvailable)
-          )
+        ? new BigNumber(currentEpochUserStaking.amount)
+            .dividedBy(new BigNumber(currentUserStakeAvailable))
+            .times(100)
        : undefined,
  };
 };
@@ -26,7 +26,11 @@ import {
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
 import type { ValidatorsTableProps } from './shared';
-import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import {
+  formatNumber,
+  formatNumberPercentage,
+  toBigNum,
+} from '@vegaprotocol/utils';

 interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
  stakeNeededForPromotion: string | undefined;
@@ -163,7 +167,7 @@ export const StandbyPendingValidatorsTable = ({
              : undefined,
            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
              : undefined,
          };
        }
@@ -19,7 +19,7 @@ NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
+NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,3 +1,3 @@
 # App configuration variables
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=LOCAL
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
@@ -1,17 +1,3 @@
 {
-  "hosts": [
-    "https://vega-data-graphql.chorus.one/query",
-    "https://vega.xprv.io/datanode/query",
-    "http://nala.mainnet.vega.community:3008/query",
-    "http://commodum.mainnet.vega.community:3008/query",
-    "http://lovali.mainnet.vega.community:3008/query",
-    "http://b-harvest.mainnet.vega.community:3008/query",
-    "http://staking-facilities.mainnet.vega.community:3008/query",
-    "http://figment.mainnet.vega.community:3008/query",
-    "http://nodes-guru.mainnet.vega.community:3008/query",
-    "http://p2p.mainnet.vega.community:3008/query",
-    "http://rockaway.mainnet.vega.community:3008/query",
-    "http://greenfield-one.mainnet.vega.community:3008/query",
-    "http://ryabina.mainnet.vega.community:3008/query"
-  ]
+  "hosts": ["https://vega.xprv.io/datanode/query"]
 }
@@ -1,11 +1,7 @@
 {
  "hosts": [
+    "https://api-n00.testnet.vega.rocks/graphql",
    "https://api-n06.testnet.vega.rocks/graphql",
-    "https://api-n07.testnet.vega.rocks/graphql",
-    "https://api-n08.testnet.vega.rocks/graphql",
-    "https://api-n09.testnet.vega.rocks/graphql",
-    "https://api-n10.testnet.vega.rocks/graphql",
-    "https://api-n11.testnet.vega.rocks/graphql",
-    "https://api-n12.testnet.vega.rocks/graphql"
+    "https://api-n07.testnet.vega.rocks/graphql"
  ]
 }
@@ -8,7 +8,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -27,6 +27,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -24,6 +24,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,4 +1,5 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';

 const marketInfoBtn = 'Info';
 const row = 'key-value-table-row';
@@ -12,7 +13,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  before(() => {
-    cy.mockTradingPage();
+    cy.mockTradingPage(
+      MarketState.STATE_ACTIVE,
+      undefined,
+      undefined,
+      'COMPROMISED'
+    );
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
@@ -20,6 +26,11 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    cy.wait('@MarketInfo');
  });

+  it('show oracle banner', () => {
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+    cy.getByTestId('oracle-status').should('contain.text', 'COMPROMISED');
+  });
+
  it('current fees displayed', () => {
    cy.getByTestId(marketTitle).contains('Current fees').click();
    validateMarketDataRow(0, 'Maker Fee', '0.02%');
@@ -32,7 +32,7 @@ describe('Navbar', { tags: '@smoke' }, () => {
    });

    it('Resources dropdown should be correctly rendered', () => {
-      const resourceSelector = 'ul li:last-child';
+      const resourceSelector = 'ul li:contains(Resources)';
      ['Docs', 'Give Feedback'].forEach((text, index) => {
        cy.get('nav').find(resourceSelector).contains('Resources').click();
        cy.get('nav')
@@ -91,7 +91,7 @@ describe('Navbar', { tags: '@smoke' }, () => {
        cy.getByTestId('button-menu-drawer').click();
        cy.getByTestId('menu-drawer').should('be.visible');
        cy.getByTestId('menu-drawer')
-          .find('[data-testid="theme-switcher"]')
+          .find('[data-testid="Settings"]')
          .should('be.visible');
        cy.getByTestId('button-menu-drawer').click();
        cy.getByTestId('menu-drawer').should('not.be.visible');
@@ -0,0 +1,45 @@
+import { closeWelcomeDialog } from '../support/helpers';
+
+describe('Settings page', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/');
+      closeWelcomeDialog();
+      cy.get('[aria-label="cog icon"]').click();
+    });
+  });
+  it('telemetry checkbox should work well', () => {
+    cy.location('hash').should('equal', '#/settings');
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+    cy.get('[for="telemetry-approval"]').click();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'checked'
+    );
+    cy.reload();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'checked'
+    );
+    cy.get('[for="telemetry-approval"]').click();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+    cy.reload();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+  });
+});
@@ -25,17 +25,7 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="accounts-actions"]')
-      .should('have.text', 'DepositWithdraw');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[data-testid="deposit"]')
-      .should('have.text', 'Deposit');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"] [data-testid="withdraw"]')
-      .should('have.text', 'Withdraw');
+      .should('have.text', ' ');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
@@ -1,7 +1,18 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { fillsQuery } from '@vegaprotocol/mock';

+const tabFills = 'tab-fills';
+
 describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
  beforeEach(() => {
    // Ensure page loads with correct key
    cy.window().then((window) => {
@@ -38,31 +49,37 @@ describe('fills', { tags: '@regression' }, () => {
  });

  function validateFillsDisplayed() {
-    cy.getByTestId('tab-fills').should('be.visible');
-
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
      .get(
        '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
      )
      .each(($marketSymbol) => {
        cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
      .get('[role="gridcell"][col-id="size"]')
      .each(($amount) => {
        cy.wrap($amount).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
      .get('[role="gridcell"][col-id="price"]')
      .each(($prices) => {
        cy.wrap($prices).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
      .get('[role="gridcell"][col-id="price_1"]')
      .each(($total) => {
        cy.wrap($total).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
      .get('[role="gridcell"][col-id="aggressor"]')
      .each(($role) => {
        cy.wrap($role)
@@ -72,13 +89,15 @@ describe('fills', { tags: '@regression' }, () => {
            expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
          });
      });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
      .get(
        '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
      )
      .each(($fees) => {
        cy.wrap($fees).invoke('text').should('not.be.empty');
      });
+    cy.getByTestId(tabFills).contains('Date');
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
    cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {
@@ -9,3 +9,8 @@ export const selectAsset = (assetIndex: number) => {
  // eslint-disable-next-line
  cy.wait(100);
 };
+
+export const closeWelcomeDialog = () => {
+  cy.getByTestId('select-market-list').should('exist');
+  cy.getByTestId('dialog-close').click();
+};
@@ -1,6 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
+import type { Provider, Status } from '@vegaprotocol/oracles';
 import {
  accountsQuery,
  assetQuery,
@@ -155,7 +156,6 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
  aliasGQLQuery(req, 'Deposits', depositsQuery());
 };
-
 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
  namespace Cypress {
@@ -164,50 +164,56 @@ declare global {
      mockTradingPage(
        state?: Schema.MarketState,
        tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger
+        trigger?: Schema.AuctionTrigger,
+        oracleStatus?: Status
      ): void;
    }
  }
 }
+
 export const addMockTradingPage = () => {
  Cypress.Commands.add(
    'mockTradingPage',
-    (state = Schema.MarketState.STATE_ACTIVE, tradingMode, trigger) => {
+    (
+      state = Schema.MarketState.STATE_ACTIVE,
+      tradingMode,
+      trigger,
+      oracleStatus
+    ) => {
      cy.mockGQL((req) => {
        mockTradingPage(req, state, tradingMode, trigger);
      });

+      const oracle: Provider = {
+        name: 'Another oracle',
+        url: 'https://zombo.com',
+        description_markdown:
+          'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
+        oracle: {
+          status: oracleStatus || 'GOOD',
+          status_reason: '',
+          first_verified: '2022-01-01T00:00:00.000Z',
+          last_verified: '2022-12-31T00:00:00.000Z',
+          type: 'public_key',
+          public_key: ORACLE_PUBKEY,
+        },
+        proofs: [
+          {
+            format: 'signed_message',
+            available: true,
+            type: 'public_key',
+            public_key: ORACLE_PUBKEY,
+            message: 'SOMEHEX',
+          },
+        ],
+        github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
+      };
      // Prevent request to github, return some dummy content
      cy.intercept(
        'GET',
        /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
        {
-          body: [
-            {
-              name: 'Another oracle',
-              url: 'https://zombo.com',
-              description_markdown:
-                'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-              oracle: {
-                status: 'GOOD',
-                status_reason: '',
-                first_verified: '2022-01-01T00:00:00.000Z',
-                last_verified: '2022-12-31T00:00:00.000Z',
-                type: 'public_key',
-                public_key: ORACLE_PUBKEY,
-              },
-              proofs: [
-                {
-                  format: 'signed_message',
-                  available: true,
-                  type: 'public_key',
-                  public_key: ORACLE_PUBKEY,
-                  message: 'SOMEHEX',
-                },
-              ],
-              github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
-            },
-          ],
+          body: [oracle],
        }
      );
    }
@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
@@ -11,4 +11,4 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -350,7 +350,10 @@ export const TradePanels = ({

  return (
    <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
      <div className="h-full">
        <AutoSizer>
          {({ width, height }) => (
@@ -0,0 +1,2 @@
+export { Settings as default } from './settings';
+export { SettingsButton } from './settings-button';
@@ -0,0 +1,16 @@
+import { Icon, NavigationLink } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import { Links, Routes } from '../../pages/client-router';
+import { COG } from '@blueprintjs/icons/src/generated/iconNames';
+
+export const SettingsButton = ({ withMobile }: { withMobile?: boolean }) => {
+  return (
+    <NavigationLink data-testid="Settings" to={Links[Routes.SETTINGS]()}>
+      {withMobile ? (
+        t('Settings')
+      ) : (
+        <Icon name={COG} className="!align-middle" />
+      )}
+    </NavigationLink>
+  );
+};
@@ -0,0 +1,45 @@
+import { t } from '@vegaprotocol/i18n';
+import { TelemetryApproval } from '../../components/welcome-dialog/telemetry-approval';
+import {
+  Divider,
+  RoundedWrapper,
+  Switch,
+  ThemeSwitcher,
+} from '@vegaprotocol/ui-toolkit';
+import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+
+export const Settings = () => {
+  const { theme, setTheme } = useThemeSwitcher();
+  const text = t(theme === 'dark' ? 'Light mode' : 'Dark mode');
+  return (
+    <div className="py-16 px-8 flex w-full justify-center">
+      <div className="lg:min-w-[700px] min-w-[300px]">
+        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
+          {t('Settings')}
+        </h1>
+        <div className="mt-8 text-base text-neutral-500 dark:text-neutral-400">
+          {t('Changes are applied automatically.')}
+        </div>
+        <div className="mt-10 w-full">
+          <RoundedWrapper paddingBottom>
+            <div className="flex justify-between py-3">
+              <div className="flex shrink">
+                <ThemeSwitcher />
+                <label htmlFor="theme-switcher" className="self-center text-lg">
+                  {text}
+                </label>
+              </div>
+              <Switch
+                name="settings-theme-switch"
+                onCheckedChange={() => setTheme()}
+                checked={theme === 'dark'}
+              />
+            </div>
+            <Divider />
+            <TelemetryApproval isSettingsPage />
+          </RoundedWrapper>
+        </div>
+      </div>
+    </div>
+  );
+};
@@ -26,7 +26,8 @@ export const OracleBanner = ({ marketId }: { marketId: string }) => {
  return (
    <NotificationBanner intent={Intent.Danger}>
      <div>
-        Oracle status for this market is {oracle.status}.{' '}
+        Oracle status for this market is{' '}
+        <span data-testId="oracle-status">{oracle.status}</span>.{' '}
        {oracleStatuses[oracle.status]}
      </div>
      {oracle.status_reason ? (
@@ -10,7 +10,6 @@ import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import {
-  ThemeSwitcher,
  Navigation,
  NavigationList,
  NavigationItem,
@@ -24,6 +23,7 @@ import {

 import { Links, Routes } from '../../pages/client-router';
 import { createDocsLinks } from '@vegaprotocol/utils';
+import { SettingsButton } from '../../client-pages/settings';

 export const Navbar = ({
  theme = 'system',
@@ -45,7 +45,7 @@ export const Navbar = ({
      theme={theme}
      actions={
        <>
-          <ThemeSwitcher />
+          <SettingsButton />
          <VegaWalletConnectButton />
        </>
      }
@@ -108,15 +108,15 @@ export const Navbar = ({
        )}
      </NavigationList>
      <NavigationList
-        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-8 [.drawer-content_&]:mt-4"
+        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-4 [.drawer-content_&]:mt-4"
        hide={[
          NavigationBreakpoint.Small,
          NavigationBreakpoint.Narrow,
          NavigationBreakpoint.Full,
        ]}
      >
-        <NavigationItem className="[.drawer-content_&]:w-full text-black dark:text-white">
-          <ThemeSwitcher withMobile />
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <SettingsButton withMobile />
        </NavigationItem>
      </NavigationList>
    </Navigation>
@@ -21,12 +21,12 @@ describe('Risk notice dialog', () => {
  });

  it.each`
-    assertion             | network
-    ${'displays'}         | ${Networks.MAINNET}
-    ${'does not display'} | ${Networks.CUSTOM}
-    ${'does not display'} | ${Networks.DEVNET}
-    ${'does not display'} | ${Networks.STAGNET3}
-    ${'does not display'} | ${Networks.TESTNET}
+    assertion     | network
+    ${'displays'} | ${Networks.MAINNET}
+    ${'displays'} | ${Networks.CUSTOM}
+    ${'displays'} | ${Networks.DEVNET}
+    ${'displays'} | ${Networks.STAGNET3}
+    ${'displays'} | ${Networks.TESTNET}
  `(
    '$assertion the risk notice on $network',
    async ({ assertion, network }) => {
@@ -43,13 +43,7 @@ describe('Risk notice dialog', () => {
        { wrapper: BrowserRouter }
      );

-      if (assertion === 'displays') {
-        // eslint-disable-next-line jest/no-conditional-expect
-        expect(screen.queryByText(introText)).toBeInTheDocument();
-      } else {
-        // eslint-disable-next-line jest/no-conditional-expect
-        expect(screen.queryByText(introText)).not.toBeInTheDocument();
-      }
+      expect(screen.queryByText(introText)).toBeInTheDocument();
    }
  );

@@ -3,6 +3,7 @@ import { t } from '@vegaprotocol/i18n';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { LocalStorage } from '@vegaprotocol/utils';
 import { RISK_ACCEPTED_KEY } from '../constants';
+import { TelemetryApproval } from './telemetry-approval';

 interface Props {
  onClose: () => void;
@@ -32,6 +33,9 @@ export const RiskNoticeDialog = ({ onClose }: Props) => {
        )}
      </p>
      <Button onClick={handleAcceptRisk}>{t('I understand, Continue')}</Button>
+      <div className="text-base mt-8">
+        <TelemetryApproval />
+      </div>
    </>
  );
 };
@@ -0,0 +1,19 @@
+import { render, screen, act } from '@testing-library/react';
+import { TelemetryApproval } from './telemetry-approval';
+
+describe('TelemetryApproval', () => {
+  it('click on checkbox should be properly handled', () => {
+    render(<TelemetryApproval />);
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'unchecked'
+    );
+    act(() => {
+      screen.getByRole('checkbox').click();
+    });
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'checked'
+    );
+  });
+});
@@ -0,0 +1,32 @@
+import { Checkbox } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
+
+export const TelemetryApproval = ({
+  isSettingsPage,
+}: {
+  isSettingsPage?: boolean;
+}) => {
+  const [isApproved, setIsApproved] = useTelemetryApproval();
+  return (
+    <div className="flex flex-col px-2 py-3">
+      <div className="mr-4" role="form">
+        <Checkbox
+          label={<span className="text-lg pl-1">{t('Share usage data')}</span>}
+          checked={isApproved}
+          name="telemetry-approval"
+          onCheckedChange={() => setIsApproved(!isApproved)}
+        />
+      </div>
+      <div className="text-sm text-vega-light-300 dark:text-vega-dark-300 ml-6">
+        <span>
+          {t(
+            'Help identify bugs and improve the service by sharing anonymous usage data.'
+          )}
+          {!isSettingsPage &&
+            ' ' + t('You can change this in your settings at any time.')}
+        </span>
+      </div>
+    </div>
+  );
+};
@@ -4,7 +4,6 @@ import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider, useLocalStorage } from '@vegaprotocol/react-helpers';
 import { activeMarketsProvider } from '@vegaprotocol/market-list';
-import { useEnvironment, Networks } from '@vegaprotocol/environment';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';
 import { WelcomeNoticeDialog } from './welcome-notice-dialog';
@@ -13,37 +12,38 @@ import { useGlobalStore } from '../../stores';

 export const WelcomeDialog = () => {
  const { pathname } = useLocation();
-  const { VEGA_ENV } = useEnvironment();
-  let dialogContent: React.ReactNode = null;
+  let dialogContent: React.ReactNode;
  let title = '';
  let size: 'small' | 'medium' = 'small';
+  let onClose: ((open: boolean) => void) | undefined = undefined;
  const [riskAccepted] = useLocalStorage(constants.RISK_ACCEPTED_KEY);
  const { data } = useDataProvider({
    dataProvider: activeMarketsProvider,
    variables: undefined,
  });

-  const { update, shouldDisplayWelcomeDialog } = useGlobalStore((store) => ({
-    update: store.update,
-    shouldDisplayWelcomeDialog: store.shouldDisplayWelcomeDialog,
-  }));
-  const isRiskDialogNeeded =
-    riskAccepted !== 'true' && VEGA_ENV === Networks.MAINNET;
+  const update = useGlobalStore((store) => store.update);
+  const shouldDisplayWelcomeDialog = useGlobalStore(
+    (store) => store.shouldDisplayWelcomeDialog
+  );
+  const isRiskDialogNeeded = riskAccepted !== 'true' && !('Cypress' in window);
  const isWelcomeDialogNeeded = pathname === '/' || shouldDisplayWelcomeDialog;
-  const onClose = useCallback(() => {
+  const onCloseDialog = useCallback(() => {
    update({ shouldDisplayWelcomeDialog: isRiskDialogNeeded });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    dialogContent = null;
  }, [update, isRiskDialogNeeded]);

  if (isRiskDialogNeeded) {
-    dialogContent = <RiskNoticeDialog onClose={onClose} />;
+    dialogContent = <RiskNoticeDialog onClose={onCloseDialog} />;
    title = t('WARNING');
    size = 'medium';
  } else if (isWelcomeDialogNeeded && data?.length === 0) {
    dialogContent = <WelcomeNoticeDialog />;
+    onClose = onCloseDialog;
  } else if (isWelcomeDialogNeeded && (data?.length || 0) > 0) {
-    dialogContent = <WelcomeLandingDialog onClose={onClose} />;
+    dialogContent = <WelcomeLandingDialog onClose={onCloseDialog} />;
+    onClose = onCloseDialog;
+  } else {
+    dialogContent = null as React.ReactNode;
  }

  return (
@@ -0,0 +1,48 @@
+import { renderHook, act, waitFor } from '@testing-library/react';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { SentryInit, SentryClose } from '@vegaprotocol/utils';
+import { STORAGE_KEY, useTelemetryApproval } from './use-telemetry-approval';
+
+const mockSetValue = jest.fn();
+const mockRemoveValue = jest.fn();
+jest.mock('@vegaprotocol/utils');
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useLocalStorage: jest
+    .fn()
+    .mockImplementation(() => [false, mockSetValue, mockRemoveValue]),
+}));
+
+describe('useTelemetryApproval', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('hook should return proper array', () => {
+    const res = renderHook(() => useTelemetryApproval());
+    expect(res.result.current[0]).toEqual(false);
+    expect(res.result.current[1]).toEqual(expect.any(Function));
+    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_KEY);
+  });
+
+  it('hook should init stuff properly', async () => {
+    const res = renderHook(() => useTelemetryApproval());
+    await act(() => {
+      res.result.current[1](true);
+    });
+    await waitFor(() => {
+      expect(SentryInit).toHaveBeenCalled();
+      expect(mockSetValue).toHaveBeenCalledWith('1');
+    });
+  });
+
+  it('hook should close stuff properly', async () => {
+    const res = renderHook(() => useTelemetryApproval());
+    await act(() => {
+      res.result.current[1](false);
+    });
+    await waitFor(() => {
+      expect(SentryClose).toHaveBeenCalled();
+      expect(mockRemoveValue).toHaveBeenCalledWith();
+    });
+  });
+});
@@ -0,0 +1,24 @@
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { useCallback } from 'react';
+import { SentryInit, SentryClose } from '@vegaprotocol/utils';
+import { ENV } from '../config';
+export const STORAGE_KEY = 'vega_telemetry_approval';
+
+export const useTelemetryApproval = (): [
+  value: boolean,
+  setValue: (value: boolean) => void
+] => {
+  const [value, setValue, removeValue] = useLocalStorage(STORAGE_KEY);
+  const setApprove = useCallback(
+    (value: boolean) => {
+      if (value) {
+        SentryInit(ENV.dsn, ENV.envName);
+        return setValue('1');
+      }
+      SentryClose();
+      removeValue();
+    },
+    [setValue, removeValue]
+  );
+  return [Boolean(value), setApprove];
+};
@@ -36,6 +36,7 @@ import { Navbar } from '../components/navbar';
 import { ENV } from '../lib/config';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
+import { useTelemetryApproval } from '../lib/hooks/use-telemetry-approval';

 const DEFAULT_TITLE = t('Welcome to Vega trading!');

@@ -145,7 +146,10 @@ const PartyData = () => {

 const MaybeConnectEagerly = () => {
  useVegaEagerConnect(Connectors);
-  useEthereumEagerConnect(ENV.dsn);
+  const [isTelemetryApproved] = useTelemetryApproval();
+  useEthereumEagerConnect(
+    isTelemetryApproved ? { dsn: ENV.dsn, env: ENV.envName } : {}
+  );

  const { pubKey, connect } = useVegaWallet();
  const [searchParams] = useSearchParams();
@@ -26,12 +26,17 @@ const LazyPortfolio = dynamic(() => import('../client-pages/portfolio'), {
  ssr: false,
 });

+const LazySettings = dynamic(() => import('../client-pages/settings'), {
+  ssr: false,
+});
+
 export enum Routes {
  HOME = '/',
  MARKET = '/markets',
  MARKETS = '/markets/all',
  PORTFOLIO = '/portfolio',
-  LIQUIDITY = '/liquidity',
+  LIQUIDITY = 'liquidity/:marketId',
+  SETTINGS = 'settings',
 }

 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -45,6 +50,7 @@ export const Links: ConsoleLinks = {
    marketId
      ? trimEnd(`${Routes.LIQUIDITY}/${marketId}`, '/')
      : Routes.LIQUIDITY,
+  [Routes.SETTINGS]: () => Routes.SETTINGS,
 };

 const routerConfig: RouteObject[] = [
@@ -87,6 +93,10 @@ const routerConfig: RouteObject[] = [
    path: Routes.PORTFOLIO,
    element: <LazyPortfolio />,
  },
+  {
+    path: Routes.SETTINGS,
+    element: <LazySettings />,
+  },
  {
    path: '*',
    element: (
@@ -1,14 +1,9 @@
-import * as Sentry from '@sentry/nextjs';
-import { BrowserTracing } from '@sentry/tracing';
 import { ENV } from './lib/config/env';
+import { LocalStorage, SentryInit } from '@vegaprotocol/utils';
+import { STORAGE_KEY } from './lib/hooks/use-telemetry-approval';

-const { dsn } = ENV;
-
-if (dsn) {
-  Sentry.init({
-    dsn,
-    integrations: [new BrowserTracing()],
-    tracesSampleRate: 1,
-    environment: ENV.envName,
-  });
+const { dsn, envName } = ENV;
+const isTelemetryApproved = !!LocalStorage.getItem(STORAGE_KEY);
+if (dsn && isTelemetryApproved) {
+  SentryInit(dsn, envName);
 }
@@ -61,14 +61,7 @@ describe('AccountsTable', () => {
      );
    });
    const cells = await screen.findAllByRole('gridcell');
-    const expectedValues = [
-      'tBTC',
-      '1,256.00',
-      '1,256.00',
-      '2,512.00',
-      'Deposit',
-      'Withdraw',
-    ];
+    const expectedValues = ['tBTC', '1,256.00', '1,256.00', '2,512.00', ''];
    cells.forEach((cell, i) => {
      expect(cell).toHaveTextContent(expectedValues[i]);
    });
@@ -9,7 +9,17 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { Button, ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit';
+import {
+  Button,
+  ButtonLink,
+  Dialog,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import {
  AgGridDynamic as AgGrid,
@@ -122,7 +132,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
        params.data.asset.id === pinnedAssetId &&
        new BigNumber(params.data.total).isLessThanOrEqualTo(0)
          ? 32
-          : 22,
+          : 24,
      [pinnedAssetId]
    );

@@ -256,7 +266,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
              colId="accounts-actions"
              headerName=""
              sortable={false}
-              minWidth={200}
+              maxWidth={200}
              type="rightAligned"
              cellRenderer={({
                data,
@@ -283,30 +293,65 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                    );
                  }
                  return (
-                    <>
-                      <span className="mx-1" />
-                      {!props.isReadOnly && (
-                        <ButtonLink
-                          data-testid="deposit"
-                          onClick={() => {
-                            onClickDeposit && onClickDeposit(data.asset.id);
-                          }}
-                        >
-                          {t('Deposit')}
-                        </ButtonLink>
-                      )}
-                      <span className="mx-1" />
-                      {!props.isReadOnly && (
-                        <ButtonLink
-                          data-testid="withdraw"
-                          onClick={() =>
-                            onClickWithdraw && onClickWithdraw(data.asset.id)
-                          }
-                        >
-                          {t('Withdraw')}
-                        </ButtonLink>
-                      )}
-                    </>
+                    !props.isReadOnly && (
+                      <DropdownMenu
+                        trigger={
+                          <DropdownMenuTrigger
+                            iconName="more"
+                            className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
+                          ></DropdownMenuTrigger>
+                        }
+                      >
+                        <DropdownMenuContent>
+                          <DropdownMenuItem
+                            key={'deposit'}
+                            data-testid="deposit"
+                            onClick={() => {
+                              onClickDeposit && onClickDeposit(data.asset.id);
+                            }}
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.DEPOSIT}
+                                size={16}
+                              />
+                              {t('Deposit')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'withdraw'}
+                            data-testid="withdraw"
+                            onClick={() =>
+                              onClickWithdraw && onClickWithdraw(data.asset.id)
+                            }
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.WITHDRAW}
+                                size={16}
+                              />
+                              {t('Withdraw')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'breakdown'}
+                            data-testid="breakdown"
+                            onClick={() => {
+                              setOpenBreakdown(!openBreakdown);
+                              setRow(data);
+                            }}
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.BREAKDOWN}
+                                size={16}
+                              />
+                              {t('Breakdown')}
+                            </span>
+                          </DropdownMenuItem>
+                        </DropdownMenuContent>
+                      </DropdownMenu>
+                    )
                  );
                }
              }}
@@ -1 +1,4 @@
-export const ASSET_ID_FOR_MARKET = 'fUSDC';
+export const ASSET_ID_FOR_MARKET =
+  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
+
+export const ASSET_SYMBOL = 'fUSDC';
@@ -4,7 +4,7 @@ import { createLog } from './logging';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
 import { getProposal } from './get-proposal';
 import { sendVegaTx } from './wallet-client';
-import { ASSET_ID_FOR_MARKET } from './contants';
+import { ASSET_ID_FOR_MARKET, ASSET_SYMBOL } from './contants';

 const log = createLog('propose-market');

@@ -43,7 +43,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
              code: 'TEST.24h',
              future: {
                settlementAsset: ASSET_ID_FOR_MARKET,
-                quoteName: ASSET_ID_FOR_MARKET,
+                quoteName: ASSET_SYMBOL,
                dataSourceSpecForSettlementData: {
                  external: {
                    oracle: {
@@ -66,7 +66,7 @@ export function addGetAssets() {

    cy.request({
      method: 'POST',
-      url: 'http://localhost:3028/query',
+      url: 'http://localhost:3008/graphql',
      body: {
        query: print(query),
      },
@@ -24,7 +24,7 @@ export function addGetNetworkParameters() {
  }`;
    cy.request({
      method: 'POST',
-      url: `http://localhost:3028/query`,
+      url: `http://localhost:3008/graphql`,
      body: {
        query: mutation,
      },
@@ -43,7 +43,7 @@ export function addGetNodes() {

    cy.request({
      method: 'POST',
-      url: `http://localhost:3028/query`,
+      url: `http://localhost:3008/graphql`,
      body: {
        query: print(query),
      },
@@ -70,7 +70,7 @@ const NetworkLabel = ({
  isCurrent = false,
  isAvailable = false,
 }: NetworkLabelProps) => (
-  <span className="text-neutral-800">
+  <span className="text-vega-dark-300 dark:text-vega-light-300">
    {getLabelText({ isCurrent, isAvailable })}
  </span>
 );
@@ -111,9 +111,12 @@ export const NetworkSwitcher = ({
      trigger={
        <DropdownMenuTrigger
          ref={menuRef}
-          className={classNames('flex justify-between items-center', className)}
+          className={classNames(
+            'flex justify-between items-center text-sm text-vega-dark-600 dark:text-vega-light-600 py-1 px-2 rounded border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500 hover:bg-vega-light-500',
+            className
+          )}
        >
-          {envTriggerMapping[current]}
+          <span className="mr-2"> {envTriggerMapping[current]}</span>
        </DropdownMenuTrigger>
      }
    >
@@ -120,6 +120,40 @@ describe('FillsTable', () => {
    expect(amountCell).toHaveClass('text-vega-pink');
  });

+  it('should format cells correctly for side unspecified', async () => {
+    const partyId = 'party-id';
+    const buyerFill = generateFill({
+      ...defaultFill,
+      seller: {
+        id: partyId,
+      },
+      aggressor: Schema.Side.SIDE_UNSPECIFIED,
+      sellerFee: {
+        makerFee: '1',
+        infrastructureFee: '1',
+        liquidityFee: '1',
+      },
+    });
+    render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
+
+    const cells = screen.getAllByRole('gridcell');
+    const expectedValues = [
+      buyerFill.market?.tradableInstrument.instrument.name || '',
+      '-3.00',
+      '1.00 BTC',
+      '3.00 BTC',
+      '-',
+      '0.03 BTC',
+      getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+
+    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
+    expect(amountCell).toHaveClass('text-vega-pink');
+  });
+
  it('should render correct maker or taker role', async () => {
    const partyId = 'party-id';
    const takerFill = generateFill({
@@ -190,7 +224,7 @@ describe('FillsTable', () => {
        makerFee: '1000',
        totalFee: '6000',
      };
-      expect(getFeesBreakdown('TAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Taker', fees)).toEqual(expectedBreakdown);
    });

    it('should return correct fees breakdown for a maker', () => {
@@ -205,7 +239,7 @@ describe('FillsTable', () => {
        makerFee: '-1000',
        totalFee: '4000',
      };
-      expect(getFeesBreakdown('MAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Maker', fees)).toEqual(expectedBreakdown);
    });
  });
 });
@@ -26,8 +26,10 @@ import BigNumber from 'bignumber.js';
 import type { Trade } from './fills-data-provider';
 import type { FillFieldsFragment } from './__generated__/Fills';

-const TAKER = 'TAKER';
-const MAKER = 'MAKER';
+const TAKER = 'Taker';
+const MAKER = 'Maker';
+
+export type Role = typeof TAKER | typeof MAKER | '-';

 export type Props = (AgGridReactProps | AgReactUiProps) & {
  partyId: string;
@@ -180,24 +182,10 @@ const formatTotal = ({
 };

 const formatRole = (partyId: string) => {
-  return ({ value, data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
-    const taker = t('Taker');
-    const maker = t('Maker');
-    if (data?.buyer.id === partyId) {
-      if (value === Schema.Side.SIDE_BUY) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else if (data?.seller.id === partyId) {
-      if (value === Schema.Side.SIDE_SELL) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else {
-      return '-';
-    }
+  return ({ data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
+    if (!data) return '-';
+    const { role } = getRoleAndFees({ data, partyId });
+    return role;
  };
 };

@@ -222,6 +210,15 @@ const formatFee = (partyId: string) => {
  };
 };

+export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
+  if (!feeObj) return true;
+  return (
+    feeObj.liquidityFee === '0' &&
+    feeObj.makerFee === '0' &&
+    feeObj.infrastructureFee === '0'
+  );
+};
+
 export const getRoleAndFees = ({
  data,
  partyId,
@@ -232,14 +229,30 @@ export const getRoleAndFees = ({
  >;
  partyId?: string;
 }) => {
-  let role;
+  let role: Role;
  let feesObj;
  if (data?.buyer.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_BUY ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.buyerFee : data.sellerFee;
+    if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = TAKER;
+      feesObj = data?.buyerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = MAKER;
+      feesObj = data?.sellerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
+    }
  } else if (data?.seller.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_SELL ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.sellerFee : data.buyerFee;
+    if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = TAKER;
+      feesObj = data?.sellerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = MAKER;
+      feesObj = data?.buyerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
+    }
  } else {
    return { role: '-', feesObj: '-' };
  }
@@ -270,11 +283,6 @@ const FeesBreakdownTooltip = ({
      {role === MAKER && (
        <>
          <p className="mb-1">{t('The maker will receive the maker fee.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the maker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
          <p className="mb-1">
            {t(
              'If the market is active the maker will pay zero infrastructure and liquidity fees.'
@@ -283,14 +291,14 @@ const FeesBreakdownTooltip = ({
        </>
      )}
      {role === TAKER && (
-        <>
-          <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the taker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
-        </>
+        <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
+      )}
+      {role === '-' && (
+        <p className="mb-1">
+          {t(
+            'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
+          )}
+        </p>
      )}
      <dl className="grid grid-cols-2 gap-x-1">
        <dt className="col-span-1">{t('Infrastructure fee')}</dt>
@@ -316,7 +324,7 @@ const FeesBreakdownTooltip = ({
 };

 export const getFeesBreakdown = (
-  role: string,
+  role: Role,
  feesObj: {
    __typename?: 'TradeFee' | undefined;
    makerFee: string;
@@ -328,6 +336,7 @@ export const getFeesBreakdown = (
    role === MAKER
      ? new BigNumber(feesObj.makerFee).times(-1).toString()
      : feesObj.makerFee;
+
  const infrastructureFee = feesObj.infrastructureFee;
  const liquidityFee = feesObj.liquidityFee;

@@ -1,5 +1,5 @@
 {
  "name": "@vegaprotocol/i18n",
-  "version": "0.0.1",
+  "version": "0.0.2",
  "type": "commonjs"
 }
@@ -6,6 +6,7 @@
    "build": {
      "executor": "@nrwl/js:tsc",
      "outputs": ["{options.outputPath}"],
+      "format": ["esm", "cjs"],
      "options": {
        "outputPath": "dist/libs/i18n",
        "main": "libs/i18n/src/index.ts",
@@ -12,4 +12,5 @@ export default {
  },
  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
  coverageDirectory: '../../coverage/libs/ledger',
+  setupFilesAfterEnv: ['./src/setup-tests.ts'],
 };
@@ -30,7 +30,10 @@ export type LedgerEntry = LedgerEntryFragment & {
 };

 export type AggregatedLedgerEntriesEdge = Schema.AggregatedLedgerEntriesEdge;
-export type AggregatedLedgerEntriesNode = AggregatedLedgerEntriesEdge & {
+export type AggregatedLedgerEntriesNode = Omit<
+  AggregatedLedgerEntriesEdge,
+  'node'
+> & {
  node: LedgerEntry;
 };

@@ -32,7 +32,7 @@ export const ledgerEntriesQuery = (
  return merge(defaultResult, override);
 };

-const ledgerEntries: LedgerEntryFragment[] = [
+export const ledgerEntries: LedgerEntryFragment[] = [
  {
    vegaTime: '1669224476734364000',
    quantity: '0',
@@ -180,7 +180,6 @@ const ledgerEntries: LedgerEntryFragment[] = [
    toAccountBalance: '0',
    fromAccountBalance: '0',
  },
-
  {
    vegaTime: '2022-11-24T12:41:22.054428Z',
    quantity: '1000000000',
@@ -0,0 +1,85 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { LedgerExportLink } from './ledger-export-link';
+import * as Types from '@vegaprotocol/types';
+import { ledgerEntries } from './ledger-entries.mock';
+import type { LedgerEntry } from './ledger-entries-data-provider';
+
+const VEGA_URL = 'https://vega-url.co.uk/querystuff';
+const mockEnvironment = jest.fn(() => VEGA_URL);
+jest.mock('@vegaprotocol/environment', () => ({
+  useEnvironment: jest.fn(() => mockEnvironment()),
+}));
+
+const asset = {
+  id: 'assetID',
+  name: 'assetName',
+  symbol: 'assetSymbol',
+  decimals: 1,
+  quantum: '1',
+  status: Types.AssetStatus,
+  source: {
+    __typename: 'ERC20',
+    contractAddress: 'contractAddres',
+    lifetimeLimit: 'lifetimeLimit',
+    withdrawThreshold: 'withdraw',
+  },
+};
+
+describe('LedgerExportLink', () => {
+  const partyId = 'partyId';
+  const entries = ledgerEntries.map((entry) => {
+    return {
+      ...entry,
+      asset: entry.assetId
+        ? {
+            ...asset,
+            id: entry.assetId,
+            name: `name ${entry.assetId}`,
+            symbol: `symbol ${entry.assetId}`,
+          }
+        : null,
+      marketSender: null,
+      marketReceiver: null,
+    } as LedgerEntry;
+  });
+
+  it('should be properly rendered', async () => {
+    render(<LedgerExportLink partyId={partyId} entries={entries} />);
+    await waitFor(() => {
+      expect(screen.getByRole('link')).toBeInTheDocument();
+      expect(screen.getByRole('link')).toHaveAttribute(
+        'href',
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id`
+      );
+      expect(
+        screen.getByRole('button', { name: /^symbol asset-id/ })
+      ).toBeInTheDocument();
+    });
+  });
+  it('should be properly change link url', async () => {
+    render(<LedgerExportLink partyId={partyId} entries={entries} />);
+    await waitFor(() => {
+      expect(
+        screen.getByRole('button', { name: /^symbol asset-id/ })
+      ).toBeInTheDocument();
+    });
+    act(() => {
+      userEvent.click(screen.getByRole('button', { name: /^symbol asset-id/ }));
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    });
+    act(() => {
+      userEvent.click(
+        screen.getByRole('menuitem', { name: /^symbol asset-id-2/ })
+      );
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('link')).toHaveAttribute(
+        'href',
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id-2`
+      );
+    });
+  });
+});
@@ -0,0 +1,71 @@
+import type { LedgerEntry } from './ledger-entries-data-provider';
+import { useMemo, useState } from 'react';
+import { useEnvironment } from '@vegaprotocol/environment';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  Link,
+  Button,
+} from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+
+const getProtoHost = (vegaurl: string) => {
+  const loc = new URL(vegaurl);
+  return `${loc.protocol}//${loc.host}`;
+};
+
+export const LedgerExportLink = ({
+  partyId,
+  entries,
+}: {
+  partyId: string;
+  entries: LedgerEntry[];
+}) => {
+  const assets = entries.reduce((aggr, item) => {
+    if (item.asset && !(item.asset.id in aggr)) {
+      aggr[item.asset.id] = item.asset.symbol;
+    }
+    return aggr;
+  }, {} as Record<string, string>);
+  const [assetId, setAssetId] = useState(Object.keys(assets)[0]);
+  const VEGA_URL = useEnvironment((store) => store.VEGA_URL);
+  const protohost = VEGA_URL ? getProtoHost(VEGA_URL) : '';
+
+  const assetDropDown = useMemo(() => {
+    return (
+      <DropdownMenu
+        trigger={<DropdownMenuTrigger>{assets[assetId]}</DropdownMenuTrigger>}
+      >
+        <DropdownMenuContent>
+          {Object.keys(assets).map((assetKey) => (
+            <DropdownMenuItem
+              key={assetKey}
+              onSelect={() => setAssetId(assetKey)}
+            >
+              {assets[assetKey]}
+            </DropdownMenuItem>
+          ))}
+        </DropdownMenuContent>
+      </DropdownMenu>
+    );
+  }, [assetId, assets]);
+
+  if (!protohost) {
+    return null;
+  }
+  return (
+    <div className="flex shrink items-stretch gap-2 p-2">
+      <div className="flex items-center">Export all</div>
+      {assetDropDown}
+      <Link
+        className="text-sm"
+        title={t('Download all to .csv file')}
+        href={`${protohost}/api/v2/ledgerentry/export?partyId=${partyId}&assetId=${assetId}`}
+      >
+        <Button size="sm">{t('Download')}</Button>
+      </Link>
+    </div>
+  );
+};
@@ -3,12 +3,13 @@ import type * as Schema from '@vegaprotocol/types';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { FilterChangedEvent } from 'ag-grid-community';
 import type { AgGridReact } from 'ag-grid-react';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { subDays, formatRFC3339 } from 'date-fns';
 import type { AggregatedLedgerEntriesNode } from './ledger-entries-data-provider';
 import { useLedgerEntriesDataProvider } from './ledger-entries-data-provider';
 import { LedgerTable } from './ledger-table';
 import type * as Types from '@vegaprotocol/types';
+import { LedgerExportLink } from './ledger-export-link';

 export interface Filter {
  vegaTime?: {
@@ -22,6 +23,7 @@ const defaultFilter = {
    value: { start: formatRFC3339(subDays(Date.now(), 7)) },
  },
 };
+
 export const LedgerManager = ({ partyId }: { partyId: string }) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const [filter, setFilter] = useState<Filter>(defaultFilter);
@@ -55,6 +57,9 @@ export const LedgerManager = ({ partyId }: { partyId: string }) => {
        rowData={extractedData}
        onFilterChanged={onFilterChanged}
      />
+      {extractedData && (
+        <LedgerExportLink entries={extractedData} partyId={partyId} />
+      )}
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
          loading={loading}
@@ -49,7 +49,7 @@ export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>(
  (props, ref) => {
    return (
      <AgGrid
-        style={{ width: '100%', height: '100%' }}
+        style={{ width: '100%', height: 'calc(100% - 50px)' }}
        ref={ref}
        tooltipShowDelay={500}
        defaultColDef={{
@@ -0,0 +1,24 @@
+import '@testing-library/jest-dom';
+import 'jest-canvas-mock';
+import ResizeObserver from 'resize-observer-polyfill';
+
+global.ResizeObserver = ResizeObserver;
+global.DOMRect = class DOMRect {
+  bottom = 0;
+  left = 0;
+  right = 0;
+  top = 0;
+
+  constructor(
+    public x = 0,
+    public y = 0,
+    public width = 0,
+    public height = 0
+  ) {}
+  static fromRect(other?: DOMRectInit): DOMRect {
+    return new DOMRect(other?.x, other?.y, other?.width, other?.height);
+  }
+  toJSON() {
+    return JSON.stringify(this);
+  }
+};
@@ -19,25 +19,29 @@ export const useMarketOracle = (marketId: string) => {
      marketInfo.tradableInstrument.instrument.product
        .dataSourceSpecForSettlementData.data;
    return data.find((provider) =>
-      provider.proofs.some(
-        (proof) =>
-          (proof.type === 'eth_address' &&
-            dataSource.sourceType.__typename ===
-              'DataSourceDefinitionExternal' &&
-            dataSource.sourceType.sourceType.signers?.some(
-              (signer) =>
-                signer.signer.__typename === 'ETHAddress' &&
-                signer.signer.address === proof.eth_address
-            )) ||
-          (proof.type === 'public_key' &&
-            dataSource.sourceType.__typename ===
-              'DataSourceDefinitionExternal' &&
-            dataSource.sourceType.sourceType.signers?.some(
-              (signer) =>
-                signer.signer.__typename === 'PubKey' &&
-                signer.signer.key === proof.public_key
-            ))
-      )
+      provider.proofs.some((proof) => {
+        if (
+          proof.type === 'eth_address' &&
+          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
+        ) {
+          return dataSource.sourceType.sourceType.signers?.some(
+            (signer) =>
+              signer.signer.__typename === 'ETHAddress' &&
+              signer.signer.address === proof.eth_address
+          );
+        }
+        if (
+          proof.type === 'public_key' &&
+          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
+        ) {
+          return dataSource.sourceType.sourceType.signers?.some(
+            (signer) =>
+              signer.signer.__typename === 'PubKey' &&
+              signer.signer.key === proof.public_key
+          );
+        }
+        return false;
+      })
    )?.oracle;
  }, [data, marketInfo]);
 };
@@ -1,4 +1,4 @@
 {
  "name": "@vegaprotocol/react-helpers",
-  "version": "0.2.1"
+  "version": "0.2.2"
 }
@@ -1,24 +1,18 @@
 import { useRef } from 'react';
-import { BrowserTracing } from '@sentry/tracing';
-import * as Sentry from '@sentry/browser';
 import type { LocalLogger, LoggerConf } from '@vegaprotocol/utils';
-import { localLoggerFactory } from '@vegaprotocol/utils';
+import { localLoggerFactory, SentryInit } from '@vegaprotocol/utils';

-interface Props extends LoggerConf {
+export interface LoggerProps extends LoggerConf {
  dsn?: string;
+  env?: string;
 }

-export const useLogger = ({ dsn, ...props }: Props) => {
+export const useLogger = ({ dsn, env, ...props }: LoggerProps) => {
  const logger = useRef<LocalLogger | null>(null);
  if (!logger.current) {
    logger.current = localLoggerFactory(props);
    if (dsn) {
-      Sentry.init({
-        dsn,
-        integrations: [new BrowserTracing()],
-        tracesSampleRate: 1,
-        defaultIntegrations: false,
-      });
+      SentryInit(dsn, env);
    }
  }
  return logger.current;
@@ -1,4 +1,4 @@
 {
  "name": "@vegaprotocol/types",
-  "version": "0.0.1"
+  "version": "0.0.2"
 }
@@ -15,6 +15,7 @@
        "external": ["react/jsx-runtime"],
        "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
        "compiler": "babel",
+        "format": ["esm", "cjs"],
        "assets": [
          {
            "glob": "libs/types/README.md",
@@ -796,6 +796,67 @@ export type ETHAddress = {
  address?: Maybe<Scalars['String']>;
 };

+/** List of all entities created by transaction hash */
+export type Entities = {
+  __typename?: 'Entities';
+  /** List of accounts created by the transaction hash */
+  accounts?: Maybe<Array<Maybe<AccountEvent>>>;
+  /** List of assets created by the transaction hash */
+  assets?: Maybe<Array<Maybe<Asset>>>;
+  /** List of balance changes created by the transaction hash */
+  balanceChanges?: Maybe<Array<Maybe<AccountBalance>>>;
+  /** List of delegations created by the transaction hash */
+  delegations?: Maybe<Array<Maybe<Delegation>>>;
+  /** List of deposits created by the transaction hash */
+  deposits?: Maybe<Array<Maybe<Deposit>>>;
+  /** List of ERC-20 multisig signer added bundles created by the transaction hash */
+  erc20MultiSigSignerAddedBundles?: Maybe<Array<Maybe<ERC20MultiSigSignerAddedBundle>>>;
+  /** List of ERC-20 multisig signer removed bundles created by the transaction hash */
+  erc20MultiSigSignerRemovedBundles?: Maybe<Array<Maybe<ERC20MultiSigSignerRemovedBundle>>>;
+  /** List of ethereum key rotations created by the transaction hash */
+  ethereumKeyRotations?: Maybe<Array<Maybe<EthereumKeyRotation>>>;
+  /** List of key rotations created by the transaction hash */
+  keyRotations?: Maybe<Array<Maybe<KeyRotation>>>;
+  /** List of ledger entries created by the transaction hash */
+  ledgerEntries?: Maybe<Array<Maybe<LedgerEntry>>>;
+  /** List of liquidity provisions created by the transaction hash */
+  liquidityProvisions?: Maybe<Array<Maybe<LiquidityProvision>>>;
+  /** List of margin levels created by the transaction hash */
+  marginLevels?: Maybe<Array<Maybe<MarginLevels>>>;
+  /** List of markets created by the transaction hash */
+  markets?: Maybe<Array<Maybe<Market>>>;
+  /** List of network parameters created by the transaction hash */
+  networkParameters?: Maybe<Array<Maybe<NetworkParameter>>>;
+  /** List of node signatures created by the transaction hash */
+  nodeSignatures?: Maybe<Array<Maybe<NodeSignature>>>;
+  /** List of nodes created by the transaction hash */
+  nodes?: Maybe<Array<Maybe<NodeBasic>>>;
+  /** List of oracle data created by the transaction hash */
+  oracleData?: Maybe<Array<Maybe<OracleData>>>;
+  /** List of oracle specs created by the transaction hash */
+  oracleSpecs?: Maybe<Array<Maybe<OracleSpec>>>;
+  /** List of orders created by the transaction hash */
+  orders?: Maybe<Array<Maybe<Order>>>;
+  /** List of parties created by the transaction hash */
+  parties?: Maybe<Array<Maybe<Party>>>;
+  /** List of positions created by the transaction hash */
+  positions?: Maybe<Array<Maybe<Position>>>;
+  /** List of proposals created by the transaction hash */
+  proposals?: Maybe<Array<Maybe<ProposalDetail>>>;
+  /** List of protocol upgrade proposals created by the transaction hash */
+  protocolUpgradeProposals?: Maybe<Array<Maybe<ProtocolUpgradeProposal>>>;
+  /** List of rewards created by the transaction hash */
+  rewards?: Maybe<Array<Maybe<Reward>>>;
+  /** List of trades created by the transaction hash */
+  trades?: Maybe<Array<Maybe<Trade>>>;
+  /** List of transfers created by the transaction hash */
+  transfers?: Maybe<Array<Maybe<Transfer>>>;
+  /** List of votes created by the transaction hash */
+  votes?: Maybe<Array<Maybe<Vote>>>;
+  /** List of withdrawals created by the transaction hash */
+  withdrawals?: Maybe<Array<Maybe<Withdrawal>>>;
+};
+
 /** Epoch describes a specific period of time in the Vega network */
 export type Epoch = {
  __typename?: 'Epoch';
@@ -988,6 +1049,15 @@ export type ExternalDataSourceSpec = {
  spec: DataSourceSpec;
 };

+/** An estimate of the fee to be paid for the order */
+export type FeeEstimate = {
+  __typename?: 'FeeEstimate';
+  /** The estimated fees if the order was to trade */
+  fees: TradeFee;
+  /** The total estimated amount of fees if the order was to trade */
+  totalFeeAmount: Scalars['String'];
+};
+
 /** The factors applied to calculate the fees */
 export type FeeFactors = {
  __typename?: 'FeeFactors';
@@ -1178,6 +1248,26 @@ export type LedgerEntryFilter = {
  TransferTypes?: InputMaybe<Array<InputMaybe<TransferType>>>;
 };

+/** Liquidation estimate for both worst and best case possible */
+export type LiquidationEstimate = {
+  __typename?: 'LiquidationEstimate';
+  /** Liquidation price estimate assuming no slippage */
+  bestCase: LiquidationPrice;
+  /** Liquidation price estimate assuming slippage cap is applied */
+  worstCase: LiquidationPrice;
+};
+
+/** Liquidation price estimate for either only the current open volume and position given some or all buy orders get filled, or position given some or all sell orders get filled */
+export type LiquidationPrice = {
+  __typename?: 'LiquidationPrice';
+  /** Liquidation price assuming buy orders start getting filled */
+  including_buy_orders: Scalars['String'];
+  /** Liquidation price assuming sell orders start getting filled */
+  including_sell_orders: Scalars['String'];
+  /** Liquidation price for current open volume ignoring any active orders */
+  open_volume_only: Scalars['String'];
+};
+
 /** Configuration of a market liquidity monitoring parameters */
 export type LiquidityMonitoringParameters = {
  __typename?: 'LiquidityMonitoringParameters';
@@ -1367,6 +1457,15 @@ export type MarginEdge = {
  node: MarginLevels;
 };

+/** Margin level estimate for both worst and best case possible */
+export type MarginEstimate = {
+  __typename?: 'MarginEstimate';
+  /** Margin level estimate assuming no slippage */
+  bestCase: MarginLevels;
+  /** Margin level estimate assuming slippage cap is applied */
+  worstCase: MarginLevels;
+};
+
 /** Margins for a given a party */
 export type MarginLevels = {
  __typename?: 'MarginLevels';
@@ -1377,7 +1476,7 @@ export type MarginLevels = {
   * the general account of the party for the given asset.
   */
  collateralReleaseLevel: Scalars['String'];
-  /** This is the minimum margin required for a party to place a new order on the network (unsigned integer) */
+  /** This is the minimum margin required for a party to place a new order on the network, expressed as unsigned integer */
  initialLevel: Scalars['String'];
  /** Minimal margin for the position to be maintained in the network (unsigned integer) */
  maintenanceLevel: Scalars['String'];
@@ -1385,7 +1484,7 @@ export type MarginLevels = {
  market: Market;
  /** The party for this margin */
  party: Party;
-  /** If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer) */
+  /** If the margin is between maintenance and search, the network will initiate a collateral search, expressed as unsigned integer */
  searchLevel: Scalars['String'];
  /** RFC3339Nano time from at which this margin level was relevant */
  timestamp: Scalars['Timestamp'];
@@ -1483,6 +1582,7 @@ export type Market = {
  state: MarketState;
  /** An instance of, or reference to, a tradable instrument. */
  tradableInstrument: TradableInstrument;
+  /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
  tradesConnection?: Maybe<TradeConnection>;
  /** Current mode of execution of the market */
  tradingMode: MarketTradingMode;
@@ -1894,6 +1994,28 @@ export type NodedelegationsConnectionArgs = {
  partyId?: InputMaybe<Scalars['ID']>;
 };

+export type NodeBasic = {
+  __typename?: 'NodeBasic';
+  /** The URL of an avatar */
+  avatarUrl?: Maybe<Scalars['String']>;
+  /** Ethereum public key of the node */
+  ethereumAddress: Scalars['String'];
+  /** The node URL, for example n01.vega.xyz */
+  id: Scalars['ID'];
+  /** URL that provides more information about the node */
+  infoUrl: Scalars['String'];
+  /** Country code for the location of the node */
+  location: Scalars['String'];
+  /** The name of the node operator */
+  name: Scalars['String'];
+  /** Public key of the node operator */
+  pubkey: Scalars['String'];
+  /** Validator status of the node */
+  status: NodeStatus;
+  /** Tendermint public key of the node */
+  tmPubkey: Scalars['String'];
+};
+
 /** Summary of data across all nodes */
 export type NodeData = {
  __typename?: 'NodeData';
@@ -2107,18 +2229,6 @@ export type ObservableMarketDepthUpdate = {
  sequenceNumber: Scalars['String'];
 };

-export type OffsetPagination = {
-  /**
-   * Descending reverses the order of the records returned
-   * default is true, if false the results will be returned in ascending order
-   */
-  descending: Scalars['Boolean'];
-  /** Limit the number of returned records to the value specified, default is 50 */
-  limit: Scalars['Int'];
-  /** Skip the number of records specified, default is 0 */
-  skip: Scalars['Int'];
-};
-
 /** The specific details for a one-off transfer */
 export type OneOffTransfer = {
  __typename?: 'OneOffTransfer';
@@ -2213,7 +2323,10 @@ export type Order = {
  status: OrderStatus;
  /** The timeInForce of order (determines how and if it executes, and whether it persists on the book) */
  timeInForce: OrderTimeInForce;
-  /** Trades relating to this order */
+  /**
+   * Trades relating to this order
+   * @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead
+   */
  tradesConnection?: Maybe<TradeConnection>;
  /** The order type */
  type?: Maybe<OrderType>;
@@ -2279,11 +2392,28 @@ export type OrderFilter = {
  /** Date range to retrieve orders from/to. Start and end time should be expressed as an integer value of nano-seconds past the Unix epoch */
  dateRange?: InputMaybe<DateRange>;
  excludeLiquidity?: InputMaybe<Scalars['Boolean']>;
+  /**
+   * If true, only orders that are live will be returned. Orders are live if they have STATUS_ACTIVE or STATUS_PARKED
+   * as per https://github.com/vegaprotocol/specs-internal/blob/master/protocol/0024-OSTA-order_status.md
+   */
+  liveOnly?: InputMaybe<Scalars['Boolean']>;
  status?: InputMaybe<Array<OrderStatus>>;
  timeInForce?: InputMaybe<Array<OrderTimeInForce>>;
  types?: InputMaybe<Array<OrderType>>;
 };

+/** Basic description of an order */
+export type OrderInfo = {
+  /** Boolean indicating a market order */
+  isMarketOrder: Scalars['Boolean'];
+  /** Price for the order */
+  price: Scalars['String'];
+  /** Number of units remaining of the total that have not yet been bought or sold (uint64) */
+  remaining: Scalars['String'];
+  /** Whether the order is to buy or sell */
+  side: Side;
+};
+
 /** Why the order was rejected by the core node */
 export enum OrderRejectionReason {
  /** Amending the order failed */
@@ -2304,6 +2434,8 @@ export enum OrderRejectionReason {
  ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT = 'ORDER_ERROR_CANNOT_HAVE_GTC_AND_EXPIRYAT',
  /** Cannot send FOK orders during an auction */
  ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION = 'ORDER_ERROR_CANNOT_SEND_FOK_ORDER_DURING_AUCTION',
+  /** Good for Auction order received during continuous trading */
+  ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING',
  /** Good for Normal order received during an auction */
  ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION = 'ORDER_ERROR_CANNOT_SEND_GFN_ORDER_DURING_AN_AUCTION',
  /** Cannot send IOC orders during an auction */
@@ -2312,8 +2444,8 @@ export enum OrderRejectionReason {
  ORDER_ERROR_EDIT_NOT_ALLOWED = 'ORDER_ERROR_EDIT_NOT_ALLOWED',
  /** Attempt to amend expiry time to a value before time order was created */
  ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT = 'ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT',
-  /** Good for Auction order received during continuous trading */
-  ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING = 'ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING',
+  /** Order was submitted with an incorrect or invalid market type */
+  ORDER_ERROR_INCORRECT_MARKET_TYPE = 'ORDER_ERROR_INCORRECT_MARKET_TYPE',
  /** Insufficient balance to submit the order (no deposit made) */
  ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE = 'ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE',
  /** Insufficient funds to pay fees */
@@ -2360,6 +2492,10 @@ export enum OrderRejectionReason {
  ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO = 'ORDER_ERROR_OFFSET_MUST_BE_GREATER_THAN_ZERO',
  /** Order is out of sequence */
  ORDER_ERROR_OUT_OF_SEQUENCE = 'ORDER_ERROR_OUT_OF_SEQUENCE',
+  /** A post-only order would produce an aggressive trade and thus it has been rejected */
+  ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE = 'ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE',
+  /** A reduce-ony order would not reduce the party's position and thus it has been rejected */
+  ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE = 'ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE',
  /** Unable to remove the order */
  ORDER_ERROR_REMOVAL_FAILURE = 'ORDER_ERROR_REMOVAL_FAILURE',
  /** Order cannot be filled because it would require self trading */
@@ -2368,6 +2504,8 @@ export enum OrderRejectionReason {
  ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE = 'ORDER_ERROR_SELL_CANNOT_REFERENCE_BEST_BID_PRICE',
  /** Time has failed us */
  ORDER_ERROR_TIME_FAILURE = 'ORDER_ERROR_TIME_FAILURE',
+  /** Unable to submit pegged order, temporarily too many pegged orders across all markets */
+  ORDER_ERROR_TOO_MANY_PEGGED_ORDERS = 'ORDER_ERROR_TOO_MANY_PEGGED_ORDERS',
  /** Unable to amend pegged order price */
  ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER = 'ORDER_ERROR_UNABLE_TO_AMEND_PRICE_ON_PEGGED_ORDER',
  /** Unable to reprice a pegged order */
@@ -2526,6 +2664,7 @@ export type Party = {
  rewardsConnection?: Maybe<RewardsConnection>;
  /** The staking information for this Party */
  stakingSummary: StakingSummary;
+  /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
  tradesConnection?: Maybe<TradeConnection>;
  /** All transfers for a public key */
  transfersConnection?: Maybe<TransferConnection>;
@@ -2754,6 +2893,15 @@ export type PositionEdge = {
  node: Position;
 };

+/** Response for the estimate of the margin level and, if available, collateral was provided in the request, liqudation price for the specified position */
+export type PositionEstimate = {
+  __typename?: 'PositionEstimate';
+  /** Liquidation price range estimate for the specified position. Only populated if available collateral was specified in the request */
+  liquidation?: Maybe<LiquidationEstimate>;
+  /** Margin level range estimate for the specified position */
+  margin: MarginEstimate;
+};
+
 export type PositionResolution = {
  __typename?: 'PositionResolution';
  /** Number of parties closed out */
@@ -2770,6 +2918,8 @@ export type PositionResolution = {
 export enum PositionStatus {
  /** The position was distressed, and had to be closed out entirely - orders were removed from the book, and the open volume was closed out by the network */
  POSITION_STATUS_CLOSED_OUT = 'POSITION_STATUS_CLOSED_OUT',
+  /** The position was distressed, but could not be closed out - orders were removed from the book, and the open volume will be closed out once there is sufficient volume on the book */
+  POSITION_STATUS_DISTRESSED = 'POSITION_STATUS_DISTRESSED',
  /** The position was distressed, but removing open orders from the book brought the margin level back to a point where the open position could be maintained */
  POSITION_STATUS_ORDERS_CLOSED = 'POSITION_STATUS_ORDERS_CLOSED',
  /** The position is either healthy, or if closed out, was closed out normally */
@@ -2923,9 +3073,9 @@ export type Proposal = {
  reference: Scalars['String'];
  /** Why the proposal was rejected by the core */
  rejectionReason?: Maybe<ProposalRejectionReason>;
-  /** Required liquidity provider equity like share majority for this proposal to succeed */
+  /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
  requiredLpMajority?: Maybe<Scalars['String']>;
-  /** Required liquidity provider equity like share participation for this proposal to succeed */
+  /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
  requiredLpParticipation?: Maybe<Scalars['String']>;
  /** Required majority for this proposal to succeed */
  requiredMajority: Scalars['String'];
@@ -2941,6 +3091,36 @@ export type Proposal = {

 export type ProposalChange = NewAsset | NewFreeform | NewMarket | UpdateAsset | UpdateMarket | UpdateNetworkParameter;

+export type ProposalDetail = {
+  __typename?: 'ProposalDetail';
+  /** RFC3339Nano time and date when the proposal reached the Vega network */
+  datetime: Scalars['Timestamp'];
+  /** Error details of the rejectionReason */
+  errorDetails?: Maybe<Scalars['String']>;
+  /** Proposal ID that is provided by Vega once proposal reaches the network */
+  id?: Maybe<Scalars['ID']>;
+  /** Party that prepared the proposal */
+  party: Party;
+  /** Rationale behind the proposal */
+  rationale: ProposalRationale;
+  /** A UUID reference to aid tracking proposals on Vega */
+  reference: Scalars['String'];
+  /** Why the proposal was rejected by the core */
+  rejectionReason?: Maybe<ProposalRejectionReason>;
+  /** Equity-like share required for a market amendment proposal to be enacted (if not met, the proposal will not be enacted), represented as a fraction that can be converted to a percentage */
+  requiredLpMajority?: Maybe<Scalars['String']>;
+  /** The market share of LPs' equity-like share that must take part in the market amendment vote for the proposal to pass. This means the votes of LPs that have submitted more liquidity to that market, or have been LPs from the start carry more weight. If it requires 50% of a market's equity-like share for a majority, and the proposal receives only YES votes but only LPs with 49% of the equity-like share voted, the proposal will not pass */
+  requiredLpParticipation?: Maybe<Scalars['String']>;
+  /** Required majority for this proposal to succeed */
+  requiredMajority: Scalars['String'];
+  /** Required participation for this proposal to succeed */
+  requiredParticipation: Scalars['String'];
+  /** State of the proposal */
+  state: ProposalState;
+  /** Terms of the proposal */
+  terms: ProposalTerms;
+};
+
 /** Edge type containing the proposals and cursor information returned by a ProposalsConnection */
 export type ProposalEdge = {
  __typename?: 'ProposalEdge';
@@ -3234,6 +3414,8 @@ export type Query = {
  deposit?: Maybe<Deposit>;
  /** Fetch all deposits */
  deposits?: Maybe<DepositsConnection>;
+  /** Fetch all entities for a given transaction hash */
+  entities: Entities;
  /** Get data for a specific epoch, if ID omitted it gets the current epoch. If the string is 'next', fetch the next epoch */
  epoch: Epoch;
  /** List reward summary per epoch by asset, market, reward type */
@@ -3249,15 +3431,17 @@ export type Query = {
  /** Find an erc20 withdrawal approval using its withdrawal ID */
  erc20WithdrawalApproval?: Maybe<Erc20WithdrawalApproval>;
  /** Return an estimation of the potential cost for a new order */
+  estimateFees: FeeEstimate;
+  /**
+   * Return an estimation of the potential cost for a new order
+   * @deprecated Use estimateFees and estimatePosition instead
+   */
  estimateOrder: OrderEstimate;
+  /** Return a margin range for the specified position and liquidation price range if available collateral is supplied */
+  estimatePosition?: Maybe<PositionEstimate>;
  /** Query for historic ethereum key rotations */
  ethereumKeyRotations: EthereumKeyRotationsConnection;
-  /**
-   * Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided, all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided.
-   * @deprecated Use getMarketDataHistoryConnectionByID instead
-   */
-  getMarketDataHistoryByID?: Maybe<Array<Maybe<MarketData>>>;
-  /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. Pagination is provided using a cursor based pagination model */
+  /** Get market data history for a specific market. If no dates are given, the latest snapshot will be returned. If only the start date is provided all history from the given date will be provided, and if only the end date is provided, all history from the start up to and including the end date will be provided. */
  getMarketDataHistoryConnectionByID?: Maybe<MarketDataConnection>;
  /** Query for historic key rotations */
  keyRotationsConnection: KeyRotationConnection;
@@ -3315,6 +3499,8 @@ export type Query = {
  protocolUpgradeStatus?: Maybe<ProtocolUpgradeStatus>;
  /** Get statistics about the Vega node */
  statistics: Statistics;
+  /** Get a list of all trades and apply any given filters to the results */
+  trades?: Maybe<TradeConnection>;
  /** Get a list of all transfers for a public key */
  transfersConnection?: Maybe<TransferConnection>;
  /** Find a withdrawal using its ID */
@@ -3364,6 +3550,12 @@ export type QuerydepositsArgs = {
 };


+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryentitiesArgs = {
+  txHash: Scalars['String'];
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryepochArgs = {
  id?: InputMaybe<Scalars['ID']>;
@@ -3413,6 +3605,19 @@ export type Queryerc20WithdrawalApprovalArgs = {
 };


+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QueryestimateFeesArgs = {
+  expiration?: InputMaybe<Scalars['Timestamp']>;
+  marketId: Scalars['ID'];
+  partyId: Scalars['ID'];
+  price?: InputMaybe<Scalars['String']>;
+  side: Side;
+  size: Scalars['String'];
+  timeInForce: OrderTimeInForce;
+  type: OrderType;
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryestimateOrderArgs = {
  expiration?: InputMaybe<Scalars['Timestamp']>;
@@ -3427,19 +3632,17 @@ export type QueryestimateOrderArgs = {


 /** Queries allow a caller to read data and filter data via GraphQL. */
-export type QueryethereumKeyRotationsArgs = {
-  nodeId?: InputMaybe<Scalars['ID']>;
+export type QueryestimatePositionArgs = {
+  collateralAvailable?: InputMaybe<Scalars['String']>;
+  marketId: Scalars['ID'];
+  openVolume: Scalars['String'];
+  orders?: InputMaybe<Array<OrderInfo>>;
 };


 /** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerygetMarketDataHistoryByIDArgs = {
-  end?: InputMaybe<Scalars['Timestamp']>;
-  first?: InputMaybe<Scalars['Int']>;
-  id: Scalars['ID'];
-  last?: InputMaybe<Scalars['Int']>;
-  skip?: InputMaybe<Scalars['Int']>;
-  start?: InputMaybe<Scalars['Timestamp']>;
+export type QueryethereumKeyRotationsArgs = {
+  nodeId?: InputMaybe<Scalars['ID']>;
 };


@@ -3600,6 +3803,14 @@ export type QueryprotocolUpgradeProposalsArgs = {
 };


+/** Queries allow a caller to read data and filter data via GraphQL. */
+export type QuerytradesArgs = {
+  dateRange?: InputMaybe<DateRange>;
+  filter?: InputMaybe<TradesFilter>;
+  pagination?: InputMaybe<Pagination>;
+};
+
+
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QuerytransfersConnectionArgs = {
  direction?: InputMaybe<TransferDirection>;
@@ -3798,7 +4009,9 @@ export enum Side {
  /** The placer of the order is aiming to buy */
  SIDE_BUY = 'SIDE_BUY',
  /** The placer of the order is aiming to sell */
-  SIDE_SELL = 'SIDE_SELL'
+  SIDE_SELL = 'SIDE_SELL',
+  /** Unspecified is only used for trades at the end of an auction, where neither party acts as the aggressor. */
+  SIDE_UNSPECIFIED = 'SIDE_UNSPECIFIED'
 }

 /** Signer is the authorized signature used for the data. */
@@ -3978,8 +4191,6 @@ export type Subscription = {
  busEvents?: Maybe<Array<BusEvent>>;
  /** Subscribe to the candles updates */
  candles: Candle;
-  /** Subscribe to delegation data */
-  delegations: Delegation;
  /** Subscribe to liquidity provisioning data */
  liquidityProvisions?: Maybe<Array<LiquidityProvisionUpdate>>;
  /** Subscribe to the margin changes */
@@ -3996,10 +4207,13 @@ export type Subscription = {
  positions: Array<PositionUpdate>;
  /** Subscribe to proposals. Leave out all arguments to receive all proposals */
  proposals: Proposal;
-  /** Subscribe to reward details data */
-  rewards: Reward;
-  /** Subscribe to the trades updates */
+  /**
+   * Subscribe to the trades updates
+   * @deprecated Use tradesStream instead as it allows for filtering multiple markets and/or parties at once
+   */
  trades?: Maybe<Array<TradeUpdate>>;
+  /** Subscribe to the trades updates */
+  tradesStream?: Maybe<Array<TradeUpdate>>;
  /** Subscribe to votes, either by proposal ID or party ID */
  votes: ProposalVote;
 };
@@ -4030,13 +4244,6 @@ export type SubscriptioncandlesArgs = {
 };


-/** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiondelegationsArgs = {
-  nodeId?: InputMaybe<Scalars['ID']>;
-  partyId?: InputMaybe<Scalars['ID']>;
-};
-
-
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
 export type SubscriptionliquidityProvisionsArgs = {
  marketId?: InputMaybe<Scalars['ID']>;
@@ -4089,16 +4296,15 @@ export type SubscriptionproposalsArgs = {


 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptionrewardsArgs = {
-  assetId?: InputMaybe<Scalars['ID']>;
+export type SubscriptiontradesArgs = {
+  marketId?: InputMaybe<Scalars['ID']>;
  partyId?: InputMaybe<Scalars['ID']>;
 };


 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
-export type SubscriptiontradesArgs = {
-  marketId?: InputMaybe<Scalars['ID']>;
-  partyId?: InputMaybe<Scalars['ID']>;
+export type SubscriptiontradesStreamArgs = {
+  filter: TradesSubscriptionFilter;
 };


@@ -4251,6 +4457,19 @@ export type TradeUpdate = {
  type: TradeType;
 };

+/** Filter to apply to the trade connection query */
+export type TradesFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  orderIds?: InputMaybe<Array<Scalars['ID']>>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
+/** Filter to apply to the trade subscription request */
+export type TradesSubscriptionFilter = {
+  marketIds?: InputMaybe<Array<Scalars['ID']>>;
+  partyIds?: InputMaybe<Array<Scalars['ID']>>;
+};
+
 /** The result from processing a transaction */
 export type TransactionResult = {
  __typename?: 'TransactionResult';
@@ -172,7 +172,7 @@ export const OrderRejectionReasonMapping: {
    'Cannot send IOC order during auction',
  ORDER_ERROR_EDIT_NOT_ALLOWED: 'Edit not allowed',
  ORDER_ERROR_EXPIRYAT_BEFORE_CREATEDAT: 'Expiry time before creation time',
-  ORDER_ERROR_GFA_CANNOT_SEND_ORDER_DURING_CONTINUOUS_TRADING:
+  ORDER_ERROR_CANNOT_SEND_GFA_ORDER_DURING_CONTINUOUS_TRADING:
    'Cannot send GFA order during continuous trading',
  ORDER_ERROR_INSUFFICIENT_ASSET_BALANCE: 'Insufficient asset balance',
  ORDER_ERROR_INSUFFICIENT_FUNDS_TO_PAY_FEES: 'Insufficient funds to pay fees',
@@ -209,6 +209,11 @@ export const OrderRejectionReasonMapping: {
    'Unable to amend price on pegged order',
  ORDER_ERROR_UNABLE_TO_REPRICE_PEGGED_ORDER: 'Unable to reprice pegged order',
  ORDER_ERROR_WITHOUT_REFERENCE_PRICE: 'Without reference price',
+  ORDER_ERROR_INCORRECT_MARKET_TYPE: 'Incorrect market type',
+  ORDER_ERROR_POST_ONLY_ORDER_WOULD_TRADE: 'Post only order would trade',
+  ORDER_ERROR_REDUCE_ONLY_ORDER_WOULD_NOT_REDUCE:
+    'Reduce only order would not reduce',
+  ORDER_ERROR_TOO_MANY_PEGGED_ORDERS: 'Too many pegged orders',
 };

 /**
@@ -345,6 +350,7 @@ export const SideMapping: {
 } = {
  SIDE_BUY: 'Long',
  SIDE_SELL: 'Short',
+  SIDE_UNSPECIFIED: 'Unspecified',
 };

 /**
@@ -458,6 +464,7 @@ export const PositionStatusMapping: {
  POSITION_STATUS_CLOSED_OUT: 'Closed by network',
  POSITION_STATUS_ORDERS_CLOSED: 'Maintained by network',
  POSITION_STATUS_UNSPECIFIED: 'Normal',
+  POSITION_STATUS_DISTRESSED: 'Distressed',
 };

 export const ConditionOperatorMapping: { [C in ConditionOperator]: string } = {
@@ -1,4 +1,4 @@
 {
  "name": "@vegaprotocol/ui-toolkit",
-  "version": "0.11.1"
+  "version": "0.12.1"
 }
@@ -57,7 +57,7 @@ export const Checkbox = ({
      </CheckboxPrimitive.Root>
      <label
        htmlFor={name}
-        className={classNames('text-sm', {
+        className={classNames('text-sm flex-1', {
          'dark:text-neutral-400 text-neutral-600': disabled,
        })}
      >
@@ -62,7 +62,7 @@ export function Dialog({
    <DialogPrimitives.Root open={open} onOpenChange={(x) => onChange?.(x)}>
      <DialogPrimitives.Portal>
        <DialogPrimitives.Overlay
-          className="fixed inset-0 bg-black/50 z-20"
+          className="fixed inset-0 dark:bg-black/80 bg-black/50 z-20"
          data-testid="dialog-overlay"
        />
        <DialogPrimitives.Content
@@ -0,0 +1,41 @@
+import type { ComponentStory, ComponentMeta } from '@storybook/react';
+import className from 'classnames';
+import { Divider } from './divider';
+
+export default {
+  title: 'Divider',
+  component: Divider,
+} as ComponentMeta<typeof Divider>;
+
+const Template: ComponentStory<typeof Divider> = (args) => {
+  return (
+    <div
+      className={className('flex', {
+        'flex-col': args?.orientation !== 'vertical',
+        'h-[50px]': args?.orientation === 'vertical',
+      })}
+    >
+      <div
+        className={className(
+          'h-[50px]',
+          args?.orientation !== 'vertical' ? 'w-full' : 'w-1/2'
+        )}
+      />
+      <Divider orientation={args?.orientation} />
+      <div
+        className={className(
+          'h-[50px]',
+          args?.orientation !== 'vertical' ? 'w-full' : 'w-2/2'
+        )}
+      />
+    </div>
+  );
+};
+
+export const Default = Template.bind({});
+Default.args = {};
+
+export const Vertical = Template.bind({});
+Vertical.args = {
+  orientation: 'vertical',
+};
@@ -0,0 +1,19 @@
+import { forwardRef } from 'react';
+import * as Separator from '@radix-ui/react-separator';
+
+interface DividerProps {
+  orientation?: 'horizontal' | 'vertical';
+  decorative?: boolean;
+}
+
+export const Divider = forwardRef<HTMLDivElement, DividerProps>(
+  ({ orientation = 'horizontal', decorative }, ref) => {
+    return (
+      <Separator.Root
+        ref={ref}
+        className="bg-neutral-700 data-[orientation=horizontal]:h-px data-[orientation=horizontal]:w-full data-[orientation=vertical]:h-full data-[orientation=vertical]:w-px data-[orientation=vertical]:mx-3 data-[orientation=horizontal]:my-3"
+        {...{ orientation, decorative }}
+      />
+    );
+  }
+);
@@ -0,0 +1 @@
+export { Divider } from './divider';
@@ -2,13 +2,14 @@ import * as DropdownMenuPrimitive from '@radix-ui/react-dropdown-menu';
 import classNames from 'classnames';
 import type { ReactNode } from 'react';
 import { forwardRef } from 'react';
+import type { IconName } from '../icon';
 import { Icon } from '../icon';

 const itemClass = classNames(
  'relative flex items-center justify-between rounded-sm p-2 text-sm',
  'cursor-default hover:cursor-pointer',
-  'hover:bg-white dark:hover:bg-neutral-200',
-  'focus:bg-white dark:focus:bg-neutral-200',
+  'hover:bg-white dark:hover:bg-vega-dark-200',
+  'focus:bg-white dark:focus:bg-vega-dark-200',
  'select-none',
  'whitespace-nowrap'
 );
@@ -16,6 +17,11 @@ const itemClass = classNames(
 type DropdownMenuProps = DropdownMenuPrimitive.DropdownMenuProps & {
  trigger: ReactNode;
 };
+
+type DropdownTriggerProps = DropdownMenuPrimitive.DropdownMenuTriggerProps & {
+  iconName?: IconName;
+};
+
 /**
 * Contains all the parts of a dropdown menu.
 */
@@ -37,22 +43,20 @@ export const DropdownMenu = ({
 */
 export const DropdownMenuTrigger = forwardRef<
  React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
-  React.ComponentProps<typeof DropdownMenuPrimitive.Trigger>
->(({ className, children, ...props }, forwardedRef) => {
-  const triggerClasses = classNames(
-    className,
-    'text-sm py-1 px-2 rounded bg-transparent border border-neutral-500 whitespace-nowrap',
-    'hover:bg-neutral-500/20 dark:hover:bg-neutral-500/40'
-  );
+  DropdownTriggerProps
+>(({ className, children, iconName, ...props }, forwardedRef) => {
+  const defaultClasses =
+    'text-sm py-1 px-2 rounded bg-transparent border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500/20 hover:bg-vega-light-500/40';
+
  return (
    <DropdownMenuPrimitive.Trigger
      asChild={true}
      ref={forwardedRef}
-      className={triggerClasses}
+      className={className || defaultClasses}
      {...props}
    >
      <button>
-        {children} <Icon name="chevron-down" className="ml-2" />
+        {children} <Icon name={iconName || 'chevron-down'} />
      </button>
    </DropdownMenuPrimitive.Trigger>
  );
@@ -73,7 +77,7 @@ export const DropdownMenuContent = forwardRef<
  <DropdownMenuPrimitive.Content
    {...contentProps}
    ref={forwardedRef}
-    className="min-w-[290px] bg-neutral-200 dark:bg-white p-2 rounded z-20 dark:text-black"
+    className="min-w-[290px] bg-vega-light-100 dark:bg-vega-dark-100 p-2 rounded z-20 text-black dark:text-white border-vega-light-200 dark:border-vega-dark-200"
    align="start"
    sideOffset={10}
  />
@@ -115,9 +119,9 @@ export const DropdownMenuRadioItem = forwardRef<
  React.ComponentProps<typeof DropdownMenuPrimitive.RadioItem> & {
    inset?: boolean;
  }
->(({ className, inset = false, ...radioItemprops }, forwardedRef) => (
+>(({ className, inset = false, ...radioItemProps }, forwardedRef) => (
  <DropdownMenuPrimitive.RadioItem
-    {...radioItemprops}
+    {...radioItemProps}
    ref={forwardedRef}
    className={classNames(itemClass, className)}
  />
@@ -151,7 +155,7 @@ export const DropdownMenuSeparator = forwardRef<
    {...separatorProps}
    ref={forwardedRef}
    className={classNames(
-      'h-px my-1 mx-2 bg-neutral-400 dark:bg-neutral-300',
+      'h-px my-1 mx-2 bg-vega-dark-400 dark:bg-vega-dark-300',
      className
    )}
  />
@@ -0,0 +1 @@
+export * from './icon';
@@ -1 +1,2 @@
-export * from './icon';
+export * from './blueprint-icons';
+export * from './vega-icons';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
sam-keen	9b64a017d0	fix(3562): use default jsonrpc connector when the provider from useWeb3React is for a different network	2023-04-27 16:36:00 +01:00
Joe Tsang	0f7bffd38b	test(ci): capsule update v0.71.1 (#3559 )	2023-04-27 14:37:55 +01:00
dexturr	3665375b75	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 12:09:22 +00:00
m.ray	8572c0a570	feat(trading): data grid dropdown menu in collateral table and vega icons (#3472 )	2023-04-27 09:21:05 +00:00
Maciek	6a29dc82ef	feat(ledger): add link for download ledger entries to .csv (#3454 )	2023-04-27 08:53:28 +00:00
Bartłomiej Głownia	c19bcc5e0c	feat(trading): add oracle banner e2e tests (#3524 )	2023-04-27 09:47:18 +01:00
Maciek	6593bbf37b	feat(trading): settings page quick adjust a css (#3558 )	2023-04-27 07:38:57 +00:00
dexturr	1e5e57b978	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 06:10:10 +00:00
dexturr	5394b00349	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 00:16:39 +00:00
dexturr	32f5eaade5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 18:07:54 +00:00
Maciek	b7a440132d	feat(trading): make Sentry only after opt in (#3448 )	2023-04-26 15:17:23 +00:00
m.ray	d6ecdf80fa	fix(fills): handle side_unspecified added for the aggresor (#3550 )	2023-04-26 13:34:56 +00:00
dexturr	21e545d941	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 12:09:35 +00:00
Sam Keen	ef5fa7cba6	feat(governance): ensure the data node urls in the monorepo are valid (#3549 )	2023-04-26 11:10:40 +00:00
Mikołaj Młodzikowski	d1f465e2af	Update Jenkinsfile	2023-04-26 12:54:34 +02:00
Mikołaj MłodzikowskiandMikołaj Młodzikowski	2740df48a3	fix(ci): urls in comments (#3539 ) Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@github.com>	2023-04-26 12:45:02 +02:00
Dexter Edwards	cf1f10e324	chore(static): remove unusable mainnet data nodes (#3003 )	2023-04-26 08:09:50 +01:00
dexturr	f09a1abcfa	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 06:07:25 +00:00
dexturr	3de83c6eb8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 00:15:38 +00:00
dexturr	e6545c13af	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-25 18:06:59 +00:00
Sam Keen	613582ee00	fix(governance): validator tables - user staking fixes (#3533 )	2023-04-25 14:17:27 +00:00
dexturr	77582a62a8	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-25 12:08:28 +00:00
Sam KeenandJoe	384c96376a	fix(governance): scroll to top on route change (#3481 ) Co-authored-by: Joe <joe@vega.xyz>	2023-04-25 12:31:34 +01:00
Dexter	0a92f62a66	ci: publish esm and cjs	2023-04-25 10:11:55 +01:00
daro-maj	f589f4a9fa	test(trading): tests for ac - 7005-FILL-fills (#3529 )	2023-04-25 09:19:37 +01:00
dexturr	b9869da492	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-25 06:07:52 +00:00
dexturr	653fec7025	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-25 00:15:25 +00:00
dexturr	8bf948578c	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-24 18:09:08 +00:00
Dexter	11b08d16e4	ci: bump version	2023-04-24 15:56:05 +01:00
daro-maj	5081b11c93	test(trading): separated artifacts for logs and html report (#3519 )	2023-04-24 15:28:42 +02:00
Dexter Edwards	a1366e59ec	fix(ui-toolkit): box size being wrong for multiline check boxes (#3527 )	2023-04-24 12:10:52 +00:00
dexturr	0b035d5064	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-24 12:07:43 +00:00
dexturr	e1a38f2197	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-24 06:07:22 +00:00
dexturr	8201e87050	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-24 00:16:56 +00:00
dexturr	3aaf4e724d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-23 18:07:11 +00:00
dexturr	6fe06e9f62	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-23 12:07:53 +00:00
dexturr	cd8b0e7caf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-23 06:06:56 +00:00
dexturr	4282faa9d9	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-23 00:16:16 +00:00
dexturr	a24846fd06	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-22 18:07:13 +00:00
dexturr	72de53cf10	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-22 12:09:27 +00:00
dexturr	f3c0313a59	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-22 06:07:33 +00:00
dexturr	4c0de8f22b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-22 00:16:38 +00:00
dexturr	254fb57af0	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-21 18:09:06 +00:00