feat: make storing grid sizes opt in

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

.github/workflows/branch-length.yml

@@ -0,0 +1,16 @@
+name: 'Check if branch is shorter than 52 chars'
+on: pull_request
+
+jobs:
+  branch-naming-rules:
+    runs-on: ubuntu-latest
+    steps:
+      # echo "branches that are longer than 51 chars can't be parsed by kubernetes to create previews. Each app has prefix of it's name like: 'governance-' (12 chars), what leaves 51 max branch length"
+      # current parsable length: $( git rev-parse --abbrev-ref HEAD | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | wc -c)
+      - uses: deepakputhraya/action-branch-name@master
+        with:
+          # regex: '([a-z])+\/([a-z])+' # Regex the branch should match. This example enforces grouping
+          # allowed_prefixes: 'feature,stable,fix' # All branches should start with the given prefix
+          # ignore: master,develop # Ignore exactly matching branch names from convention
+          min_length: 1 # Min length of the branch name
+          max_length: 51 # Max length of the branch name

.github/workflows/ci-cd-trigger.yml

@@ -50,7 +50,7 @@ jobs:
     secrets: inherit
 
   lint-test-build:
-    timeout-minutes: 35
+    timeout-minutes: 60
     needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
@@ -105,7 +105,7 @@ jobs:
           affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
           echo -n "Affected projects: $affected"
 
-          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
+          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
           projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"

apps/explorer-e2e/.env

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

apps/explorer-e2e/cypress.config.js

@@ -25,7 +25,7 @@ module.exports = defineConfig({
   },
   env: {
     environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3028/query',
+    networkQueryUrl: 'http://localhost:3008/graphql',
     ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
     commitHash: 'dev',
     tsConfig: 'tsconfig.json',

apps/explorer-e2e/src/integration/home.cy.js

@@ -9,21 +9,22 @@ context('Home Page', function () {
     it('should show connected environment stats', function () {
       const statTitles = {
         0: 'Status',
-        1: 'Block height',
-        2: 'Uptime',
-        3: 'Total nodes',
-        4: 'Total staked',
-        5: 'Backlog',
-        6: 'Trades / second',
-        7: 'Orders / block',
-        8: 'Orders / second',
-        9: 'Transactions / block',
-        10: 'Block time',
-        11: 'Time',
-        12: 'App',
-        13: 'Tendermint',
-        14: 'Up since',
-        15: 'Chain ID',
+        1: 'Epoch',
+        2: 'Block height',
+        3: 'Uptime',
+        4: 'Total nodes',
+        5: 'Total staked',
+        6: 'Backlog',
+        7: 'Trades / second',
+        8: 'Orders / block',
+        9: 'Orders / second',
+        10: 'Transactions / block',
+        11: 'Block time',
+        12: 'Time',
+        13: 'App',
+        14: 'Tendermint',
+        15: 'Up since',
+        16: 'Chain ID',
       };
 
       cy.get('[data-testid="stats-title"]')
@@ -31,42 +32,13 @@ context('Home Page', function () {
           cy.wrap($list).should('contain.text', statTitles[index]);
         })
         .then(($list) => {
-          cy.wrap($list).should('have.length', 16);
+          cy.wrap($list).should('have.length', 17);
         });
-
-      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
-      cy.get(statsValue).eq(1).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(2)
-        .invoke('text')
-        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('contain.text', '2');
-      cy.get(statsValue)
-        .eq(4)
-        .invoke('text')
-        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(5).should('contain.text', '0');
-      cy.get(statsValue).eq(6).should('contain.text', '0');
-      cy.get(statsValue).eq(7).should('contain.text', '0');
-      cy.get(statsValue).eq(8).should('contain.text', '0');
-      cy.get(statsValue).eq(9).should('not.be.empty');
-      cy.get(statsValue).eq(10).should('not.be.empty');
-      cy.get(statsValue).eq(11).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(12)
-        .invoke('text')
-        .should('match', /v\d+\.\d+\.\d+/i);
-      cy.get(statsValue)
-        .eq(13)
-        .invoke('text')
-        .should('match', /\d+\.\d+\.\d+/i);
-      cy.get(statsValue).eq(14).should('not.be.empty');
-      cy.get(statsValue).eq(15).should('not.be.empty');
     });
 
     it('Block height should be updating', function () {
       cy.get(statsValue)
-        .eq(1)
+        .eq(2)
         .invoke('text')
         .then((blockHeightTxt) => {
           cy.get(statsValue)

apps/explorer-e2e/src/integration/node-switcher.cy.js

@@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node';
 context.skip('Node switcher', { tags: '@regression' }, function () {
   beforeEach('visit home page', function () {
     cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', {
-      hosts: ['http://localhost:3028/query'],
+      hosts: ['http://localhost:3008/graphql'],
     }).as('nodeData');
     cy.visit('/');
     cy.wait('@nodeData');

apps/explorer-e2e/src/integration/parties.cy.js

@@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () {
           balance type asset {id symbol decimals}}}}}}}}';
       cy.request({
         method: 'POST',
-        url: `http://localhost:3028/query`,
+        url: `http://localhost:3008/graphql`,
         body: {
           query: mutation,
         },

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';

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

@@ -43,7 +43,7 @@ export const AssetLink = ({
         if (asDialog) {
           open(assetId, e.target as HTMLElement);
         } else {
-          navigate(`${Routes.ASSETS}/${asset?.id}`);
+          navigate(`/${Routes.ASSETS}/${asset?.id}`);
         }
       }}
       {...props}

apps/explorer/src/app/components/markets/market-details.tsx

@@ -14,7 +14,6 @@ import {
   SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
-import { Link } from 'react-router-dom';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
@@ -97,22 +96,19 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
       ),
     },
     {
-      title: t('Oracle'),
+      title: t('Settlement Oracle'),
       content: (
-        <OracleInfoPanel noBorder={false} market={market}>
-          <Link
-            className="text-xs hover:underline"
-            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
-          >
-            {t('View settlement data oracle specification')}
-          </Link>
-          <Link
-            className="text-xs hover:underline"
-            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForTradingTermination.id}`}
-          >
-            {t('View termination oracle specification')}
-          </Link>
-        </OracleInfoPanel>
+        <OracleInfoPanel
+          noBorder={false}
+          market={market}
+          type="settlementData"
+        />
+      ),
+    },
+    {
+      title: t('Termination Oracle'),
+      content: (
+        <OracleInfoPanel noBorder={false} market={market} type="termination" />
       ),
     },
   ];

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -3,7 +3,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueGetterParams,

apps/explorer/src/app/components/order-details/deterministic-order-details.tsx

@@ -9,7 +9,7 @@ import SizeInMarket from '../size-in-market/size-in-market';
 export interface DeterministicOrderDetailsProps {
   id: string;
   // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
-  version?: number;
+  version?: number | null;
 }
 
 export const wrapperClasses =
@@ -28,7 +28,7 @@ export const wrapperClasses =
  */
 const DeterministicOrderDetails = ({
   id,
-  version = 0,
+  version = null,
 }: DeterministicOrderDetailsProps) => {
   const { data, error } = useExplorerDeterministicOrderQuery({
     variables: { orderId: id, version },

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -3,7 +3,7 @@ import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,

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

@@ -71,7 +71,7 @@ export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
                 />
               </td>
               <td className="text-md">
-                <AssetLink assetId={account.asset.id} />
+                <AssetLink assetId={account.asset.id} asDialog={true} />
               </td>
             </TableRow>
           );

apps/explorer/src/styles.css

@@ -1,3 +1,7 @@
+@import 'ag-grid-community/dist/styles/ag-grid.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
+
 /* You can add global styles to this file, and also import other style files */
 @tailwind base;
 @tailwind components;
@@ -11,3 +15,43 @@
 .react-markdown-container a:before {
   content: '🔗 ';
 }
+
+/* AG GRID - Do not edit without updating other global stylesheets for each app */
+
+.vega-ag-grid .ag-root-wrapper {
+  border: solid 0px;
+}
+
+.vega-ag-grid .ag-react-container {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.vega-ag-grid .ag-cell,
+.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
+  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
+}
+
+/* Light variables */
+.ag-theme-balham {
+  --ag-background-color: theme(colors.white);
+  --ag-border-color: theme(colors.neutral[300]);
+  --ag-header-background-color: theme(colors.white);
+  --ag-odd-row-background-color: theme(colors.white);
+  --ag-header-column-separator-color: theme(colors.neutral[300]);
+  --ag-row-border-color: theme(colors.white);
+  --ag-row-hover-color: theme(colors.neutral[100]);
+  --ag-font-size: 12px;
+}
+
+/* Dark variables */
+.ag-theme-balham-dark {
+  --ag-background-color: theme(colors.black);
+  --ag-border-color: theme(colors.neutral[700]);
+  --ag-header-background-color: theme(colors.black);
+  --ag-odd-row-background-color: theme(colors.black);
+  --ag-header-column-separator-color: theme(colors.neutral[600]);
+  --ag-row-border-color: theme(colors.black);
+  --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
+}

apps/governance-e2e/.env

@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}
 
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -20,7 +20,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
@@ -31,6 +31,5 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/governance-e2e/src/fixtures/proposals/new-market.json

@@ -9,7 +9,7 @@
       "name": "Token test market",
       "code": "Token.24h",
       "future": {
-        "settlementAsset": "fBTC",
+        "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
         "quoteName": "fBTC",
         "dataSourceSpecForSettlementData": {
           "external": {

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -49,6 +49,7 @@ describe(
     });
 
     beforeEach('visit proposals tab', function () {
+      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -217,9 +218,9 @@ describe(
       vegaWalletSetSpecifiedApprovalAmount('1000');
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
-          .as('submittedProposal')
-          .within(() => cy.get(viewProposalButton).click());
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       voteForProposal('for');
       // 3001-VOTE-079
@@ -237,9 +238,9 @@ describe(
           );
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getSubmittedProposalFromProposalList(rawProposal.rationale.title)
-              .as('submittedProposal')
-              .within(() => cy.get(viewProposalButton).click());
+            getSubmittedProposalFromProposalList(
+              rawProposal.rationale.title
+            ).within(() => cy.get(viewProposalButton).click());
           });
           cy.get(proposalVoteProgressForPercentage)
             .contains('100.00%')

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -16,6 +16,7 @@ import {
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
+const proposalListItem = '[data-testid="proposals-list-item"]';
 const closedProposals = '[data-testid="closed-proposals"]';
 const proposalStatus = '[data-testid="proposal-status"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
@@ -35,6 +36,7 @@ context(
     });
 
     beforeEach('visit proposals', function () {
+      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -51,7 +53,8 @@ context(
       waitForSpinner();
       cy.get(closedProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
+          .parentsUntil(proposalListItem)
+          .last()
           .within(() => {
             cy.get(proposalStatus).should('have.text', 'Enacted ');
             cy.get(viewProposalButton).click();
@@ -78,7 +81,8 @@ context(
       waitForSpinner();
       cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
+          .parentsUntil(proposalListItem)
+          .last()
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')
@@ -111,7 +115,8 @@ context(
       waitForSpinner();
       cy.get(openProposals, { timeout: 6000 }).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
+          .parentsUntil(proposalListItem)
+          .last()
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')
@@ -133,7 +138,8 @@ context(
       waitForSpinner();
       cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
-          .parentsUntil('[data-testid="proposals-list-item"]')
+          .parentsUntil(proposalListItem)
+          .last()
           .within(() => cy.get(viewProposalButton).click());
       });
       getProposalInformationFromTable('State')

apps/governance-e2e/src/integration/flow/proposal-flow.cy.ts

@@ -84,6 +84,7 @@ context(
     });
 
     beforeEach('visit governance tab', function () {
+      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -50,6 +50,8 @@ const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
 const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
+const fUSDCId =
+  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
@@ -74,6 +76,7 @@ context(
     });
 
     beforeEach('visit governance tab', function () {
+      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();
@@ -264,7 +267,7 @@ context(
     it('Unable to submit update market proposal without minimum amount of tokens', function () {
       vegaWalletTeardown();
       vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
         '1000000',
         vegaWalletPublicKey
       );
@@ -290,7 +293,7 @@ context(
     // 3001-VOTE-092 3004-PMAC-001
     it('Able to submit update market proposal and vote for proposal', function () {
       vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
         '1000000',
         vegaWalletPublicKey
       );
@@ -302,7 +305,10 @@ context(
         cy.get('dd').eq(0).should('have.text', 'Test market 1');
         cy.get('dd').eq(1).should('have.text', 'TEST.24h');
         cy.get('dd').eq(2).should('not.be.empty');
-        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
+        cy.get('dd')
+          .eq(2)
+          .invoke('text')
+          .as('EnactedMarketId', { type: 'static' });
       });
       cy.get('@EnactedMarketId').then((marketId) => {
         cy.VegaWalletSubmitLiquidityProvision(String(marketId), '1');
@@ -320,6 +326,7 @@ context(
       cy.get('@EnactedMarketId').then((marketId) => {
         cy.contains(String(marketId))
           .parentsUntil(proposalListItem)
+          .last()
           .within(() => {
             cy.getByTestId(viewProposalBtn).click();
           });
@@ -373,16 +380,19 @@ context(
       cy.get(newProposalSubmitButton).should('be.visible').click();
       // cannot submit a proposal with ERC20 address already in use
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.getByTestId('dialog-content').within(() => {
-        cy.get('p').should(
-          'have.text',
-          'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
-        );
-      });
+      cy.getByTestId('dialog-content')
+        .last()
+        .within(() => {
+          cy.get('p').should(
+            'have.text',
+            'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
+          );
+        });
       closeDialog();
       navigateTo(navigation.proposals);
       cy.contains(proposalTitle)
         .parentsUntil(proposalListItem)
+        .last()
         .within(() => {
           cy.getByTestId(viewProposalBtn).click();
         });
@@ -420,6 +430,7 @@ context(
         cy.get(proposalType)
           .contains('Update asset')
           .parentsUntil(proposalListItem)
+          .last()
           .within(() => {
             cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
             cy.getByTestId(viewProposalBtn).click();

apps/governance-e2e/src/integration/flow/proposal-list.cy.ts

@@ -35,6 +35,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
   });
 
   beforeEach('visit proposals tab', function () {
+    cy.clearLocalStorage();
     cy.reload();
     waitForSpinner();
     cy.connectVegaWallet();
@@ -59,7 +60,10 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     cy.get(openProposals).within(() => {
       cy.get(proposalClosingDate).first().should('contain.text', 'year');
       cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'days');
+      cy.get(proposalClosingDate)
+        .last()
+        .invoke('text')
+        .should('match', /days|minutes/);
     });
   });
 

apps/governance-e2e/src/integration/flow/rewards-flow.cy.ts

@@ -25,9 +25,10 @@ const rewardsTimeOut = { timeout: 60000 };
 
 context('rewards - flow', { tags: '@slow' }, function () {
   before('set up environment to allow rewards', function () {
+    cy.clearLocalStorage();
     cy.visit('/');
     waitForSpinner();
-    depositAsset(vegaAssetAddress, '1000');
+    depositAsset(vegaAssetAddress, '1000', 18);
     cy.validatorsSelfDelegate();
     ethereumWalletConnect();
     cy.connectVegaWallet();
@@ -56,7 +57,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.getByTestId(rewardsTable)
       .first()
       .within(() => {
-        cy.getByTestId('asset').should('have.text', 'Vega');
+        cy.getByTestId('asset', rewardsTimeOut).should('have.text', 'Vega');
         cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD').should('have.text', '1');
         cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
           'have.text',
@@ -93,13 +94,13 @@ context('rewards - flow', { tags: '@slow' }, function () {
       .within(() => {
         cy.get('h2').first().should('contain.text', 'EPOCH');
         cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD')
-          .should('contain.text', '0.1177')
-          .and('contain.text', '(11.7733%)');
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
+          .should('contain.text', '0.4415')
+          .and('contain.text', '(44.15%)');
         cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0001')
-          .and('contain.text', '(11.7733%)');
-        cy.getByTestId('total').should('have.text', '0.1179');
+          .should('contain.text', '0.0004')
+          .and('contain.text', '(44.15%)');
+        cy.getByTestId('total').should('have.text', '0.4419');
       });
   });
 });

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -55,7 +55,6 @@ context(
   function () {
     // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
-      cy.clearAllLocalStorage();
       cy.visit('/');
       ethereumWalletConnect();
       // this is a workaround for #2422 which can be removed once issue is resolved
@@ -67,6 +66,7 @@ context(
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
+          cy.clearLocalStorage();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -53,6 +53,7 @@ context(
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
+          cy.clearLocalStorage();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();
@@ -90,9 +91,14 @@ context(
 
         verifyEthWalletTotalAssociatedBalance('2.0');
 
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              2.0
+            );
+          });
 
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
       });
@@ -128,26 +134,38 @@ context(
         stakingPageAssociateTokens('1001', { approve: true });
         verifyEthWalletAssociatedBalance('1,001.00');
         verifyEthWalletTotalAssociatedBalance('1,001.00');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '1,001.00'
-          );
-        });
+        cy.get(vegaWallet)
+          .last()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              '1,001.00'
+            );
+          });
       });
 
       it('Able to disassociate a partial amount of tokens currently associated', function () {
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              2.0
+            );
+          });
 
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageDisassociateTokens('1');
         verifyEthWalletAssociatedBalance('1.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              1.0
+            );
+          });
       });
 
       it('Able to disassociate all tokens - using max', function () {
@@ -155,26 +173,40 @@ context(
         const warningText =
           'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              2.0
+            );
+          });
         cy.get('button').contains('Select a validator to nominate').click();
         cy.get(ethWalletDissociateButton).click();
         cy.get(disassociationWarning).should('contain', warningText);
         stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer).within(() => {
-          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-            'not.exist'
-          );
-        });
-        cy.get(ethWalletContainer).within(() => {
-          cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
-            'not.exist'
-          );
-        });
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
-        });
+        cy.get(ethWalletContainer)
+          .first()
+          .within(() => {
+            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+              'not.exist'
+            );
+          });
+        cy.get(ethWalletContainer)
+          .first()
+          .within(() => {
+            cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
+              'not.exist'
+            );
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              0.0
+            );
+          });
       });
 
       it('Able to associate and disassociate vesting contract tokens', function () {
@@ -200,9 +232,14 @@ context(
         cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              2.0
+            );
+          });
         cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
         stakingPageDisassociateTokens('1', {
           type: 'contract',
@@ -228,38 +265,61 @@ context(
         stakingPageAssociateTokens('21', { type: 'wallet' });
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.get(vestingContractSection).within(() => {
-          cy.get(associatedKey).should(
-            'contain',
-            Cypress.env('vegaWalletPublicKeyShort')
-          );
-          cy.get(associatedAmount, txTimeout).should('contain', 37);
-        });
-        cy.get(vegaInWalletSection).within(() => {
-          cy.get(associatedKey).should(
-            'contain',
-            Cypress.env('vegaWalletPublicKeyShort')
-          );
-          cy.get(associatedAmount, txTimeout).should('contain', 21);
-        });
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
-        });
+        cy.get(vestingContractSection)
+          .first()
+          .within(() => {
+            cy.get(associatedKey).should(
+              'contain',
+              Cypress.env('vegaWalletPublicKeyShort')
+            );
+            cy.get(associatedAmount, txTimeout).should('contain', 37);
+          });
+        cy.get(vegaInWalletSection)
+          .first()
+          .within(() => {
+            cy.get(associatedKey).should(
+              'contain',
+              Cypress.env('vegaWalletPublicKeyShort')
+            );
+            cy.get(associatedAmount, txTimeout).should('contain', 21);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              58
+            );
+          });
         stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.get(vestingContractSection).within(() => {
-          cy.get(associatedAmount, txTimeout).should('contain', 31);
-        });
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
-        });
+        cy.get(vestingContractSection)
+          .first()
+          .within(() => {
+            cy.get(associatedAmount, txTimeout).should('contain', 31);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              52
+            );
+          });
         navigateTo(navigation.validators);
         stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.get(vegaInWalletSection).within(() => {
-          cy.get(associatedAmount, txTimeout).should('contain', 12);
-        });
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
-        });
+        cy.get(vegaInWalletSection)
+          .first()
+          .within(() => {
+            cy.get(associatedAmount, txTimeout).should('contain', 12);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              43
+            );
+          });
       });
 
       it('Not able to associate more tokens than owned', function () {
@@ -318,9 +378,14 @@ context(
           Cypress.env('vegaWalletPublicKey2')
         );
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
-        });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              2.0
+            );
+          });
         cy.get(associateCompleteText).should(
           'have.text',
           `Vega key ${Cypress.env(

apps/governance-e2e/src/integration/flow/withdrawal-flow.cy.ts

@@ -4,10 +4,7 @@ import {
   waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import {
-  depositAsset,
-  vegaWalletTeardown,
-} from '../../support/wallet-teardown.functions';
+import { depositAsset } from '../../support/wallet-teardown.functions';
 
 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -25,6 +22,13 @@ const withdrawalAmount = 'withdrawal-amount';
 const withdrawalRecipient = 'withdrawal-recipient';
 const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
+const tableTxHash = '[col-id="txHash"]';
+const tableAssetSymbol = '[col-id="asset.symbol"]';
+const tableAmount = '[col-id="amount"]';
+const tableReceiverAddress = '[col-id="details.receiverAddress"]';
+const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
+const tableWithdrawnStatus = '[col-id="status"]';
+const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -42,26 +46,23 @@ context(
       cy.visit('/');
       // When running tests locally, will fail if run without restarting capsule
       cy.updateCapsuleMultiSig().then(() => {
-        depositAsset(usdcEthAddress, '100');
+        ethereumWalletConnect();
+        depositAsset(usdcEthAddress, '1000', 5);
       });
     });
 
     beforeEach('Navigate to withdrawal page', function () {
+      cy.clearLocalStorage();
       cy.reload();
       waitForSpinner();
       navigateTo(navigation.withdraw);
       cy.connectVegaWallet();
       ethereumWalletConnect();
-      vegaWalletTeardown();
     });
 
     it('Able to open withdrawal form with vega wallet connected', function () {
-      // needs to reload page for withdrawal form to be displayed in ci - not reproducible outside of ci
-      cy.reload();
-      waitForSpinner();
-      ethereumWalletConnect();
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm).within(() => {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
         cy.get('select').find('option').should('have.length.at.least', 2);
         cy.getByTestId(ethAddressInput).should('be.visible');
         cy.getByTestId(amountInput).should('be.visible');
@@ -70,7 +71,7 @@ context(
 
     it('Unable to submit withdrawal with invalid fields', function () {
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm).within(() => {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(submitWithdrawalButton).click();
@@ -94,7 +95,7 @@ context(
     it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
       // fill in withdrawal form
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm).within(() => {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(withdrawalThreshold).should(
@@ -102,7 +103,7 @@ context(
           '100,000.00000T'
         );
         cy.getByTestId(delayTime).should('have.text', 'None');
-        cy.getByTestId(amountInput).click().type('100');
+        cy.getByTestId(amountInput).click().type('120');
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
@@ -116,7 +117,7 @@ context(
         .should('have.attr', 'href')
         .and('contain', '/txs/');
       cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
-      cy.getByTestId(withdrawalAmount).should('have.text', '100.00');
+      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
       cy.getByTestId(withdrawalRecipient)
         .should('have.text', truncatedWithdrawalEthAddress)
         .and('have.attr', 'href')
@@ -128,26 +129,20 @@ context(
         'Withdraw asset complete'
       );
       cy.getByTestId(dialogClose).click();
-
-      // need to reload page to see withdrawal history complete
-      cy.reload();
-      waitForAssetsDisplayed(usdtName);
-
       // withdrawal history for complete withdrawal displayed
-      cy.get('[col-id="txHash"]', txTimeout)
-        .should('have.length.above', 1)
-        .eq(1)
+      cy.get(tableWithdrawnStatus)
+        .eq(1, txTimeout)
+        .should('have.text', 'Completed')
         .parent()
         .within(() => {
-          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
-          cy.get('[col-id="amount"]').should('have.text', '100.00');
-          cy.get('[col-id="details.receiverAddress"]')
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '120.00');
+          cy.get(tableReceiverAddress)
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
-          cy.get('[col-id="status"]').should('have.text', 'Completed');
-          cy.get('[col-id="txHash"]')
+          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
+          cy.get(tableTxHash)
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/tx/');
@@ -155,16 +150,16 @@ context(
     });
 
     // Skipping because of bug #1857
-    it.skip('Able to withdraw asset: -eth wallet not connected', function () {
+    it('Able to withdraw asset: -eth wallet not connected', function () {
       const ethWalletAddress = Cypress.env('ethWalletPublicKey');
       cy.reload();
       waitForAssetsDisplayed(usdtName);
       // fill in withdrawal form
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm).within(() => {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(ethAddressInput).should('be.empty');
-        cy.getByTestId(amountInput).click().type('100');
+        cy.getByTestId(amountInput).click().type('110');
         cy.getByTestId(submitWithdrawalButton).click();
 
         // Need eth address to submit withdrawal
@@ -180,20 +175,20 @@ context(
         'Transaction complete'
       );
       cy.getByTestId(dialogClose).click();
-
-      cy.getByTestId(completeWithdrawalButton)
-        .eq(0)
-        .parent()
+      cy.get(tableTxHash)
+        .eq(1)
+        .should('have.text', 'Complete withdrawal')
         .parent()
         .within(() => {
-          cy.get('[col-id="asset.symbol"]').should('have.text', usdcSymbol);
-          cy.get('[col-id="amount"]').should('have.text', '100.00');
-          cy.get('[col-id="details.receiverAddress"]')
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '110.00');
+          cy.get(tableReceiverAddress)
             .find('a')
             .should('have.attr', 'href')
             .and('contain', 'https://sepolia.etherscan.io/address/');
-          cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+          cy.get(tableCreatedTimeStamp).should('not.be.empty');
           cy.getByTestId(completeWithdrawalButton).click();
+          // Unable to complete withdrawal in Capsule
         });
     });
 
@@ -202,26 +197,28 @@ context(
       const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
       // Disconnect vega wallet
-      cy.getByTestId('manage-vega-wallet').click();
+      cy.getByTestId('manage-vega-wallet').last().click();
       cy.getByTestId('disconnect').click();
 
       cy.connectPublicKey(vegaWalletPubKey);
       cy.getByTestId(withdraw).should('be.visible').click();
-      cy.getByTestId(withdrawalForm).within(() => {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId('dialog-content').within(() => {
-        cy.get('h1').should('have.text', 'Transaction failed');
-        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-      });
+      cy.getByTestId('dialog-content')
+        .last()
+        .within(() => {
+          cy.get('h1').should('have.text', 'Transaction failed');
+          cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+        });
     });
 
     function waitForAssetsDisplayed(expectedAsset: string) {
-      cy.contains(expectedAsset, txTimeout).should('be.visible');
+      cy.getByTestId('currency-title').should('contain.text', expectedAsset);
     }
   }
 );

apps/governance-e2e/src/integration/view/home.cy.ts

@@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
         .within(() => {
           cy.get('span')
             .first()
-            .should('have.text', 'http://localhost:3028/query');
+            .should('have.text', 'http://localhost:3008/graphql');
           cy.getByTestId('link').should('exist');
         });
     });

apps/governance-e2e/src/integration/view/pubkey-view.cy.ts

@@ -17,10 +17,15 @@ const banner = 'view-banner';
 
 context('View functionality with public key', { tags: '@smoke' }, function () {
   before('send asset to wallet', function () {
-    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
+    vegaWalletFaucetAssetsWithoutCheck(
+      '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+      '1000000',
+      vegaWalletPubKey
+    );
   });
 
   beforeEach('visit home page', function () {
+    cy.clearLocalStorage();
     cy.visit('/');
     waitForSpinner();
     cy.connectPublicKey(vegaWalletPubKey);

apps/governance-e2e/src/integration/view/rewards.cy.ts

@@ -13,6 +13,7 @@ context(
   { tags: '@regression' },
   function () {
     before('navigate to rewards page', function () {
+      cy.clearLocalStorage();
       cy.visit('/');
       navigateTo(navigation.rewards);
     });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -282,26 +282,30 @@ context(
       describe('Vega wallet with assets', function () {
         const assets = [
           {
-            id: 'fUSDC',
+            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
             name: 'USDC (fake)',
+            symbol: 'fUSDC',
             amount: '1000000',
             expectedAmount: '10.00',
           },
           {
-            id: 'fDAI',
+            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
             name: 'DAI (fake)',
+            symbol: 'fDAI',
             amount: '200000',
             expectedAmount: '2.00',
           },
           {
-            id: 'fBTC',
+            id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
             name: 'BTC (fake)',
+            symbol: 'fBTC',
             amount: '600000',
             expectedAmount: '6.00',
           },
           {
-            id: 'fEURO',
+            id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
             name: 'EURO (fake)',
+            symbol: 'fEURO',
             amount: '800000',
             expectedAmount: '8.00',
           },
@@ -322,15 +326,15 @@ context(
           });
         });
 
-        for (const { id, name, expectedAmount } of assets) {
-          it(`should see ${id} within vega wallet`, () => {
+        for (const { name, symbol, expectedAmount } of assets) {
+          it(`should see ${name} within vega wallet`, () => {
             cy.get(walletContainer).within(() => {
               cy.get(vegaWalletCurrencyTitle)
-                .contains(id, txTimeout)
+                .contains(name, txTimeout)
                 .should('be.visible');
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                 .parent()
                 .siblings()
                 .invoke('text')
@@ -338,9 +342,9 @@ context(
                 .should('be.gte', parseFloat(expectedAmount));
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                 .parent()
-                .contains(name);
+                .contains(symbol);
             });
           });
         }

apps/governance-e2e/src/support/governance.functions.ts

@@ -90,6 +90,7 @@ export function getSubmittedProposalFromProposalList(proposalTitle: string) {
 export function getProposalIdFromList(proposalTitle: string) {
   cy.contains(proposalTitle)
     .parentsUntil(proposalListItem)
+    .last()
     .within(() => {
       cy.get(proposalDetails)
         .invoke('text')
@@ -133,7 +134,7 @@ export function waitForProposalSync() {
   // before proposal appears in the list - so rather than hard coded wait - we just wait on the
   // delegation checks that are performed on the governance page.
 
-  cy.intercept('POST', '/query', (req) => {
+  cy.intercept('POST', '/graphql', (req) => {
     if (req.body.operationName === 'Delegations') {
       req.alias = 'proposalDelegationsCompletion';
     }
@@ -143,7 +144,7 @@ export function waitForProposalSync() {
   cy.wait(['@proposalDelegationsCompletion', '@proposalDelegationsCompletion']);
 
   // Turn off this intercept from here on in
-  cy.intercept('POST', '/query', (req) => {
+  cy.intercept('POST', '/graphql', (req) => {
     if (req.body.operationName === 'Delegations') {
       req.continue();
     }

apps/governance-e2e/src/support/proposal.functions.ts

@@ -89,6 +89,6 @@ export function mockNetworkUpgradeProposal() {
   cy.mockGQL((req) => {
     aliasGQLQuery(req, 'Nodes', nodeData);
     aliasGQLQuery(req, 'Proposals', proposalsData);
-    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
+    aliasGQLQuery(req, 'ProtocolUpgradeProposals', upgradeProposalsData);
   });
 }

apps/governance-e2e/src/support/staking.functions.ts

@@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
     .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
     .and('be.visible')
     .click();
-  cy.contains('been removed from validator').should('be.visible');
+  cy.contains('been removed from validator', txTimeout).should('be.visible');
   closeDialog();
 }
 
@@ -185,7 +185,7 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]:visible`)
+  cy.get(`[row-id="${positionOnList}"]`)
     .eq(1)
     .within(() => {
       cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
@@ -221,12 +221,12 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }
 
 export function closeStakingDialog() {
-  cy.get('[data-testid="dialog-title"]:visible').should(
+  cy.getByTestId('dialog-title').should(
     'contain.text',
     'At the beginning of the next epoch'
   );
-  cy.get('[data-testid="dialog-content"]:visible')
-    .first()
+  cy.getByTestId('dialog-content')
+    .last()
     .within(() => {
       cy.get('a').should('have.text', 'Back to Staking').click();
     });

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';
 
 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -35,18 +35,25 @@ const stakingBridgeContract = new StakingBridge(
 );
 const vestingContract = new TokenVesting(vegaTokenContractAddress, signer);
 
-export async function depositAsset(assetEthAddress: string, amount: string) {
+export async function depositAsset(
+  assetEthAddress: string,
+  amount: string,
+  decimalPlaces: number
+) {
   // Approve asset
   const faucet = new TokenFaucetable(assetEthAddress, signer);
-  cy.wrap(faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(19)), {
-    timeout: transactionTimeout,
-    log: false,
-  }).then(() => {
+  cy.wrap(
+    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
+    {
+      timeout: transactionTimeout,
+      log: false,
+    }
+  ).then(() => {
     const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
     cy.wrap(
       collateralBridge.deposit_asset(
         assetEthAddress,
-        amount + '0'.repeat(18),
+        amount + '0'.repeat(decimalPlaces),
         '0x' + vegaWalletPubKey
       ),
       { timeout: transactionTimeout, log: false }
@@ -102,11 +109,12 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
   cy.highlight('Tearing down staking tokens from vega wallet if present');
   cy.wrap(
     stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-    { timeout: transactionTimeout, log: false }
+    { timeout: transactionTimeout }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
       cy.get(vegaWalletContainer).within(() => {
         cy.getByTestId('currency-value')
+          .first()
           .invoke('text')
           .then(($associatedAmount) => {
             cy.wrap(
@@ -114,14 +122,34 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                 String(stakeBalance),
                 vegaWalletPubKey
               ),
-              { timeout: transactionTimeout, log: false }
+              { timeout: transactionTimeout }
             );
-            cy.get("[data-testid='currency-value']")
-              .first()
-              .invoke('text', {
+            cy.wrap(
+              vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
+              {
                 timeout: transactionTimeout,
-              })
-              .should('not.eq', $associatedAmount);
+                log: false,
+              }
+            ).then((vestingAmount) => {
+              if (Number(vestingAmount) != 0) {
+                cy.contains('Associated', {
+                  timeout: transactionTimeout,
+                })
+                  .parent()
+                  .parent()
+                  .within(() => {
+                    cy.getByTestId('currency-value', {
+                      timeout: transactionTimeout,
+                    })
+                      .should('have.length', 1)
+                      .invoke('text')
+                      .as('displayedAmount');
+                    cy.get('@displayedAmount', {
+                      timeout: transactionTimeout,
+                    }).should('not.eq', $associatedAmount);
+                  });
+              }
+            });
           });
       });
     }
@@ -137,7 +165,7 @@ async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
     if (Number(vestingAmount) != 0) {
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
-        { timeout: transactionTimeout, log: false }
+        { timeout: transactionTimeout }
       );
     }
   });

apps/governance/.env.capsule

@@ -8,7 +8,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''
 
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session

apps/governance/src/components/disconnected-notice/disconnected-notice.spec.tsx

@@ -0,0 +1,39 @@
+import { render, screen } from '@testing-library/react';
+import { DisconnectedNotice } from './disconnected-notice';
+
+describe('DisconnectedNotice', () => {
+  it('renders Notification when isDisconnected is true and correctNetworkChainId is valid', () => {
+    render(
+      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={'1'} />
+    );
+    const disconnectedNotice = screen.getByTestId('disconnected-notice');
+    expect(disconnectedNotice).toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when isDisconnected is false", () => {
+    render(
+      <DisconnectedNotice isDisconnected={false} correctNetworkChainId={'1'} />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when correctNetworkChainId is undefined", () => {
+    render(
+      <DisconnectedNotice
+        isDisconnected={true}
+        correctNetworkChainId={undefined}
+      />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when correctNetworkChainId is null", () => {
+    render(
+      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={null} />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+});

apps/governance/src/components/disconnected-notice/disconnected-notice.tsx

@@ -0,0 +1,33 @@
+import { useTranslation } from 'react-i18next';
+import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
+
+interface DisconnectedNoticeProps {
+  isDisconnected: boolean;
+  correctNetworkChainId?: string | null;
+}
+
+export const DisconnectedNotice = ({
+  isDisconnected,
+  correctNetworkChainId,
+}: DisconnectedNoticeProps) => {
+  const { t } = useTranslation();
+
+  if (
+    !isDisconnected ||
+    correctNetworkChainId === undefined ||
+    correctNetworkChainId === null
+  ) {
+    return null;
+  }
+
+  return (
+    <div className="col-span-full" data-testid="disconnected-notice">
+      <Notification
+        message={t('disconnectedNotice', {
+          correctNetwork: correctNetworkChainId,
+        })}
+        intent={Intent.Danger}
+      />
+    </div>
+  );
+};

apps/governance/src/components/disconnected-notice/index.tsx

@@ -0,0 +1 @@
+export * from './disconnected-notice';

apps/governance/src/components/eth-wallet/eth-wallet.tsx

@@ -3,6 +3,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { Button } from '@vegaprotocol/ui-toolkit';
+import { DisconnectedNotice } from '../disconnected-notice';
 
 import {
   AppStateActionType,
@@ -26,7 +27,8 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useWeb3Disconnect } from '@vegaprotocol/web3';
+import { useEthereumConfig, useWeb3Disconnect } from '@vegaprotocol/web3';
+import { getChainName } from '@vegaprotocol/web3';
 
 const removeLeadingAddressSymbol = (key: string) => {
   if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -182,16 +184,21 @@ const ConnectedKey = () => {
 
 export const EthWallet = () => {
   const { t } = useTranslation();
-  const { appDispatch } = useAppState();
+  const { appDispatch, appState } = useAppState();
   const { account, connector } = useWeb3React();
   const pendingTxs = usePendingTransactions();
   const disconnect = useWeb3Disconnect(connector);
+  const { config } = useEthereumConfig();
 
   return (
     <WalletCard>
       <section data-testid="ethereum-wallet">
         <WalletCardHeader>
           <h1 className="m-0 uppercase">{t('ethereumKey')}</h1>
+          <DisconnectedNotice
+            isDisconnected={appState.disconnectNotice}
+            correctNetworkChainId={getChainName(Number(config?.chain_id))}
+          />
           {account && (
             <div className="place-self-end font-mono">
               <div

apps/governance/src/components/page-templates/app-layout.tsx

@@ -14,7 +14,7 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
   const { isReadOnly } = useVegaWallet();
   const AppLayoutClasses = classNames(
     'app w-full max-w-[1500px] mx-auto grid',
-    'lg:text-body-large',
+    'font-alpha lg:text-body-large',
     {
       'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
       'grid-rows-[repeat(3,min-content)_1fr_min-content]': isReadOnly,

apps/governance/src/components/web3-connector/web3-connector.tsx

@@ -1,13 +1,12 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
 import {
-  getChainName,
   useWeb3ConnectStore,
   useWeb3Disconnect,
   Web3ConnectDialog,
 } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import {
   AppStateActionType,
   useAppState,
@@ -36,9 +35,7 @@ export function Web3Connector({
   const appChainId = Number(chainId);
   return (
     <>
-      <Web3Content appChainId={appChainId} setDialogOpen={setDialogOpen}>
-        {children}
-      </Web3Content>
+      <Web3Content appChainId={appChainId}>{children}</Web3Content>
       <Web3ConnectDialog
         connectors={connectors}
         dialogOpen={appState.ethConnectOverlay}
@@ -52,23 +49,59 @@ export function Web3Connector({
 interface Web3ContentProps {
   children: ReactElement;
   appChainId: number;
-  setDialogOpen: (isOpen: boolean) => void;
 }
 
 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
+  const { appState, appDispatch } = useAppState();
   const { connector, chainId } = useWeb3React();
+  const [previousChainId, setPreviousChainId] = useState(chainId);
   const error = useWeb3ConnectStore((store) => store.error);
   const disconnect = useWeb3Disconnect(connector);
 
+  const showDisconnectNotice = useCallback(
+    (isVisible: boolean) =>
+      appDispatch({
+        type: AppStateActionType.SET_DISCONNECT_NOTICE,
+        isVisible,
+      }),
+    [appDispatch]
+  );
+
   useEffect(() => {
     if (connector?.connectEagerly) {
       connector.connectEagerly();
     }
-    // wallet connect doesnt handle connectEagerly being called when connector is also in the
+    // wallet connect doesn't handle connectEagerly being called when connector is also in the
     // deps array.
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    if (chainId !== undefined) {
+      // We use this to detect when the user switches networks.
+      setPreviousChainId(chainId);
+
+      if (chainId !== appChainId) {
+        disconnect();
+
+        // If the user was previously connected, show the disconnect explanation notice.
+        if (previousChainId !== undefined && !appState.disconnectNotice) {
+          showDisconnectNotice(true);
+        }
+      } else if (appState.disconnectNotice) {
+        showDisconnectNotice(false);
+      }
+    }
+  }, [
+    appChainId,
+    appDispatch,
+    appState.disconnectNotice,
+    chainId,
+    disconnect,
+    previousChainId,
+    showDisconnectNotice,
+  ]);
+
   if (error) {
     return (
       <Splash>
@@ -80,18 +113,5 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
     );
   }
 
-  if (chainId !== undefined && chainId !== appChainId) {
-    return (
-      <Splash>
-        <div className="flex flex-col items-center gap-12">
-          <p className="text-white">
-            This app only works on {getChainName(appChainId)}
-          </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
-        </div>
-      </Splash>
-    );
-  }
-
   return children;
 };

apps/governance/src/contexts/app-state/app-state-context.ts

@@ -43,6 +43,11 @@ export interface AppState {
    * Message to display in a banner at the top of the screen, currently always shown as a warning/error
    */
   bannerMessage: string;
+  /**
+   * Displays a notice to the user that they have been disconnected because they've changed their
+   * ethereum network to an incompatible one.
+   */
+  disconnectNotice: boolean;
 }
 
 export enum AppStateActionType {
@@ -58,6 +63,7 @@ export enum AppStateActionType {
   SET_ASSOCIATION_BREAKDOWN,
   SET_TRANSACTION_OVERLAY,
   SET_BANNER_MESSAGE,
+  SET_DISCONNECT_NOTICE,
 }
 
 export type AppStateAction =
@@ -90,6 +96,10 @@ export type AppStateAction =
   | {
       type: AppStateActionType.SET_BANNER_MESSAGE;
       message: string;
+    }
+  | {
+      type: AppStateActionType.SET_DISCONNECT_NOTICE;
+      isVisible: boolean;
     };
 
 type AppStateContextShape = {

apps/governance/src/contexts/app-state/app-state-provider.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 
 import { BigNumber } from '../../lib/bignumber';
-import { AppStateActionType, AppStateContext } from './app-state-context';
 import type { AppState, AppStateAction } from './app-state-context';
+import { AppStateActionType, AppStateContext } from './app-state-context';
 
 interface AppStateProviderProps {
   children: React.ReactNode;
@@ -19,6 +19,7 @@ const initialAppState: AppState = {
   ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
+  disconnectNotice: false,
 };
 
 function appStateReducer(state: AppState, action: AppStateAction): AppState {
@@ -68,6 +69,12 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
         bannerMessage: action.message,
       };
     }
+    case AppStateActionType.SET_DISCONNECT_NOTICE: {
+      return {
+        ...state,
+        disconnectNotice: action.isVisible,
+      };
+    }
   }
 }
 

apps/governance/src/contexts/contracts/contracts-provider.tsx

@@ -14,13 +14,17 @@ import { ContractsContext } from './contracts-context';
 import { createDefaultProvider } from '../../lib/web3-connectors';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { ENV } from '../../config/env';
+import { ENV } from '../../config';
 
 /**
  * Provides Vega Ethereum contract instances to its children.
  */
 export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
-  const { provider: activeProvider, account } = useWeb3React();
+  const {
+    provider: activeProvider,
+    account,
+    chainId: activeChainId,
+  } = useWeb3React();
   const { config } = useEthereumConfig();
   const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
   const [contracts, setContracts] =
@@ -39,7 +43,11 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
           ETHEREUM_PROVIDER_URL,
           Number(config.chain_id)
         );
-        const provider = activeProvider ? activeProvider : defaultProvider;
+
+        const provider =
+          activeProvider && activeChainId === Number(config.chain_id)
+            ? activeProvider
+            : defaultProvider;
 
         if (
           account &&
@@ -84,7 +92,14 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
       //  TODO: hacky quick fix for release to prevent race condition, find a better fix for this.
       cancelled = true;
     };
-  }, [activeProvider, account, config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);
+  }, [
+    activeProvider,
+    activeChainId,
+    account,
+    config,
+    VEGA_ENV,
+    ETHEREUM_PROVIDER_URL,
+  ]);
 
   if (!contracts) {
     return (

apps/governance/src/i18n/translations/dev.json

@@ -790,5 +790,6 @@
   "approval (% validator voting power)": "approval (% validator voting power)",
   "67% voting power required": "67% voting power required",
   "Token": "Token",
-  "associateVegaNow": "Associate $VEGA now"
+  "associateVegaNow": "Associate $VEGA now",
+  "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app."
 }

apps/governance/src/routes/home/index.tsx

@@ -15,7 +15,6 @@ import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
 import { useNodesQuery } from '../staking/home/__generated__/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
-import { useProtocolUpgradesQuery } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 import {
   getNotRejectedProposals,
   getNotRejectedProtocolUpgradeProposals,
@@ -25,7 +24,8 @@ import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 
 const nodesToShow = 6;
 
@@ -181,7 +181,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     data: protocolUpgradesData,
     loading: protocolUpgradesLoading,
     error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
+  } = useProtocolUpgradeProposalsQuery({
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',

apps/governance/src/routes/proposals/components/list-asset/list-asset.spec.tsx

@@ -56,6 +56,7 @@ const mockAppState: AppState = {
   ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
+  disconnectNotice: false,
 };
 
 jest.mock('../../../contexts/app-state/app-state-context', () => ({

apps/governance/src/routes/proposals/components/proposal-change-table/proposal-change-table.spec.tsx

@@ -1,8 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import { format } from 'date-fns';
+import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
 
-import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { ProposalChangeTable } from './proposal-change-table';
 
@@ -24,16 +23,15 @@ it('Renders all data for table', () => {
   expect(screen.getByText('Closes on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
+      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
     )
   ).toBeInTheDocument();
 
   expect(screen.getByText('Proposed enactment')).toBeInTheDocument();
   expect(
     screen.getByText(
-      format(
-        new Date(proposal?.terms.enactmentDatetime || 0),
-        DATE_FORMAT_DETAILED
+      formatDateWithLocalTimezone(
+        new Date(proposal?.terms.enactmentDatetime || 0)
       )
     )
   ).toBeInTheDocument();
@@ -43,7 +41,7 @@ it('Renders all data for table', () => {
 
   expect(screen.getByText('Proposed on')).toBeInTheDocument();
   expect(
-    screen.getByText(format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED))
+    screen.getByText(formatDateWithLocalTimezone(new Date(proposal?.datetime)))
   ).toBeInTheDocument();
 
   expect(screen.getByText('Type')).toBeInTheDocument();
@@ -62,16 +60,15 @@ it('Changes data based on if data is in future or past', () => {
   expect(screen.getByText('Closed on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      format(new Date(proposal?.terms.closingDatetime), DATE_FORMAT_DETAILED)
+      formatDateWithLocalTimezone(new Date(proposal?.terms.closingDatetime))
     )
   ).toBeInTheDocument();
 
   expect(screen.getByText('Enacted on')).toBeInTheDocument();
   expect(
     screen.getByText(
-      format(
-        new Date(proposal?.terms.enactmentDatetime || 0),
-        DATE_FORMAT_DETAILED
+      formatDateWithLocalTimezone(
+        new Date(proposal?.terms.enactmentDatetime || 0)
       )
     )
   ).toBeInTheDocument();
@@ -91,9 +88,8 @@ it('Does not render enactment time for freeform proposal', () => {
   expect(screen.queryByText('Enacted on')).not.toBeInTheDocument();
   expect(
     screen.queryByText(
-      format(
-        new Date(proposal?.terms.enactmentDatetime || 0),
-        DATE_FORMAT_DETAILED
+      formatDateWithLocalTimezone(
+        new Date(proposal?.terms.enactmentDatetime || 0)
       )
     )
   ).not.toBeInTheDocument();

apps/governance/src/routes/proposals/components/proposal-change-table/proposal-change-table.tsx

@@ -1,12 +1,11 @@
-import { format, isFuture } from 'date-fns';
+import { isFuture } from 'date-fns';
 import { useTranslation } from 'react-i18next';
-
+import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
 import {
   KeyValueTable,
   KeyValueTableRow,
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
-import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
 import { CurrentProposalState } from '../current-proposal-state';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -35,16 +34,15 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
           {isFuture(new Date(terms?.closingDatetime))
             ? t('closesOn')
             : t('closedOn')}
-          {format(new Date(terms?.closingDatetime), DATE_FORMAT_DETAILED)}
+          {formatDateWithLocalTimezone(new Date(terms?.closingDatetime))}
         </KeyValueTableRow>
         {terms?.change.__typename !== 'NewFreeform' ? (
           <KeyValueTableRow>
             {isFuture(new Date(terms?.enactmentDatetime || 0))
               ? t('proposedEnactment')
               : t('enactedOn')}
-            {format(
-              new Date(terms?.enactmentDatetime || 0),
-              DATE_FORMAT_DETAILED
+            {formatDateWithLocalTimezone(
+              new Date(terms?.enactmentDatetime || 0)
             )}
           </KeyValueTableRow>
         ) : null}
@@ -54,7 +52,7 @@ export const ProposalChangeTable = ({ proposal }: ProposalChangeTableProps) => {
         </KeyValueTableRow>
         <KeyValueTableRow>
           {t('proposedOn')}
-          {format(new Date(proposal?.datetime), DATE_FORMAT_DETAILED)}
+          {formatDateWithLocalTimezone(new Date(proposal?.datetime))}
         </KeyValueTableRow>
         {proposal?.rejectionReason ? (
           <KeyValueTableRow>

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.tsx

@@ -12,7 +12,7 @@ import { ExternalLinks } from '@vegaprotocol/utils';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;

apps/governance/src/routes/proposals/components/protocol-upgrade-proposal-detail-info/protocol-upgrade-proposal-detail-info.tsx

@@ -5,7 +5,7 @@ import {
   RoundedWrapper,
 } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 export interface ProtocolUpgradeProposalDetailInfoProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.spec.tsx

@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import { BrowserRouter } from 'react-router-dom';
 import { ProtocolUpgradeProposalsListItem } from './protocol-upgrade-proposals-list-item';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 const proposal = {
   status:

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.tsx

@@ -11,8 +11,8 @@ import { stripFullStops } from '@vegaprotocol/utils';
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
 import Routes from '../../../routes';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 interface ProtocolProposalsListItemProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;

apps/governance/src/routes/proposals/hooks/use-vote-information.spec.ts

@@ -19,6 +19,7 @@ const mockAppState: AppState = {
   ethConnectOverlay: false,
   transactionOverlay: false,
   bannerMessage: '',
+  disconnectNotice: false,
 };
 
 jest.mock('../../../contexts/app-state/app-state-context', () => ({

apps/governance/src/routes/proposals/proposals/proposals-container.tsx

@@ -13,10 +13,9 @@ import {
 } from '@vegaprotocol/types';
 import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
 import orderBy from 'lodash/orderBy';
-import { useProtocolUpgradesQuery } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 
 const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
@@ -73,7 +72,7 @@ export const ProposalsContainer = () => {
     data: protocolUpgradesData,
     loading: protocolUpgradesLoading,
     error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
+  } = useProtocolUpgradeProposalsQuery({
     pollInterval: 5000,
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',

apps/governance/src/routes/proposals/propose/update-market/UpdateMarket.graphql

@@ -9,6 +9,9 @@ query ProposalMarketsQuery {
             code
           }
         }
+        proposal {
+          state
+        }
       }
     }
   }

apps/governance/src/routes/proposals/propose/update-market/__generated__/UpdateMarket.ts

@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ProposalMarketsQueryQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ProposalMarketsQueryQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } } } }> } | null };
+export type ProposalMarketsQueryQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } }, proposal?: { __typename?: 'Proposal', state: Types.ProposalState } | null } }> } | null };
 
 
 export const ProposalMarketsQueryDocument = gql`
@@ -21,6 +21,9 @@ export const ProposalMarketsQueryDocument = gql`
             code
           }
         }
+        proposal {
+          state
+        }
       }
     }
   }

apps/governance/src/routes/proposals/propose/update-market/__generated___/UpdateMarket.ts

@@ -1,94 +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 ProposalMarketsQueryQueryVariables = Types.Exact<{
-  [key: string]: never;
-}>;
-
-export type ProposalMarketsQueryQuery = {
-  __typename?: 'Query';
-  marketsConnection?: {
-    __typename?: 'MarketConnection';
-    edges: Array<{
-      __typename?: 'MarketEdge';
-      node: {
-        __typename?: 'Market';
-        id: string;
-        tradableInstrument: {
-          __typename?: 'TradableInstrument';
-          instrument: { __typename?: 'Instrument'; name: string; code: string };
-        };
-      };
-    }>;
-  } | null;
-};
-
-export const ProposalMarketsQueryDocument = gql`
-  query ProposalMarketsQuery {
-    marketsConnection {
-      edges {
-        node {
-          id
-          tradableInstrument {
-            instrument {
-              name
-              code
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-/**
- * __useProposalMarketsQueryQuery__
- *
- * To run a query within a React component, call `useProposalMarketsQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `useProposalMarketsQueryQuery` 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 } = useProposalMarketsQueryQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProposalMarketsQueryQuery(
-  baseOptions?: Apollo.QueryHookOptions<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >(ProposalMarketsQueryDocument, options);
-}
-export function useProposalMarketsQueryLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >(ProposalMarketsQueryDocument, options);
-}
-export type ProposalMarketsQueryQueryHookResult = ReturnType<
-  typeof useProposalMarketsQueryQuery
->;
-export type ProposalMarketsQueryLazyQueryHookResult = ReturnType<
-  typeof useProposalMarketsQueryLazyQuery
->;
-export type ProposalMarketsQueryQueryResult = Apollo.QueryResult<
-  ProposalMarketsQueryQuery,
-  ProposalMarketsQueryQueryVariables
->;

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.spec.tsx

@@ -1,15 +1,16 @@
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateMarket } from './propose-update-market';
 import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
-import type { ProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
-import { ProposalMarketsQueryDocument } from './__generated___/UpdateMarket';
+import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
+import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket';
+import { ProposalState } from '@vegaprotocol/types';
 
 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
   request: {
@@ -89,6 +90,10 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                   code: 'ETHiUSDT',
                 },
               },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_ENACTED,
+              },
             },
           },
           {
@@ -101,11 +106,16 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                 instrument: {
                   __typename: 'Instrument',
                   name: 'Las Vegas nuggets',
-                  code: 'Nuggets2',
+                  code: 'Nuggets',
                 },
               },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_OPEN,
+              },
             },
           },
+
           {
             __typename: 'MarketEdge',
             node: {
@@ -115,10 +125,14 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                 __typename: 'TradableInstrument',
                 instrument: {
                   __typename: 'Instrument',
-                  name: 'Nuggets',
-                  code: 'Nuggets',
+                  name: 'California Nuggets',
+                  code: 'Nuggets2',
                 },
               },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+              },
             },
           },
           {
@@ -130,10 +144,71 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                 __typename: 'TradableInstrument',
                 instrument: {
                   __typename: 'Instrument',
-                  name: 'CELUSD (June 2022)',
-                  code: 'CELUSD',
+                  name: 'Nevada Nuggets',
+                  code: 'Nugetts3',
                 },
               },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_REJECTED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'asdfe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'NZ Nuggets',
+                  code: 'Nugetts4',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_DECLINED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'asdfe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'Aussie Nuggets',
+                  code: 'Nugetts5',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_PASSED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'xcvbe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'Tasmanian Nuggets',
+                  code: 'Nugetts6',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_FAILED,
+              },
             },
           },
         ],
@@ -199,6 +274,27 @@ describe('Propose Update Market', () => {
     expect(screen.getByTestId('proposal-market-select')).toHaveValue('');
   });
 
+  it('should only render enacted markets', async () => {
+    renderComponent();
+    expect(
+      await screen.findByText('Update market proposal')
+    ).toBeInTheDocument();
+    // (state enacted)
+    expect(screen.getByText('ETHUSD (September Market)')).toBeInTheDocument();
+    // (state open)
+    expect(screen.queryByText('Las Vegas nuggets')).not.toBeInTheDocument();
+    // (state waiting for node vote)
+    expect(screen.queryByText('California nuggets')).not.toBeInTheDocument();
+    // (state rejected)
+    expect(screen.queryByText('Nevada nuggets')).not.toBeInTheDocument();
+    // (state declined)
+    expect(screen.queryByText('NZ nuggets')).not.toBeInTheDocument();
+    // (state passed)
+    expect(screen.queryByText('Aussie nuggets')).not.toBeInTheDocument();
+    // (state failed)
+    expect(screen.queryByText('Tasmanian nuggets')).not.toBeInTheDocument();
+  });
+
   it('should render the correct market details when the market select is used', async () => {
     renderComponent();
     expect(

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -2,25 +2,28 @@ import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
 import {
+  doesValueEquateToParam,
   getClosingTimestamp,
   getEnactmentTimestamp,
   useProposalSubmit,
-  doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
 import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
   ProposalFormDescription,
+  ProposalFormDownloadJson,
   ProposalFormSubheader,
   ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
-  ProposalFormDownloadJson,
   ProposalFormVoteAndEnactmentDeadline,
 } from '../../components/propose';
-import { ProposalMinRequirements } from '../../components/shared';
+import {
+  ProposalMinRequirements,
+  ProposalUserAction,
+} from '../../components/shared';
 import {
   AsyncRenderer,
   ExternalLink,
@@ -31,9 +34,9 @@ import {
   Select,
 } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
-import { ProposalUserAction } from '../../components/shared';
-import { useProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
+import { useProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
 import { downloadJson } from '../../../../lib/download-json';
+import { ProposalState } from '@vegaprotocol/types';
 
 export interface UpdateMarketProposalFormFields {
   proposalVoteDeadline: string;
@@ -73,6 +76,9 @@ export const ProposeUpdateMarket = () => {
 
     return marketsData.marketsConnection.edges
       .map((edge) => edge.node)
+      .filter(
+        (market) => market.proposal?.state === ProposalState.STATE_ENACTED
+      )
       .sort((a, b) => {
         const aName = a.tradableInstrument.instrument.name;
         const bName = b.tradableInstrument.instrument.name;

apps/governance/src/routes/proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals.ts

@@ -1,59 +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 ProtocolUpgradeProposalFieldsFragment = { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus };
-
-export type ProtocolUpgradesQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ProtocolUpgradesQuery = { __typename?: 'Query', lastBlockHeight: string, protocolUpgradeProposals?: { __typename?: 'ProtocolUpgradeProposalConnection', edges?: Array<{ __typename?: 'ProtocolUpgradeProposalEdge', node: { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus } }> | null } | null };
-
-export const ProtocolUpgradeProposalFieldsFragmentDoc = gql`
-    fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-    `;
-export const ProtocolUpgradesDocument = gql`
-    query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
-    ${ProtocolUpgradeProposalFieldsFragmentDoc}`;
-
-/**
- * __useProtocolUpgradesQuery__
- *
- * To run a query within a React component, call `useProtocolUpgradesQuery` and pass it any options that fit your needs.
- * When your component renders, `useProtocolUpgradesQuery` 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 } = useProtocolUpgradesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProtocolUpgradesQuery(baseOptions?: Apollo.QueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-      }
-export function useProtocolUpgradesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-        }
-export type ProtocolUpgradesQueryHookResult = ReturnType<typeof useProtocolUpgradesQuery>;
-export type ProtocolUpgradesLazyQueryHookResult = ReturnType<typeof useProtocolUpgradesLazyQuery>;
-export type ProtocolUpgradesQueryResult = Apollo.QueryResult<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>;

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal-container.tsx

@@ -6,14 +6,14 @@ import * as Schema from '@vegaprotocol/types';
 
 import { ProtocolUpgradeProposal } from './protocol-upgrade-proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
-import { useProtocolUpgradesQuery } from './__generated__/ProtocolUpgradeProposals';
 import { useNodesQuery } from '../../staking/home/__generated__/Nodes';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
+import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 
 export const ProtocolUpgradeProposalContainer = () => {
   const params = useParams<{ proposalReleaseTag: string }>();
 
-  const { data, loading, error, refetch } = useProtocolUpgradesQuery({
+  const { data, loading, error, refetch } = useProtocolUpgradeProposalsQuery({
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
     skip: !params.proposalReleaseTag,

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal.spec.tsx

@@ -9,7 +9,7 @@ import {
 import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import { getNormalisedVotingPower } from '../../staking/shared';
 import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 const mockProposal: ProtocolUpgradeProposalFieldsFragment = {
   vegaReleaseTag: 'v0.1.234',

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal.tsx

@@ -3,8 +3,8 @@ import { ProtocolUpgradeProposalDetailHeader } from '../components/protocol-upgr
 import { ProtocolUpdateProposalDetailApprovals } from '../components/protocol-upgrade-proposal-detail-approvals';
 import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrade-proposal-detail-info';
 import { getNormalisedVotingPower } from '../../staking/shared';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
 import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
+import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 export interface ProtocolUpgradeProposalProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -3,7 +3,7 @@ import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Button, Icon } from '@vegaprotocol/ui-toolkit';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -17,7 +17,6 @@ import {
 } from '../../shared';
 import {
   defaultColDef,
-  NODE_LIST_GRID_STYLES,
   PendingStakeRenderer,
   stakedTotalPercentage,
   StakeShareRenderer,
@@ -382,12 +381,14 @@ export const ConsensusValidatorsTable = ({
     );
 
     return (
-      <div data-testid="consensus-validators-table">
+      <div
+        data-testid="consensus-validators-table"
+        className="validators-table"
+      >
         {nodes.length > 0 && (
           <AgGrid
             domLayout="autoHeight"
             style={{ width: '100%' }}
-            customThemeParams={NODE_LIST_GRID_STYLES}
             getRowHeight={(params: RowHeightParams) => getRowHeight(params)}
             defaultColDef={defaultColDef}
             tooltipShowDelay={0}

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -79,17 +79,6 @@ export interface ValidatorsTableProps {
   validatorsView: ValidatorsView;
 }
 
-// Custom styling to account for the scrollbar. This is needed because the
-// AG Grid places the scrollbar over the bottom validator, which obstructs
-export const NODE_LIST_GRID_STYLES = `
-  .ag-theme-balham-dark .ag-body-horizontal-scroll {
-    opacity: 0.75;
-  }
-  .ag-theme-balham-dark *:hover {
-    cursor: pointer;
-  }
-`;
-
 export const stakedTotalPercentage = (stakeScore: string) =>
   formatNumberPercentage(toBigNum(stakeScore, 0).times(100), 2);
 

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -13,7 +13,6 @@ import {
 } from '../../shared';
 import {
   defaultColDef,
-  NODE_LIST_GRID_STYLES,
   StakeNeededForPromotionRenderer,
   stakedTotalPercentage,
   ValidatorFields,
@@ -248,11 +247,13 @@ export const StandbyPendingValidatorsTable = ({
     );
 
     return (
-      <div data-testid="standby-pending-validators-table">
+      <div
+        data-testid="standby-pending-validators-table"
+        className="validators-table"
+      >
         <AgGrid
           domLayout="autoHeight"
           style={{ width: '100%' }}
-          customThemeParams={NODE_LIST_GRID_STYLES}
           rowHeight={68}
           defaultColDef={defaultColDef}
           tooltipShowDelay={0}

apps/governance/src/setup-tests.ts

@@ -6,6 +6,7 @@ import '@testing-library/jest-dom';
 import dev from './i18n/translations/dev.json';
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
+import ResizeObserver from 'resize-observer-polyfill';
 
 // Set up i18n instance so that components have the correct default
 // en translations
@@ -22,3 +23,5 @@ i18n.use(initReactI18next).init({
   ns: ['translations'],
   defaultNS: 'translations',
 });
+
+global.ResizeObserver = ResizeObserver;

apps/governance/src/styles.css

@@ -1,3 +1,7 @@
+@import 'ag-grid-community/dist/styles/ag-grid.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -19,3 +23,38 @@
     @apply border-vega-dark-200;
   }
 }
+
+/* AG GRID - Do not edit without updating other global stylesheets for each app */
+
+.vega-ag-grid .ag-root-wrapper {
+  border: solid 0px;
+}
+
+.vega-ag-grid .ag-react-container {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.vega-ag-grid .ag-cell,
+.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
+  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
+}
+
+/* Dark variables */
+.ag-theme-balham-dark {
+  --ag-background-color: theme(colors.black);
+  --ag-border-color: theme(colors.neutral[700]);
+  --ag-header-background-color: theme(colors.black);
+  --ag-odd-row-background-color: theme(colors.black);
+  --ag-header-column-separator-color: theme(colors.neutral[600]);
+  --ag-row-border-color: theme(colors.black);
+  --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
+}
+
+.validators-table .ag-theme-balham-dark .ag-body-horizontal-scroll {
+  opacity: 0.75;
+}
+.validators-table .ag-theme-balham-dark *:hover {
+  cursor: pointer;
+}

apps/liquidity-provision-dashboard/.env.capsule

@@ -1,3 +1,3 @@
 # App configuration variables
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=LOCAL

apps/static/src/assets/mainnet-tranches.json

@@ -37,8 +37,8 @@
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
     "total_added": "19242.125",
-    "total_removed": "397.984073768865",
-    "locked_amount": "14587.4163594714507360625",
+    "total_removed": "959.3245960538025",
+    "locked_amount": "9937.5330975115729338",
     "deposits": [
       {
         "amount": "188",
@@ -221,6 +221,21 @@
         "amount": "195.89040769089",
         "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
         "tx": "0x338ca1f2a725add8aa5328efa43ac7cb1e91c35bf01a2312431c0dbb57137387"
+      },
+      {
+        "amount": "96.6447222258",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x13b160a21d48eab98cc304bbb46cd675da08afbf6e0ad261c67c10ba34dc4d74"
+      },
+      {
+        "amount": "42.592326391125",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x5f544a659ae728cc7b1a29dcda14740425cadf1f47aa74bae92bf2ade3c8093d"
+      },
+      {
+        "amount": "422.1034736680125",
+        "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+        "tx": "0x5932f574afe019060f5812fc89c7298ab9f768cddebe0a803c27e9914b45dc3d"
       }
     ],
     "users": [
@@ -270,11 +285,23 @@
             "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
             "tranche_id": 56,
             "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+          },
+          {
+            "amount": "96.6447222258",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x13b160a21d48eab98cc304bbb46cd675da08afbf6e0ad261c67c10ba34dc4d74"
+          },
+          {
+            "amount": "42.592326391125",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x5f544a659ae728cc7b1a29dcda14740425cadf1f47aa74bae92bf2ade3c8093d"
           }
         ],
         "total_tokens": "1207.5",
-        "withdrawn_tokens": "202.093666077975",
-        "remaining_tokens": "1005.406333922025"
+        "withdrawn_tokens": "341.3307146949",
+        "remaining_tokens": "866.1692853051"
       },
       {
         "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
@@ -644,10 +671,17 @@
             "tx": "0x6840e2b579765303fc31a04f43fcea1d5ccf157b46bbd1e3f3e7f6a2e6cea039"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "422.1034736680125",
+            "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
+            "tranche_id": 56,
+            "tx": "0x5932f574afe019060f5812fc89c7298ab9f768cddebe0a803c27e9914b45dc3d"
+          }
+        ],
         "total_tokens": "1121.25",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "1121.25"
+        "withdrawn_tokens": "422.1034736680125",
+        "remaining_tokens": "699.1465263319875"
       },
       {
         "address": "0x237D23FcA6d7B2530C7614a9cB921CF27924911E",
@@ -809,15 +843,25 @@
     "tranche_id": 54,
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "8976",
-    "total_removed": "596.64743517951",
-    "locked_amount": "2615.8875925925923488",
+    "total_added": "14520",
+    "total_removed": "5079.76864115505",
+    "locked_amount": "722.8069444444451328",
     "deposits": [
       {
         "amount": "111",
         "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
         "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
       },
+      {
+        "amount": "5010",
+        "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
+        "tx": "0xf0d2927bb8d9363ddefaad3783f9a0abf8e468316c4baea24766991f6cb8cdac"
+      },
+      {
+        "amount": "534",
+        "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
+        "tx": "0xf970ea0ce3e36fa0014d24bb830dd2ea0dbea06f6e53af486de5ee7e1c63e540"
+      },
       {
         "amount": "33",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -960,6 +1004,16 @@
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
         "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
       },
+      {
+        "amount": "135.13897222254",
+        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+        "tx": "0x29905e6ae54245e824fe9ea488f491b1a3c33f6d8b9345cf2b6b00aec305c5bf"
+      },
+      {
+        "amount": "4347.982233753",
+        "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
+        "tx": "0x23b713ac5ee16f744549b0c4d8b49943117d0964ca2b635d9629931ae2f4a961"
+      },
       {
         "amount": "5.46866782407",
         "user": "0x92A1e98C6f09970e45645Cbe57c6DcaF4547c8FE",
@@ -1007,6 +1061,43 @@
         "withdrawn_tokens": "0",
         "remaining_tokens": "111"
       },
+      {
+        "address": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
+        "deposits": [
+          {
+            "amount": "5010",
+            "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
+            "tranche_id": 54,
+            "tx": "0xf0d2927bb8d9363ddefaad3783f9a0abf8e468316c4baea24766991f6cb8cdac"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "4347.982233753",
+            "user": "0x83D7eD53E7CB97b542F1F71f40561d51F8019C8B",
+            "tranche_id": 54,
+            "tx": "0x23b713ac5ee16f744549b0c4d8b49943117d0964ca2b635d9629931ae2f4a961"
+          }
+        ],
+        "total_tokens": "5010",
+        "withdrawn_tokens": "4347.982233753",
+        "remaining_tokens": "662.017766247"
+      },
+      {
+        "address": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
+        "deposits": [
+          {
+            "amount": "534",
+            "user": "0x2586bA83696a92b5467Aaa0CF9EEC052F28F2c02",
+            "tranche_id": 54,
+            "tx": "0xf970ea0ce3e36fa0014d24bb830dd2ea0dbea06f6e53af486de5ee7e1c63e540"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "534",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "534"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -1219,6 +1310,12 @@
             "tranche_id": 54,
             "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
           },
+          {
+            "amount": "135.13897222254",
+            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+            "tranche_id": 54,
+            "tx": "0x29905e6ae54245e824fe9ea488f491b1a3c33f6d8b9345cf2b6b00aec305c5bf"
+          },
           {
             "amount": "155.03186111556",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1245,8 +1342,8 @@
           }
         ],
         "total_tokens": "858",
-        "withdrawn_tokens": "531.01030786518",
-        "remaining_tokens": "326.98969213482"
+        "withdrawn_tokens": "666.14928008772",
+        "remaining_tokens": "191.85071991228"
       },
       {
         "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1",
@@ -1583,7 +1680,7 @@
     "tranche_start": "2023-03-06T00:00:00.000Z",
     "tranche_end": "2023-04-06T00:00:00.000Z",
     "total_added": "14099",
-    "total_removed": "3112.49002352036",
+    "total_removed": "3722.49002352036",
     "locked_amount": "0",
     "deposits": [
       {
@@ -2348,6 +2445,16 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "30",
+        "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
+        "tx": "0x191a1901917ada560c9c30efd3d24c0ec116b9dc131a6966cc67ad7e3701df3b"
+      },
+      {
+        "amount": "580",
+        "user": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E",
+        "tx": "0x795e8308c0001ad97f322ea94c382cc1799cfd8231a0c492fa8d54f16d2eef56"
+      },
       {
         "amount": "30",
         "user": "0x8499411Bff99ddE9A02903008F917EEa0E27B42A",
@@ -2582,10 +2689,17 @@
             "tx": "0x20d505a766d3d8e376509ed8003a5b9f35fd0524f0979a5a57c7d3714d01d3e5"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "30",
+            "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
+            "tranche_id": 53,
+            "tx": "0x191a1901917ada560c9c30efd3d24c0ec116b9dc131a6966cc67ad7e3701df3b"
+          }
+        ],
         "total_tokens": "30",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "30"
+        "withdrawn_tokens": "30",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xA9821681fEF27Ed817DF77E476DDDAf0aDac4443",
@@ -3490,10 +3604,17 @@
             "tx": "0x46d80a145d2f49ef3152cbfaa6d2bb054deabe21396ab43553a3f076e2db62e1"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "580",
+            "user": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E",
+            "tranche_id": 53,
+            "tx": "0x795e8308c0001ad97f322ea94c382cc1799cfd8231a0c492fa8d54f16d2eef56"
+          }
+        ],
         "total_tokens": "580",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "580"
+        "withdrawn_tokens": "580",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x674038f225586317f3959C00D696Cb53cd52c16C",
@@ -4594,7 +4715,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "52651.0670675174430414228",
+    "locked_amount": "50929.7231498068801776055",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4660,7 +4781,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "477.23818426943425",
+    "locked_amount": "377.65663156288155",
     "deposits": [
       {
         "amount": "2500",
@@ -4693,7 +4814,7 @@
     "tranche_end": "2023-11-01T00:00:00.000Z",
     "total_added": "15000.000000000000015",
     "total_removed": "0",
-    "locked_amount": "15000.000000000000015",
+    "locked_amount": "14714.136096014493014714136096014493",
     "deposits": [
       {
         "amount": "1.5e-14",
@@ -4781,7 +4902,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "12054.35568890901775",
+    "locked_amount": "11364.8616772342995",
     "deposits": [
       {
         "amount": "12500",
@@ -5047,8 +5168,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "12704.026146825",
-    "locked_amount": "19836.24443677102875",
+    "total_removed": "17836.1796921",
+    "locked_amount": "18334.268531307550125",
     "deposits": [
       {
         "amount": "7500",
@@ -5067,6 +5188,16 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
       },
+      {
+        "amount": "4974.3093924",
+        "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+        "tx": "0xfce75d8b6bf0d20cbdb1ef29cfabcae4f4504c30b30ca166b4e66d37f7f04339"
+      },
+      {
+        "amount": "157.844152875",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
+      },
       {
         "amount": "126.30064455",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5231,6 +5362,12 @@
             "tranche_id": 34,
             "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
           },
+          {
+            "amount": "157.844152875",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
+          },
           {
             "amount": "126.30064455",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5395,8 +5532,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "3468.576868425",
-        "remaining_tokens": "4031.423131575"
+        "withdrawn_tokens": "3626.4210213",
+        "remaining_tokens": "3873.5789787"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5409,6 +5546,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "4974.3093924",
+            "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
+            "tranche_id": 34,
+            "tx": "0xfce75d8b6bf0d20cbdb1ef29cfabcae4f4504c30b30ca166b4e66d37f7f04339"
+          },
           {
             "amount": "6960.3360957",
             "user": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5423,8 +5566,8 @@
           }
         ],
         "total_tokens": "30000",
-        "withdrawn_tokens": "9235.4492784",
-        "remaining_tokens": "20764.5507216"
+        "withdrawn_tokens": "14209.7586708",
+        "remaining_tokens": "15790.2413292"
       }
     ]
   },
@@ -5434,7 +5577,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "52603.029593629619941305",
+    "locked_amount": "50883.256185656170147137",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5467,7 +5610,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "50260.38819220796159812442",
+    "locked_amount": "49187.91691173374041346364",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5500,7 +5643,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "22080.29597919837872",
+    "locked_amount": "20836.950722983256762",
     "deposits": [
       {
         "amount": "10000",
@@ -5693,7 +5836,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1955.382737189244",
+    "locked_amount": "1856.07401065448985",
     "deposits": [
       {
         "amount": "5000",
@@ -6233,8 +6376,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "7280.725809525",
-    "locked_amount": "465.2825736648258",
+    "total_removed": "7438.558452225",
+    "locked_amount": "0",
     "deposits": [
       {
         "amount": "7500",
@@ -6253,6 +6396,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
       },
+      {
+        "amount": "157.8326427",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
+      },
       {
         "amount": "126.2948895",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6472,6 +6620,12 @@
             "tranche_id": 33,
             "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
           },
+          {
+            "amount": "157.8326427",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
+          },
           {
             "amount": "126.2948895",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6714,8 +6868,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "7280.725809525",
-        "remaining_tokens": "219.274190475"
+        "withdrawn_tokens": "7438.558452225",
+        "remaining_tokens": "61.441547775"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -6740,7 +6894,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "1709370.7872515768348",
-    "locked_amount": "189969.1598120306593902572",
+    "locked_amount": "151438.7964147451270015398",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -9760,10 +9914,15 @@
     "tranche_id": 10,
     "tranche_start": "2021-07-15T23:37:11.000Z",
     "tranche_end": "2021-07-15T23:37:11.000Z",
-    "total_added": "6459302.299000000000000001",
-    "total_removed": "6413483.280000000000000001",
+    "total_added": "6559302.299000000000000001",
+    "total_removed": "6513483.280000000000000001",
     "locked_amount": "0",
     "deposits": [
+      {
+        "amount": "100000",
+        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+        "tx": "0xfe7ab31de818986a1984617dea435e8bb02fba8fca50c1e173b5808fc8c2a81e"
+      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -10301,6 +10460,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "100000",
+        "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+        "tx": "0xfe7ab31de818986a1984617dea435e8bb02fba8fca50c1e173b5808fc8c2a81e"
+      },
       {
         "amount": "100000",
         "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -10781,6 +10945,12 @@
       {
         "address": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
         "deposits": [
+          {
+            "amount": "100000",
+            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+            "tranche_id": 10,
+            "tx": "0xfe7ab31de818986a1984617dea435e8bb02fba8fca50c1e173b5808fc8c2a81e"
+          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -10981,6 +11151,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "100000",
+            "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
+            "tranche_id": 10,
+            "tx": "0xfe7ab31de818986a1984617dea435e8bb02fba8fca50c1e173b5808fc8c2a81e"
+          },
           {
             "amount": "100000",
             "user": "0xb2d6DEC77558Cf8EdB7c428d23E70Eab0688544f",
@@ -11174,8 +11350,8 @@
             "tx": "0xac16a4ce688d40a482a59914d68c3a676592f8804ee8f0781b66a4ba5ccfbdfc"
           }
         ],
-        "total_tokens": "3256651",
-        "withdrawn_tokens": "3256651",
+        "total_tokens": "3356651",
+        "withdrawn_tokens": "3356651",
         "remaining_tokens": "0"
       },
       {
@@ -12240,7 +12416,7 @@
     "tranche_start": "2021-09-03T00:00:00.000Z",
     "tranche_end": "2022-09-03T00:00:00.000Z",
     "total_added": "57278.000000000000000003",
-    "total_removed": "48182.21518131551",
+    "total_removed": "50196.35141572991",
     "locked_amount": "0",
     "deposits": [
       {
@@ -22825,6 +23001,16 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "725",
+        "user": "0x52Dd36AB8e8eec8f6bE968E93679838dc73b19D3",
+        "tx": "0xbc67aa993d42656a84c7da90e6abcc0a3c00e7e9e21da4013251b0f8582567ca"
+      },
+      {
+        "amount": "1289.1362344144",
+        "user": "0xab6dE081Af6C78433AFDaC5B756804bcE17e9eC1",
+        "tx": "0x9e6077e2dc83701a70b2a04028ab533e89cd7f1bb757ea4fe45e1388cfee600d"
+      },
       {
         "amount": "25",
         "user": "0x363D3d06d70761c34D6EfEB25E409A9549E6970D",
@@ -32334,10 +32520,17 @@
             "tx": "0x1a0e42b837a8f3908bc4e36e9b024f48c371b98f066a0db36fd98793cd178f57"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "725",
+            "user": "0x52Dd36AB8e8eec8f6bE968E93679838dc73b19D3",
+            "tranche_id": 11,
+            "tx": "0xbc67aa993d42656a84c7da90e6abcc0a3c00e7e9e21da4013251b0f8582567ca"
+          }
+        ],
         "total_tokens": "725",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "725"
+        "withdrawn_tokens": "725",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xab6dE081Af6C78433AFDaC5B756804bcE17e9eC1",
@@ -33040,6 +33233,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "1289.1362344144",
+            "user": "0xab6dE081Af6C78433AFDaC5B756804bcE17e9eC1",
+            "tranche_id": 11,
+            "tx": "0x9e6077e2dc83701a70b2a04028ab533e89cd7f1bb757ea4fe45e1388cfee600d"
+          },
           {
             "amount": "842.29689345648",
             "user": "0xab6dE081Af6C78433AFDaC5B756804bcE17e9eC1",
@@ -33084,8 +33283,8 @@
           }
         ],
         "total_tokens": "3439",
-        "withdrawn_tokens": "2149.8637655856",
-        "remaining_tokens": "1289.1362344144"
+        "withdrawn_tokens": "3439",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x23E18CBa049393DFebC5a17e3b5ec9aF584CAE04",
@@ -40567,7 +40766,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "316417.783123780845942826482",
+    "locked_amount": "257209.934903168881888467304",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -41959,8 +42158,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "864400.93329864929559852",
-    "locked_amount": "6421684.7286343349090524101959629311219249",
+    "total_removed": "869802.17678213314859352",
+    "locked_amount": "6211737.5003512443867025914959180178169776",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42494,6 +42693,31 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x28d2b3f088965906ac3da878c491309729680c302fb98e2a435d07f88d6b962a"
       },
+      {
+        "amount": "381.93267176186375",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x6d5ce55a076149d5f66e5e84720d3bd46f31e5c79c54632927c1a00d1fdbce37"
+      },
+      {
+        "amount": "980.13570973214325",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x45de80ad7201a69e9ac4f1f964218840867adaf64a7fc6020b51baa5de37816e"
+      },
+      {
+        "amount": "924.25597923393625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
+      },
+      {
+        "amount": "923.531125735486125",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
+      },
+      {
+        "amount": "2191.38799702042362",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+      },
       {
         "amount": "981.387731774910625",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44620,6 +44844,30 @@
             "tranche_id": 2,
             "tx": "0x28d2b3f088965906ac3da878c491309729680c302fb98e2a435d07f88d6b962a"
           },
+          {
+            "amount": "381.93267176186375",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x6d5ce55a076149d5f66e5e84720d3bd46f31e5c79c54632927c1a00d1fdbce37"
+          },
+          {
+            "amount": "980.13570973214325",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x45de80ad7201a69e9ac4f1f964218840867adaf64a7fc6020b51baa5de37816e"
+          },
+          {
+            "amount": "924.25597923393625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
+          },
+          {
+            "amount": "923.531125735486125",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
+          },
           {
             "amount": "981.387731774910625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46128,8 +46376,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "154502.7650820091405",
-        "remaining_tokens": "105496.1224179908595"
+        "withdrawn_tokens": "157712.620568472569875",
+        "remaining_tokens": "102286.266931527430125"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46368,6 +46616,12 @@
             "tranche_id": 2,
             "tx": "0x9d12dadb940c59a796a405a4971e73f24d7ad284528ec7ce676ae361a4ac1f51"
           },
+          {
+            "amount": "2191.38799702042362",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+          },
           {
             "amount": "2873.74755113623213",
             "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46640,8 +46894,8 @@
           }
         ],
         "total_tokens": "150551.801",
-        "withdrawn_tokens": "89385.81693579122338",
-        "remaining_tokens": "61165.98406420877662"
+        "withdrawn_tokens": "91577.204932811647",
+        "remaining_tokens": "58974.596067188353"
       },
       {
         "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -48504,8 +48758,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "6129688.581848831721813882",
-    "locked_amount": "207013.1123407730577557502438032262",
+    "total_removed": "6169862.126766503085603932",
+    "locked_amount": "13191.17171553312990484487088804078",
     "deposits": [
       {
         "amount": "129284.449",
@@ -48734,6 +48988,41 @@
         "user": "0xDdc5F6484349B242A9B23382Aa21f49B5Dc9a089",
         "tx": "0xba1fdde929e0e2d4fe79de4dbac92cb5d20bb8b1dd7e5ff9bab961b728e7dae2"
       },
+      {
+        "amount": "529.38555487723284925",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x0c555d0f3b2b4b3fb50f208d9155b5886c83511a552518af11cadd5d5a06acec"
+      },
+      {
+        "amount": "1358.95419763598962675",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x59bc5ab04aa250d84bd2ffe62dba38ed926c26f8ac2497e9414f3a7df2b3a661"
+      },
+      {
+        "amount": "35040.39233886007943262",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0x956f4f6e867e23aa7a3f0fb29612074de4edaf259eb1597f61b5289add0bedb2"
+      },
+      {
+        "amount": "4.18758350477578368",
+        "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+        "tx": "0xa83729135615d88392e9ec5164e60ae9fe049b0127c7829c44dc94ee1b28d73e"
+      },
+      {
+        "amount": "1289.709285120855118",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x2c531bd9c61e0a3705f161bba2c03703722f1e41533725684fcccb9176117e0e"
+      },
+      {
+        "amount": "985.963473355830749",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
+      },
+      {
+        "amount": "964.95248431660023075",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+      },
       {
         "amount": "1360.32447632896938825",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52052,6 +52341,36 @@
             "tranche_id": 3,
             "tx": "0xc37374c867eb2543ba3de47bf14990096f3371a93609cfd557a1eeaa3fb3e774"
           },
+          {
+            "amount": "529.38555487723284925",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x0c555d0f3b2b4b3fb50f208d9155b5886c83511a552518af11cadd5d5a06acec"
+          },
+          {
+            "amount": "1358.95419763598962675",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x59bc5ab04aa250d84bd2ffe62dba38ed926c26f8ac2497e9414f3a7df2b3a661"
+          },
+          {
+            "amount": "1289.709285120855118",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x2c531bd9c61e0a3705f161bba2c03703722f1e41533725684fcccb9176117e0e"
+          },
+          {
+            "amount": "985.963473355830749",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
+          },
+          {
+            "amount": "964.95248431660023075",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+          },
           {
             "amount": "1360.32447632896938825",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -54874,8 +55193,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "353628.4490036538056375",
-        "remaining_tokens": "5495.0205713461943625"
+        "withdrawn_tokens": "358757.41399896031421125",
+        "remaining_tokens": "366.05557603968578875"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -55105,6 +55424,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "35040.39233886007943262",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0x956f4f6e867e23aa7a3f0fb29612074de4edaf259eb1597f61b5289add0bedb2"
+          },
+          {
+            "amount": "4.18758350477578368",
+            "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
+            "tranche_id": 3,
+            "tx": "0xa83729135615d88392e9ec5164e60ae9fe049b0127c7829c44dc94ee1b28d73e"
+          },
           {
             "amount": "5074.06012653876566886",
             "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -55497,8 +55828,8 @@
           }
         ],
         "total_tokens": "1266324.603486",
-        "withdrawn_tokens": "1220819.41847917671599364",
-        "remaining_tokens": "45505.18500682328400636"
+        "withdrawn_tokens": "1255863.99840154157120994",
+        "remaining_tokens": "10460.60508445842879006"
       },
       {
         "address": "0xC5d9221EB9c28A69859264c0A2Fe0d3272228296",
@@ -56332,7 +56663,7 @@
     "tranche_start": "2021-10-05T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
-    "total_removed": "3480709.486904665102263769",
+    "total_removed": "3480901.398845846498418769",
     "locked_amount": "0",
     "deposits": [
       {
@@ -56482,6 +56813,11 @@
         "user": "0x83b1a48376E045D26420200345414e6b93066396",
         "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
       },
+      {
+        "amount": "191.911941181396155",
+        "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
+        "tx": "0xb741f4e653131d11eed34bc9c5f3f8425d23cf054b336f3dc61fbd936b39744a"
+      },
       {
         "amount": "219.945520329711288",
         "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -57504,6 +57840,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "191.911941181396155",
+            "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
+            "tranche_id": 4,
+            "tx": "0xb741f4e653131d11eed34bc9c5f3f8425d23cf054b336f3dc61fbd936b39744a"
+          },
           {
             "amount": "10509.407528939748325",
             "user": "0xBc934494675a6ceB639B9EfEe5b9C0f017D35a75",
@@ -57614,8 +57956,8 @@
           }
         ],
         "total_tokens": "110499.5291",
-        "withdrawn_tokens": "110307.617158818603845",
-        "remaining_tokens": "191.911941181396155"
+        "withdrawn_tokens": "110499.5291",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xdbC5d439F373EB646345e1c67D1d46231ACE7dD3",
@@ -58526,8 +58868,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "43935.8732690563416",
-    "locked_amount": "50138.206457121953572821564586524",
+    "total_removed": "44078.8527972103416",
+    "locked_amount": "40756.38446007669418433357128362",
     "deposits": [
       {
         "amount": "3000",
@@ -65171,6 +65513,16 @@
         "user": "0x0a6A5e1da768709A2bF17b2E58B2B73120051D03",
         "tx": "0x097e43cb4f64f1cb502f321eceb8b91e6378cac0b3b6fe558fc1d543aec597e2"
       },
+      {
+        "amount": "61.181050224",
+        "user": "0xe7770271d882C54C46B9f00137e96a3BbfFD4d94",
+        "tx": "0x3c7d0394e431000fa5c733213116dc39b0f87a9a32a40e75cec3c2fce7795b0b"
+      },
+      {
+        "amount": "81.79847793",
+        "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53",
+        "tx": "0x1e4902d0a3cb7b4f2ba7119dfcaa681a784e1d724c984961767e9feaa078fe54"
+      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -78176,6 +78528,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "61.181050224",
+            "user": "0xe7770271d882C54C46B9f00137e96a3BbfFD4d94",
+            "tranche_id": 5,
+            "tx": "0x3c7d0394e431000fa5c733213116dc39b0f87a9a32a40e75cec3c2fce7795b0b"
+          },
           {
             "amount": "101.521461192",
             "user": "0xe7770271d882C54C46B9f00137e96a3BbfFD4d94",
@@ -78214,8 +78572,8 @@
           }
         ],
         "total_tokens": "600",
-        "withdrawn_tokens": "476.48491248",
-        "remaining_tokens": "123.51508752"
+        "withdrawn_tokens": "537.665962704",
+        "remaining_tokens": "62.334037296"
       },
       {
         "address": "0x79D8ff1699911f065fD97a95a6B47216925C4B0e",
@@ -87309,6 +87667,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "81.79847793",
+            "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53",
+            "tranche_id": 5,
+            "tx": "0x1e4902d0a3cb7b4f2ba7119dfcaa681a784e1d724c984961767e9feaa078fe54"
+          },
           {
             "amount": "32.02214612",
             "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53",
@@ -87335,8 +87699,8 @@
           }
         ],
         "total_tokens": "200",
-        "withdrawn_tokens": "99.05242897",
-        "remaining_tokens": "100.94757103"
+        "withdrawn_tokens": "180.8509069",
+        "remaining_tokens": "19.1490931"
       },
       {
         "address": "0xd9390b46a1749DEe5325A490490491db9a826D1F",
@@ -88271,7 +88635,7 @@
     "tranche_start": "2021-12-05T00:00:00.000Z",
     "tranche_end": "2022-06-05T00:00:00.000Z",
     "total_added": "171288.42",
-    "total_removed": "69890.5995794947989",
+    "total_removed": "70140.5995794947989",
     "locked_amount": "0",
     "deposits": [
       {
@@ -92496,6 +92860,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "250",
+        "user": "0x0E3407C9A94effa675471afe7A9D37e687C32141",
+        "tx": "0x6086c36011fd863c6a34f1a7cd45a798bb1bf6bde6f0e4106c51071c46dbef79"
+      },
       {
         "amount": "250",
         "user": "0x99492aF57325BA3971542B9ea4036186BE50fa07",
@@ -95770,10 +96139,17 @@
             "tx": "0xee02e72ef8e0755982704385da512cc12c8ff0ea7b58056fa3d5a5932394e9ca"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0x0E3407C9A94effa675471afe7A9D37e687C32141",
+            "tranche_id": 6,
+            "tx": "0x6086c36011fd863c6a34f1a7cd45a798bb1bf6bde6f0e4106c51071c46dbef79"
+          }
+        ],
         "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x953680303b33898962AB7FadCD485374CeDFf87e",
@@ -143801,6 +144177,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "0",
+        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+        "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+      },
       {
         "amount": "0",
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -144091,6 +144472,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "0",
+            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+            "tranche_id": 9,
+            "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+          },
           {
             "amount": "0",
             "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",

apps/trading-e2e/.env

@@ -8,7 +8,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -27,6 +27,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/.env.capsule

@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -24,6 +24,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/src/integration/closed-markets.cy.ts

@@ -0,0 +1,375 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import { addDays, subDays } from 'date-fns';
+import {
+  chainIdQuery,
+  statisticsQuery,
+  createDataConnection,
+  oracleSpecDataConnectionQuery,
+  createMarketFragment,
+  marketsQuery,
+  marketsDataQuery,
+  createMarketsDataFragment,
+  assetQuery,
+  networkParamsQuery,
+} from '@vegaprotocol/mock';
+import {
+  addDecimalsFormatNumber,
+  getDateTimeFormat,
+} from '@vegaprotocol/utils';
+
+describe('Closed markets', { tags: '@smoke' }, () => {
+  const rowSelector =
+    '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row';
+
+  const assetsResult = assetQuery();
+  // @ts-ignore asset definitely exists
+  const settlementAsset = assetsResult.assetsConnection.edges[0].node;
+
+  const settledMarket = createMarketFragment({
+    id: '0',
+    state: MarketState.STATE_SETTLED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: subDays(new Date(), 4).toISOString(),
+    },
+    tradableInstrument: {
+      instrument: {
+        product: {
+          dataSourceSpecForTradingTermination: {
+            id: 'market-1-trading-termination-oracle-id',
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+          },
+          settlementAsset,
+        },
+      },
+    },
+  });
+
+  const terminatedMarket = createMarketFragment({
+    id: '1',
+    state: MarketState.STATE_TRADING_TERMINATED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: null, // market
+    },
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [
+            `settlement-expiry-date:${addDays(new Date(), 4).toISOString()}`,
+          ],
+        },
+      },
+    },
+  });
+
+  const delayedSettledMarket = createMarketFragment({
+    id: '2',
+    state: MarketState.STATE_TRADING_TERMINATED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: null, // market
+    },
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [
+            `settlement-expiry-date:${subDays(new Date(), 2).toISOString()}`,
+          ],
+        },
+      },
+    },
+  });
+
+  const unknownMarket = createMarketFragment({
+    id: '3',
+    state: MarketState.STATE_SETTLED,
+  });
+
+  const closedMarketsResult = [
+    {
+      node: settledMarket,
+    },
+    {
+      node: terminatedMarket,
+    },
+    {
+      node: delayedSettledMarket,
+    },
+    { node: unknownMarket },
+    {
+      node: createMarketFragment({ id: '4', state: MarketState.STATE_PENDING }),
+    },
+    {
+      node: createMarketFragment({ id: '5', state: MarketState.STATE_ACTIVE }),
+    },
+  ];
+
+  const settledMarketData = createMarketsDataFragment({
+    market: {
+      id: settledMarket.id,
+    },
+    bestBidPrice: '1000',
+    bestOfferPrice: '2000',
+    markPrice: '1500',
+  });
+
+  const closedMarketsDataResult = [
+    {
+      node: {
+        data: settledMarketData,
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: terminatedMarket.id,
+          },
+        }),
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: delayedSettledMarket.id,
+          },
+        }),
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: unknownMarket.id,
+          },
+        }),
+      },
+    },
+  ];
+
+  const specDataConnection = createDataConnection();
+
+  before(() => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
+      aliasGQLQuery(
+        req,
+        'Markets',
+        marketsQuery({
+          marketsConnection: {
+            edges: closedMarketsResult,
+          },
+        })
+      );
+      aliasGQLQuery(
+        req,
+        'MarketsData',
+        marketsDataQuery({
+          marketsConnection: {
+            edges: closedMarketsDataResult,
+          },
+        })
+      );
+      aliasGQLQuery(
+        req,
+        'OracleSpecDataConnection',
+        oracleSpecDataConnectionQuery()
+      );
+    });
+
+    cy.mockSubscription();
+
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Closed markets"]').click();
+  });
+
+  it('renders a settled market', () => {
+    const expectedMarkets = closedMarketsResult.filter((edge) => {
+      return [
+        MarketState.STATE_SETTLED,
+        MarketState.STATE_TRADING_TERMINATED,
+      ].includes(edge.node.state);
+    });
+    const product = settledMarket.tradableInstrument.instrument.product;
+
+    // rows should be filtered to only include settled/terminated markets
+    cy.get(rowSelector).should('have.length', expectedMarkets.length);
+
+    // check each column in the first row renders correctly
+    // 6001-MARK-001
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="code"]')
+      .should('have.text', settledMarket.tradableInstrument.instrument.code);
+
+    // 6001-MARK-002
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="name"]')
+      .should('have.text', settledMarket.tradableInstrument.instrument.name);
+
+    // 6001-MARK-003
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="state"]')
+      .should('have.text', MarketStateMapping[settledMarket.state]);
+
+    // 6001-MARK-004
+    // 6001-MARK-005
+    // 6001-MARK-009
+    // 6001-MARK-008
+    // 6001-MARK-010
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should(($el) => {
+        const href = $el.attr('href');
+        expect(href).to.match(
+          new RegExp(
+            `/oracles/${product.dataSourceSpecForTradingTermination.id}`
+          )
+        );
+      })
+      .should('have.text', '4 days ago')
+      .should(
+        'have.attr',
+        'title',
+        getDateTimeFormat().format(
+          new Date(settledMarket.marketTimestamps.close)
+        )
+      );
+
+    // 6001-MARK-011
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="bestBidPrice"]')
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          settledMarketData.bestBidPrice,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-012
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="bestOfferPrice"]')
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          settledMarketData.bestOfferPrice,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-013
+    cy.get(rowSelector).first().find('[col-id="markPrice"]').should(
+      'have.text',
+
+      addDecimalsFormatNumber(
+        settledMarketData.markPrice,
+        settledMarket.decimalPlaces
+      )
+    );
+
+    // 6001-MARK-014
+    // 6001-MARK-015
+    // 6001-MARK-016
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementDataOracleId"]')
+      .find('[data-testid="link"]')
+      .should(($el) => {
+        const href = $el.attr('href');
+        expect(href).to.match(
+          new RegExp(`/oracles/${product.dataSourceSpecForSettlementData.id}`)
+        );
+      })
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          // @ts-ignore cannot deep un-partial
+          specDataConnection.externalData.data.data[0].value,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-017
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="realisedPNL"]')
+      .should('have.text', '-');
+
+    // 6001-MARK-018
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementAsset"]')
+      .should('have.text', product.settlementAsset.symbol);
+
+    // 6001-MARK-020
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="id"]')
+      .should('have.text', settledMarket.id);
+  });
+
+  // test market list for market in terminated state
+  it('renders a terminated market', () => {
+    cy.get(rowSelector)
+      .eq(1)
+      .find('[col-id="state"]')
+      .should('have.text', MarketStateMapping[terminatedMarket.state]);
+
+    // 6001-MARK-006
+    // 6001-MARK-007
+    cy.get(rowSelector)
+      .eq(1)
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Expected in 4 days');
+  });
+
+  it('renders a terminated market which was expected to have settled', () => {
+    cy.get(rowSelector)
+      .eq(2)
+      .find('[col-id="settlementDate"]')
+      .should('have.class', 'text-danger')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Expected 2 days ago');
+  });
+
+  it('renders terminated market which doesnt have settlement date metadata', () => {
+    cy.get(rowSelector)
+      .eq(3)
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Unknown');
+  });
+
+  it('can open asset detail dialog', () => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Asset', assetsResult);
+    });
+
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementAsset"]')
+      .find('button')
+      .click();
+
+    // 6001-MARK-019
+    cy.get('[data-testid="dialog-title"]').should(
+      'have.text',
+      `Asset details - ${settlementAsset.symbol}`
+    );
+  });
+});

apps/trading-e2e/src/integration/deposit.cy.ts

@@ -101,7 +101,7 @@ describe('deposit actions', { tags: '@smoke' }, () => {
     cy.mockTradingPage();
     cy.mockSubscription();
     cy.setVegaWallet();
-    cy.visit('/');
+    cy.visit('/#/markets/market-1');
     cy.wait('@MarketsCandles');
     cy.getByTestId('dialog-close').click();
   });
@@ -112,7 +112,6 @@ describe('deposit actions', { tags: '@smoke' }, () => {
       'be.visible'
     );
     cy.contains('[data-testid="deposit"]', 'Deposit to trade').click();
-    connectEthereumWallet('MetaMask');
     cy.getByTestId('deposit-submit').should('be.visible');
   });
 });

apps/trading-e2e/src/integration/home.cy.ts

@@ -153,7 +153,7 @@ describe('home', { tags: '@regression' }, () => {
       // the choose market overlay is no longer showing
       cy.contains('Select a market to get started').should('not.exist');
       cy.contains('Loading...').should('not.exist');
-      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-1');
+      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-0');
     });
   });
 
@@ -172,6 +172,7 @@ describe('home', { tags: '@regression' }, () => {
           ],
         },
       };
+      // @ts-ignore partial deep check failing
       const data = marketsDataQuery(override);
       cy.mockGQL((req) => {
         aliasGQLQuery(req, 'MarketsData', data);

apps/trading-e2e/src/integration/market-info.cy.ts

@@ -1,4 +1,5 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 
 const marketInfoBtn = 'Info';
 const row = 'key-value-table-row';
@@ -12,7 +13,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   });
 
   before(() => {
-    cy.mockTradingPage();
+    cy.mockTradingPage(
+      MarketState.STATE_ACTIVE,
+      undefined,
+      undefined,
+      'COMPROMISED'
+    );
     cy.mockSubscription();
     cy.visit('/#/markets/market-0');
     cy.wait('@Markets');
@@ -20,6 +26,11 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     cy.wait('@MarketInfo');
   });
 
+  it('show oracle banner', () => {
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+    cy.getByTestId('oracle-status').should('contain.text', 'COMPROMISED');
+  });
+
   it('current fees displayed', () => {
     cy.getByTestId(marketTitle).contains('Current fees').click();
     validateMarketDataRow(0, 'Maker Fee', '0.02%');
@@ -169,25 +180,21 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   it('oracle displayed', () => {
     cy.getByTestId(marketTitle).contains('Oracle').click();
 
-    validateMarketDataRow(0, 'Settlement Data Property', 'prices.BTC.value');
-    validateMarketDataRow(
-      1,
-      'Trading Termination Property',
-      'termination.BTC.value'
-    );
-
-    // check that links to github for oracle proofs are shown
     cy.getByTestId(accordionContent)
-      .getByTestId('oracle-proof-links')
-      .find(`[data-testid="${externalLink}"]`)
-      .should('have.attr', 'href')
-      .and('contain', 'https://github.com/vegaprotocol/well-known');
+      .getByTestId('provider-name')
+      .and('contain', 'Another oracle');
 
     cy.getByTestId(accordionContent)
-      .getByTestId('oracle-spec-links')
-      .find(`[data-testid="${externalLink}"]`)
-      .should('have.attr', 'href')
-      .and('contain', '/oracles');
+      .getByTestId('signed-proofs')
+      .and('contain', '1');
+
+    cy.getByTestId(accordionContent)
+      .getByTestId('verified-proofs')
+      .and('contain', '1');
+
+    cy.getByTestId(accordionContent)
+      .getByTestId('signed-proofs')
+      .and('contain', '1');
   });
 
   it('proposal displayed', () => {

apps/trading-e2e/src/integration/market-split-bottom-panels.cy.ts

@@ -9,6 +9,21 @@ describe('market bottom panel', { tags: '@smoke' }, () => {
 
   it('on xxl screen should be splitted out into two tables', () => {
     cy.getByTestId('tab-positions').should('have.attr', 'data-state', 'active');
+    cy.getByTestId('tab-open-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.getByTestId('tab-closed-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.getByTestId('tab-rejected-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
     cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'inactive');
     cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
     cy.getByTestId('tab-accounts').should(
@@ -19,7 +34,22 @@ describe('market bottom panel', { tags: '@smoke' }, () => {
 
     cy.viewport(1801, 1000);
     cy.getByTestId('tab-positions').should('have.attr', 'data-state', 'active');
-    cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'active');
+    cy.getByTestId('tab-open-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.getByTestId('tab-closed-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.getByTestId('tab-rejected-orders').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+    cy.getByTestId('tab-orders').should('have.attr', 'data-state', 'inactive');
     cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
     cy.getByTestId('tab-accounts').should(
       'have.attr',

apps/trading-e2e/src/integration/markets.cy.ts

@@ -222,6 +222,7 @@ describe('markets table', { tags: '@smoke' }, () => {
           ],
         },
       };
+      // @ts-ignore partial deep check failing
       const market = marketsQuery(override);
       aliasGQLQuery(req, 'Market', market);
       aliasGQLQuery(req, 'ProposalOfMarket', {

apps/trading-e2e/src/integration/settings.cy.ts

@@ -1,12 +1,12 @@
+import { closeWelcomeDialog } from '../support/helpers';
+
 describe('Settings page', { tags: '@smoke' }, () => {
   beforeEach(() => {
     cy.clearLocalStorage().then(() => {
       cy.mockTradingPage();
       cy.mockSubscription();
       cy.visit('/');
-      cy.get('[role=dialog]').within(() => {
-        cy.getByTestId('dialog-close').click();
-      });
+      closeWelcomeDialog();
       cy.get('[aria-label="cog icon"]').click();
     });
   });

apps/trading-e2e/src/integration/trading-accounts.cy.ts

@@ -1,17 +1,25 @@
 import { checkSorting } from '@vegaprotocol/cypress';
 
+const dialogClose = 'dialog-close';
+
 describe('accounts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.clearAllLocalStorage();
+  beforeEach(() => {
     cy.mockTradingPage();
     cy.mockWeb3Provider();
     cy.mockSubscription();
     cy.setVegaWallet();
     cy.visit('/#/markets/market-0');
-    cy.wait('@Assets');
   });
 
   it('renders accounts', () => {
+    // 7001-COLL-001
+    // 7001-COLL-002
+    // 7001-COLL-003
+    // 7001-COLL-004
+    // 7001-COLL-005
+    // 7001-COLL-006
+    // 7001-COLL-007
+
     const tradingAccountRowId = '[row-id="t-0"]';
     cy.getByTestId('Collateral').click();
 
@@ -24,29 +32,113 @@ describe('accounts', { tags: '@smoke' }, () => {
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"]')
-      .should('have.text', 'DepositWithdraw');
+      .find('[col-id="used"]')
+      .should('have.text', '1.010.00%');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
-      .find('[data-testid="deposit"]')
-      .should('have.text', 'Deposit');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"] [data-testid="withdraw"]')
-      .should('have.text', 'Withdraw');
+      .find('[col-id="available"]')
+      .should('have.text', '100,000.00');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="total"]')
       .should('have.text', '100,001.01');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"]')
+      .should('have.text', ' ');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '100,001.01');
+
+    cy.getByTestId('tab-accounts')
+      .get('[col-id="accounts-actions"]')
+      .find('[data-testid="dropdown-menu"]')
+      .eq(1)
+      .click();
+    cy.getByTestId('deposit').should('be.visible');
+    cy.getByTestId('withdraw').should('be.visible');
+    cy.getByTestId('breakdown').should('be.visible');
+    cy.getByTestId('Collateral').click({ force: true });
   });
 
   it('should open asset details dialog when clicked on symbol', () => {
+    // 7001-COLL-008
+    // 6501-ASSE-001
+    // 6501-ASSE-002
+    // 6501-ASSE-003
+    // 6501-ASSE-004
+    // 6501-ASSE-005
+    // 6501-ASSE-006
+    // 6501-ASSE-007
+    // 6501-ASSE-008
+    // 6501-ASSE-009
+    // 6501-ASSE-010
+    // 6501-ASSE-011
+    // 6501-ASSE-012
+    // 6501-ASSE-013
+    const titles = [
+      'ID',
+      'Type',
+      'Name',
+      'Symbol',
+      'Decimals',
+      'Quantum',
+      'Status',
+      'Contract address',
+      'Withdrawal threshold',
+      'Lifetime limit',
+      'Infrastructure fee account balance',
+      'Global reward pool account balance',
+      'Maker paid fees account balance',
+      'Maker received fees account balance',
+      'Liquidity provision fee reward account balance',
+      'Market proposer reward account balance',
+    ];
     cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid="dialog-content"]:visible').should('exist');
-    cy.get('[data-testid="dialog-close"]:visible').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
+    cy.get('[data-testid$="_label"]').each((element, index) => {
+      cy.wrap(element).should('have.text', titles[index]);
+    });
+    cy.getByTestId(dialogClose).click();
+    cy.getByTestId(dialogClose).should('not.exist');
+  });
+
+  it('should open usage breakdown dialog when clicked on used', () => {
+    // 7001-COLL-009
+    cy.getByTestId('breakdown').contains('1.01').click();
+    const headers = ['Market', 'Account type', 'Balance'];
+    cy.getByTestId('usage-breakdown').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+    cy.getByTestId(dialogClose).click();
+  });
+
+  it('sorting usage breakdown columns should work well', () => {
+    // 7001-COLL-010
+    cy.getByTestId('breakdown').contains('1.01').click();
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(1)
+      .should('have.text', 'Margin');
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(2)
+      .should('have.text', 'Margin');
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(3)
+      .should('have.text', 'General');
+
+    cy.getByTestId(dialogClose).click();
   });
 
   describe('sorting by ag-grid columns should work well', () => {

apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts

@@ -88,5 +88,18 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
         'Size cannot be lower than 1'
       );
     });
+    it('must have total margin available', () => {
+      // 7001-COLL-011
+      cy.getByTestId('tab-ticket')
+        .find('.text-xs')
+        .eq(5)
+        .within(() => {
+          cy.get('[data-state="closed"]').should(
+            'have.text',
+            'Total margin available'
+          );
+          cy.get('.text-neutral-500').should('have.text', '~100,000.01 tDAI');
+        });
+    });
   });
 });

apps/trading-e2e/src/integration/trading-fills.cy.ts

@@ -85,7 +85,7 @@ describe('fills', { tags: '@regression' }, () => {
         cy.wrap($role)
           .invoke('text')
           .then((text) => {
-            const roles = ['Maker', 'Taker'];
+            const roles = ['Maker', 'Taker', '-'];
             expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
           });
       });

apps/trading-e2e/src/integration/trading-orders.cy.ts

@@ -29,7 +29,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
     cy.mockSubscription(subscriptionMocks);
     cy.setVegaWallet();
     cy.visit('/#/markets/market-0');
-    cy.getByTestId('Orders').click();
+    cy.getByTestId('All').click();
     cy.wait('@Markets');
   });
 
@@ -87,7 +87,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
       cy.get('[col-id="status"] .ag-icon-menu').click();
     });
     cy.contains('Partially Filled').click();
-    cy.getByTestId('Orders').click();
+    cy.getByTestId('All').click();
 
     cy.get(`[row-id="${partiallyFilledId}"]`)
       .eq(1)
@@ -116,7 +116,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
       cy.get('[col-id="status"] .ag-icon-menu').click();
     });
     cy.contains('Reset').click();
-    cy.getByTestId('Orders').click();
+    cy.getByTestId('All').click();
 
     cy.getByTestId('tab-orders')
       .get(`.ag-center-cols-container [col-id='${orderSymbol}']`)
@@ -139,14 +139,15 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
 });
 
 describe('subscribe orders', { tags: '@smoke' }, () => {
-  before(() => {
+  let orderId = '0';
+  beforeEach(() => {
     const subscriptionMocks = getSubscriptionMocks();
     cy.spy(subscriptionMocks, 'OrdersUpdate');
     cy.mockTradingPage();
     cy.mockSubscription(subscriptionMocks);
     cy.setVegaWallet();
     cy.visit('/#/markets/market-0');
-    cy.getByTestId('Orders').click();
+    cy.getByTestId('All').click();
     cy.getByTestId('tab-orders').within(() => {
       cy.get('[col-id="status"][role="columnheader"]')
         .focus()
@@ -154,8 +155,8 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
         .click();
       cy.get('.ag-filter-apply-panel-button').click();
     });
+    orderId = (parseInt(orderId, 10) + 1).toString();
   });
-  const orderId = '1234567890';
   // 7002-SORD-053
   // 7002-SORD-040
   // 7003-MORD-001
@@ -299,7 +300,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
     });
     cy.get(`[row-id=${orderId}]`)
       .find('[col-id="price"]')
-      .should('have.text', '200.00');
+      .should('have.text', '-');
   });
 
   it('must see the time in force applied to the order', () => {
@@ -370,7 +371,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
     cy.mockSubscription(subscriptionMocks);
     cy.setVegaWallet();
     cy.visit('/#/markets/market-0');
-    cy.getByTestId('Orders').click();
+    cy.getByTestId('All').click();
     cy.getByTestId('tab-orders').within(() => {
       cy.get('[col-id="status"][role="columnheader"]')
         .focus()
@@ -455,7 +456,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       });
   });
   it('must be warned (pre-submit) if the input price has too many digits after the decimal place for the market', () => {
-    // 7003-MORD-016
+    // 7003-MORD-013
     updateOrder({
       id: orderId,
       status: Schema.OrderStatus.STATUS_ACTIVE,

apps/trading-e2e/src/support/helpers.ts

@@ -9,3 +9,8 @@ export const selectAsset = (assetIndex: number) => {
   // eslint-disable-next-line
   cy.wait(100);
 };
+
+export const closeWelcomeDialog = () => {
+  cy.getByTestId('select-market-list').should('exist');
+  cy.getByTestId('dialog-close').click();
+};

apps/trading-e2e/src/support/order-update-subscription.ts

@@ -26,6 +26,7 @@ export function updateOrder(
   override?: PartialDeep<OrderUpdateFieldsFragment>
 ): void {
   const update: OrdersUpdateSubscription = orderUpdateSubscription({
+    // @ts-ignore partial deep check failing
     orders: [override],
   });
   if (!sendOrderUpdate) {

apps/trading-e2e/src/support/trading.ts

@@ -1,6 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
+import type { Provider, Status } from '@vegaprotocol/oracles';
 import {
   accountsQuery,
   assetQuery,
@@ -45,7 +46,9 @@ const marketDataOverride = (
       {
         node: {
           data: {
+            // @ts-ignore conflict between incoming and outgoing types
             trigger: data.trigger,
+            // @ts-ignore same as above
             marketTradingMode: data.tradingMode,
             marketState: data.state,
           },
@@ -62,6 +65,7 @@ const marketsDataOverride = (
     edges: [
       {
         node: {
+          // @ts-ignore conflict between incoming and outgoing types
           tradingMode: data.tradingMode,
           state: data.state,
         },
@@ -155,7 +159,6 @@ const mockTradingPage = (
   aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
   aliasGQLQuery(req, 'Deposits', depositsQuery());
 };
-
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Cypress {
@@ -164,50 +167,56 @@ declare global {
       mockTradingPage(
         state?: Schema.MarketState,
         tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger
+        trigger?: Schema.AuctionTrigger,
+        oracleStatus?: Status
       ): void;
     }
   }
 }
+
 export const addMockTradingPage = () => {
   Cypress.Commands.add(
     'mockTradingPage',
-    (state = Schema.MarketState.STATE_ACTIVE, tradingMode, trigger) => {
+    (
+      state = Schema.MarketState.STATE_ACTIVE,
+      tradingMode,
+      trigger,
+      oracleStatus
+    ) => {
       cy.mockGQL((req) => {
         mockTradingPage(req, state, tradingMode, trigger);
       });
 
+      const oracle: Provider = {
+        name: 'Another oracle',
+        url: 'https://zombo.com',
+        description_markdown:
+          'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
+        oracle: {
+          status: oracleStatus || 'GOOD',
+          status_reason: '',
+          first_verified: '2022-01-01T00:00:00.000Z',
+          last_verified: '2022-12-31T00:00:00.000Z',
+          type: 'public_key',
+          public_key: ORACLE_PUBKEY,
+        },
+        proofs: [
+          {
+            format: 'signed_message',
+            available: true,
+            type: 'public_key',
+            public_key: ORACLE_PUBKEY,
+            message: 'SOMEHEX',
+          },
+        ],
+        github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
+      };
       // Prevent request to github, return some dummy content
       cy.intercept(
         'GET',
         /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
         {
-          body: [
-            {
-              name: 'Another oracle',
-              url: 'https://zombo.com',
-              description_markdown:
-                'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-              oracle: {
-                status: 'GOOD',
-                status_reason: '',
-                first_verified: '2022-01-01T00:00:00.000Z',
-                last_verified: '2022-12-31T00:00:00.000Z',
-                type: 'public_key',
-                public_key: ORACLE_PUBKEY,
-              },
-              proofs: [
-                {
-                  format: 'signed_message',
-                  available: true,
-                  type: 'public_key',
-                  public_key: ORACLE_PUBKEY,
-                  message: 'SOMEHEX',
-                },
-              ],
-              github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
-            },
-          ],
+          body: [oracle],
         }
       );
     }

apps/trading/.env.capsule

@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases

apps/trading/.env.validator-testnet

@@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"STAGNET3\":\"https://stagnet3.console.vega.xyz\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
-NX_VEGA_TOKEN_URL=https://validator-testnet.governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://validator-testnet.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases

apps/trading/client-pages/market/trade-grid.tsx

@@ -1,7 +1,8 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
 import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
-import { OrderListContainer } from '@vegaprotocol/orders';
+import { OrderListContainer, Filter } from '@vegaprotocol/orders';
+import type { OrderListContainerProps } from '@vegaprotocol/orders';
 import { FillsContainer } from '@vegaprotocol/fills';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { TradesContainer } from '@vegaprotocol/trades';
@@ -27,7 +28,10 @@ import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import {
+  usePaneLayout,
+  useScreenDimensions,
+} from '@vegaprotocol/react-helpers';
 import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,
@@ -55,17 +59,59 @@ const requiresMarket = (View: MarketDependantView) => {
 };
 
 const TradingViews = {
-  Candles: requiresMarket(CandlesChartContainer),
-  Depth: requiresMarket(DepthChartContainer),
-  Liquidity: requiresMarket(LiquidityContainer),
-  Ticket: requiresMarket(DealTicketContainer),
-  Info: requiresMarket(MarketInfoAccordionContainer),
-  Orderbook: requiresMarket(OrderbookContainer),
-  Trades: requiresMarket(TradesContainer),
-  Positions: PositionsContainer,
-  Orders: OrderListContainer,
-  Collateral: AccountsContainer,
-  Fills: FillsContainer,
+  candles: {
+    label: 'Candles',
+    component: requiresMarket(CandlesChartContainer),
+  },
+  depth: {
+    label: 'Depth',
+    component: requiresMarket(DepthChartContainer),
+  },
+  liquidity: {
+    label: 'Liquidity',
+    component: requiresMarket(LiquidityContainer),
+  },
+  ticket: {
+    label: 'Ticket',
+    component: requiresMarket(DealTicketContainer),
+  },
+  info: {
+    label: 'Info',
+    component: requiresMarket(MarketInfoAccordionContainer),
+  },
+  orderbook: {
+    label: 'Orderbook',
+    component: requiresMarket(OrderbookContainer),
+  },
+  trades: {
+    label: 'Trades',
+    component: requiresMarket(TradesContainer),
+  },
+  positions: { label: 'Positions', component: PositionsContainer },
+  activeOrders: {
+    label: 'Active',
+    component: (props: OrderListContainerProps) => (
+      <OrderListContainer {...props} filter={Filter.Open} />
+    ),
+  },
+  closedOrders: {
+    label: 'Closed',
+    component: (props: OrderListContainerProps) => (
+      <OrderListContainer {...props} filter={Filter.Closed} />
+    ),
+  },
+  rejectedOrders: {
+    label: 'Rejected',
+    component: (props: OrderListContainerProps) => (
+      <OrderListContainer {...props} filter={Filter.Rejected} />
+    ),
+  },
+  orders: {
+    label: 'All',
+    component: OrderListContainer,
+  },
+  collateral: { label: 'Collateral', component: AccountsContainer },
+  fills: { label: 'Fills', component: FillsContainer },
 };
 
 type TradingView = keyof typeof TradingViews;
@@ -83,34 +129,77 @@ interface BottomPanelProps {
 
 const MarketBottomPanel = memo(
   ({ marketId, pinnedAsset }: BottomPanelProps) => {
+    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'bottom' });
     const { screenSize } = useScreenDimensions();
     const onMarketClick = useMarketClickHandler(true);
     const onOrderTypeClick = useMarketLiquidityClickHandler(true);
 
     return 'xxxl' === screenSize ? (
-      <ResizableGrid proportionalLayout minSize={200}>
+      <ResizableGrid
+        proportionalLayout
+        minSize={200}
+        onChange={handleOnLayoutChange}
+      >
         <ResizableGridPanel
           priority={LayoutPriority.Low}
-          preferredSize="50%"
+          preferredSize={sizes[0] || '50%'}
           minSize={50}
         >
           <TradeGridChild>
             <Tabs storageKey="console-trade-grid-bottom-left">
-              <Tab id="orders" name={t('Orders')}>
+              <Tab id="open-orders" name={t('Open')}>
                 <VegaWalletContainer>
-                  <TradingViews.Orders
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Open}
+                    onMarketClick={onMarketClick}
+                    onOrderTypeClick={onOrderTypeClick}
+                    enforceBottomPlaceholder
+                    id="marketOpenOrders"
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="closed-orders" name={t('Closed')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Closed}
+                    onMarketClick={onMarketClick}
+                    onOrderTypeClick={onOrderTypeClick}
+                    enforceBottomPlaceholder
+                    id="marketClosedOrders"
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="rejected-orders" name={t('Rejected')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Rejected}
+                    onMarketClick={onMarketClick}
+                    onOrderTypeClick={onOrderTypeClick}
+                    enforceBottomPlaceholder
+                    id="marketRejectOrders"
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="orders" name={t('All')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
                     marketId={marketId}
                     onMarketClick={onMarketClick}
                     onOrderTypeClick={onOrderTypeClick}
                     enforceBottomPlaceholder
+                    id="marketAllOrders"
                   />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="fills" name={t('Fills')}>
                 <VegaWalletContainer>
-                  <TradingViews.Fills
+                  <TradingViews.fills.component
                     marketId={marketId}
                     onMarketClick={onMarketClick}
+                    id="marketFills"
                   />
                 </VegaWalletContainer>
               </Tab>
@@ -119,25 +208,27 @@ const MarketBottomPanel = memo(
         </ResizableGridPanel>
         <ResizableGridPanel
           priority={LayoutPriority.Low}
-          preferredSize="50%"
+          preferredSize={sizes[1] || '50%'}
           minSize={50}
         >
           <TradeGridChild>
             <Tabs storageKey="console-trade-grid-bottom-right">
               <Tab id="positions" name={t('Positions')}>
                 <VegaWalletContainer>
-                  <TradingViews.Positions
+                  <TradingViews.positions.component
                     onMarketClick={onMarketClick}
                     noBottomPlaceholder
+                    id="marketPositions"
                   />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="accounts" name={t('Collateral')}>
                 <VegaWalletContainer>
-                  <TradingViews.Collateral
+                  <TradingViews.collateral.component
                     pinnedAsset={pinnedAsset}
                     noBottomPlaceholder
                     hideButtons
+                    id="marketCollateral"
                   />
                 </VegaWalletContainer>
               </Tab>
@@ -150,30 +241,75 @@ const MarketBottomPanel = memo(
         <Tabs storageKey="console-trade-grid-bottom">
           <Tab id="positions" name={t('Positions')}>
             <VegaWalletContainer>
-              <TradingViews.Positions onMarketClick={onMarketClick} />
+              <TradingViews.positions.component
+                onMarketClick={onMarketClick}
+                id="marketPositions"
+              />
             </VegaWalletContainer>
           </Tab>
-          <Tab id="orders" name={t('Orders')}>
+          <Tab id="open-orders" name={t('Open')}>
             <VegaWalletContainer>
-              <TradingViews.Orders
+              <TradingViews.orders.component
+                marketId={marketId}
+                filter={Filter.Open}
+                onMarketClick={onMarketClick}
+                onOrderTypeClick={onOrderTypeClick}
+                enforceBottomPlaceholder
+                id="marketOpenOrders"
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="closed-orders" name={t('Closed')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
+                marketId={marketId}
+                filter={Filter.Closed}
+                onMarketClick={onMarketClick}
+                onOrderTypeClick={onOrderTypeClick}
+                enforceBottomPlaceholder
+                id="marketClosedOrders"
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="rejected-orders" name={t('Rejected')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
+                marketId={marketId}
+                filter={Filter.Rejected}
+                onMarketClick={onMarketClick}
+                onOrderTypeClick={onOrderTypeClick}
+                enforceBottomPlaceholder
+                id="marketRejectedOrders"
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="orders" name={t('All')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
                 marketId={marketId}
                 onMarketClick={onMarketClick}
                 onOrderTypeClick={onOrderTypeClick}
                 enforceBottomPlaceholder
+                id="marketAllOrders"
               />
             </VegaWalletContainer>
           </Tab>
           <Tab id="fills" name={t('Fills')}>
             <VegaWalletContainer>
-              <TradingViews.Fills
+              <TradingViews.fills.component
                 marketId={marketId}
                 onMarketClick={onMarketClick}
+                id="marketFills"
               />
             </VegaWalletContainer>
           </Tab>
           <Tab id="accounts" name={t('Collateral')}>
             <VegaWalletContainer>
-              <TradingViews.Collateral pinnedAsset={pinnedAsset} hideButtons />
+              <TradingViews.collateral.component
+                pinnedAsset={pinnedAsset}
+                hideButtons
+                id="marketCollateral"
+              />
             </VegaWalletContainer>
           </Tab>
         </Tabs>
@@ -186,68 +322,75 @@ MarketBottomPanel.displayName = 'MarketBottomPanel';
 const MainGrid = memo(
   ({
     marketId,
-    onSelect,
     pinnedAsset,
   }: {
     marketId: string;
-    onSelect: (marketId: string, metaKey?: boolean) => void;
     pinnedAsset?: PinnedAsset;
   }) => {
     const navigate = useNavigate();
+    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
+    const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
+      id: 'middle',
+    });
+
     return (
-      <ResizableGrid vertical>
+      <ResizableGrid vertical onChange={handleOnLayoutChange}>
         <ResizableGridPanel minSize={75} priority={LayoutPriority.High}>
-          <ResizableGrid proportionalLayout={false} minSize={200}>
+          <ResizableGrid
+            proportionalLayout={false}
+            minSize={200}
+            onChange={handleOnMiddleLayoutChange}
+          >
             <ResizableGridPanel
               priority={LayoutPriority.High}
               minSize={200}
-              preferredSize="50%"
+              preferredSize={sizesMiddle[0] || '50%'}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-left">
                   <Tab id="chart" name={t('Chart')}>
-                    <TradingViews.Candles marketId={marketId} />
+                    <TradingViews.candles.component marketId={marketId} />
                   </Tab>
                   <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.Depth marketId={marketId} />
+                    <TradingViews.depth.component marketId={marketId} />
                   </Tab>
                   <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.Liquidity marketId={marketId} />
+                    <TradingViews.liquidity.component marketId={marketId} />
                   </Tab>
                 </Tabs>
               </TradeGridChild>
             </ResizableGridPanel>
             <ResizableGridPanel
               priority={LayoutPriority.Low}
-              preferredSize={330}
+              preferredSize={sizesMiddle[1] || 330}
               minSize={300}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-center">
                   <Tab id="ticket" name={t('Ticket')}>
-                    <TradingViews.Ticket
+                    <TradingViews.ticket.component
                       marketId={marketId}
                       onClickCollateral={() => navigate('/portfolio')}
                     />
                   </Tab>
                   <Tab id="info" name={t('Info')}>
-                    <TradingViews.Info marketId={marketId} />
+                    <TradingViews.info.component marketId={marketId} />
                   </Tab>
                 </Tabs>
               </TradeGridChild>
             </ResizableGridPanel>
             <ResizableGridPanel
               priority={LayoutPriority.Low}
-              preferredSize={430}
+              preferredSize={sizesMiddle[2] || 430}
               minSize={200}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-right">
                   <Tab id="orderbook" name={t('Orderbook')}>
-                    <TradingViews.Orderbook marketId={marketId} />
+                    <TradingViews.orderbook.component marketId={marketId} />
                   </Tab>
                   <Tab id="trades" name={t('Trades')}>
-                    <TradingViews.Trades marketId={marketId} />
+                    <TradingViews.trades.component marketId={marketId} />
                   </Tab>
                 </Tabs>
               </TradeGridChild>
@@ -256,7 +399,7 @@ const MainGrid = memo(
         </ResizableGridPanel>
         <ResizableGridPanel
           priority={LayoutPriority.Low}
-          preferredSize="25%"
+          preferredSize={sizes[1] || '25%'}
           minSize={50}
         >
           <MarketBottomPanel marketId={marketId} pinnedAsset={pinnedAsset} />
@@ -278,11 +421,7 @@ export const TradeGrid = ({
         <TradeMarketHeader market={market} onSelect={onSelect} />
         <OracleBanner marketId={market?.id || ''} />
       </div>
-      <MainGrid
-        marketId={market?.id || ''}
-        onSelect={onSelect}
-        pinnedAsset={pinnedAsset}
-      />
+      <MainGrid marketId={market?.id || ''} pinnedAsset={pinnedAsset} />
     </div>
   );
 };
@@ -319,7 +458,7 @@ export const TradePanels = ({
   const onMarketClick = useMarketClickHandler(true);
   const onOrderTypeClick = useMarketLiquidityClickHandler(true);
 
-  const [view, setView] = useState<TradingView>('Candles');
+  const [view, setView] = useState<TradingView>('candles');
   const renderView = () => {
     const Component = memo<{
       marketId: string;
@@ -328,7 +467,7 @@ export const TradePanels = ({
       onOrderTypeClick?: (marketId: string) => void;
       onClickCollateral: () => void;
       pinnedAsset?: PinnedAsset;
-    }>(TradingViews[view]);
+    }>(TradingViews[view].component);
 
     if (!Component) {
       throw new Error(`No component for view: ${view}`);
@@ -350,7 +489,10 @@ export const TradePanels = ({
 
   return (
     <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
       <div className="h-full">
         <AutoSizer>
           {({ width, height }) => (
@@ -374,7 +516,7 @@ export const TradePanels = ({
               className={className}
               key={key}
             >
-              {key}
+              {TradingViews[key as keyof typeof TradingViews].label}
             </button>
           );
         })}

apps/trading/client-pages/markets/closed.spec.tsx

@@ -0,0 +1,335 @@
+import { act, render, screen, within } from '@testing-library/react';
+import { Closed } from './closed';
+import { MarketStateMapping } from '@vegaprotocol/types';
+import { PositionStatus } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
+import { subDays } from 'date-fns';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/oracles';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/oracles';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaWalletContext } from '@vegaprotocol/wallet';
+import type {
+  PositionsQuery,
+  PositionFieldsFragment,
+} from '@vegaprotocol/positions';
+import { PositionsDocument } from '@vegaprotocol/positions';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import type { MarketsDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import { MarketsDataDocument } from '@vegaprotocol/market-list';
+import { MarketsDocument } from '@vegaprotocol/market-list';
+import {
+  createMarketFragment,
+  marketsQuery,
+  marketsDataQuery,
+  createMarketsDataFragment,
+} from '@vegaprotocol/mock';
+
+describe('Closed', () => {
+  let originalNow: typeof Date.now;
+  const mockNowTimestamp = 1672531200000;
+  const settlementDateMetaDate = subDays(
+    new Date(mockNowTimestamp),
+    3
+  ).toISOString();
+  const settlementDateTag = `settlement-expiry-date:${settlementDateMetaDate}`;
+  const pubKey = 'pubKey';
+  const marketId = 'market-0';
+  const settlementDataProperty = 'spec-binding';
+  const settlementDataId = 'settlement-data-oracle-id';
+
+  const market = createMarketFragment({
+    id: marketId,
+    state: MarketState.STATE_SETTLED,
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [settlementDateTag],
+        },
+        product: {
+          dataSourceSpecForSettlementData: {
+            id: settlementDataId,
+          },
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+        },
+      },
+    },
+  });
+  const marketsMock: MockedResponse<MarketsQuery> = {
+    request: {
+      query: MarketsDocument,
+    },
+    result: {
+      data: marketsQuery({
+        marketsConnection: {
+          edges: [
+            {
+              node: market,
+            },
+          ],
+        },
+      }),
+    },
+  };
+
+  const marketsData = createMarketsDataFragment({
+    __typename: 'MarketData',
+    market: {
+      __typename: 'Market',
+      id: marketId,
+    },
+    bestBidPrice: '1000',
+    bestOfferPrice: '2000',
+    markPrice: '1500',
+  });
+  const marketsDataMock: MockedResponse<MarketsDataQuery> = {
+    request: {
+      query: MarketsDataDocument,
+    },
+    result: {
+      data: marketsDataQuery({
+        marketsConnection: {
+          edges: [
+            {
+              node: {
+                data: marketsData,
+              },
+            },
+          ],
+        },
+      }),
+    },
+  };
+
+  // Create mock oracle data
+  const property = {
+    __typename: 'Property' as const,
+    name: settlementDataProperty,
+    value: '12345',
+  };
+  const oracleDataMock: MockedResponse<OracleSpecDataConnectionQuery> = {
+    request: {
+      query: OracleSpecDataConnectionDocument,
+      variables: {
+        oracleSpecId: settlementDataId,
+      },
+    },
+    result: {
+      data: {
+        oracleSpec: {
+          dataConnection: {
+            edges: [
+              {
+                node: {
+                  externalData: {
+                    data: {
+                      data: [property],
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
+  };
+
+  // Create mock position
+  const createPosition = (): PositionFieldsFragment => {
+    return {
+      __typename: 'Position' as const,
+      realisedPNL: '1000',
+      unrealisedPNL: '2000',
+      openVolume: '3000',
+      averageEntryPrice: '100',
+      updatedAt: new Date().toISOString(),
+      positionStatus: PositionStatus.POSITION_STATUS_UNSPECIFIED,
+      lossSocializationAmount: '1000',
+      market: {
+        __typename: 'Market',
+        id: marketId,
+      },
+    };
+  };
+  const position = createPosition();
+  const positionsMock: MockedResponse<PositionsQuery> = {
+    request: {
+      query: PositionsDocument,
+      variables: {
+        partyId: pubKey,
+      },
+    },
+    result: {
+      data: {
+        party: {
+          __typename: 'Party',
+          id: pubKey,
+          positionsConnection: {
+            __typename: 'PositionConnection',
+            edges: [{ __typename: 'PositionEdge', node: position }],
+          },
+        },
+      },
+    },
+  };
+
+  beforeAll(() => {
+    originalNow = Date.now;
+    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
+  });
+
+  afterAll(() => {
+    Date.now = originalNow;
+  });
+
+  it('renders correctly formatted and filtered rows', async () => {
+    await act(async () => {
+      render(
+        <MockedProvider
+          mocks={[marketsMock, marketsDataMock, positionsMock, oracleDataMock]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      );
+    });
+    // screen.debug(document, Infinity);
+
+    const headers = screen.getAllByRole('columnheader');
+    const expectedHeaders = [
+      'Market',
+      'Description',
+      'Status',
+      'Settlement date',
+      'Best bid',
+      'Best offer',
+      'Mark price',
+      'Settlement price',
+      'Realised PNL',
+      'Settlement asset',
+      'Market ID',
+    ];
+    expect(headers).toHaveLength(expectedHeaders.length);
+    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
+
+    const cells = screen.getAllByRole('gridcell');
+    const expectedValues = [
+      market.tradableInstrument.instrument.code,
+      market.tradableInstrument.instrument.name,
+      MarketStateMapping[market.state],
+      '3 days ago',
+      /* eslint-disable @typescript-eslint/no-non-null-assertion */
+      addDecimalsFormatNumber(marketsData.bestBidPrice, market.decimalPlaces),
+      addDecimalsFormatNumber(
+        marketsData!.bestOfferPrice,
+        market.decimalPlaces
+      ),
+      addDecimalsFormatNumber(marketsData!.markPrice, market.decimalPlaces),
+      /* eslint-enable @typescript-eslint/no-non-null-assertion */
+      addDecimalsFormatNumber(property.value, market.decimalPlaces),
+      addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces),
+      market.tradableInstrument.instrument.product.settlementAsset.symbol,
+      market.id,
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+  });
+
+  it('only renders settled and terminated markets', async () => {
+    const mixedMarkets = [
+      {
+        // inlclude as settled
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-0',
+          state: MarketState.STATE_SETTLED,
+        }),
+      },
+      {
+        // omit this market
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'discard-0',
+          state: MarketState.STATE_SUSPENDED,
+        }),
+      },
+      {
+        // include as terminated
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-1',
+          state: MarketState.STATE_TRADING_TERMINATED,
+        }),
+      },
+      {
+        // omit this market
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'discard-1',
+          state: MarketState.STATE_ACTIVE,
+        }),
+      },
+    ];
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
+      request: {
+        query: MarketsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: mixedMarkets,
+          },
+        },
+      },
+    };
+    await act(async () => {
+      render(
+        <MockedProvider
+          mocks={[
+            mixedMarketsMock,
+            marketsDataMock,
+            positionsMock,
+            oracleDataMock,
+          ]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      );
+    });
+
+    // check that the number of rows in datagrid is 2
+    const container = within(
+      document.querySelector('.ag-center-cols-container') as HTMLElement
+    );
+    const expectedRows = mixedMarkets.filter((m) => {
+      return [
+        MarketState.STATE_SETTLED,
+        MarketState.STATE_TRADING_TERMINATED,
+      ].includes(m.node.state);
+    });
+
+    // check rows length is correct
+    const rows = container.getAllByRole('row');
+    expect(rows).toHaveLength(expectedRows.length);
+
+    // check that only included ids are shown
+    const cells = screen
+      .getAllByRole('gridcell')
+      .filter((cell) => cell.getAttribute('col-id') === 'id')
+      .map((cell) => cell.textContent?.trim());
+    expect(cells).toEqual(expectedRows.map((m) => m.node.id));
+  });
+});

apps/trading/client-pages/markets/closed.tsx

@@ -0,0 +1,286 @@
+import compact from 'lodash/compact';
+import { isAfter } from 'date-fns';
+import type {
+  VegaICellRendererParams,
+  VegaValueFormatterParams,
+} from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { useMemo } from 'react';
+import { t } from '@vegaprotocol/i18n';
+import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import {
+  addDecimalsFormatNumber,
+  getMarketExpiryDate,
+} from '@vegaprotocol/utils';
+import { usePositionsQuery } from '@vegaprotocol/positions';
+import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
+import { closedMarketsWithDataProvider } from '@vegaprotocol/market-list';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import type { ColDef } from 'ag-grid-community';
+import { SettlementDateCell } from './settlement-date-cell';
+import { SettlementPriceCell } from './settlement-price-cell';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+
+type SettlementAsset =
+  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
+
+interface Row {
+  id: string;
+  code: string;
+  name: string;
+  decimalPlaces: number;
+  state: MarketState;
+  metadata: string[];
+  closeTimestamp: string | null;
+  bestBidPrice: string | undefined;
+  bestOfferPrice: string | undefined;
+  markPrice: string | undefined;
+  settlementDataOracleId: string;
+  settlementDataSpecBinding: string;
+  tradingTerminationOracleId: string;
+  settlementAsset: SettlementAsset;
+  realisedPNL: string | undefined;
+}
+
+export const Closed = () => {
+  const { pubKey } = useVegaWallet();
+  const {
+    data: marketData,
+    loading,
+    error,
+    reload,
+  } = useDataProvider({
+    dataProvider: closedMarketsWithDataProvider,
+    variables: undefined,
+  });
+  const { data: positionData } = usePositionsQuery({
+    variables: {
+      partyId: pubKey || '',
+    },
+    skip: !pubKey,
+  });
+
+  // find a position for each market and add the realised pnl to
+  // a normalized object
+  const rowData = compact(marketData).map((market) => {
+    const position = positionData?.party?.positionsConnection?.edges?.find(
+      (edge) => {
+        return edge.node.market.id === market.id;
+      }
+    );
+
+    const row: Row = {
+      id: market.id,
+      code: market.tradableInstrument.instrument.code,
+      name: market.tradableInstrument.instrument.name,
+      decimalPlaces: market.decimalPlaces,
+      state: market.state,
+      metadata: market.tradableInstrument.instrument.metadata.tags ?? [],
+      closeTimestamp: market.marketTimestamps.close,
+      bestBidPrice: market.data?.bestBidPrice,
+      bestOfferPrice: market.data?.bestOfferPrice,
+      markPrice: market.data?.markPrice,
+      settlementDataOracleId:
+        market.tradableInstrument.instrument.product
+          .dataSourceSpecForSettlementData.id,
+      settlementDataSpecBinding:
+        market.tradableInstrument.instrument.product.dataSourceSpecBinding
+          .settlementDataProperty,
+      tradingTerminationOracleId:
+        market.tradableInstrument.instrument.product
+          .dataSourceSpecForTradingTermination.id,
+      settlementAsset:
+        market.tradableInstrument.instrument.product.settlementAsset,
+      realisedPNL: position?.node.realisedPNL,
+    };
+
+    return row;
+  });
+  return (
+    <div className="h-full relative">
+      <ClosedMarketsDataGrid rowData={rowData} />
+      <div className="pointer-events-none absolute inset-0">
+        <AsyncRenderer
+          loading={loading}
+          error={error}
+          data={marketData}
+          noDataMessage={t('No markets')}
+          reload={reload}
+        />
+      </div>
+    </div>
+  );
+};
+
+const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
+  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
+  const colDefs = useMemo(() => {
+    const cols: ColDef[] = [
+      {
+        headerName: t('Market'),
+        field: 'code',
+      },
+      {
+        headerName: t('Description'),
+        field: 'name',
+      },
+      {
+        headerName: t('Status'),
+        field: 'state',
+        valueFormatter: ({ value }: VegaValueFormatterParams<Row, 'state'>) => {
+          if (!value) return '-';
+          return MarketStateMapping[value];
+        },
+      },
+      {
+        headerName: t('Settlement date'),
+        colId: 'settlementDate', // colId needed if no field property provided otherwise column order is ruined in tests
+        valueGetter: ({ data }: { data: Row }) => {
+          return getMarketExpiryDate(data.metadata);
+        },
+        cellRenderer: ({ value, data }: { value: Date | null; data: Row }) => {
+          return (
+            <SettlementDateCell
+              oracleSpecId={data.tradingTerminationOracleId}
+              metaDate={value}
+              marketState={data.state}
+              closeTimestamp={data.closeTimestamp}
+            />
+          );
+        },
+        cellClassRules: {
+          'text-danger': ({
+            value,
+            data,
+          }: {
+            value: Date | null;
+            data: Row;
+          }) => {
+            const date = data.closeTimestamp
+              ? new Date(data.closeTimestamp)
+              : value;
+
+            if (!date) return false;
+
+            if (
+              // expiry has passed and market is not yet settled
+              isAfter(new Date(), date) &&
+              data.state !== MarketState.STATE_SETTLED
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+      },
+      {
+        headerName: t('Best bid'),
+        field: 'bestBidPrice',
+        type: 'numericColumn',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'bestBidPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Best offer'),
+        field: 'bestOfferPrice',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'bestOfferPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Mark price'),
+        field: 'markPrice',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'markPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Settlement price'),
+        type: 'numericColumn',
+        field: 'settlementDataOracleId',
+        // 'tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaICellRendererParams<Row, 'settlementDataOracleId'>) => (
+          <SettlementPriceCell
+            oracleSpecId={value}
+            decimalPlaces={data?.decimalPlaces ?? 0}
+            settlementDataSpecBinding={data?.settlementDataSpecBinding}
+          />
+        ),
+      },
+      {
+        headerName: t('Realised PNL'),
+        field: 'realisedPNL',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'realisedPNL'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Settlement asset'),
+        field: 'settlementAsset',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'settlementAsset'>) => (
+          <button
+            className="underline"
+            onClick={() => {
+              if (!value) return;
+              openAssetDialog(value.id);
+            }}
+          >
+            {value ? value.symbol : '-'}
+          </button>
+        ),
+      },
+      {
+        headerName: t('Market ID'),
+        field: 'id',
+        flex: 1,
+      },
+    ];
+    return cols;
+  }, [openAssetDialog]);
+
+  return (
+    <AgGrid
+      id="closedMarkets"
+      style={{ width: '100%', height: '100%' }}
+      rowData={rowData}
+      columnDefs={colDefs}
+      getRowId={({ data }) => data.id}
+      defaultColDef={{
+        resizable: true,
+      }}
+      overlayNoRowsTemplate="No data"
+    />
+  );
+};

apps/trading/client-pages/markets/markets-page.tsx

@@ -5,6 +5,7 @@ import { LocalStoragePersistTabs as Tabs, Tab } from '@vegaprotocol/ui-toolkit';
 import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
+import { Closed } from './closed';
 
 export const MarketsPage = () => {
   const { updateTitle } = usePageTitleStore((store) => ({
@@ -21,6 +22,9 @@ export const MarketsPage = () => {
       <Tab id="proposed-markets" name={t('Proposed markets')}>
         <Proposed />
       </Tab>
+      <Tab id="closed-markets" name={t('Closed markets')}>
+        <Closed />
+      </Tab>
     </Tabs>
   );
 };

apps/trading/client-pages/markets/proposed.tsx

@@ -12,7 +12,9 @@ export const Proposed = () => {
   const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
   return (
     <>
-      <ProposalsList />
+      <div className="min-h-[200px]">
+        <ProposalsList />
+      </div>
       <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>
         {t('Propose a new market')}
       </ExternalLink>

apps/trading/client-pages/markets/settlement-date-cell.spec.tsx

@@ -0,0 +1,105 @@
+import { render, screen } from '@testing-library/react';
+import { MarketState } from '@vegaprotocol/types';
+import { addDays, subDays } from 'date-fns';
+import type { SettlementDataCellProps } from './settlement-date-cell';
+import { SettlementDateCell } from './settlement-date-cell';
+
+describe('SettlementDateCell', () => {
+  let originalNow: typeof Date.now;
+  const mockNowTimestamp = 1672531200000;
+
+  const createProps = (): SettlementDataCellProps => {
+    return {
+      oracleSpecId: 'oracle-spec-id',
+      metaDate: null,
+      closeTimestamp: null,
+      marketState: MarketState.STATE_SETTLED,
+    };
+  };
+
+  beforeAll(() => {
+    originalNow = Date.now;
+    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
+  });
+
+  afterAll(() => {
+    Date.now = originalNow;
+  });
+
+  it('renders unknown if date cannot be determined', () => {
+    const props = createProps();
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent('Unknown');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders using close timestamp if provided', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.closeTimestamp = subDays(
+      new Date(mockNowTimestamp),
+      daysAgo
+    ).toISOString();
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders using meta tag date if no close timestamp provided', () => {
+    const daysAgo = 4;
+    const props = createProps();
+    props.metaDate = subDays(new Date(mockNowTimestamp), daysAgo);
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders past expected settlement date', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.metaDate = subDays(new Date(mockNowTimestamp), daysAgo);
+    props.marketState = MarketState.STATE_TRADING_TERMINATED;
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`Expected ${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders future expected settlement date', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.metaDate = addDays(new Date(mockNowTimestamp), daysAgo);
+    props.marketState = MarketState.STATE_TRADING_TERMINATED;
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`Expected in ${daysAgo} days`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+});

apps/trading/client-pages/markets/settlement-date-cell.tsx

@@ -0,0 +1,55 @@
+import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
+import { MarketState } from '@vegaprotocol/types';
+import { Link } from '@vegaprotocol/ui-toolkit';
+import { getDateTimeFormat } from '@vegaprotocol/utils';
+import { formatDistanceToNowStrict, isAfter } from 'date-fns';
+
+export interface SettlementDataCellProps {
+  oracleSpecId: string;
+  metaDate: Date | null;
+  closeTimestamp: string | null;
+  marketState: MarketState;
+}
+
+export const SettlementDateCell = ({
+  oracleSpecId,
+  metaDate,
+  closeTimestamp,
+  marketState,
+}: SettlementDataCellProps) => {
+  const linkCreator = useLinks(DApp.Explorer);
+  const date = closeTimestamp ? new Date(closeTimestamp) : metaDate;
+
+  let text = '';
+  if (!date) {
+    text = t('Unknown');
+  } else {
+    // pass Date.now() to date constructor for easier mocking
+    const expiryHasPassed = isAfter(new Date(Date.now()), date);
+    const distance = formatDistanceToNowStrict(date); // X days/mins ago
+
+    if (expiryHasPassed) {
+      if (marketState !== MarketState.STATE_SETTLED) {
+        text = t('Expected %s ago', distance);
+      } else {
+        text = t('%s ago', distance);
+      }
+    } else {
+      text = t('Expected in %s', distance);
+    }
+  }
+
+  return (
+    <Link
+      href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
+      className="underline"
+      target="_blank"
+      title={
+        date ? getDateTimeFormat().format(date) : t('Unknown settlement date')
+      }
+    >
+      {text}
+    </Link>
+  );
+};

apps/trading/client-pages/markets/settlement-price-cell.spec.tsx

@@ -0,0 +1,113 @@
+import { render, screen } from '@testing-library/react';
+import type { Property } from '@vegaprotocol/types';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/oracles';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/oracles';
+import type { SettlementPriceCellProps } from './settlement-price-cell';
+import { SettlementPriceCell } from './settlement-price-cell';
+
+describe('SettlementPriceCell', () => {
+  const createMock = (
+    id: string,
+    property: Property
+  ): MockedResponse<OracleSpecDataConnectionQuery> => {
+    return {
+      request: {
+        query: OracleSpecDataConnectionDocument,
+        variables: {
+          oracleSpecId: id,
+        },
+      },
+      result: {
+        data: {
+          oracleSpec: {
+            dataConnection: {
+              edges: [
+                {
+                  node: {
+                    externalData: {
+                      data: {
+                        data: [property],
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    };
+  };
+  const createProps = (): SettlementPriceCellProps => {
+    return {
+      oracleSpecId: 'oracle-spec-id',
+      decimalPlaces: 2,
+      settlementDataSpecBinding: 'settlement-data-spec-binding',
+    };
+  };
+  it('renders fetches and renders the settlment data value', async () => {
+    const props = createProps();
+    const property = {
+      __typename: 'Property' as const,
+      name: props.settlementDataSpecBinding as string,
+      value: '1234',
+    };
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const mock = createMock(props.oracleSpecId!, property);
+
+    render(
+      <MockedProvider mocks={[mock]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    const link = await screen.findByRole('link');
+    expect(link).toHaveTextContent('12.34');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders "-" if no spec value is found', async () => {
+    const props = createProps();
+    const property = {
+      __typename: 'Property' as const,
+      name: 'no matching spec binding',
+      value: '1234',
+    };
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const mock = createMock(props.oracleSpecId!, property);
+
+    render(
+      <MockedProvider mocks={[mock]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    const link = await screen.findByRole('link');
+    expect(link).toHaveTextContent('-');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders "-" with no link if oracle spec id is not provided', () => {
+    const props = createProps();
+    props.oracleSpecId = undefined;
+
+    render(
+      <MockedProvider mocks={[]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    expect(screen.queryByRole('link')).not.toBeInTheDocument();
+  });
+});

apps/trading/client-pages/markets/settlement-price-cell.tsx

@@ -0,0 +1,39 @@
+import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
+import { useOracleSpecBindingData } from '@vegaprotocol/oracles';
+import { Link } from '@vegaprotocol/ui-toolkit';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+
+export interface SettlementPriceCellProps {
+  oracleSpecId: string | undefined;
+  decimalPlaces: number;
+  settlementDataSpecBinding: string | undefined;
+}
+
+export const SettlementPriceCell = ({
+  oracleSpecId,
+  decimalPlaces,
+  settlementDataSpecBinding,
+}: SettlementPriceCellProps) => {
+  const linkCreator = useLinks(DApp.Explorer);
+  const { property, loading } = useOracleSpecBindingData(
+    oracleSpecId,
+    settlementDataSpecBinding
+  );
+
+  if (!oracleSpecId || loading) {
+    return <span>-</span>;
+  }
+
+  return (
+    <Link
+      href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
+      className="underline font-mono"
+      target="_blank"
+    >
+      {property
+        ? addDecimalsFormatNumber(property.value, decimalPlaces)
+        : t('-')}
+    </Link>
+  );
+};

apps/trading/client-pages/portfolio/portfolio.tsx

@@ -7,6 +7,7 @@ import { WithdrawalsContainer } from './withdrawals-container';
 import { FillsContainer } from '@vegaprotocol/fills';
 import type { ReactNode } from 'react';
 import { useEffect } from 'react';
+import { usePaneLayout } from '@vegaprotocol/react-helpers';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { DepositsContainer } from './deposits-container';
 import { LayoutPriority } from 'allotment';
@@ -34,11 +35,11 @@ export const Portfolio = () => {
 
   const onMarketClick = useMarketClickHandler(true);
   const onOrderTypeClick = useMarketLiquidityClickHandler(true);
-
+  const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'h-full max-h-full flex flex-col';
   return (
     <div className={wrapperClasses}>
-      <ResizableGrid vertical>
+      <ResizableGrid vertical onChange={handleOnLayoutChange}>
         <ResizableGridPanel minSize={75}>
           <PortfolioGridChild>
             <Tabs storageKey="console-portfolio-top">
@@ -52,6 +53,7 @@ export const Portfolio = () => {
                   <PositionsContainer
                     onMarketClick={onMarketClick}
                     noBottomPlaceholder
+                    id="portfolioPositions"
                   />
                 </VegaWalletContainer>
               </Tab>
@@ -60,12 +62,16 @@ export const Portfolio = () => {
                   <OrderListContainer
                     onMarketClick={onMarketClick}
                     onOrderTypeClick={onOrderTypeClick}
+                    id="portfolioOrders"
                   />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="fills" name={t('Fills')}>
                 <VegaWalletContainer>
-                  <FillsContainer onMarketClick={onMarketClick} />
+                  <FillsContainer
+                    onMarketClick={onMarketClick}
+                    id="portfolioFills"
+                  />
                 </VegaWalletContainer>
               </Tab>
               <Tab id="ledger-entries" name={t('Ledger entries')}>
@@ -78,7 +84,7 @@ export const Portfolio = () => {
         </ResizableGridPanel>
         <ResizableGridPanel
           priority={LayoutPriority.Low}
-          preferredSize={300}
+          preferredSize={sizes[1] || 300}
           minSize={50}
         >
           <PortfolioGridChild>

apps/trading/client-pages/settings/settings.tsx

@@ -36,7 +36,11 @@ export const Settings = () => {
               />
             </div>
             <Divider />
-            <TelemetryApproval isSettingsPage />
+            <TelemetryApproval
+              helpText={t(
+                'Help identify bugs and improve the service by sharing anonymous usage data.'
+              )}
+            />
           </RoundedWrapper>
         </div>
       </div>