fix: typo fix in token readme

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/actions/setup-vegawallet-docker/action.yml

@@ -8,21 +8,17 @@ outputs:
 runs:
   using: 'composite'
   steps:
-    - name: Create passphrase
-      shell: bash
-      run: echo "${{ inputs.passphrase }}" > ./passphrase
-
     - name: Initialize wallet
       shell: bash
       run: vega wallet init -f --home ~/.vegacapsule/testnet/wallet
 
     - name: Import wallet
       shell: bash
-      run: vega wallet import -w capsule_wallet --recovery-phrase-file ./frontend-monorepo/vegacapsule/recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      run: vega wallet import -w capsule_wallet --recovery-phrase-file ./frontend-monorepo/vegacapsule/recovery -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
 
     - name: Generate second public key
       shell: bash
-      run: vega wallet key generate -w capsule_wallet -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      run: vega wallet key generate -w capsule_wallet -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
 
     - name: Import network
       shell: bash
@@ -30,13 +26,13 @@ runs:
 
     - name: Init api-token
       shell: bash
-      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file passphrase
+      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file ./frontend-monorepo/vegacapsule/passphrase
 
     - name: Generate api-token
       id: generate-api-token
       shell: bash
-      run: echo api-token=$(vega wallet api-token generate --wallet-name capsule_wallet --tokens-passphrase-file passphrase  --wallet-passphrase-file passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
+      run: echo api-token=$(vega wallet api-token generate --wallet-name capsule_wallet --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase  --wallet-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
 
     - name: Start service using capsule network
       shell: bash
-      run: vega wallet service run -n DV --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
+      run: vega wallet service run -n DV --load-tokens --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &

.github/workflows/cypress-console-lite-e2e.yml

@@ -19,6 +19,9 @@ jobs:
     if: ${{ inputs.trigger == 'true' }}
     runs-on: self-hosted
     steps:
+      - name: Vega version
+        run: vega version
+
       # Checkout front ends
       - name: Checkout frontend mono repo
         uses: actions/checkout@v3

.github/workflows/cypress-explorer-e2e.yml

@@ -24,6 +24,12 @@ jobs:
     runs-on: self-hosted
     timeout-minutes: 30
     steps:
+      - name: Vega version
+        run: vega version
+
+      - name: Vegacapsule version
+        run: vegacapsule version
+
       # Checkout front ends
       - name: Checkout frontend mono repo
         uses: actions/checkout@v3
@@ -85,10 +91,16 @@ jobs:
       ## Upload logs
       ######
 
-      - name: Logs
-        run: vegacapsule network logs > vega-capsule-logs.txt
+      # Artifact path is not valid: /ganache-1/capsule-logscolletor.stderr-2022-12-22T10:20:30Z.log. Contains the following character:  Colon :
+      - name: Rename files to allow archive
+        if: ${{ always() }}
+        run: |
+          while read -r file; do
+            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
+          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
 
       - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
         with:
           name: logs
-          path: ./vega-capsule-logs.txt
+          path: /home/runner/.vegacapsule/testnet/logs

.github/workflows/cypress-token-e2e.yml

@@ -20,6 +20,12 @@ jobs:
     runs-on: self-hosted
     timeout-minutes: 60
     steps:
+      - name: Vega version
+        run: vega version
+
+      - name: Vegacapsule version
+        run: vegacapsule version
+
       # Checkout front ends
       - name: Checkout frontend mono repo
         uses: actions/checkout@v3
@@ -80,10 +86,16 @@ jobs:
       ## Upload logs
       ######
 
-      - name: Logs
-        run: vegacapsule network logs > vega-capsule-logs.txt
+      # Artifact path is not valid: /ganache-1/capsule-logscolletor.stderr-2022-12-22T10:20:30Z.log. Contains the following character:  Colon :
+      - name: Rename files to allow archive
+        if: ${{ always() }}
+        run: |
+          while read -r file; do
+            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
+          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
 
       - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
         with:
           name: logs
-          path: ./vega-capsule-logs.txt
+          path: /home/runner/.vegacapsule/testnet/logs

.github/workflows/cypress-trading-e2e.yml

@@ -20,8 +20,9 @@ jobs:
     timeout-minutes: 30
     runs-on: self-hosted
     steps:
-      - name: check version
+      - name: Vega version
         run: vega version
+
       # Checkout front ends
       - name: Checkout frontend mono repo
         uses: actions/checkout@v3

CODEOWNERS

@@ -1 +1,2 @@
 * @vegaprotocol/frontend
+*.graphql @vegaprotocol/core

README.md

@@ -156,6 +156,23 @@ In order to run the bootstrap command to generate and start a new network, we mu
 vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl
 ```
 
+In order to setup and run vegawallet for e2e capsule tests, in a separate terminal window:
+
+1. cd into `./vegacapsule`
+2. run:
+
+```bash
+bash setup-vegawallet.sh
+```
+
+3. copy generated `api-token` and paste the token into `CYPRESS_VEGA_WALLET_API_TOKEN` environment variable in either `apps/token-e2e/.env` or `apps/explorer-e2e/.env` depending on which project needs testing.
+
+Note: The script is only needed if capsule was built for first time or fresh. To run existing wallet service for capsule:
+
+```bash
+vega wallet service run -n DV --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet
+```
+
 # 📑 License
 
 [MIT](./LICENSE)

apps/console-lite-e2e/src/integration/app.test.ts

@@ -1,15 +1,6 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-} from '../support/mocks/generate-markets';
-
 describe('simple trading app', { tags: '@smoke' }, () => {
   beforeEach(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-    });
+    cy.mockConsole();
     cy.visit('/');
   });
 

apps/console-lite-e2e/src/integration/market-list.test.ts

@@ -1,18 +1,11 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import type { MarketsQuery } from '@vegaprotocol/market-list';
-import {
-  generateLongListMarkets,
-  generateSimpleMarkets,
-  generateMarketsCandles,
-} from '../support/mocks/generate-markets';
+import { marketCandlesQuery, marketsQuery } from '@vegaprotocol/mock';
 
 describe('market list', { tags: '@smoke' }, () => {
   describe('simple url', () => {
     beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      });
+      cy.mockConsole();
       cy.visit('/markets');
     });
 
@@ -64,10 +57,7 @@ describe('market list', { tags: '@smoke' }, () => {
 
   describe('url params should select filters', () => {
     beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      });
+      cy.mockConsole();
     });
 
     it('suspended status', () => {
@@ -100,14 +90,26 @@ describe('market list', { tags: '@smoke' }, () => {
   });
 
   describe('long list of results should be handled properly', () => {
-    it('handles 1000 markets', () => {
+    beforeEach(() => {
+      cy.mockConsole();
       cy.viewport(1440, 900);
+      const market = marketsQuery().marketsConnection?.edges[0];
+      const edges = new Array(1000)
+        .fill('')
+        .map(() => Object.assign({}, market));
       cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateLongListMarkets(1000));
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+        aliasGQLQuery(
+          req,
+          'Markets',
+          marketsQuery({ marketsConnection: { edges } })
+        );
+        aliasGQLQuery(req, 'MarketsCandles', marketCandlesQuery());
       });
       performance.mark('start-1k');
       cy.visit('/markets');
+      cy.wait('@Markets');
+    });
+    it('handles 1000 markets', () => {
       cy.get('.ag-center-cols-container', { timeout: 50000 }).then(() => {
         performance.mark('end-1k');
         performance.measure('load-1k', 'start-1k', 'end-1k');

apps/console-lite-e2e/src/integration/market-selector.test.ts

@@ -1,155 +1,84 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateMarket,
-  generateMarketData,
-  generateMarketsCandles,
-  generateMarketsData,
-  generateSimpleMarkets,
-} from '../support/mocks/generate-markets';
-import { generateMarketTags } from '../support/mocks/generate-market-tags';
-import { generateMarketPositions } from '../support/mocks/generate-market-positions';
-import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
-import { generatePartyBalance } from '../support/mocks/generate-party-balance';
-import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
-import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
-import { generateMarketNames } from '../support/mocks/generate-market-names';
-import { generateMarketDepth } from '../support/mocks/generate-market-depth';
-import type { Market, MarketsQuery } from '@vegaprotocol/market-list';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';
+const marketId = 'market-0';
+const marketName = 'ACTIVE MARKET';
 
 describe('market selector', { tags: '@smoke' }, () => {
-  let markets: Market[];
   beforeEach(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'MarketData', generateMarketData());
-      aliasQuery(req, 'Market', generateMarket());
-      aliasQuery(req, 'MarketTags', generateMarketTags());
-      aliasQuery(req, 'MarketPositions', generateMarketPositions());
-      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
-      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
-      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
-      aliasQuery(req, 'MarketNames', generateMarketNames());
-      aliasQuery(req, 'MarketDepth', generateMarketDepth());
-    });
-
-    cy.visit('/markets');
-    cy.wait('@Markets').then((response) => {
-      const data: MarketsQuery | undefined = response?.response?.body?.data;
-      if (data?.marketsConnection?.edges.length) {
-        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
-      }
-    });
+    cy.mockConsole();
+    cy.visit(`/trading/${marketId}`);
+    cy.connectVegaWallet();
+    cy.wait('@Markets');
   });
 
   it('should be properly rendered', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('input[placeholder="Search"]').should(
-        'have.value',
-        markets[0].tradableInstrument.instrument.name
-      );
-      cy.getByTestId('arrow-button').click();
-      cy.getByTestId('market-pane').should('be.visible');
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .first()
-        .should('contain.text', markets[0].tradableInstrument.instrument.name);
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .first()
-        .click();
-      cy.getByTestId('market-pane').should('not.be.visible');
-    }
+    cy.get('input[placeholder="Search"]').should('have.value', marketName);
+    cy.getByTestId('arrow-button').click();
+    cy.getByTestId('market-pane').should('be.visible');
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .first()
+      .should('contain.text', marketName);
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .first()
+      .click();
+    cy.getByTestId('market-pane').should('not.be.visible');
   });
 
   it('typing should change list', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('input[placeholder="Search"]').type('{backspace}');
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .should('have.length.at.least', 1);
-      cy.get('input[placeholder="Search"]').clear();
-      cy.get('input[placeholder="Search"]').type('aa');
-      const filtered = markets.filter(
-        (market) =>
-          market.state === 'STATE_ACTIVE' &&
-          market.tradableInstrument.instrument.name.match(/aa/i)
-      );
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .should('have.length', filtered.length);
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .last()
-        .click();
-      cy.location('pathname').should(
-        'eq',
-        `/trading/${filtered[filtered.length - 1].id}`
-      );
-      cy.get('input[placeholder="Search"]').should(
-        'have.value',
-        filtered[filtered.length - 1].tradableInstrument.instrument.name
-      );
-    }
+    cy.get('input[placeholder="Search"]').type('{backspace}');
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .should('have.length.at.least', 1);
+    cy.get('input[placeholder="Search"]').clear();
+    cy.get('input[placeholder="Search"]').type('ACTIVE');
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .should('have.length', 1);
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .last()
+      .click();
+    cy.location('pathname').should('eq', `/trading/${marketId}`);
+    cy.get('input[placeholder="Search"]').should('have.value', marketName);
   });
   // constantly failing on ci
   it.skip('keyboard navigation should work well', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('input[placeholder="Search"]').type('{backspace}');
-      cy.get('input[placeholder="Search"]').clear();
-      cy.focused().realPress('ArrowDown');
-      cy.focused().should('contain.text', 'AAVEDAI Monthly');
-      cy.focused().realPress('ArrowDown');
-      cy.focused().should('contain.text', 'ETHBTC').realPress('Enter');
-      cy.location('pathname').should('eq', '/trading/ethbtc-quaterly');
+    cy.get('input[placeholder="Search"]').type('{backspace}');
+    cy.get('input[placeholder="Search"]').clear();
+    cy.focused().realPress('ArrowDown');
+    cy.focused().should('contain.text', marketName);
+    cy.focused().realPress('ArrowDown');
+    cy.focused().should('contain.text', 'ETHBTC').realPress('Enter');
+    cy.location('pathname').should('eq', '/trading/ethbtc-quaterly');
 
-      cy.get('input[placeholder="Search"]').type('{backspace}');
-      cy.get('input[placeholder="Search"]').clear();
-      cy.getByTestId('market-pane').should('be.visible');
-      cy.get('body').realPress('ArrowDown');
-      cy.get('body').realPress('Tab');
-      cy.getByTestId('market-pane').should('not.be.visible');
-    }
+    cy.get('input[placeholder="Search"]').type('{backspace}');
+    cy.get('input[placeholder="Search"]').clear();
+    cy.getByTestId('market-pane').should('be.visible');
+    cy.get('body').realPress('ArrowDown');
+    cy.get('body').realPress('Tab');
+    cy.getByTestId('market-pane').should('not.be.visible');
   });
 
   it('mobile view', () => {
-    if (markets?.length) {
-      cy.viewport('iphone-xr');
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('[role="dialog"]').should('not.exist');
-      cy.getByTestId('arrow-button').click();
-      cy.get('[role="dialog"]').should('be.visible');
-      cy.get('input[placeholder="Search"]').then((search) => {
-        cy.wrap(search).clear();
-      });
-      cy.getByTestId('market-pane')
-        .children()
-        .find('[role="button"]')
-        .should('have.length', 9);
-      cy.get('div[role="dialog"]').should('have.class', 'w-screen');
-      cy.getByTestId('dialog-close').click();
-      cy.get('input[placeholder="Search"]').should(
-        'have.value',
-        markets[0].tradableInstrument.instrument.name
-      );
-    }
+    cy.viewport('iphone-xr');
+    cy.visit(`/trading/${marketId}`);
+    cy.get('[role="dialog"]').should('not.exist');
+    cy.getByTestId('arrow-button').click();
+    cy.get('[role="dialog"]').should('be.visible');
+    cy.get('input[placeholder="Search"]').then((search) => {
+      cy.wrap(search).clear();
+    });
+    cy.getByTestId('market-pane')
+      .children()
+      .find('[role="button"]')
+      .should('have.length', 3);
+    cy.get('div[role="dialog"]').should('have.class', 'w-screen');
+    cy.getByTestId('dialog-close').click();
+    cy.get('input[placeholder="Search"]').should('have.value', marketName);
   });
 });

apps/console-lite-e2e/src/integration/market-trade.test.ts

@@ -1,53 +1,38 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-  generateMarketsData,
-  generateMarket,
-  generateMarketData,
-} from '../support/mocks/generate-markets';
-import { generateMarketTags } from '../support/mocks/generate-market-tags';
-import { generateMarketPositions } from '../support/mocks/generate-market-positions';
-import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
-import { generatePartyBalance } from '../support/mocks/generate-party-balance';
-import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
-import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
-import { generateMarketDepth } from '../support/mocks/generate-market-depth';
-import type { MarketsQuery, Market } from '@vegaprotocol/market-list';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { marketQuery, marketsQuery } from '@vegaprotocol/mock';
 
-describe('Market trade', { tags: '@smoke' }, () => {
-  let markets: Market[];
-  beforeEach(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketTags', generateMarketTags());
-      aliasQuery(req, 'MarketPositions', generateMarketPositions());
-      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
-      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
-      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
-      aliasQuery(req, 'MarketDepth', generateMarketDepth());
-      aliasQuery(req, 'Market', generateMarket());
-      aliasQuery(req, 'MarketData', generateMarketData());
-    });
-    cy.visit('/markets');
-    cy.wait('@Markets').then((response) => {
-      const data: MarketsQuery | undefined = response?.response?.body?.data;
-      if (data?.marketsConnection?.edges.length) {
-        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
-      }
-    });
+const marketId =
+  marketsQuery().marketsConnection?.edges[1].node.id || 'market-1';
+const marketOverride = {
+  market: {
+    depth: {
+      lastTrade: {
+        price: '9893006',
+      },
+    },
+    id: marketId,
+    tradableInstrument: {
+      instrument: {
+        product: {
+          settlementAsset: {
+            id: 'asset-id-2',
+            name: 'DAI Name',
+            symbol: 'tDAI',
+          },
+        },
+      },
+    },
+  },
+};
+
+describe('Market trade with wallet disconnected', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockConsole();
+    cy.visit(`/trading/${marketId}`);
+    cy.wait('@Market');
+    console.log('marketId', marketId);
   });
-
-  it('should not display steps if wallet is disconnected', () => {
-    cy.visit(`/trading/${markets[0].id}`);
+  it('should not display steps', () => {
     cy.getByTestId('trading-connect-wallet')
       .find('h3')
       .should('have.text', 'Please connect your Vega wallet to make a trade');
@@ -58,273 +43,236 @@ describe('Market trade', { tags: '@smoke' }, () => {
       .find('a')
       .should('have.text', 'https://vega.xyz/wallet');
   });
+});
+
+describe('Market trade', { tags: '@regression' }, () => {
+  beforeEach(() => {
+    cy.mockConsole();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Market', marketQuery(marketOverride));
+    });
+    cy.visit(`/trading/${marketId}`);
+    cy.connectVegaWallet();
+    cy.wait('@Market');
+  });
 
   it('side selector should work well', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').should(
-        'have.text',
-        'Long'
-      );
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-1-control [aria-label^="Selected value"]').should(
-        'have.text',
-        'Short'
-      );
-    }
+    cy.get('#step-1-control [aria-label^="Selected value"]').should(
+      'have.text',
+      'Long'
+    );
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-1-control [aria-label^="Selected value"]').should(
+      'have.text',
+      'Short'
+    );
   });
 
   it('side selector mobile view should work well', () => {
-    if (markets?.length) {
-      cy.viewport('iphone-xr');
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.getByTestId('next-button').scrollIntoView().click();
+    cy.viewport('iphone-xr');
+    cy.getByTestId('next-button').scrollIntoView().click();
 
-      cy.get('button[aria-label="Open long position"]').should(
-        'have.class',
-        'selected'
-      );
-      cy.get('button[aria-label="Open short position"]').should(
-        'not.have.class',
-        'selected'
-      );
+    cy.get('button[aria-label="Open long position"]').should(
+      'have.class',
+      'selected'
+    );
+    cy.get('button[aria-label="Open short position"]').should(
+      'not.have.class',
+      'selected'
+    );
 
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('button[aria-label="Open long position"]').should(
-        'not.have.class',
-        'selected'
-      );
-      cy.get('button[aria-label="Open short position"]').should(
-        'have.class',
-        'selected'
-      );
-      cy.getByTestId('next-button').scrollIntoView().click();
-      cy.get('#step-1-control').should(
-        'contain.html',
-        'aria-label="Selected value Short"'
-      );
-    }
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('button[aria-label="Open long position"]').should(
+      'not.have.class',
+      'selected'
+    );
+    cy.get('button[aria-label="Open short position"]').should(
+      'have.class',
+      'selected'
+    );
+    cy.getByTestId('next-button').scrollIntoView().click();
+    cy.get('#step-1-control').should(
+      'contain.html',
+      'aria-label="Selected value Short"'
+    );
   });
 
   it('size slider should work well', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '1');
-      cy.get('#step-2-panel').find('[role="slider"]').type('{rightarrow}');
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '1');
+    cy.get('#step-2-panel').find('[role="slider"]').type('{rightarrow}');
 
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '2');
-    }
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '2');
   });
 
   it('percentage selection should work well', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '1');
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '1');
 
-      cy.getByTestId('max-label').should('have.text', '21');
+    cy.getByTestId('max-label').should('have.text', '10');
 
-      cy.getByTestId('percentage-selector')
-        .find('button')
-        .contains('Max')
-        .click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '21');
-    }
+    cy.getByTestId('percentage-selector')
+      .find('button')
+      .contains('Max')
+      .click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '10');
   });
 
   it('size input should work well', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '1');
-      cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('input')
-        .type('{backspace}2');
-      cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '2');
-      cy.get('button').contains('Max').click();
-    }
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '1');
+    cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
+    cy.get('#step-2-panel').find('dd').eq(0).find('input').type('{backspace}2');
+    cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '2');
+    cy.get('button').contains('Max').click();
   });
 
   it('slippage value should be displayed', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('button').contains('Max').click();
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '0.02%');
-    }
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('button').contains('Max').click();
+    cy.get('#step-2-panel')
+      .find('dl')
+      .eq(2)
+      .find('dd')
+      .should('have.text', '0.01%');
   });
 
   it('allow slippage value to be adjusted', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('button').contains('Max').click();
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '0.02%');
-      cy.get('#step-2-panel').find('dl').eq(2).find('button').click();
-      cy.get('#input-order-slippage')
-        .focus()
-        .type('{backspace}{backspace}{backspace}1');
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('button').contains('Max').click();
+    cy.get('#step-2-panel')
+      .find('dl')
+      .eq(2)
+      .find('dd')
+      .should('have.text', '0.01%');
+    cy.get('#step-2-panel').find('dl').eq(2).find('button').click();
+    cy.get('#input-order-slippage')
+      .focus()
+      .type('{backspace}{backspace}{backspace}1');
 
-      cy.getByTestId('slippage-dialog').find('button').click();
+    cy.getByTestId('slippage-dialog').find('button').click();
 
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '1%');
-    }
+    cy.get('#step-2-panel')
+      .find('dl')
+      .eq(2)
+      .find('dd')
+      .should('have.text', '1%');
   });
 
   it('notional position size should be present', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('button')
-        .should('have.text', '1');
-      cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(0)
-        .find('input')
-        .type('{backspace}2');
-      cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
-      cy.get('#step-2-panel')
-        .find('dt')
-        .eq(2)
-        .should('have.text', 'Est. Position Size (tDAI)');
-      cy.get('#step-2-panel').find('dd').eq(2).should('have.text', '197.86012');
-    }
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(0)
+      .find('button')
+      .should('have.text', '1');
+    cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
+    cy.get('#step-2-panel').find('dd').eq(0).find('input').type('{backspace}2');
+    cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
+    cy.get('#step-2-panel')
+      .find('dt')
+      .eq(2)
+      .should('have.text', 'Est. Position Size (tDAI)');
+    cy.get('#step-2-panel').find('dd').eq(2).should('have.text', '197.86012');
   });
 
   it('total fees should be displayed', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-1-control [aria-label^="Selected value"]').click();
-      cy.get('button[aria-label="Open short position"]').click();
-      cy.get('#step-2-control').click();
-      cy.get('#step-2-panel')
-        .find('dt')
-        .eq(3)
-        .should('have.text', 'Est. Fees (tDAI)');
-      cy.get('#step-2-panel')
-        .find('dd')
-        .eq(3)
-        .should('have.text', '3.00 (3.03%)');
-    }
+    cy.get('#step-1-control [aria-label^="Selected value"]').click();
+    cy.get('button[aria-label="Open short position"]').click();
+    cy.get('#step-2-control').click();
+    cy.get('#step-2-panel')
+      .find('dt')
+      .eq(3)
+      .should('have.text', 'Est. Fees (tDAI)');
+    cy.get('#step-2-panel')
+      .find('dd')
+      .eq(3)
+      .should('have.text', '3.00 (3.03%)');
   });
 
   it('order review should display proper calculations', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-3-control').click();
+    cy.get('#step-3-control').click();
 
-      cy.getByTestId('review-trade')
-        .get('#contracts_tooltip_trigger')
-        .trigger('click')
-        .realTouch();
+    cy.getByTestId('review-trade')
+      .get('#contracts_tooltip_trigger')
+      .trigger('click')
+      .realTouch();
 
-      cy.get('[data-radix-popper-content-wrapper]').contains(
-        'The number of contracts determines'
-      );
-      cy.get('#step-3-panel').find('dd').eq(1).should('have.text', '1');
+    cy.get('[data-radix-popper-content-wrapper]').contains(
+      'The number of contracts determines'
+    );
+    cy.get('#step-3-panel').find('dd').eq(1).should('have.text', '1');
 
-      cy.get('#step-3-panel').find('dd').eq(2).should('have.text', '98.93006');
+    cy.get('#step-3-panel').find('dd').eq(2).should('have.text', '98.93006');
 
-      cy.get('#step-3-panel')
-        .find('dd')
-        .eq(3)
-        .should('have.text', '3.00 (3.03%)');
+    cy.get('#step-3-panel')
+      .find('dd')
+      .eq(3)
+      .should('have.text', '3.00 (3.03%)');
 
-      cy.get('#step-3-panel').find('dd').eq(4).should('have.text', ' - ');
+    cy.get('#step-3-panel')
+      .find('dd')
+      .eq(4)
+      .should('have.text', '45,126.90058');
 
-      cy.getByTestId('place-order').should('be.enabled').click();
-    }
+    cy.getByTestId('place-order').should('be.enabled').click();
   });
 
   it('info tooltip on mobile view should work well', () => {
-    if (markets?.length) {
-      cy.viewport('iphone-xr');
-      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
-      cy.get('#step-3-control').click();
+    cy.viewport('iphone-xr');
+    cy.get('#step-3-control').click();
 
-      // Start from the bottom tooltip to ensure the tooltip above
-      // can be interacted with
-      cy.getByTestId('review-trade').get('div.cursor-help').eq(1).realTouch();
-      cy.get('[data-radix-popper-content-wrapper]').contains(
-        'The notional size represents the position size'
-      );
+    // Start from the bottom tooltip to ensure the tooltip above
+    // can be interacted with
+    cy.getByTestId('review-trade').get('div.cursor-help').eq(1).realTouch();
+    cy.get('[data-radix-popper-content-wrapper]').contains(
+      'The notional size represents the position size'
+    );
 
-      cy.getByTestId('review-trade')
-        .get('#contracts_tooltip_trigger')
-        .realTouch();
-      cy.get('[data-radix-popper-content-wrapper]').contains(
-        'The number of contracts determines'
-      );
-    }
+    cy.getByTestId('review-trade')
+      .get('#contracts_tooltip_trigger')
+      .realTouch();
+    cy.get('[data-radix-popper-content-wrapper]').contains(
+      'The number of contracts determines'
+    );
   });
 });

apps/console-lite-e2e/src/integration/portfolio-page.test.ts

@@ -1,20 +1,16 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
-  generatePositions,
-  emptyPositions,
-  generateMargins,
-} from '../support/mocks/generate-positions';
-import { generateAccounts } from '../support/mocks/generate-accounts';
-import { generateAssets } from '../support/mocks/generate-assets';
-import { generateOrders } from '../support/mocks/generate-orders';
-import { generateFills } from '../support/mocks/generate-fills';
-import {
-  generateFillsMarkets,
-  generateMarketsData,
-  generatePositionsMarkets,
-} from '../support/mocks/generate-markets';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';
+  accountsQuery,
+  assetsQuery,
+  chainIdQuery,
+  fillsQuery,
+  marginsQuery,
+  marketsDataQuery,
+  marketsQuery,
+  ordersQuery,
+  positionsQuery,
+  statisticsQuery,
+} from '@vegaprotocol/mock';
 
 describe('Portfolio page - wallet', { tags: '@smoke' }, () => {
   it('button for wallet connect should work', () => {
@@ -29,14 +25,14 @@ describe('Portfolio page - wallet', { tags: '@smoke' }, () => {
 describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   before(() => {
     cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
-      aliasQuery(req, 'Positions', generatePositions());
-      aliasQuery(req, 'Margins', generateMargins());
-      aliasQuery(req, 'Markets', generatePositionsMarkets());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'Accounts', generateAccounts());
-      aliasQuery(req, 'Assets', generateAssets());
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      aliasGQLQuery(req, 'Positions', positionsQuery());
+      aliasGQLQuery(req, 'Margins', marginsQuery());
+      aliasGQLQuery(req, 'Markets', marketsQuery());
+      aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
+      aliasGQLQuery(req, 'Accounts', accountsQuery());
+      aliasGQLQuery(req, 'Assets', assetsQuery());
     });
   });
 
@@ -63,21 +59,21 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   describe('Assets view', () => {
     before(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
-        aliasQuery(req, 'Positions', generatePositions());
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'Markets', generatePositionsMarkets());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
-        aliasQuery(req, 'Accounts', generateAccounts());
-        aliasQuery(req, 'Assets', generateAssets());
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        aliasGQLQuery(req, 'Positions', positionsQuery());
+        aliasGQLQuery(req, 'Margins', marginsQuery());
+        aliasGQLQuery(req, 'Markets', marketsQuery());
+        aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
+        aliasGQLQuery(req, 'Accounts', accountsQuery());
+        aliasGQLQuery(req, 'Assets', assetsQuery());
       });
       cy.visit('/portfolio/assets');
       cy.connectVegaWallet();
     });
 
     it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 3);
+      cy.get('.ag-center-cols-container .ag-row').should('have.length', 5);
       cy.get(
         '.ag-center-cols-container [row-id="ACCOUNT_TYPE_GENERAL-asset-id-null"]'
       )
@@ -94,14 +90,14 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   describe('Positions view', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
-        aliasQuery(req, 'Positions', generatePositions());
-        aliasQuery(req, 'Accounts', generateAccounts());
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'Markets', generatePositionsMarkets());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
-        aliasQuery(req, 'Assets', generateAssets());
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        aliasGQLQuery(req, 'Positions', positionsQuery());
+        aliasGQLQuery(req, 'Margins', marginsQuery());
+        aliasGQLQuery(req, 'Markets', marketsQuery());
+        aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
+        aliasGQLQuery(req, 'Accounts', accountsQuery());
+        aliasGQLQuery(req, 'Assets', assetsQuery());
       });
       cy.visit('/portfolio/positions');
       cy.connectVegaWallet();
@@ -115,10 +111,10 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   describe('Orders view', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
-        aliasQuery(req, 'Orders', generateOrders());
-        aliasQuery(req, 'Markets', generateFillsMarkets());
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        aliasGQLQuery(req, 'Orders', ordersQuery());
+        aliasGQLQuery(req, 'Markets', marketsQuery());
       });
       cy.visit('/portfolio/orders');
       cy.connectVegaWallet();
@@ -132,10 +128,11 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   describe('Fills view', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
-        aliasQuery(req, 'Fills', generateFills());
-        aliasQuery(req, 'Markets', generateFillsMarkets());
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        aliasGQLQuery(req, 'Orders', ordersQuery());
+        aliasGQLQuery(req, 'Markets', marketsQuery());
+        aliasGQLQuery(req, 'Fills', fillsQuery());
       });
       cy.visit('/portfolio/fills');
       cy.connectVegaWallet();
@@ -149,20 +146,20 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
   describe('Empty views', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
-        aliasQuery(req, 'Positions', emptyPositions());
-        aliasQuery(req, 'Accounts', { party: null });
-        aliasQuery(req, 'Orders', { party: null });
-        aliasQuery(req, 'Fills', { party: null });
-        aliasQuery(req, 'Markets', {
+        aliasGQLQuery(req, 'ChainId', chainIdQuery());
+        aliasGQLQuery(req, 'Statistics', statisticsQuery());
+        aliasGQLQuery(req, 'Positions', { party: null });
+        aliasGQLQuery(req, 'Accounts', { party: null });
+        aliasGQLQuery(req, 'Orders', { party: null });
+        aliasGQLQuery(req, 'Fills', { party: null });
+        aliasGQLQuery(req, 'Markets', {
           marketsConnection: { edges: [], __typename: 'MarketConnection' },
         });
-        aliasQuery(req, 'Assets', {
+        aliasGQLQuery(req, 'Assets', {
           assetsConnection: { edges: null, __typename: 'AssetsConnection' },
         });
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
+        aliasGQLQuery(req, 'Margins', marginsQuery());
+        aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
       });
       cy.visit('/portfolio');
       cy.connectVegaWallet();

apps/console-lite-e2e/src/support/commands.ts

@@ -1,9 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************

apps/console-lite-e2e/src/support/console-mock.ts

@@ -0,0 +1,56 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import type { CyHttpMessages } from 'cypress/types/net-stubbing';
+import {
+  accountsQuery,
+  assetsQuery,
+  chainIdQuery,
+  estimateOrderQuery,
+  fillsQuery,
+  marginsQuery,
+  marketDataQuery,
+  marketDepthQuery,
+  marketQuery,
+  marketsCandlesQuery,
+  marketsDataQuery,
+  marketsQuery,
+  ordersQuery,
+  positionsQuery,
+  statisticsQuery,
+} from '@vegaprotocol/mock';
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace Cypress {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface Chainable<Subject> {
+      mockConsole(): void;
+    }
+  }
+}
+
+const mockPage = (req: CyHttpMessages.IncomingHttpRequest) => {
+  aliasGQLQuery(req, 'ChainId', chainIdQuery());
+  aliasGQLQuery(req, 'Statistics', statisticsQuery());
+  aliasGQLQuery(req, 'Markets', marketsQuery());
+  aliasGQLQuery(req, 'MarketsCandles', marketsCandlesQuery());
+  aliasGQLQuery(req, 'MarketsData', marketsDataQuery());
+  aliasGQLQuery(req, 'MarketData', marketDataQuery());
+  aliasGQLQuery(req, 'Market', marketQuery());
+  aliasGQLQuery(req, 'MarketTags', {});
+  aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
+  aliasGQLQuery(req, 'MarketNames', {});
+  aliasGQLQuery(req, 'MarketDepth', marketDepthQuery());
+  aliasGQLQuery(req, 'Positions', positionsQuery());
+  aliasGQLQuery(req, 'Margins', marginsQuery());
+  aliasGQLQuery(req, 'Accounts', accountsQuery());
+  aliasGQLQuery(req, 'Assets', assetsQuery());
+  aliasGQLQuery(req, 'SimpleMarkets', marketsQuery());
+  aliasGQLQuery(req, 'Orders', ordersQuery());
+  aliasGQLQuery(req, 'Fills', fillsQuery());
+};
+
+export const addMockConsole = () => {
+  Cypress.Commands.add('mockConsole', () => {
+    cy.mockGQL(mockPage);
+  });
+};

apps/console-lite-e2e/src/support/index.js

@@ -1,36 +1,7 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
 import '@vegaprotocol/cypress';
 import 'cypress-real-events/support';
-// Import commands.js using ES2015 syntax:
-import './commands';
 import registerCypressGrep from '@cypress/grep';
-import { aliasQuery } from '@vegaprotocol/cypress';
-registerCypressGrep();
+import { addMockConsole } from './console-mock';
 
-before(() => {
-  // Mock chainId fetch which happens on every page for wallet connection
-  cy.mockGQL((req) => {
-    aliasQuery(req, 'ChainId', {
-      statistics: {
-        __typename: 'Statistics',
-        chainId:
-          Cypress.env('VEGA_ENV').toLowerCase() ||
-          'vega-fairground-202210041151',
-      },
-    });
-  });
-});
+registerCypressGrep();
+addMockConsole();

apps/console-lite-e2e/src/support/mocks/commons.ts

@@ -1,156 +0,0 @@
-import type { Market } from '@vegaprotocol/market-list';
-import * as Schema from '@vegaprotocol/types';
-import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
-
-export const protoCandles = [
-  { open: '9556163', close: '9587028', __typename: 'Candle' },
-  {
-    open: '9587028',
-    close: '9769899',
-    __typename: 'Candle',
-  },
-  { open: '9769899', close: '9586292', __typename: 'Candle' },
-  {
-    open: '9586292',
-    close: '9261774',
-    __typename: 'Candle',
-  },
-  { open: '9261773', close: '9236369', __typename: 'Candle' },
-  {
-    open: '9236369',
-    close: '9226070',
-    __typename: 'Candle',
-  },
-  { open: '9226077', close: '9233252', __typename: 'Candle' },
-  {
-    open: '9249854',
-    close: '9333038',
-    __typename: 'Candle',
-  },
-  { open: '9333038', close: '9410371', __typename: 'Candle' },
-  {
-    open: '9410371',
-    close: '9626249',
-    __typename: 'Candle',
-  },
-  { open: '9626247', close: '9493253', __typename: 'Candle' },
-  {
-    open: '9493253',
-    close: '9309054',
-    __typename: 'Candle',
-  },
-  { open: '9309054', close: '9378428', __typename: 'Candle' },
-  {
-    open: '9378428',
-    close: '9352996',
-    __typename: 'Candle',
-  },
-  { open: '9352996', close: '9451142', __typename: 'Candle' },
-  {
-    open: '9451142',
-    close: '9691070',
-    __typename: 'Candle',
-  },
-  { open: '9691071', close: '9622031', __typename: 'Candle' },
-  {
-    open: '9622034',
-    close: '9519285',
-    __typename: 'Candle',
-  },
-  { open: '9528904', close: '9671275', __typename: 'Candle' },
-  {
-    open: '9671275',
-    close: '9988454',
-    __typename: 'Candle',
-  },
-  { open: '9982457', close: '10085537', __typename: 'Candle' },
-  {
-    open: '10085537',
-    close: '9967390',
-    __typename: 'Candle',
-  },
-  { open: '9967390', close: '9974844', __typename: 'Candle' },
-  {
-    open: '9974844',
-    close: '9940706',
-    __typename: 'Candle',
-  },
-];
-
-export const protoMarket: Market = {
-  id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-  tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  state: Schema.MarketState.STATE_ACTIVE,
-  decimalPlaces: 5,
-  positionDecimalPlaces: 0,
-  marketTimestamps: {
-    __typename: 'MarketTimestamps',
-    close: '',
-    open: '',
-  },
-  fees: {
-    __typename: 'Fees',
-    factors: {
-      __typename: 'FeeFactors',
-      makerFee: '',
-      infrastructureFee: '',
-      liquidityFee: '',
-    },
-  },
-  tradableInstrument: {
-    instrument: {
-      id: '',
-      code: 'AAVEDAI.MF21',
-      name: 'AAVEDAI Monthly (30 Jun 2022)',
-      metadata: {
-        tags: [
-          'formerly:2839D9B2329C9E70',
-          'base:AAVE',
-          'quote:DAI',
-          'class:fx/crypto',
-          'monthly',
-          'sector:defi',
-        ],
-        __typename: 'InstrumentMetadata',
-      },
-      product: {
-        __typename: 'Future',
-        quoteName: 'DAI',
-        settlementAsset: {
-          __typename: 'Asset',
-          id: 'asset-id',
-          symbol: 'tDAI',
-          decimals: 5,
-        },
-      },
-      __typename: 'Instrument',
-    },
-    __typename: 'TradableInstrument',
-  },
-  __typename: 'Market',
-};
-
-export const singleMarket: SingleMarketFieldsFragment = {
-  ...protoMarket,
-  tradableInstrument: {
-    ...protoMarket.tradableInstrument,
-    instrument: {
-      ...protoMarket.tradableInstrument.instrument,
-      product: {
-        ...protoMarket.tradableInstrument.instrument.product,
-        settlementAsset: {
-          ...protoMarket.tradableInstrument.instrument.product.settlementAsset,
-          id: 'dai-id',
-          name: 'DAI Name',
-        },
-        dataSourceSpecForTradingTermination: {
-          id: 'oid',
-        },
-      },
-    },
-  },
-  depth: {
-    __typename: 'MarketDepth',
-    lastTrade: { price: '9893006', __typename: 'Trade' },
-  },
-};

apps/console-lite-e2e/src/support/mocks/generate-accounts.ts

@@ -1,95 +0,0 @@
-import merge from 'lodash/merge';
-import type { AccountsQuery } from '@vegaprotocol/accounts';
-import * as Types from '@vegaprotocol/types';
-import type { PartialDeep } from 'type-fest';
-
-export const generateAccounts = (
-  override?: PartialDeep<AccountsQuery>
-): AccountsQuery => {
-  const defaultAccounts: AccountsQuery = {
-    party: {
-      __typename: 'Party',
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: null,
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: {
-                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-                __typename: 'Market',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id-2',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
-              balance: '1000',
-              market: {
-                __typename: 'Market',
-                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
-              balance: '1000',
-              market: {
-                __typename: 'Market',
-                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id-2',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: null,
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-0',
-              },
-            },
-          },
-        ],
-      },
-    },
-  };
-  return merge(defaultAccounts, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-assets.ts

@@ -1,120 +0,0 @@
-import merge from 'lodash/merge';
-import type { AssetsQuery } from '@vegaprotocol/assets';
-import * as Types from '@vegaprotocol/types';
-import type { PartialDeep } from 'type-fest';
-
-export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
-  const defaultAssets: AssetsQuery = {
-    assetsConnection: {
-      edges: [
-        {
-          node: {
-            id: 'asset-id',
-            symbol: 'tEURO',
-            decimals: 5,
-            name: 'Euro',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
-              lifetimeLimit: '1',
-              withdrawThreshold: '2',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '1',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: {
-              balance: '2',
-              __typename: 'AccountBalance',
-            },
-            takerFeeRewardAccount: {
-              balance: '3',
-              __typename: 'AccountBalance',
-            },
-            makerFeeRewardAccount: {
-              balance: '4',
-              __typename: 'AccountBalance',
-            },
-            lpFeeRewardAccount: {
-              balance: '5',
-              __typename: 'AccountBalance',
-            },
-            marketProposerRewardAccount: {
-              balance: '6',
-              __typename: 'AccountBalance',
-            },
-            __typename: 'Asset',
-          },
-        },
-        {
-          node: {
-            id: 'asset-id-2',
-            symbol: 'tDAI',
-            decimals: 5,
-            name: 'DAI',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
-              lifetimeLimit: '1',
-              withdrawThreshold: '2',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '1',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: {
-              balance: '2',
-              __typename: 'AccountBalance',
-            },
-            takerFeeRewardAccount: {
-              balance: '3',
-              __typename: 'AccountBalance',
-            },
-            makerFeeRewardAccount: {
-              balance: '4',
-              __typename: 'AccountBalance',
-            },
-            lpFeeRewardAccount: {
-              balance: '5',
-              __typename: 'AccountBalance',
-            },
-            marketProposerRewardAccount: {
-              balance: '6',
-              __typename: 'AccountBalance',
-            },
-            __typename: 'Asset',
-          },
-        },
-        {
-          node: {
-            id: 'asset-0',
-            symbol: 'AST0',
-            decimals: 5,
-            name: 'Asto',
-            source: {
-              __typename: 'BuiltinAsset',
-              maxFaucetAmountMint: '3',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '0',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: null,
-            takerFeeRewardAccount: null,
-            makerFeeRewardAccount: null,
-            lpFeeRewardAccount: null,
-            marketProposerRewardAccount: null,
-            __typename: 'Asset',
-          },
-        },
-      ],
-    },
-  };
-  return merge(defaultAssets, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-chain-id.ts

@@ -1,16 +0,0 @@
-import type { ChainIdQuery } from '@vegaprotocol/react-helpers';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateChainId = (
-  override?: PartialDeep<ChainIdQuery>
-): ChainIdQuery => {
-  const defaultResult = {
-    statistics: {
-      __typename: 'Statistics',
-      chainId: Cypress.env('VEGA_ENV').toLowerCase() || 'test-chain-id',
-    },
-  };
-
-  return merge(defaultResult, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-estimate-order.ts

@@ -1,17 +0,0 @@
-export const generateEstimateOrder = () => {
-  return {
-    estimateOrder: {
-      fee: {
-        __typename: 'TradeFee',
-        makerFee: '100000',
-        liquidityFee: '100000',
-        infrastructureFee: '100000',
-      },
-      marginLevels: {
-        initialLevel: '2844054.80937741220203',
-        __typename: 'MarginLevels',
-      },
-      __typename: 'OrderEstimate',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-fills.ts

@@ -1,111 +0,0 @@
-import type { FillsQuery, FillFieldsFragment } from '@vegaprotocol/fills';
-import * as Schema from '@vegaprotocol/types';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateFills = (
-  override?: PartialDeep<FillsQuery>
-): FillsQuery => {
-  const fills: FillFieldsFragment[] = [
-    generateFill({
-      buyer: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-    }),
-    generateFill({
-      id: '1',
-      seller: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-      aggressor: Schema.Side.SIDE_SELL,
-      buyerFee: {
-        infrastructureFee: '5000',
-      },
-      market: {
-        id: 'market-1',
-      },
-    }),
-    generateFill({
-      id: '2',
-      seller: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-      aggressor: Schema.Side.SIDE_BUY,
-    }),
-    generateFill({
-      id: '3',
-      aggressor: Schema.Side.SIDE_SELL,
-      market: {
-        id: 'market-2',
-      },
-      buyer: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-    }),
-  ];
-
-  const defaultResult: FillsQuery = {
-    party: {
-      id: 'buyer-id',
-      tradesConnection: {
-        __typename: 'TradeConnection',
-        edges: fills.map((f) => {
-          return {
-            __typename: 'TradeEdge',
-            node: f,
-            cursor: '3',
-          };
-        }),
-        pageInfo: {
-          __typename: 'PageInfo',
-          startCursor: '1',
-          endCursor: '2',
-          hasNextPage: false,
-          hasPreviousPage: false,
-        },
-      },
-      __typename: 'Party',
-    },
-  };
-
-  return merge(defaultResult, override);
-};
-
-export const generateFill = (override?: PartialDeep<FillFieldsFragment>) => {
-  const defaultFill: FillFieldsFragment = {
-    __typename: 'Trade',
-    id: '0',
-    createdAt: new Date().toISOString(),
-    price: '10000000',
-    size: '50000',
-    buyOrder: 'buy-order',
-    sellOrder: 'sell-order',
-    aggressor: Schema.Side.SIDE_BUY,
-    buyer: {
-      __typename: 'Party',
-      id: 'buyer-id',
-    },
-    seller: {
-      __typename: 'Party',
-      id: 'seller-id',
-    },
-    buyerFee: {
-      __typename: 'TradeFee',
-      makerFee: '100',
-      infrastructureFee: '100',
-      liquidityFee: '100',
-    },
-    sellerFee: {
-      __typename: 'TradeFee',
-      makerFee: '200',
-      infrastructureFee: '200',
-      liquidityFee: '200',
-    },
-    market: {
-      __typename: 'Market',
-      id: 'market-0',
-    },
-  };
-
-  return merge(defaultFill, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-market-depth.ts

@@ -1,210 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
-import type { MarketDepthQuery } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';
-
-export const generateMarketDepth = (
-  override?: PartialDeep<MarketDepthQuery>
-): MarketDepthQuery => {
-  const defaultResult: MarketDepthQuery = {
-    market: {
-      id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
-      depth: {
-        sell: [
-          {
-            price: '9893007',
-            volume: '3',
-            numberOfOrders: '3',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893010',
-            volume: '4',
-            numberOfOrders: '4',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893012',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893015',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893017',
-            volume: '2',
-            numberOfOrders: '2',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893021',
-            volume: '4',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893025',
-            volume: '5',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893125',
-            volume: '4',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893135',
-            volume: '2',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893165',
-            volume: '5',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893175',
-            volume: '3',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893185',
-            volume: '3',
-            numberOfOrders: '3',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9894185',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9894585',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9895585',
-            volume: '4',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9896585',
-            volume: '2',
-            numberOfOrders: '2',
-            __typename: 'PriceLevel',
-          },
-        ],
-        buy: [
-          {
-            price: '9893005',
-            volume: '4',
-            numberOfOrders: '3',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893003',
-            volume: '2',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9893001',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9892006',
-            volume: '3',
-            numberOfOrders: '2',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9891006',
-            volume: '2',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9891001',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890101',
-            volume: '2',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890091',
-            volume: '5',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890081',
-            volume: '4',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890050',
-            volume: '2',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890040',
-            volume: '6',
-            numberOfOrders: '3',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890030',
-            volume: '6',
-            numberOfOrders: '2',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890021',
-            volume: '3',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890011',
-            volume: '1',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-          {
-            price: '9890001',
-            volume: '11',
-            numberOfOrders: '1',
-            __typename: 'PriceLevel',
-          },
-        ],
-        sequenceNumber: '1661773865550746910',
-        __typename: 'MarketDepth',
-      },
-      __typename: 'Market',
-    },
-  };
-  return merge(defaultResult, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-market-mark-price.ts

@@ -1,9 +0,0 @@
-export const generateMarketMarkPrice = () => {
-  return {
-    market: {
-      decimalPlaces: 5,
-      data: { markPrice: '692748', __typename: 'MarketData' },
-      __typename: 'Market',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-market-names.ts

@@ -1,136 +0,0 @@
-import { protoMarket } from './commons';
-
-export const generateMarketNames = () => {
-  return {
-    markets: [
-      { ...protoMarket },
-      {
-        id: '1d7ddf67dac4924db03f5bf58571a7bcb1908d70c66580467717aabc5345b68a',
-        state: 'STATE_SUSPENDED',
-        tradableInstrument: {
-          instrument: {
-            code: 'AAPL.MF21',
-            name: 'Apple Monthly (30 Jun 2022)',
-            metadata: {
-              tags: [
-                'formerly:4899E01009F1A721',
-                'quote:USD',
-                'ticker:AAPL',
-                'class:equities/single-stock-futures',
-                'sector:tech',
-                'listing_venue:NASDAQ',
-                'country:US',
-              ],
-              __typename: 'InstrumentMetadata',
-            },
-            product: { quoteName: 'USD', __typename: 'Future' },
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
-        __typename: 'Market',
-      },
-      {
-        id: '87ae87cd3244fc1fab4b0e2dad2437879864192bb969f3109b69293421644c8b',
-        state: 'STATE_SUSPENDED',
-        tradableInstrument: {
-          instrument: {
-            code: 'TSLA.QM21',
-            name: 'Tesla Quarterly (30 Jun 2022)',
-            metadata: {
-              tags: [
-                'formerly:5A86B190C384997F',
-                'quote:EURO',
-                'ticker:TSLA',
-                'class:equities/single-stock-futures',
-                'sector:tech',
-                'listing_venue:NASDAQ',
-                'country:US',
-              ],
-              __typename: 'InstrumentMetadata',
-            },
-            product: { quoteName: 'EURO', __typename: 'Future' },
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
-        __typename: 'Market',
-      },
-      {
-        id: '69205712a854f1bbfb69fa3d11b60e01a1e249bafb5ece88115e7451e8ef07b3',
-        state: 'STATE_SUSPENDED',
-        tradableInstrument: {
-          instrument: {
-            code: 'BTCUSD.MF21',
-            name: 'BTCUSD Monthly (30 Jun 2022)',
-            metadata: {
-              tags: [
-                'formerly:076BB86A5AA41E3E',
-                'base:BTC',
-                'quote:USD',
-                'class:fx/crypto',
-                'monthly',
-                'sector:crypto',
-              ],
-              __typename: 'InstrumentMetadata',
-            },
-            product: { quoteName: 'USD', __typename: 'Future' },
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
-        __typename: 'Market',
-      },
-      {
-        id: 'ethbtc-quaterly',
-        state: 'STATE_ACTIVE',
-        tradableInstrument: {
-          instrument: {
-            code: 'ETHBTC.QM21',
-            name: 'ETHBTC Quarterly (30 Jun 2022)',
-            metadata: {
-              tags: [
-                'formerly:1F0BB6EB5703B099',
-                'base:ETH',
-                'quote:BTC',
-                'class:fx/crypto',
-                'quarterly',
-                'sector:crypto',
-              ],
-              __typename: 'InstrumentMetadata',
-            },
-            product: { quoteName: 'BTC', __typename: 'Future' },
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
-        __typename: 'Market',
-      },
-      {
-        id: '3c62b2714c4332d1a689a5352bff090e6aabccfd6bd87ce018936b38372530c9',
-        state: 'STATE_ACTIVE',
-        tradableInstrument: {
-          instrument: {
-            code: 'UNIDAI.MF21',
-            name: 'UNIDAI Monthly (30 Jun 2022)',
-            metadata: {
-              tags: [
-                'formerly:3C58ED2A4A6C5D7E',
-                'base:UNI',
-                'quote:DAI',
-                'class:fx/crypto',
-                'monthly',
-                'sector:defi',
-              ],
-              __typename: 'InstrumentMetadata',
-            },
-            product: { quoteName: 'DAI', __typename: 'Future' },
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
-        __typename: 'Market',
-      },
-    ],
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-market-positions.ts

@@ -1,72 +0,0 @@
-import type { MarketPositionsQuery } from '@vegaprotocol/deal-ticket';
-import * as Schema from '@vegaprotocol/types';
-
-export const generateMarketPositions = (): MarketPositionsQuery => {
-  return {
-    party: {
-      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                decimals: 5,
-              },
-              balance: '400000000000000000000',
-              market: {
-                id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
-                __typename: 'Market',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-              asset: {
-                decimals: 5,
-              },
-              balance: '265329',
-              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-                __typename: 'Market',
-              },
-            },
-          },
-        ],
-      },
-      positionsConnection: {
-        edges: [
-          {
-            node: {
-              openVolume: '3',
-              market: {
-                id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
-                __typename: 'Market',
-              },
-              __typename: 'Position',
-            },
-            __typename: 'PositionEdge',
-          },
-          {
-            node: {
-              openVolume: '12',
-              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-                __typename: 'Market',
-              },
-              __typename: 'Position',
-            },
-            __typename: 'PositionEdge',
-          },
-        ],
-        __typename: 'PositionConnection',
-      },
-      __typename: 'Party',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-market-tags.ts

@@ -1,25 +0,0 @@
-export const generateMarketTags = () => {
-  return {
-    market: {
-      tradableInstrument: {
-        instrument: {
-          metadata: {
-            tags: [
-              'formerly:2839D9B2329C9E70',
-              'base:AAVE',
-              'quote:DAI',
-              'class:fx/crypto',
-              'monthly',
-              'sector:defi',
-              'settlement:2022-08-01',
-            ],
-            __typename: 'InstrumentMetadata',
-          },
-          __typename: 'Instrument',
-        },
-        __typename: 'TradableInstrument',
-      },
-      __typename: 'Market',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-orders.ts

@@ -1,143 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type { OrdersQuery, OrderFieldsFragment } from '@vegaprotocol/orders';
-import * as Schema from '@vegaprotocol/types';
-
-export const generateOrders = (
-  override?: PartialDeep<OrdersQuery>
-): OrdersQuery => {
-  const orders: OrderFieldsFragment[] = [
-    {
-      __typename: 'Order',
-      id: '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
-      market: {
-        __typename: 'Market',
-        id: 'market-0',
-      },
-      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 30).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '48DB6767E4E4E0F649C5A13ABFADE39F8451C27DA828DAF14B7A1E8E5EBDAD99',
-      market: {
-        __typename: 'Market',
-        id: 'market-1',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '100',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 29).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '4e93702990712c41f6995fcbbd94f60bb372ad12d64dfa7d96d205c49f790336',
-      market: {
-        __typename: 'Market',
-        id: 'market-2',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 28).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '94737d2bafafa4bc3b80a56ef084ae52a983b91aa067c31e243c61a0f962a836',
-      market: {
-        __typename: 'Market',
-        id: 'market-3',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_ACTIVE,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 27).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '94aead3ca92dc932efcb503631b03a410e2a5d4606cae6083e2406dc38e52f78',
-      market: {
-        __typename: 'Market',
-        id: 'market-3',
-      },
-      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_PARTIALLY_FILLED,
-      side: Schema.Side.SIDE_SELL,
-      remaining: '3',
-      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 27).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-      rejectionReason: null,
-    },
-  ];
-
-  const defaultResult: OrdersQuery = {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      ordersConnection: {
-        __typename: 'OrderConnection',
-        edges: orders.map((f) => {
-          return {
-            __typename: 'OrderEdge',
-            node: f,
-            cursor: f.id,
-          };
-        }),
-        pageInfo: {
-          __typename: 'PageInfo',
-          startCursor:
-            '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
-          endCursor:
-            '94737d2bafafa4bc3b80a56ef084ae52a983b91aa067c31e243c61a0f962a836',
-          hasNextPage: false,
-          hasPreviousPage: false,
-        },
-      },
-      __typename: 'Party',
-    },
-  };
-  return merge(defaultResult, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-party-balance.ts

@@ -1,81 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartyBalanceQuery } from '@vegaprotocol/deal-ticket';
-import type { PartialDeep } from 'type-fest';
-import * as Types from '@vegaprotocol/types';
-
-export const generatePartyBalance = (
-  override?: PartialDeep<PartyBalanceQuery>
-): PartyBalanceQuery => {
-  const defaultResult: PartyBalanceQuery = {
-    party: {
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '88474051',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '100000000',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
-                symbol: 'tEURO',
-                name: 'tEURO TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '3412867',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '70007',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-        ],
-      },
-      __typename: 'Party',
-    },
-  };
-
-  return merge(defaultResult, override);
-};

apps/console-lite-e2e/src/support/mocks/generate-party-market-data.ts

@@ -1,40 +0,0 @@
-import type { PartyMarketDataQuery } from '@vegaprotocol/deal-ticket';
-import * as Types from '@vegaprotocol/types';
-
-export const generatePartyMarketData = (): PartyMarketDataQuery => {
-  return {
-    party: {
-      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '1200000',
-              asset: { id: 'fBTC', decimals: 5, __typename: 'Asset' },
-              market: null,
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '0.000000001',
-              asset: {
-                __typename: 'Asset',
-                id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-                decimals: 0,
-              },
-            },
-          },
-        ],
-      },
-      marginsConnection: { edges: null, __typename: 'MarginConnection' },
-      __typename: 'Party',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-positions.ts

@@ -1,145 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type {
-  PositionsQuery,
-  PositionFieldsFragment,
-  MarginsQuery,
-} from '@vegaprotocol/positions';
-
-export const generatePositions = (
-  override?: PartialDeep<PositionsQuery>
-): PositionsQuery => {
-  const nodes: PositionFieldsFragment[] = [
-    {
-      __typename: 'Position',
-      realisedPNL: '0',
-      openVolume: '6',
-      unrealisedPNL: '895000',
-      averageEntryPrice: '1129935',
-      updatedAt: '2022-07-28T15:09:34.441143Z',
-      market: {
-        id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-        __typename: 'Market',
-      },
-    },
-    {
-      __typename: 'Position',
-      realisedPNL: '100',
-      openVolume: '20',
-      unrealisedPNL: '895000',
-      averageEntryPrice: '8509338',
-      updatedAt: '2022-07-28T15:09:34.441143Z',
-      market: {
-        id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-        __typename: 'Market',
-      },
-    },
-    {
-      realisedPNL: '0',
-      openVolume: '1',
-      unrealisedPNL: '-22519',
-      averageEntryPrice: '84400088',
-      updatedAt: '2022-07-28T14:53:54.725477Z',
-      market: {
-        id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-        __typename: 'Market',
-      },
-      __typename: 'Position',
-    },
-  ];
-
-  const defaultResult: PositionsQuery = {
-    party: {
-      __typename: 'Party',
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      positionsConnection: {
-        __typename: 'PositionConnection',
-        edges: nodes.map((node) => {
-          return {
-            __typename: 'PositionEdge',
-            node,
-          };
-        }),
-      },
-    },
-  };
-
-  return merge(defaultResult, override);
-};
-
-export const emptyPositions = (): PositionsQuery => {
-  return {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      positionsConnection: { edges: null, __typename: 'PositionConnection' },
-      __typename: 'Party',
-    },
-  };
-};
-
-export const generateMargins = (): MarginsQuery => {
-  return {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      marginsConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tDAI-id',
-              },
-            },
-          },
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tDAI-id',
-              },
-            },
-            __typename: 'MarginEdge',
-          },
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tEURO-id',
-              },
-            },
-            __typename: 'MarginEdge',
-          },
-        ],
-        __typename: 'MarginConnection',
-      },
-      __typename: 'Party',
-    },
-  };
-};

apps/console-lite-e2e/src/support/mocks/generate-statistics.ts

@@ -1,17 +0,0 @@
-import type { StatisticsQuery } from '@vegaprotocol/environment';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateStatistics = (
-  override?: PartialDeep<StatisticsQuery>
-): StatisticsQuery => {
-  const defaultResult = {
-    statistics: {
-      __typename: 'Statistics',
-      chainId: Cypress.env('VEGA_ENV').toLowerCase() || 'test-chain-id',
-      blockHeight: '11',
-    },
-  };
-
-  return merge(defaultResult, override);
-};

apps/console-lite/src/app/app.tsx

@@ -1,7 +1,5 @@
 import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
-import { ThemeContext } from '@vegaprotocol/react-helpers';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { EnvironmentProvider, NetworkLoader } from '@vegaprotocol/environment';
 import {
   VegaConnectDialog,
@@ -18,8 +16,7 @@ import useLocalValues from './hooks/use-local-values';
 import type { InMemoryCacheConfig } from '@apollo/client';
 
 function App() {
-  const [theme, toggleTheme] = useThemeSwitcher();
-  const localValues = useLocalValues(theme, toggleTheme);
+  const localValues = useLocalValues();
   const {
     vegaWalletDialog,
     menu: { setMenuOpen },
@@ -56,25 +53,23 @@ function App() {
 
   return (
     <EnvironmentProvider>
-      <ThemeContext.Provider value={theme}>
-        <NetworkLoader cache={cacheConfig}>
-          <VegaWalletProvider>
-            <LocalContext.Provider value={localValues}>
-              <AppLoader>
-                <div className="max-h-full min-h-full dark:bg-lite-black dark:text-neutral-200 bg-white text-neutral-800 grid grid-rows-[min-content,1fr]">
-                  <Header />
-                  <Main />
-                  <VegaConnectDialog connectors={Connectors} />
-                  <VegaManageDialog
-                    dialogOpen={vegaWalletDialog.manage}
-                    setDialogOpen={vegaWalletDialog.setManage}
-                  />
-                </div>
-              </AppLoader>
-            </LocalContext.Provider>
-          </VegaWalletProvider>
-        </NetworkLoader>
-      </ThemeContext.Provider>
+      <NetworkLoader cache={cacheConfig}>
+        <VegaWalletProvider>
+          <LocalContext.Provider value={localValues}>
+            <AppLoader>
+              <div className="max-h-full min-h-full dark:bg-lite-black dark:text-neutral-200 bg-white text-neutral-800 grid grid-rows-[min-content,1fr]">
+                <Header />
+                <Main />
+                <VegaConnectDialog connectors={Connectors} />
+                <VegaManageDialog
+                  dialogOpen={vegaWalletDialog.manage}
+                  setDialogOpen={vegaWalletDialog.setManage}
+                />
+              </div>
+            </AppLoader>
+          </LocalContext.Provider>
+        </VegaWalletProvider>
+      </NetworkLoader>
     </EnvironmentProvider>
   );
 }

apps/console-lite/src/app/components/console-lite-grid/console-lite-grid.tsx

@@ -1,14 +1,11 @@
-import React, {
-  forwardRef,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-} from 'react';
+import React, { forwardRef, useCallback, useMemo, useRef } from 'react';
 import classNames from 'classnames';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit';
-import { ThemeContext, useScreenDimensions } from '@vegaprotocol/react-helpers';
+import {
+  useScreenDimensions,
+  useThemeSwitcher,
+} from '@vegaprotocol/react-helpers';
 import type {
   GridOptions,
   GetRowIdParams,
@@ -43,7 +40,7 @@ const ConsoleLiteGrid = <T extends { id?: string }>(
 ) => {
   const { isMobile, screenSize } = useScreenDimensions();
   const gridRef = useRef<AgGridReact | null>(null);
-  const theme = useContext(ThemeContext);
+  const { theme } = useThemeSwitcher();
   const handleOnGridReady = useCallback(() => {
     (
       (ref as React.RefObject<AgGridReact>) || gridRef

apps/console-lite/src/app/components/deal-ticket/PartyBalance.graphql

@@ -1,18 +0,0 @@
-query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
-      }
-    }
-  }
-}

apps/console-lite/src/app/components/deal-ticket/__generated__/PartyBalance.ts

@@ -1,61 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type PartyBalanceQueryQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } } } | null> | null } | null } | null };
-
-
-export const PartyBalanceQueryDocument = gql`
-    query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __usePartyBalanceQueryQuery__
- *
- * To run a query within a React component, call `usePartyBalanceQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `usePartyBalanceQueryQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = usePartyBalanceQueryQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function usePartyBalanceQueryQuery(baseOptions: Apollo.QueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-      }
-export function usePartyBalanceQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-        }
-export type PartyBalanceQueryQueryHookResult = ReturnType<typeof usePartyBalanceQueryQuery>;
-export type PartyBalanceQueryLazyQueryHookResult = ReturnType<typeof usePartyBalanceQueryLazyQuery>;
-export type PartyBalanceQueryQueryResult = Apollo.QueryResult<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>;

apps/console-lite/src/app/components/deal-ticket/deal-ticket-balance.spec.tsx

@@ -1,9 +1,13 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
-import { DealTicketBalance } from './deal-ticket-balance';
-import * as Schema from '@vegaprotocol/types';
+import { MockedProvider } from '@apollo/client/testing';
 import type { MarketDealTicketAsset } from '@vegaprotocol/market-list';
+import { DealTicketBalance } from './deal-ticket-balance';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));
 
 const tDAI: MarketDealTicketAsset = {
   __typename: 'Asset',
@@ -13,23 +17,20 @@ const tDAI: MarketDealTicketAsset = {
   decimals: 2,
 };
 
-const accounts: AccountFragment[] = [
-  {
-    __typename: 'AccountBalance',
-    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '1000000',
-    asset: tDAI,
-  },
-];
+let mockAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '1000000', accountDecimals: 2 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useAccountBalance: jest.fn(() => mockAccountBalance),
+}));
 
 describe('DealTicketBalance', function () {
   it('should render the balance', () => {
     const { getByText, getByRole } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={accounts}
-        isWalletConnected
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected />,
+      { wrapper: MockedProvider }
     );
 
     expect(getByRole('complementary')).toHaveAccessibleName('tDAI Balance');
@@ -39,11 +40,8 @@ describe('DealTicketBalance', function () {
 
   it('should prompt to connect wallet', () => {
     const { getByText } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={accounts}
-        isWalletConnected={false}
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected={false} />,
+      { wrapper: MockedProvider }
     );
 
     expect(
@@ -52,12 +50,10 @@ describe('DealTicketBalance', function () {
   });
 
   it('should display zero balance', () => {
+    mockAccountBalance = { accountBalance: '', accountDecimals: null };
     const { getByText } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={[]}
-        isWalletConnected={true}
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected={true} />,
+      { wrapper: MockedProvider }
     );
 
     expect(getByText('No tDAI left to trade')).toBeInTheDocument();

apps/console-lite/src/app/components/deal-ticket/deal-ticket-balance.tsx

@@ -1,41 +1,38 @@
 import classNames from 'classnames';
-import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import * as Schema from '@vegaprotocol/types';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
+import {
+  addDecimalsFormatNumber,
+  t,
+  toBigNum,
+} from '@vegaprotocol/react-helpers';
 import type { MarketDealTicket } from '@vegaprotocol/market-list';
-import { useSettlementAccount } from '@vegaprotocol/deal-ticket';
+import { useAccountBalance } from '@vegaprotocol/accounts';
 
 interface DealTicketBalanceProps {
   settlementAsset: MarketDealTicket['tradableInstrument']['instrument']['product']['settlementAsset'];
-  accounts: AccountFragment[];
   isWalletConnected: boolean;
   className?: string;
 }
 
 export const DealTicketBalance = ({
   settlementAsset,
-  accounts,
   isWalletConnected,
   className = '',
 }: DealTicketBalanceProps) => {
   const settlementAssetId = settlementAsset?.id;
   const settlementAssetSymbol = settlementAsset?.symbol;
-  const settlementAccount = useSettlementAccount(
-    settlementAssetId,
-    accounts,
-    Schema.AccountType.ACCOUNT_TYPE_GENERAL
-  );
+
+  const { accountBalance, accountDecimals } =
+    useAccountBalance(settlementAssetId) || {};
+  const settlementBalance = toBigNum(accountBalance || 0, accountDecimals || 0);
+
   const formattedNumber =
-    settlementAccount?.balance &&
-    settlementAccount.asset.decimals &&
-    addDecimalsFormatNumber(
-      settlementAccount.balance,
-      settlementAccount.asset.decimals
-    );
+    accountBalance &&
+    accountDecimals &&
+    addDecimalsFormatNumber(accountBalance, accountDecimals);
 
   const balance = (
     <p className="text-blue text-lg font-semibold">
-      {settlementAccount
+      {!settlementBalance.isZero()
         ? t(`${formattedNumber}`)
         : `No ${settlementAssetSymbol} left to trade`}
     </p>

apps/console-lite/src/app/components/deal-ticket/deal-ticket-container.tsx

@@ -1,14 +1,7 @@
 import { useParams } from 'react-router-dom';
-import {
-  DealTicketManager,
-  usePartyBalanceQuery,
-} from '@vegaprotocol/deal-ticket';
+import { DealTicketManager } from '@vegaprotocol/deal-ticket';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import {
-  t,
-  useDataProvider,
-  removePaginationWrapper,
-} from '@vegaprotocol/react-helpers';
+import { t, useDataProvider } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { DealTicketSteps } from './deal-ticket-steps';
 import { DealTicketBalance } from './deal-ticket-balance';
@@ -29,11 +22,6 @@ export const DealTicketContainer = () => {
   const { marketId } = useParams<{ marketId: string }>();
   const { pubKey } = useVegaWallet();
 
-  const { data: partyData } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-
   const variables = useMemo(
     () => ({
       marketId: marketId || '',
@@ -49,10 +37,6 @@ export const DealTicketContainer = () => {
     skip: !marketId,
   });
 
-  const accounts = removePaginationWrapper(
-    partyData?.party?.accountsConnection?.edges
-  );
-
   const loader = <Loader />;
   if (marketId && data) {
     const balance = (
@@ -61,7 +45,6 @@ export const DealTicketContainer = () => {
         settlementAsset={
           data.tradableInstrument.instrument.product?.settlementAsset
         }
-        accounts={accounts || []}
         isWalletConnected={!!pubKey}
       />
     );

apps/console-lite/src/app/components/deal-ticket/deal-ticket-steps.tsx

@@ -6,7 +6,6 @@ import {
   getDefaultOrder,
   useOrderCloseOut,
   useOrderMargin,
-  usePartyBalanceQuery,
   useMaximumPositionSize,
   useCalculateSlippage,
   validateAmount,
@@ -24,7 +23,6 @@ import {
   addDecimalsFormatNumber,
   addDecimal,
   formatNumber,
-  removePaginationWrapper,
 } from '@vegaprotocol/react-helpers';
 import {
   useOrderSubmit,
@@ -77,17 +75,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
   });
   const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
 
-  const { data: partyBalance } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-
-  const accounts = removePaginationWrapper(
-    partyBalance?.party?.accountsConnection?.edges
-  );
   const maxTrade = useMaximumPositionSize({
-    partyId: pubKey || '',
-    accounts: accounts,
     marketId: market.id,
     settlementAssetId:
       market.tradableInstrument.instrument.product.settlementAsset.id,
@@ -98,7 +86,6 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
   const estCloseOut = useOrderCloseOut({
     order,
     market,
-    partyData: partyBalance,
   });
   const slippage = useCalculateSlippage({ marketId: market.id, order });
   const [slippageValue, setSlippageValue] = useState(

apps/console-lite/src/app/components/header/header.tsx

@@ -11,8 +11,6 @@ const Header = () => {
   }));
   const {
     vegaWalletDialog: { setManage },
-    theme,
-    toggleTheme,
   } = useContext(LocalContext);
   return (
     <div
@@ -25,7 +23,7 @@ const Header = () => {
           setConnectDialog={updateVegaWalletDialog}
           setManageDialog={setManage}
         />
-        <ThemeSwitcher theme={theme} onToggle={toggleTheme} className="-my-4" />
+        <ThemeSwitcher className="-my-4" />
       </div>
     </div>
   );

apps/console-lite/src/app/context/local-context.ts

@@ -14,8 +14,6 @@ interface MenuState {
 export interface LocalValues {
   vegaWalletDialog: VegaWalletDialogState;
   menu: MenuState;
-  theme: 'light' | 'dark';
-  toggleTheme: () => void;
 }
 
 const LocalContext = createContext<LocalValues>({} as LocalValues);

apps/console-lite/src/app/hooks/use-local-values.spec.ts

@@ -3,8 +3,7 @@ import useLocalValues from './use-local-values';
 
 describe('local values hook', () => {
   it('state of wallet dialog should be properly handled', () => {
-    const setTheme = jest.fn();
-    const { result } = renderHook(() => useLocalValues('light', setTheme));
+    const { result } = renderHook(() => useLocalValues());
     expect(result.current.vegaWalletDialog).toBeDefined();
     expect(result.current.vegaWalletDialog.manage).toBe(false);
     act(() => {

apps/console-lite/src/app/hooks/use-local-values.ts

@@ -1,17 +1,15 @@
 import { useMemo, useState } from 'react';
 import type { LocalValues } from '../context/local-context';
 
-const useLocalValues = (theme: 'light' | 'dark', toggleTheme: () => void) => {
+const useLocalValues = () => {
   const [manage, setManage] = useState<boolean>(false);
   const [menuOpen, setMenuOpen] = useState(false);
   return useMemo<LocalValues>(
     () => ({
       vegaWalletDialog: { manage, setManage },
       menu: { menuOpen, setMenuOpen, onToggle: () => setMenuOpen(!menuOpen) },
-      theme,
-      toggleTheme,
     }),
-    [manage, theme, toggleTheme, menuOpen]
+    [manage, menuOpen]
   );
 };
 

apps/explorer-e2e/README.md

@@ -0,0 +1,34 @@
+# Vega Explorer E2E tests
+
+To run the UI automation tests with Vega Capsule, run:
+
+```bash
+yarn nx run explorer-e2e:e2e
+```
+
+To open Cypress and run in interactive mode, run:
+
+```bash
+yarn nx run explorer-e2e:e2e --watch
+```
+
+## Vega Capsule Setup
+
+The e2e tests run against a locally running instance of the Vega network, managed and controlled by [Vega Capsule](https://github.com/vegaprotocol/vegacapsule). Vega Capsule will:
+
+- Bootstrap and start up a Vega network
+- Start up [Ganache](https://trufflesuite.com/ganache/) for a local Ethereum network
+- Install the required Vega smart contracts
+- Set up DataNodes with a running GraphQL and REST APIs.
+
+Refer to the [Vega Capsule readme](https://github.com/vegaprotocol/vegacapsule#readme) for setting up and running Capsule. You will need [Go 1.19 or later](https://go.dev/doc/install) and [Docker](https://docs.docker.com/get-docker/) installed.
+
+### Troubleshooting
+
+- You may need to run `vegacapsule nodes unsafe-reset-all` to get a clean network state
+
+## Vega Wallet Setup
+
+Start by [downloading the Vega wallet software here](https://github.com/vegaprotocol/vega/releases).
+
+You can then refer to (or run) `vegacapsule/setup-vegawallet.sh`. This will initialise and configure your wallet to have the correct public keys and network config to run against capsule.

apps/explorer/src/app/app.tsx

@@ -3,7 +3,6 @@ import { useState, useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { BrowserTracing } from '@sentry/tracing';
 import { useLocation } from 'react-router-dom';
-import { ThemeContext, useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import {
   EnvironmentProvider,
   NetworkLoader,
@@ -19,7 +18,6 @@ import type { InMemoryCacheConfig } from '@apollo/client';
 
 function App() {
   const { VEGA_ENV } = useEnvironment();
-  const [theme, toggleTheme] = useThemeSwitcher();
   const [menuOpen, setMenuOpen] = useState(false);
 
   const location = useLocation();
@@ -57,25 +55,18 @@ function App() {
   );
 
   return (
-    <ThemeContext.Provider value={theme}>
-      <TendermintWebsocketProvider>
-        <NetworkLoader cache={cacheConfig}>
-          <div className={layoutClasses}>
-            <Header
-              theme={theme}
-              toggleTheme={toggleTheme}
-              menuOpen={menuOpen}
-              setMenuOpen={setMenuOpen}
-            />
-            <Nav menuOpen={menuOpen} />
-            <Main />
-            <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-sm md:text-md md:flex md:col-span-2 p-4 gap-4 border-t border-neutral-700 dark:border-neutral-300">
-              <NetworkInfo />
-            </footer>
-          </div>
-        </NetworkLoader>
-      </TendermintWebsocketProvider>
-    </ThemeContext.Provider>
+    <TendermintWebsocketProvider>
+      <NetworkLoader cache={cacheConfig}>
+        <div className={layoutClasses}>
+          <Header menuOpen={menuOpen} setMenuOpen={setMenuOpen} />
+          <Nav menuOpen={menuOpen} />
+          <Main />
+          <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-sm md:text-md md:flex md:col-span-2 p-4 gap-4 border-t border-neutral-700 dark:border-neutral-300">
+            <NetworkInfo />
+          </footer>
+        </div>
+      </NetworkLoader>
+    </TendermintWebsocketProvider>
   );
 }
 

apps/explorer/src/app/components/asset-balance/Governance-asset.graphql

@@ -0,0 +1,5 @@
+query ExplorerGovernanceAsset {
+  networkParameter(key: "reward.asset") {
+    value
+  }
+}

apps/explorer/src/app/components/asset-balance/__generated__/Governance-asset.ts

@@ -0,0 +1,45 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerGovernanceAssetQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type ExplorerGovernanceAssetQuery = { __typename?: 'Query', networkParameter?: { __typename?: 'NetworkParameter', value: string } | null };
+
+
+export const ExplorerGovernanceAssetDocument = gql`
+    query ExplorerGovernanceAsset {
+  networkParameter(key: "reward.asset") {
+    value
+  }
+}
+    `;
+
+/**
+ * __useExplorerGovernanceAssetQuery__
+ *
+ * To run a query within a React component, call `useExplorerGovernanceAssetQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerGovernanceAssetQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useExplorerGovernanceAssetQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useExplorerGovernanceAssetQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>(ExplorerGovernanceAssetDocument, options);
+      }
+export function useExplorerGovernanceAssetLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>(ExplorerGovernanceAssetDocument, options);
+        }
+export type ExplorerGovernanceAssetQueryHookResult = ReturnType<typeof useExplorerGovernanceAssetQuery>;
+export type ExplorerGovernanceAssetLazyQueryHookResult = ReturnType<typeof useExplorerGovernanceAssetLazyQuery>;
+export type ExplorerGovernanceAssetQueryResult = Apollo.QueryResult<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>;

apps/explorer/src/app/components/asset-balance/asset-balance.tsx

@@ -5,14 +5,20 @@ import { useExplorerAssetQuery } from '../links/asset-link/__generated__/Asset';
 export type AssetBalanceProps = {
   assetId: string;
   price: string;
+  showAssetLink?: boolean;
 };
 
 /**
  * Given a market ID and a price it will fetch the market
  * and format the price in that market's decimal places.
  */
-const AssetBalance = ({ assetId, price }: AssetBalanceProps) => {
+const AssetBalance = ({
+  assetId,
+  price,
+  showAssetLink = true,
+}: AssetBalanceProps) => {
   const { data } = useExplorerAssetQuery({
+    fetchPolicy: 'cache-first',
     variables: { id: assetId },
   });
 
@@ -23,7 +29,10 @@ const AssetBalance = ({ assetId, price }: AssetBalanceProps) => {
 
   return (
     <div className="inline-block">
-      <span>{label}</span> <AssetLink id={data?.asset?.id || ''} />
+      <span>{label}</span>{' '}
+      {showAssetLink && data?.asset?.id ? (
+        <AssetLink id={data.asset.id} />
+      ) : null}
     </div>
   );
 };

apps/explorer/src/app/components/asset-balance/governance-asset-balance.tsx

@@ -0,0 +1,30 @@
+import { addDecimalsFormatNumber } from '@vegaprotocol/react-helpers';
+import { useExplorerGovernanceAssetQuery } from './__generated__/Governance-asset';
+import AssetBalance from './asset-balance';
+
+export type GovernanceAssetBalanceProps = {
+  price: string;
+};
+
+const DEFAULT_DECIMALS = 18;
+
+/**
+ * Effectively a wrapper around AssetBalance that does an extra query to fetch
+ * the governance asset first, which is set by a network parameter
+ */
+const GovernanceAssetBalance = ({ price }: GovernanceAssetBalanceProps) => {
+  const { data } = useExplorerGovernanceAssetQuery();
+
+  if (data && data.networkParameter?.value) {
+    const governanceAssetId = data.networkParameter.value;
+    return <AssetBalance price={price} assetId={governanceAssetId} />;
+  } else {
+    return (
+      <div className="inline-block">
+        <span>{addDecimalsFormatNumber(price, DEFAULT_DECIMALS)}</span>
+      </div>
+    );
+  }
+};
+
+export default GovernanceAssetBalance;

apps/explorer/src/app/components/header/header.spec.tsx

@@ -14,12 +14,7 @@ jest.mock('../search', () => ({
 
 const renderComponent = () => (
   <MemoryRouter>
-    <Header
-      theme="dark"
-      toggleTheme={jest.fn()}
-      menuOpen={false}
-      setMenuOpen={jest.fn()}
-    />
+    <Header menuOpen={false} setMenuOpen={jest.fn()} />
   </MemoryRouter>
 );
 

apps/explorer/src/app/components/header/header.tsx

@@ -8,18 +8,11 @@ import type { Dispatch, SetStateAction } from 'react';
 import { NetworkSwitcher } from '@vegaprotocol/environment';
 
 interface ThemeToggleProps {
-  theme: 'light' | 'dark';
-  toggleTheme: () => void;
   menuOpen: boolean;
   setMenuOpen: Dispatch<SetStateAction<boolean>>;
 }
 
-export const Header = ({
-  theme,
-  toggleTheme,
-  menuOpen,
-  setMenuOpen,
-}: ThemeToggleProps) => {
+export const Header = ({ menuOpen, setMenuOpen }: ThemeToggleProps) => {
   const headerClasses = classnames(
     'md:col-span-2',
     'grid grid-rows-2 md:grid-rows-1 grid-cols-[1fr_auto] md:grid-cols-[auto_1fr_auto] items-center',
@@ -48,7 +41,7 @@ export const Header = ({
         <Icon name={menuOpen ? 'cross' : 'menu'} />
       </button>
       <Search />
-      <ThemeSwitcher theme={theme} onToggle={toggleTheme} className="-my-4" />
+      <ThemeSwitcher className="-my-4" />
     </header>
   );
 };

apps/explorer/src/app/components/links/asset-link/asset-link.tsx

@@ -16,6 +16,7 @@ export type AssetLinkProps = Partial<ComponentProps<typeof Link>> & {
  */
 const AssetLink = ({ id, ...props }: AssetLinkProps) => {
   const { data } = useExplorerAssetQuery({
+    fetchPolicy: 'cache-first',
     variables: { id },
   });
 

apps/explorer/src/app/components/nested-data-list/nested-data-list.spec.tsx

@@ -88,7 +88,7 @@ describe('NestedDataList', () => {
 
     for (let i = 0; i < 8; i++) {
       const item = getByTestId(`T${i}`);
-      const expected = BORDER_COLOURS.dark[i % 5];
+      const expected = BORDER_COLOURS.light[i % 5];
       expect(item.style.borderColor.toUpperCase()).toBe(expected);
     }
   });

apps/explorer/src/app/components/nested-data-list/nested-data-list.tsx

@@ -1,7 +1,7 @@
-import React, { useCallback, useContext, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import isObject from 'lodash/isObject';
-import { ThemeContext } from '@vegaprotocol/react-helpers';
+import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { Icon } from '@vegaprotocol/ui-toolkit';
 import { IconNames } from '@blueprintjs/icons';
 import { VegaColours } from '@vegaprotocol/tailwindcss-config';
@@ -65,7 +65,7 @@ const NestedDataListItem = ({
   );
   const hasChildren = isObject(value) && !!Object.keys(value).length;
   const title = useMemo(() => camelToTitle(label), [label]);
-  const theme = useContext(ThemeContext);
+  const { theme } = useThemeSwitcher();
   const currentLevelBorder = useMemo(
     () => getBorderColour(index, theme),
     [index, theme]

apps/explorer/src/app/components/txs/details/__generated__/node-vote.ts

@@ -1,75 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerNodeVoteQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerNodeVoteQuery = { __typename?: 'Query', withdrawal?: { __typename?: 'Withdrawal', id: string, status: Types.WithdrawalStatus, createdTimestamp: any, withdrawnTimestamp?: any | null, txHash?: string | null, asset: { __typename?: 'Asset', id: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string } } | null, deposit?: { __typename?: 'Deposit', id: string, status: Types.DepositStatus, createdTimestamp: any, creditedTimestamp?: any | null, txHash?: string | null, asset: { __typename?: 'Asset', id: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string } } | null };
-
-
-export const ExplorerNodeVoteDocument = gql`
-    query ExplorerNodeVote($id: ID!) {
-  withdrawal(id: $id) {
-    id
-    status
-    createdTimestamp
-    withdrawnTimestamp
-    txHash
-    asset {
-      id
-      name
-      decimals
-    }
-    party {
-      id
-    }
-  }
-  deposit(id: $id) {
-    id
-    status
-    createdTimestamp
-    creditedTimestamp
-    txHash
-    asset {
-      id
-      name
-      decimals
-    }
-    party {
-      id
-    }
-  }
-}
-    `;
-
-/**
- * __useExplorerNodeVoteQuery__
- *
- * To run a query within a React component, call `useExplorerNodeVoteQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerNodeVoteQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useExplorerNodeVoteQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerNodeVoteQuery(baseOptions: Apollo.QueryHookOptions<ExplorerNodeVoteQuery, ExplorerNodeVoteQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerNodeVoteQuery, ExplorerNodeVoteQueryVariables>(ExplorerNodeVoteDocument, options);
-      }
-export function useExplorerNodeVoteLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerNodeVoteQuery, ExplorerNodeVoteQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerNodeVoteQuery, ExplorerNodeVoteQueryVariables>(ExplorerNodeVoteDocument, options);
-        }
-export type ExplorerNodeVoteQueryHookResult = ReturnType<typeof useExplorerNodeVoteQuery>;
-export type ExplorerNodeVoteLazyQueryHookResult = ReturnType<typeof useExplorerNodeVoteLazyQuery>;
-export type ExplorerNodeVoteQueryResult = Apollo.QueryResult<ExplorerNodeVoteQuery, ExplorerNodeVoteQueryVariables>;

apps/explorer/src/app/components/txs/details/chain-response-code/chain-reponse.code.tsx

@@ -13,6 +13,7 @@ export const successCodes = new Set([0]);
 interface ChainResponseCodeProps {
   code: number;
   hideLabel?: boolean;
+  error?: string;
 }
 
 /**
@@ -23,6 +24,7 @@ interface ChainResponseCodeProps {
 export const ChainResponseCode = ({
   code,
   hideLabel = false,
+  error,
 }: ChainResponseCodeProps) => {
   const isSuccess = successCodes.has(code);
 
@@ -39,6 +41,9 @@ export const ChainResponseCode = ({
         {icon}
       </span>
       {hideLabel ? null : <span>{label}</span>}
+      {!hideLabel && !!error ? (
+        <span className="ml-1">&mdash;&nbsp;{error}</span>
+      ) : null}
     </div>
   );
 };

apps/explorer/src/app/components/txs/details/shared/tx-details-shared.tsx

@@ -73,7 +73,7 @@ export const TxDetailsShared = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Response code')}</TableCell>
         <TableCell>
-          <ChainResponseCode code={txData.code} />
+          <ChainResponseCode code={txData.code} error={txData.error} />
         </TableCell>
       </TableRow>
     </>

apps/explorer/src/app/components/txs/details/tx-delegation.tsx

@@ -0,0 +1,58 @@
+import { t } from '@vegaprotocol/react-helpers';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableCell, TableRow, TableWithTbody } from '../../table';
+import { NodeLink } from '../../links';
+import GovernanceAssetBalance from '../../asset-balance/governance-asset-balance';
+import type { components } from '../../../../types/explorer';
+
+interface TxDetailsDelegateProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * There aren't currently good APIs for exploring delegations or epochs so this
+ * view is currently a little basic - but it gives the key details.
+ *
+ * Future improvements could be:
+ * - Show if the delegation has taken effect or not, based on epoch
+ *
+ * The signature can be turned in to an id with txSignatureToDeterministicId but
+ * for now there are no details to fetch.
+ */
+export const TxDetailsDelegate = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsDelegateProps) => {
+  if (!txData || !txData.command.delegateSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+  const d: components['schemas']['v1DelegateSubmission'] =
+    txData.command.delegateSubmission;
+
+  return (
+    <TableWithTbody className="mb-8">
+      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      {d.nodeId ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Node')}</TableCell>
+          <TableCell>
+            <NodeLink id={d.nodeId} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {d.amount ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Amount')}</TableCell>
+          <TableCell>
+            <GovernanceAssetBalance price={d.amount} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+    </TableWithTbody>
+  );
+};

apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx

@@ -15,6 +15,8 @@ import { TxDetailsOrderCancel } from './tx-order-cancel';
 import get from 'lodash/get';
 import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
+import { TxDetailsDelegate } from './tx-delegation';
+import { TxDetailsUndelegate } from './tx-undelegation';
 
 interface TxDetailsWrapperProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -91,6 +93,10 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
       return TxDetailsNodeVote;
     case 'Withdraw':
       return TxDetailsWithdrawSubmission;
+    case 'Delegate':
+      return TxDetailsDelegate;
+    case 'Undelegate':
+      return TxDetailsUndelegate;
     default:
       return TxDetailsGeneric;
   }

apps/explorer/src/app/components/txs/details/tx-node-vote.tsx

@@ -3,8 +3,8 @@ import type { BlockExplorerTransactionResult } from '../../../routes/types/block
 import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { ExplorerNodeVoteQueryResult } from './__generated___/Node-vote';
-import { useExplorerNodeVoteQuery } from './__generated___/Node-vote';
+import type { ExplorerNodeVoteQueryResult } from './__generated__/Node-vote';
+import { useExplorerNodeVoteQuery } from './__generated__/Node-vote';
 import { PartyLink } from '../../links';
 import { Time } from '../../time';
 import {

apps/explorer/src/app/components/txs/details/tx-undelegation.tsx

@@ -0,0 +1,77 @@
+import { t } from '@vegaprotocol/react-helpers';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableCell, TableRow, TableWithTbody } from '../../table';
+import { NodeLink } from '../../links';
+import GovernanceAssetBalance from '../../asset-balance/governance-asset-balance';
+import type { components } from '../../../../types/explorer';
+
+export const methodText: Record<
+  components['schemas']['UndelegateSubmissionMethod'],
+  string
+> = {
+  METHOD_NOW: 'Immediate',
+  METHOD_UNSPECIFIED: 'Unspecified',
+  METHOD_AT_END_OF_EPOCH: 'End of epoch',
+  // This will be removed in a future release
+  METHOD_IN_ANGER: 'Immediate',
+};
+
+interface TxDetailsUndelegateProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * There aren't currently good APIs for exploring delegations or epochs so this
+ * view is currently a little basic - but it gives the key details.
+ *
+ * Future improvements could be:
+ * - Show if the undelegation has taken effect or not, based on epoch
+ * - Show the the total stake for the node after undelegation takes effect
+ *
+ * The signature can be turned in to an id with txSignatureToDeterministicId but
+ * for now there are no details to fetch.
+ */
+export const TxDetailsUndelegate = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsUndelegateProps) => {
+  if (!txData || !txData.command.undelegateSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const u: components['schemas']['v1UndelegateSubmission'] =
+    txData.command.undelegateSubmission;
+
+  return (
+    <TableWithTbody className="mb-8">
+      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      {u.nodeId ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Node')}</TableCell>
+          <TableCell>
+            <NodeLink id={u.nodeId} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {u.amount ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('Amount')}</TableCell>
+          <TableCell>
+            <GovernanceAssetBalance price={u.amount} />
+          </TableCell>
+        </TableRow>
+      ) : null}
+      {u.method ? (
+        <TableRow modifier="bordered">
+          <TableCell>{t('When')}</TableCell>
+          <TableCell>{methodText[u.method]}</TableCell>
+        </TableRow>
+      ) : null}
+    </TableWithTbody>
+  );
+};

apps/explorer/src/app/components/txs/txs-stats-info.tsx

@@ -2,8 +2,8 @@ import { t } from '@vegaprotocol/react-helpers';
 import { useEffect } from 'react';
 import { InfoBlock } from '../../components/info-block';
 import { Panel } from '../../components/panel';
-import { useExplorerStatsQuery } from './__generated__/explorer-stats';
-import type { ExplorerStatsFieldsFragment } from './__generated__/explorer-stats';
+import { useExplorerStatsQuery } from './__generated__/Explorer-stats';
+import type { ExplorerStatsFieldsFragment } from './__generated__/Explorer-stats';
 
 interface StatsMap {
   field: keyof ExplorerStatsFieldsFragment;

apps/explorer/src/app/components/withdrawal/withdrawal-progress.tsx

@@ -86,7 +86,7 @@ const classes = {
   indicatorFailed:
     'rounded-full transition duration-500 ease-in-out h-12 w-12 py-3 border-2 border-red-600 bg-red-600 text-center text-white font-bold leading-5',
   textFailed:
-    'absolute top-0 -ml-10 text-center mt-16 w-32 text-xs font-medium uppercase text-red-600',
+    'absolute top-0 -ml-10 text-center mt-16 w-32 text-xs font-medium uppercase text-vega-red',
   indicatorComplete:
     'rounded-full transition duration-500 ease-in-out h-12 w-12 py-3 border-2 border-vega-green-dark bg-vega-green-dark text-center text-white leading-5',
   textComplete:

apps/explorer/src/app/routes/governance/index.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { RouteTitle } from '../../components/route-title';
 import { SubHeading } from '../../components/sub-heading';
 import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
-import { useExplorerProposalsQuery } from './__generated__/proposals';
+import { useExplorerProposalsQuery } from './__generated__/Proposals';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 
 const Governance = () => {

apps/explorer/src/app/routes/parties/id/Party-assets.graphql

@@ -1,3 +1,28 @@
+fragment ExplorerPartyAssetsAccounts on AccountBalance {
+  asset {
+    name
+    id
+    decimals
+    symbol
+    source {
+      __typename
+      ... on ERC20 {
+        contractAddress
+      }
+    }
+  }
+  type
+  balance
+  market {
+    id
+    tradableInstrument {
+      instrument {
+        name
+      }
+    }
+  }
+}
+
 query ExplorerPartyAssets($partyId: ID!) {
   partiesConnection(id: $partyId) {
     edges {
@@ -21,28 +46,7 @@ query ExplorerPartyAssets($partyId: ID!) {
         accountsConnection {
           edges {
             node {
-              asset {
-                name
-                id
-                decimals
-                symbol
-                source {
-                  __typename
-                  ... on ERC20 {
-                    contractAddress
-                  }
-                }
-              }
-              type
-              balance
-              market {
-                id
-                tradableInstrument {
-                  instrument {
-                    name
-                  }
-                }
-              }
+              ...ExplorerPartyAssetsAccounts
             }
           }
         }

apps/explorer/src/app/routes/parties/id/__generated__/Party-assets.ts

@@ -3,6 +3,8 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
+export type ExplorerPartyAssetsAccountsFragment = { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } | null };
+
 export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
 }>;
@@ -10,7 +12,32 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 
 export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } | null } } | null> | null } | null } }> } | null };
 
-
+export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
+    fragment ExplorerPartyAssetsAccounts on AccountBalance {
+  asset {
+    name
+    id
+    decimals
+    symbol
+    source {
+      __typename
+      ... on ERC20 {
+        contractAddress
+      }
+    }
+  }
+  type
+  balance
+  market {
+    id
+    tradableInstrument {
+      instrument {
+        name
+      }
+    }
+  }
+}
+    `;
 export const ExplorerPartyAssetsDocument = gql`
     query ExplorerPartyAssets($partyId: ID!) {
   partiesConnection(id: $partyId) {
@@ -35,28 +62,7 @@ export const ExplorerPartyAssetsDocument = gql`
         accountsConnection {
           edges {
             node {
-              asset {
-                name
-                id
-                decimals
-                symbol
-                source {
-                  __typename
-                  ... on ERC20 {
-                    contractAddress
-                  }
-                }
-              }
-              type
-              balance
-              market {
-                id
-                tradableInstrument {
-                  instrument {
-                    name
-                  }
-                }
-              }
+              ...ExplorerPartyAssetsAccounts
             }
           }
         }
@@ -64,7 +70,7 @@ export const ExplorerPartyAssetsDocument = gql`
     }
   }
 }
-    `;
+    ${ExplorerPartyAssetsAccountsFragmentDoc}`;
 
 /**
  * __useExplorerPartyAssetsQuery__

apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx

@@ -0,0 +1,81 @@
+import { t } from '@vegaprotocol/react-helpers';
+import get from 'lodash/get';
+import AssetBalance from '../../../../components/asset-balance/asset-balance';
+import { AssetLink, MarketLink } from '../../../../components/links';
+import { Table, TableRow } from '../../../../components/table';
+import type * as Schema from '@vegaprotocol/types';
+import type { ExplorerPartyAssetsAccountsFragment } from '../__generated__/Party-assets';
+
+const accountTypeString: Record<Schema.AccountType, string> = {
+  ACCOUNT_TYPE_BOND: t('Bond'),
+  ACCOUNT_TYPE_EXTERNAL: t('External'),
+  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: t('Fees (Infrastructure)'),
+  ACCOUNT_TYPE_FEES_LIQUIDITY: t('Fees (Liquidity)'),
+  ACCOUNT_TYPE_FEES_MAKER: t('Fees (Maker)'),
+  ACCOUNT_TYPE_GENERAL: t('General'),
+  ACCOUNT_TYPE_GLOBAL_INSURANCE: t('Global Insurance Pool'),
+  ACCOUNT_TYPE_GLOBAL_REWARD: t('Global Reward Pool'),
+  ACCOUNT_TYPE_INSURANCE: t('Insurance'),
+  ACCOUNT_TYPE_MARGIN: t('Margin'),
+  ACCOUNT_TYPE_PENDING_TRANSFERS: t('Pending Transfers'),
+  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: t('Reward - LP Fees received'),
+  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: t('Reward - Maker fees paid'),
+  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: t('Reward - Maker fees received'),
+  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: t('Reward - Market proposers'),
+  ACCOUNT_TYPE_SETTLEMENT: t('Settlement'),
+};
+
+interface PartyAccountsProps {
+  accounts: ExplorerPartyAssetsAccountsFragment[];
+}
+
+/**
+ * Renders a list of a party's accounts as a table. Currently unsorted, but could
+ * probably do with sorting by asset, and then within asset, by type with general
+ * appearing first and... tbd
+ */
+export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
+  return (
+    <Table className="max-w-5xl min-w-fit">
+      <thead>
+        <TableRow modifier="bordered" className="font-mono">
+          <td>{t('Type')}</td>
+          <td>{t('Market')}</td>
+          <td className="text-right pr-2">{t('Balance')}</td>
+          <td>{t('Asset')}</td>
+        </TableRow>
+      </thead>
+      <tbody>
+        {accounts.map((account) => {
+          const m = get(account, 'market.tradableInstrument.instrument.name');
+
+          return (
+            <TableRow
+              title={account.asset.name}
+              id={`${accountTypeString[account.type]} ${m ? ` - ${m}` : ''}`}
+            >
+              <td className="text-md">{accountTypeString[account.type]}</td>
+              <td className="text-md">
+                {account.market?.id ? (
+                  <MarketLink id={account.market?.id} />
+                ) : (
+                  <p>-</p>
+                )}
+              </td>
+              <td className="text-md text-right pr-2">
+                <AssetBalance
+                  assetId={account.asset.id}
+                  price={account.balance}
+                  showAssetLink={false}
+                />
+              </td>
+              <td className="text-md">
+                <AssetLink id={account.asset.id} />
+              </td>
+            </TableRow>
+          );
+        })}
+      </tbody>
+    </Table>
+  );
+};

apps/explorer/src/app/routes/parties/id/index.tsx

@@ -1,40 +1,17 @@
-import {
-  t,
-  addDecimalsFormatNumber,
-  useScreenDimensions,
-} from '@vegaprotocol/react-helpers';
+import { getNodes, t, useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
 import { useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
 import { Panel } from '../../../components/panel';
-import { InfoPanel } from '../../../components/info-panel';
 import { toNonHex } from '../../../components/search/detect-search';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { TxsInfiniteList } from '../../../components/txs';
 import { PageHeader } from '../../../components/page-header';
-import { useExplorerPartyAssetsQuery } from './__generated__/party-assets';
-import type * as Schema from '@vegaprotocol/types';
-import get from 'lodash/get';
+import { useExplorerPartyAssetsQuery } from './__generated__/Party-assets';
+import type { ExplorerPartyAssetsAccountsFragment } from './__generated__/Party-assets';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
-
-const accountTypeString: Record<Schema.AccountType, string> = {
-  ACCOUNT_TYPE_BOND: t('Bond'),
-  ACCOUNT_TYPE_EXTERNAL: t('External'),
-  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: t('Fees (Infrastructure)'),
-  ACCOUNT_TYPE_FEES_LIQUIDITY: t('Fees (Liquidity)'),
-  ACCOUNT_TYPE_FEES_MAKER: t('Fees (Maker)'),
-  ACCOUNT_TYPE_GENERAL: t('General'),
-  ACCOUNT_TYPE_GLOBAL_INSURANCE: t('Global Insurance Pool'),
-  ACCOUNT_TYPE_GLOBAL_REWARD: t('Global Reward Pool'),
-  ACCOUNT_TYPE_INSURANCE: t('Insurance'),
-  ACCOUNT_TYPE_MARGIN: t('Margin'),
-  ACCOUNT_TYPE_PENDING_TRANSFERS: t('Pending Transfers'),
-  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: t('Reward - LP Fees received'),
-  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: t('Reward - Maker fees paid'),
-  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: t('Reward - Maker fees received'),
-  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: t('Reward - Market proposers'),
-  ACCOUNT_TYPE_SETTLEMENT: t('Settlement'),
-};
+import GovernanceAssetBalance from '../../../components/asset-balance/governance-asset-balance';
+import { PartyAccounts } from './components/party-accounts';
 
 const Party = () => {
   const { party } = useParams<{ party: string }>();
@@ -71,63 +48,23 @@ const Party = () => {
     </Panel>
   );
 
-  const accounts = (
-    <section>
-      {p?.accountsConnection?.edges?.length ? (
-        p.accountsConnection?.edges?.map((a) => {
-          const account = a?.node;
-          if (!account || !account.asset) {
-            return '';
-          }
-          const m = get(account, 'market.tradableInstrument.instrument.name');
-
-          return (
-            <InfoPanel
-              title={account.asset.name}
-              id={`${accountTypeString[account.type]} ${m ? ` - ${m}` : ''}`}
-            >
-              <section>
-                <dl className="flex gap-2 flex-wrap">
-                  <dt className="text-zinc-500 dark:text-zinc-400 text-md">
-                    <p>
-                      {t('Balance')} ({account.asset.symbol})
-                    </p>
-                  </dt>
-                  <dd className="text-md">
-                    {addDecimalsFormatNumber(
-                      account.balance,
-                      account.asset.decimals
-                    )}
-                  </dd>
-                </dl>
-              </section>
-            </InfoPanel>
-          );
-        })
-      ) : (
-        <Panel>
-          <p>No Data</p>
-        </Panel>
-      )}
-    </section>
-  );
-
   const staking = (
     <section>
       {p?.stakingSummary?.currentStakeAvailable ? (
-        <InfoPanel
-          title={t('Current Stake Available')}
-          id={p?.stakingSummary?.currentStakeAvailable}
-          copy={false}
-        />
-      ) : (
-        <Panel>
-          <p>Nothing staked for {party}</p>
-        </Panel>
-      )}
+        <p className="mt-4 leading-3">
+          <strong className="font-semibold">{t('Staking Balance: ')}</strong>
+          <GovernanceAssetBalance
+            price={p.stakingSummary.currentStakeAvailable}
+          />
+        </p>
+      ) : null}
     </section>
   );
 
+  const accounts = getNodes<ExplorerPartyAssetsAccountsFragment>(
+    p?.accountsConnection
+  );
+
   return (
     <section>
       <h1
@@ -140,8 +77,7 @@ const Party = () => {
         <>
           {header}
           <SubHeading>{t('Asset data')}</SubHeading>
-          {accounts}
-          <SubHeading>{t('Staking')}</SubHeading>
+          {accounts ? <PartyAccounts accounts={accounts} /> : null}
           {staking}
 
           <SubHeading>{t('Transactions')}</SubHeading>

apps/explorer/src/app/routes/types/block-explorer-response.d.ts

@@ -13,6 +13,7 @@ export interface BlockExplorerTransactionResult {
   signature: {
     value: string;
   };
+  error?: string;
 }
 
 export interface BlockExplorerTransactions {

apps/explorer/src/app/routes/validators/index.tsx

@@ -6,7 +6,7 @@ import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { DATA_SOURCES } from '../../config';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type { TendermintValidatorsResponse } from './tendermint-validator-response';
-import { useExplorerNodesQuery } from './__generated__/nodes';
+import { useExplorerNodesQuery } from './__generated__/Nodes';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 
 const Validators = () => {

apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx

@@ -11,6 +11,7 @@ import {
   t,
   toBigNum,
 } from '@vegaprotocol/react-helpers';
+import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import type * as Schema from '@vegaprotocol/types';
 import {
   AsyncRenderer,
@@ -18,11 +19,7 @@ import {
   PriceCellChange,
   TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import type {
-  GetRowIdParams,
-  RowClickedEvent,
-  ValueFormatterParams,
-} from 'ag-grid-community';
+import type { GetRowIdParams, RowClickedEvent } from 'ag-grid-community';
 import 'ag-grid-community/dist/styles/ag-grid.css';
 import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
 import { AgGridColumn } from 'ag-grid-react';
@@ -32,6 +29,7 @@ import { Grid } from '../../grid';
 import { HealthBar } from '../../health-bar';
 import { HealthDialog } from '../../health-dialog';
 import { Status } from '../../status';
+import { formatDistanceToNow } from 'date-fns';
 
 export const MarketList = () => {
   const { data, error, loading } = useMarketsLiquidity();
@@ -115,19 +113,26 @@ export const MarketList = () => {
             headerName={t('Last Price')}
             headerTooltip={t('Latest price for this market')}
             field="data.markPrice"
-            valueFormatter={({ value, data }: ValueFormatterParams) =>
-              formatWithAsset(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'data.markPrice'>) =>
+              value && data
+                ? formatWithAsset(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
             }
           />
 
           <AgGridColumn
             headerName={t('Change (24h)')}
             headerTooltip={t('Change in price over the last 24h')}
-            cellRenderer={({ data }: { data: Market }) => {
-              if (data.candles) {
+            cellRenderer={({
+              data,
+            }: VegaValueFormatterParams<Market, 'data.candles'>) => {
+              if (data && data.candles) {
                 const prices = data.candles.map((candle) => candle.close);
                 return (
                   <PriceCellChange
@@ -135,19 +140,24 @@ export const MarketList = () => {
                     decimalPlaces={data?.decimalPlaces}
                   />
                 );
-              } else return <div>{t('No data')}</div>;
+              } else return <div>{t('-')}</div>;
             }}
           />
 
           <AgGridColumn
             headerName={t('Volume (24h)')}
             field="dayVolume"
-            valueFormatter={({ value, data }: ValueFormatterParams) =>
-              `${addDecimalsFormatNumber(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-                  .decimals
-              )} (${displayChange(data.volumeChange)})`
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'dayVolume'>) =>
+              value && data
+                ? `${addDecimalsFormatNumber(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                      .decimals
+                  )} (${displayChange(data.volumeChange)})`
+                : '-'
             }
             headerTooltip={t('The trade volume over the last 24h')}
           />
@@ -155,11 +165,16 @@ export const MarketList = () => {
           <AgGridColumn
             headerName={t('Total staked by LPs')}
             field="liquidityCommitted"
-            valueFormatter={({ value, data }: ValueFormatterParams) =>
-              formatWithAsset(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'liquidityCommitted'>) =>
+              data && value
+                ? formatWithAsset(
+                    value.toString(),
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
             }
             headerTooltip={t(
               'The amount of funds allocated to provide liquidity'
@@ -169,11 +184,16 @@ export const MarketList = () => {
           <AgGridColumn
             headerName={t('Target stake')}
             field="target"
-            valueFormatter={({ value, data }: ValueFormatterParams) =>
-              formatWithAsset(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'target'>) =>
+              data && value
+                ? formatWithAsset(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
             }
             headerTooltip={t(
               'The ideal committed liquidity to operate the market.  If total commitment currently below this level then LPs can set the fee level with new commitment.'
@@ -182,15 +202,21 @@ export const MarketList = () => {
 
           <AgGridColumn
             headerName={t('% Target stake met')}
-            valueFormatter={({ data }: ValueFormatterParams) => {
-              const roundedPercentage =
-                parseInt(
-                  (data.liquidityCommitted / parseFloat(data.target)).toFixed(0)
-                ) * 100;
-              const display = Number.isNaN(roundedPercentage)
-                ? 'N/A'
-                : formatNumberPercentage(toBigNum(roundedPercentage, 2));
-              return display;
+            valueFormatter={({
+              data,
+            }: VegaValueFormatterParams<Market, ''>) => {
+              if (data) {
+                const roundedPercentage =
+                  parseInt(
+                    (data.liquidityCommitted / parseFloat(data.target)).toFixed(
+                      0
+                    )
+                  ) * 100;
+                const display = Number.isNaN(roundedPercentage)
+                  ? 'N/A'
+                  : formatNumberPercentage(toBigNum(roundedPercentage, 2));
+                return display;
+              } else return '-';
             }}
             headerTooltip={t('% Target stake met')}
           />
@@ -198,8 +224,10 @@ export const MarketList = () => {
           <AgGridColumn
             headerName={t('Fee levels')}
             field="fees"
-            valueFormatter={({ value, data }: ValueFormatterParams) =>
-              `${value.factors.liquidityFee}%`
+            valueFormatter={({
+              value,
+            }: VegaValueFormatterParams<Market, 'fees'>) =>
+              value ? `${value.factors.liquidityFee}%` : '-'
             }
             headerTooltip={t('Fee level for this market')}
           />
@@ -258,6 +286,16 @@ export const MarketList = () => {
             sortable={false}
             cellStyle={{ overflow: 'unset' }}
           />
+          <AgGridColumn
+            headerName={t('Age')}
+            field="marketTimestamps.open"
+            headerTooltip={t('Age of the market')}
+            valueFormatter={({
+              value,
+            }: VegaValueFormatterParams<Market, 'marketTimestamps.open'>) => {
+              return value ? formatDistanceToNow(new Date(value)) : '-';
+            }}
+          />
         </Grid>
 
         <HealthDialog

apps/liquidity-provision-dashboard/src/main.tsx

@@ -1,7 +1,6 @@
 import { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
 import { BrowserRouter } from 'react-router-dom';
-import { ThemeContext } from '@vegaprotocol/react-helpers';
 import { EnvironmentProvider, NetworkLoader } from '@vegaprotocol/environment';
 
 import App from './app/app';
@@ -36,11 +35,9 @@ root?.render(
   <StrictMode>
     <BrowserRouter>
       <EnvironmentProvider>
-        <ThemeContext.Provider value="light">
-          <NetworkLoader cache={cache}>
-            <App />
-          </NetworkLoader>
-        </ThemeContext.Provider>
+        <NetworkLoader cache={cache}>
+          <App />
+        </NetworkLoader>
       </EnvironmentProvider>
     </BrowserRouter>
   </StrictMode>

apps/multisig-signer/src/app/app.tsx

@@ -10,7 +10,7 @@ import {
 import { AsyncRenderer, Button, Lozenge } from '@vegaprotocol/ui-toolkit';
 import type { EthereumConfig } from '@vegaprotocol/web3';
 import { useEthereumConfig, Web3Provider } from '@vegaprotocol/web3';
-import { ThemeContext, useThemeSwitcher, t } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
 import { ENV } from './config/env';
 import { ContractsProvider } from './config/contracts/contracts-provider';
 import {
@@ -55,7 +55,6 @@ function App() {
   const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
   const { config, loading, error } = useEthereumConfig();
   const [dialogOpen, setDialogOpen] = useState(false);
-  const [theme, toggleTheme] = useThemeSwitcher();
 
   useEffect(() => {
     Sentry.init({
@@ -73,25 +72,23 @@ function App() {
   }, [config?.chain_id, ETHEREUM_PROVIDER_URL]);
 
   return (
-    <ThemeContext.Provider value={theme}>
-      <AsyncRenderer loading={loading} data={config} error={error}>
-        <Web3Provider connectors={Connectors}>
-          <Web3Connector dialogOpen={dialogOpen} setDialogOpen={setDialogOpen}>
-            <EthWalletContainer
-              dialogOpen={dialogOpen}
-              setDialogOpen={setDialogOpen}
-            >
-              <ContractsProvider>
-                <div className={pageWrapperClasses}>
-                  <Header theme={theme} toggleTheme={toggleTheme} />
-                  <ConnectedApp config={config} />
-                </div>
-              </ContractsProvider>
-            </EthWalletContainer>
-          </Web3Connector>
-        </Web3Provider>
-      </AsyncRenderer>
-    </ThemeContext.Provider>
+    <AsyncRenderer loading={loading} data={config} error={error}>
+      <Web3Provider connectors={Connectors}>
+        <Web3Connector dialogOpen={dialogOpen} setDialogOpen={setDialogOpen}>
+          <EthWalletContainer
+            dialogOpen={dialogOpen}
+            setDialogOpen={setDialogOpen}
+          >
+            <ContractsProvider>
+              <div className={pageWrapperClasses}>
+                <Header />
+                <ConnectedApp config={config} />
+              </div>
+            </ContractsProvider>
+          </EthWalletContainer>
+        </Web3Connector>
+      </Web3Provider>
+    </AsyncRenderer>
   );
 }
 

apps/multisig-signer/src/app/components/header/header.tsx

@@ -4,19 +4,14 @@ import {
   VegaLogo,
 } from '@vegaprotocol/ui-toolkit';
 
-interface HeaderProps {
-  theme: 'light' | 'dark';
-  toggleTheme: () => void;
-}
-
-export const Header = ({ theme, toggleTheme }: HeaderProps) => {
+export const Header = () => {
   return (
     <header className="relative overflow-hidden py-2 mb-8">
       <BackgroundVideo />
       <div className="relative flex justify-center px-2 dark:bg-black bg-white">
         <div className="w-full max-w-3xl p-5 flex items-center justify-between">
           <VegaLogo />
-          <ThemeSwitcher theme={theme} onToggle={toggleTheme} />
+          <ThemeSwitcher />
         </div>
       </div>
     </header>

apps/static/src/index.html

@@ -15,7 +15,6 @@
     <ul>
       <li><a href="./fonts.css">AlphaLyrae font</a></li>
       <li><a href="./favicon.ico">Favicon</a></li>
-      <li><a href="./theme.js">Theme</a></li>
     </ul>
   </body>
 </html>

apps/static/src/theme.js

@@ -1,9 +0,0 @@
-(function () {
-  var storedTheme = window.localStorage.getItem('theme');
-  if (
-    storedTheme === 'dark' ||
-    (!storedTheme && window.matchMedia('(prefers-color-scheme: dark)').matches)
-  ) {
-    document.documentElement.classList.add('dark');
-  }
-})();

apps/stats/.env.stagnet3

@@ -1,3 +1,3 @@
 # App configuration variables
 NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3;
+NX_VEGA_ENV=STAGNET3

apps/stats/src/app.tsx

@@ -1,23 +1,17 @@
 import { EnvironmentProvider, NetworkLoader } from '@vegaprotocol/environment';
 import { Header } from './components/header';
 import { StatsManager } from '@vegaprotocol/network-stats';
-import { ThemeContext } from '@vegaprotocol/react-helpers';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 
 function App() {
-  const [theme, toggleTheme] = useThemeSwitcher();
-
   return (
-    <ThemeContext.Provider value={theme}>
-      <NetworkLoader>
-        <div className="w-screen min-h-screen grid pb-6 bg-white text-neutral-900 dark:bg-black dark:text-neutral-100">
-          <div className="layout-grid w-screen justify-self-center">
-            <Header theme={theme} toggleTheme={toggleTheme} />
-            <StatsManager className="max-w-3xl px-6" />
-          </div>
+    <NetworkLoader>
+      <div className="w-screen min-h-screen grid pb-6 bg-white text-neutral-900 dark:bg-black dark:text-neutral-100">
+        <div className="layout-grid w-screen justify-self-center">
+          <Header />
+          <StatsManager className="max-w-3xl px-6" />
         </div>
-      </NetworkLoader>
-    </ThemeContext.Provider>
+      </div>
+    </NetworkLoader>
   );
 }
 

apps/stats/src/components/header/header.tsx

@@ -4,12 +4,7 @@ import {
   ThemeSwitcher,
 } from '@vegaprotocol/ui-toolkit';
 
-interface ThemeToggleProps {
-  theme: 'light' | 'dark';
-  toggleTheme: () => void;
-}
-
-export const Header = ({ theme, toggleTheme }: ThemeToggleProps) => {
+export const Header = () => {
   return (
     <header className="relative overflow-hidden py-2 mb-10 md:mb-16">
       <BackgroundVideo />
@@ -17,7 +12,7 @@ export const Header = ({ theme, toggleTheme }: ThemeToggleProps) => {
       <div className="relative flex justify-center px-2 dark:bg-black bg-white">
         <div className="w-full max-w-3xl p-5 flex items-center justify-between">
           <VegaLogo />
-          <ThemeSwitcher theme={theme} onToggle={toggleTheme} />
+          <ThemeSwitcher />
         </div>
       </div>
     </header>

apps/token-e2e/README.md

@@ -0,0 +1,34 @@
+# Vega token website E2E tests
+
+To run the UI automation tests with Vega Capsule, run:
+
+```bash
+yarn nx run token-e2e:e2e
+```
+
+To open Cypress and run in interactive mode, run:
+
+```bash
+yarn nx run token-e2e:e2e --watch
+```
+
+## Vega Capsule Setup
+
+The e2e tests run against a locally running instance of the Vega network, managed and controlled by [Vega Capsule](https://github.com/vegaprotocol/vegacapsule). Vega Capsule will:
+
+- Bootstrap and start up a Vega network
+- Start up [Ganache](https://trufflesuite.com/ganache/) for a local Ethereum network
+- Install the required Vega smart contracts
+- Set up DataNodes with a running GraphQL and REST APIs.
+
+Refer to the [Vega Capsule readme](https://github.com/vegaprotocol/vegacapsule#readme) for setting up and running Capsule. You will need [Go 1.19 or later](https://go.dev/doc/install) and [Docker](https://docs.docker.com/get-docker/) installed.
+
+### Troubleshooting
+
+- You may need to run `vegacapsule nodes unsafe-reset-all` to get a clean network state
+
+## Vega Wallet Setup
+
+Start by [downloading the Vega wallet software here](https://github.com/vegaprotocol/vega/releases).
+
+You can then refer to (or run) `vegacapsule/setup-vegawallet.sh`. This will initialise and configure your wallet to have the correct public keys and network config to run against capsule.

apps/token-e2e/src/integration/flow/governance-flow.cy.js

@@ -29,7 +29,7 @@ const voteButtons = '[data-testid="vote-buttons"]';
 const votingDate = '[data-testid="voting-date"]';
 const voteTwoMinExtraNote = '[data-testid="voting-2-mins-extra"]';
 const voteStatus = '[data-testid="vote-status"]';
-const rejectProposalsLink = '[href="/governance/rejected"]';
+const rejectProposalsLink = '[href="/proposals/rejected"]';
 const feedbackError = '[data-testid="Error"]';
 const noOpenProposals = '[data-testid="no-open-proposals"]';
 const noClosedProposals = '[data-testid="no-closed-proposals"]';
@@ -123,6 +123,8 @@ context(
             parseInt(this.minCloseDays + 1),
             'Asserting that network parameter maxCloseDays is at least 1 day higher than minCloseDays'
           );
+          // workaround for first eth tx hanging
+          associateTokenStartOfTests();
         }
       );
 
@@ -132,7 +134,6 @@ context(
         cy.connectVegaWallet();
         cy.ethereum_wallet_connect();
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
       });
 
       it('Should be able to see that no proposals exist', function () {
@@ -207,7 +208,6 @@ context(
         let arrayOfProposals = [];
 
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
         cy.get(proposalDetailsTitle)
           .each((proposalTitleElement) => {
             arrayOfProposals.push(proposalTitleElement.text());
@@ -225,14 +225,12 @@ context(
         cy.navigate_to_page_if_not_already_loaded('proposals');
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', '2');
         cy.navigate_to('validators');
-        cy.wait_for_spinner();
         cy.click_on_validator_from_list(0);
         cy.staking_validator_page_add_stake('2');
 
         cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
 
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
         cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
         cy.enter_unique_freeform_proposal_body('50', generateProposalTitle());
         cy.get(newProposalSubmitButton).should('be.visible').click();
@@ -327,7 +325,6 @@ context(
               .contains('👍')
               .should('be.visible');
             cy.navigate_to('proposals');
-            cy.wait_for_spinner();
             cy.get('@submittedProposal').within(() =>
               cy.get(voteStatus).should('have.text', 'Participation met')
             );
@@ -378,7 +375,6 @@ context(
             cy.wait_for_proposal_submitted();
             cy.wait_for_proposal_sync();
             cy.navigate_to('proposals');
-            cy.wait_for_spinner();
             cy.get_submitted_proposal_from_proposal_list(proposalTitle).within(
               () => cy.get(viewProposalButton).click()
             );
@@ -485,7 +481,6 @@ context(
         cy.get_proposal_information_from_table('Tokens for proposal')
           .should('have.text', parseFloat(this.minProposerBalance).toFixed(2))
           .and('be.visible');
-        cy.wait_for_spinner();
         cy.get(changeVoteButton).should('be.visible').click();
         cy.vote_for_proposal('against');
         cy.get(proposalVoteProgressAgainstPercentage)
@@ -611,8 +606,7 @@ context(
         cy.get(dialogCloseButton).click();
         cy.wait_for_proposal_sync();
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
-        cy.get(rejectProposalsLink).click().wait_for_spinner();
+        cy.get(rejectProposalsLink).click();
         cy.get('@rawProposal').then((rawProposal) => {
           cy.get_submitted_proposal_from_proposal_list(
             rawProposal.rationale.title
@@ -650,7 +644,7 @@ context(
         cy.contains('Transaction failed', proposalTimeout).should('be.visible');
         cy.get(feedbackError).should(
           'have.text',
-          'party has insufficient associated governance tokens in their staking account to submit proposal request'
+          'Network error: the network blocked the transaction through the spam protection'
         );
         cy.get(dialogCloseButton).click();
       });
@@ -669,7 +663,7 @@ context(
         cy.contains('Transaction failed', proposalTimeout).should('be.visible');
         cy.get(feedbackError).should(
           'have.text',
-          'party has insufficient associated governance tokens in their staking account to submit proposal request'
+          'Network error: the network blocked the transaction through the spam protection'
         );
         cy.get(dialogCloseButton).click();
       });
@@ -698,7 +692,7 @@ context(
         cy.contains('Transaction failed', proposalTimeout).should('be.visible');
         cy.get(feedbackError).should(
           'have.text',
-          '*: unknown field "unexpected" in vega.commands.v1.ProposalSubmission'
+          'Invalid params: the transaction is malformed'
         );
         cy.get(dialogCloseButton).click();
       });
@@ -728,48 +722,50 @@ context(
         cy.contains('Transaction failed', proposalTimeout).should('be.visible');
         cy.get(feedbackError).should(
           'have.text',
-          '*: unknown field "unexpectedField" in vega.ProposalTerms'
+          'Invalid params: the transaction is malformed'
         );
         cy.get(dialogCloseButton).click();
       });
 
       // 1005-PROP-009
-      it('Unable to vote on a freeform proposal - when some but not enough vega associated', function () {
-        const proposalTitle = generateProposalTitle();
+      it(
+        'Unable to vote on a freeform proposal - when some but not enough vega associated',
+        { tags: '@smoke' },
+        function () {
+          const proposalTitle = generateProposalTitle();
 
-        cy.ensure_specified_unstaked_tokens_are_associated(
-          this.minProposerBalance
-        );
-        cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
-        cy.enter_unique_freeform_proposal_body('50', proposalTitle);
-        cy.get(newProposalSubmitButton).should('be.visible').click();
-        cy.wait_for_proposal_submitted();
-        cy.wait_for_proposal_sync();
-        cy.staking_page_disassociate_tokens('0.0001');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.9999'
+          cy.vega_wallet_teardown();
+          cy.ensure_specified_unstaked_tokens_are_associated(
+            this.minProposerBalance
           );
-        });
-        cy.navigate_to('governance');
-        cy.wait_for_spinner();
-        cy.get_submitted_proposal_from_proposal_list(proposalTitle).within(() =>
-          cy.get(viewProposalButton).click()
-        );
-        cy.contains('Vote breakdown').should('be.visible', {
-          timeout: 10000,
-        });
-        cy.get(voteButtons).should('not.exist');
-        cy.getByTestId('min-proposal-requirements').should(
-          'have.text',
-          `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
-        );
-      });
+          cy.go_to_make_new_proposal(governanceProposalType.FREEFORM);
+          cy.enter_unique_freeform_proposal_body('50', proposalTitle);
+          cy.get(newProposalSubmitButton).should('be.visible').click();
+          cy.wait_for_proposal_submitted();
+          cy.staking_page_disassociate_tokens('0.0001');
+          cy.get(vegaWallet).within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              '0.9999'
+            );
+          });
+          cy.navigate_to('proposals');
+          cy.get_submitted_proposal_from_proposal_list(proposalTitle).within(
+            () => cy.get(viewProposalButton).click()
+          );
+          cy.contains('Vote breakdown').should('be.visible', {
+            timeout: 10000,
+          });
+          cy.get(voteButtons).should('not.exist');
+          cy.getByTestId('min-proposal-requirements').should(
+            'have.text',
+            `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
+          );
+        }
+      );
 
       it('Unable to vote on a proposal - when vega wallet disconnected - option to connect from within', function () {
         createRawProposal(this.minProposerBalance);
-        cy.wait_for_spinner();
         cy.get('[data-testid="manage-vega-wallet"]').click();
         cy.get('[data-testid="disconnect"]').click();
         cy.get('@rawProposal').then((rawProposal) => {
@@ -809,7 +805,6 @@ context(
         cy.wait_for_proposal_submitted();
         cy.wait_for_proposal_sync();
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
       }
 
       function createFreeformProposal(proposerBalance, proposalTitle) {
@@ -821,13 +816,41 @@ context(
         cy.wait_for_proposal_sync();
         cy.get(proposalDetailsTitle).invoke('text').as('proposalTitle');
         cy.navigate_to('proposals');
-        cy.wait_for_spinner();
       }
 
       function generateProposalTitle() {
         const randomNum = Math.floor(Math.random() * 1000) + 1;
         return randomNum + ': Freeform e2e proposal';
       }
+
+      // This is a workaround function to begin tests with associating tokens without failing
+      // Should be removed when eth transaction bug is fixed
+      function associateTokenStartOfTests() {
+        cy.highlight(`Associating tokens for first time`);
+        cy.ethereum_wallet_connect();
+        cy.connectVegaWallet();
+        cy.get('[href="/validators/associate"]').first().click();
+        cy.getByTestId('associate-radio-wallet', { timeout: 30000 }).click();
+        cy.getByTestId('token-amount-input', epochTimeout).type('1');
+        cy.getByTestId('token-input-submit-button', txTimeout)
+          .should('be.enabled')
+          .click();
+        cy.contains(
+          `Associating with Vega key. Waiting for ${Cypress.env(
+            'blockConfirmations'
+          )} more confirmations..`,
+          txTimeout
+        ).should('be.visible');
+        cy.getByTestId('associated-amount', txTimeout).should(
+          'contain.text',
+          '1'
+        );
+        // Wait is needed to allow time for transaction to complete
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(10000);
+        cy.vega_wallet_teardown();
+        cy.clearLocalStorage();
+      }
     });
   }
 );

apps/token-e2e/src/integration/flow/governance-forms-flow.cy.js

@@ -50,7 +50,6 @@ context(
       cy.connectVegaWallet();
       cy.ethereum_wallet_connect();
       cy.navigate_to('proposals');
-      cy.wait_for_spinner();
     });
 
     it('Able to submit valid update network parameter proposal', function () {
@@ -61,7 +60,7 @@ context(
       // 3002-PROP-007
       cy.get(newProposalDescription).type('E2E test for proposals');
 
-      cy.get(proposalParameterSelect).find('option').should('have.length', 109);
+      cy.get(proposalParameterSelect).find('option').should('have.length', 114);
       cy.get(proposalParameterSelect).select(
         // 3007-PNEC-002
         'governance_proposal_asset_minEnact'

apps/token-e2e/src/integration/flow/staking-flow.cy.js

@@ -46,7 +46,6 @@ context(
           cy.ethereum_wallet_connect();
           cy.vega_wallet_teardown();
           cy.navigate_to('validators');
-          cy.wait_for_spinner();
         }
       );
 
@@ -97,7 +96,11 @@ context(
         cy.navigate_to('validators');
 
         // 2002-SINC-007
-        cy.validate_validator_list_total_stake_and_share('0', '2.00', '100%');
+        cy.validate_validator_list_total_stake_and_share(
+          '0',
+          '2.00',
+          '100.00%'
+        );
       });
 
       it('Able to stake against a validator - using vega from vesting contract', function () {
@@ -144,7 +147,11 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '2.00', '100%');
+        cy.validate_validator_list_total_stake_and_share(
+          '0',
+          '2.00',
+          '100.00%'
+        );
       });
 
       it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
@@ -204,7 +211,11 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '6.00', '100%');
+        cy.validate_validator_list_total_stake_and_share(
+          '0',
+          '6.00',
+          '100.00%'
+        );
       });
 
       it('Able to stake against multiple validators', function () {
@@ -254,7 +265,6 @@ context(
           .should('contain', 1.0, txTimeout);
 
         cy.navigate_to('validators');
-        cy.wait_for_spinner();
 
         cy.get(`[row-id="${0}"]`).within(() => {
           cy.get(stakeValidatorListTotalStake)
@@ -285,68 +295,76 @@ context(
       });
 
       // 2001-STKE-041
-      it('Able to remove part of a stake against a validator', function () {
-        cy.staking_page_associate_tokens('4');
+      it(
+        'Able to remove part of a stake against a validator',
+        { tags: '@smoke' },
+        function () {
+          cy.staking_page_associate_tokens('4');
 
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          4.0,
-          txTimeout
-        );
+          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
+            'contain',
+            4.0,
+            txTimeout
+          );
 
-        cy.get('button').contains('Select a validator to nominate').click();
+          cy.get('button').contains('Select a validator to nominate').click();
 
-        cy.click_on_validator_from_list(0);
+          cy.click_on_validator_from_list(0);
 
-        cy.staking_validator_page_add_stake('3');
+          cy.staking_validator_page_add_stake('3');
 
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(3.0, epochTimeout)
-          .should('be.visible');
+          cy.get(stakeNextEpochValue, epochTimeout)
+            .contains(3.0, epochTimeout)
+            .should('be.visible');
 
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          1.0,
-          txTimeout
-        );
+          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
+            'contain',
+            1.0,
+            txTimeout
+          );
 
-        cy.navigate_to('validators');
-        // 2001-STKE-040
-        cy.click_on_validator_from_list(0);
+          cy.navigate_to('validators');
+          // 2001-STKE-040
+          cy.click_on_validator_from_list(0);
 
-        // 2001-STKE-044, 2001-STKE-048
-        cy.staking_validator_page_remove_stake('1');
+          // 2001-STKE-044, 2001-STKE-048
+          cy.staking_validator_page_remove_stake('1');
 
-        // 2001-STKE-049
-        cy.get(stakeNextEpochValue, epochTimeout).contains(2.0, epochTimeout);
+          // 2001-STKE-049
+          cy.get(stakeNextEpochValue, epochTimeout).contains(2.0, epochTimeout);
 
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
+          cy.get(vegaWalletUnstakedBalance, txTimeout).should(
+            'contain',
+            2.0,
+            txTimeout
+          );
 
-        cy.get(vegaWalletStakedBalances, txTimeout).should(
-          'contain',
-          2.0,
-          txTimeout
-        );
+          cy.get(vegaWalletStakedBalances, txTimeout).should(
+            'contain',
+            2.0,
+            txTimeout
+          );
 
-        cy.get(stakeNextEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
+          cy.get(stakeNextEpochValue, epochTimeout)
+            .contains(2.0, epochTimeout)
+            .should('be.visible');
 
-        cy.get(stakeThisEpochValue, epochTimeout)
-          .contains(2.0, epochTimeout)
-          .should('be.visible');
+          cy.get(stakeThisEpochValue, epochTimeout)
+            .contains(2.0, epochTimeout)
+            .should('be.visible');
 
-        cy.get(totalStake, epochTimeout).should('contain.text', '2');
-        cy.get(stakeShare, epochTimeout).should('have.text', '100%');
+          cy.get(totalStake, epochTimeout).should('contain.text', '2');
+          cy.get(stakeShare, epochTimeout).should('have.text', '100%');
 
-        cy.navigate_to('validators');
+          cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '2.00', '100%');
-      });
+          cy.validate_validator_list_total_stake_and_share(
+            '0',
+            '2.00',
+            '100.00%'
+          );
+        }
+      );
 
       // 2001-STKE-045
       it('Able to remove a full stake against a validator', function () {
@@ -401,7 +419,7 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0%');
+        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
       });
 
       it('Unable to remove a stake with a negative value for a validator', function () {
@@ -538,7 +556,7 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0%');
+        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
       });
 
       it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
@@ -592,7 +610,7 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0%');
+        cy.validate_validator_list_total_stake_and_share('0', '0.00', '0.00%');
       });
 
       it('Disassociating some tokens - prioritizes unstaked tokens', function () {
@@ -639,7 +657,11 @@ context(
 
         cy.navigate_to('validators');
 
-        cy.validate_validator_list_total_stake_and_share('0', '2.00', '100%');
+        cy.validate_validator_list_total_stake_and_share(
+          '0',
+          '2.00',
+          '100.00%'
+        );
       });
 
       it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {

apps/token-e2e/src/integration/flow/token-association-flow.cy.js

@@ -15,8 +15,8 @@ const ethWalletDissociateButton = '[href="/validators/disassociate"]';
 const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
 const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
 const connectedVegaKey = '[data-testid="connected-vega-key"]';
-const associatedKey = '[data-test-id="associated-key"]';
-const associatedAmount = '[data-test-id="associated-amount"]';
+const associatedKey = '[data-testid="associated-key"]';
+const associatedAmount = '[data-testid="associated-amount"]';
 const associateCompleteText = '[data-testid="transaction-complete-body"]';
 const disassociationWarning = '[data-testid="disassociation-warning"]';
 const vegaWallet = '[data-testid="vega-wallet"]';
@@ -41,7 +41,6 @@ context(
           cy.ethereum_wallet_connect();
           cy.vega_wallet_teardown();
           cy.navigate_to('validators');
-          cy.wait_for_spinner();
         }
       );
 

apps/token-e2e/src/integration/flow/withdrawal-flow.cy.js

@@ -34,7 +34,6 @@ context(
       cy.reload();
       cy.visit('/');
       cy.navigate_to('withdraw');
-      cy.wait_for_spinner();
       cy.connectVegaWallet();
       cy.ethereum_wallet_connect();
       cy.vega_wallet_teardown();

apps/token-e2e/src/integration/view/governance.cy.js

@@ -1,4 +1,4 @@
-const proposalDocumentationLink = '[data-testid="external-link"]';
+const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
 const newProposalButton = '[data-testid="new-proposal-link"]';
 const newProposalLink = '[data-testid="new-proposal-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
@@ -18,7 +18,7 @@ context(
       });
 
       it('should have GOVERNANCE header visible', function () {
-        cy.verify_page_header('Governance');
+        cy.verify_page_header('Proposals');
       });
 
       it('should be able to see a working link for - find out more about Vega governance', function () {