Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/lp-rows-duplicated

fix: use LP order ID as ag-grid row key
fix(liquidity): rows duplicated wrong ag-grid row ID (#3614 )
2023-05-04 18:35:28 +01:00 · 2023-05-04 18:33:30 +01:00 · 2023-05-04 17:23:52 +00:00 · 2023-05-04 16:50:39 +00:00 · 2023-05-04 17:50:04 +01:00 · 2023-05-04 14:29:31 +00:00
165 changed files with 2444 additions and 1303 deletions
@@ -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
@@ -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"
@@ -66,7 +66,7 @@ jobs:
                fi
              fi
            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
+              envName="stagnet1"
            fi
            bucketName="${{ matrix.app }}.${envName}.${domain}"
            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
@@ -7,5 +7,4 @@ __generated___

 apps/static/src/assets/devnet-tranches.json
 apps/static/src/assets/mainnet-tranches.json
-apps/static/src/assets/stagnet3-tranches.json
 apps/static/src/assets/testnet-tranches.json
@@ -1,18 +0,0 @@
-# App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-
-# App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_MARKETS=1
-NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1
@@ -1,13 +1,17 @@
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_ENV=STAGNET3
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
+NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -6,12 +6,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json

 # App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_MARKETS=1
-NX_EXPLORER_ORACLES=1
 NX_EXPLORER_TXS_LIST=0
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1
@@ -1,14 +1 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+# .env is stagnet1, so there are no overrides required
@@ -1,8 +0,0 @@
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_ENV=STAGNET3
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -35,12 +35,11 @@ Example configurations are provided here:
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run explorer:serve --env={env} # e.g. stagnet3
+yarn nx run explorer:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -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" />
      ),
    },
  ];
@@ -13,7 +13,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -1,5 +0,0 @@
-# App configuration variables
-NX_VEGA_ENV=STAGNET3
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -9,7 +9,7 @@
      "name": "Token test market",
      "code": "Token.24h",
      "future": {
-        "settlementAsset": "fBTC",
+        "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
        "quoteName": "fBTC",
        "dataSourceSpecForSettlementData": {
          "external": {
@@ -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%')
@@ -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')
@@ -84,6 +84,7 @@ context(
    });

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

    beforeEach('visit governance tab', function () {
+      cy.clearLocalStorage();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -304,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');
@@ -322,6 +326,7 @@ context(
      cy.get('@EnactedMarketId').then((marketId) => {
        cy.contains(String(marketId))
          .parentsUntil(proposalListItem)
+          .last()
          .within(() => {
            cy.getByTestId(viewProposalBtn).click();
          });
@@ -375,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();
        });
@@ -422,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();
@@ -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/);
    });
  });

@@ -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');
      });
  });
 });
@@ -66,7 +66,7 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
-          cy.clearAllLocalStorage();
+          cy.clearLocalStorage();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -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(
@@ -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);
    }
  }
 );
@@ -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();
    }
@@ -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);
  });
 }
@@ -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,27 +109,49 @@ 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('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
-        () => {
-          cy.get(associatedAmountInWallet)
-            .invoke('text')
-            .then(($walletAmount) => {
-              cy.wrap(
-                stakingBridgeContract.remove_stake(
-                  String(stakeBalance),
-                  vegaWalletPubKey
-                ),
-                { timeout: transactionTimeout, log: false }
-              );
-              cy.get(associatedAmountInWallet, {
+      cy.get(vegaWalletContainer).within(() => {
+        cy.getByTestId('currency-value')
+          .first()
+          .invoke('text')
+          .then(($associatedAmount) => {
+            cy.wrap(
+              stakingBridgeContract.remove_stake(
+                String(stakeBalance),
+                vegaWalletPubKey
+              ),
+              { timeout: transactionTimeout }
+            );
+            cy.wrap(
+              vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
+              {
                timeout: transactionTimeout,
-              }).should('not.have.text', $walletAmount);
+                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);
+                  });
+              }
            });
-        }
-      );
+          });
+      });
    }
  });
 }
@@ -136,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 }
      );
    }
  });
@@ -1,18 +1,18 @@
 # App configuration variables
-NX_VEGA_ENV=STAGNET3
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

@@ -3,7 +3,7 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 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=''
@@ -16,7 +16,7 @@ NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
+NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=DEVNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.xyz/query
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -1,11 +0,0 @@
-# App configuration variables
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_DELEGATIONS_PAGINATION=50
-NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -3,7 +3,7 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -27,12 +27,11 @@ Example configurations are provided here:
 - [Mainnet](./.env.mainnet)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)
- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run governance:serve --env={env} # e.g. stagnet3
+yarn nx run governance:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -33,10 +33,6 @@ export const ContractAddresses: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
-  STAGNET3: {
-    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
-    lockedAddress: '0x0', // TODO not deployed to this env
-  },
  TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
@@ -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',
@@ -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();
@@ -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>
@@ -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']>;
@@ -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;
@@ -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:
@@ -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;
@@ -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',
@@ -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>;
@@ -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,
@@ -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',
@@ -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;
@@ -40,18 +40,6 @@
  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);
@@ -63,3 +51,10 @@
  --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;
+}
@@ -23,5 +23,5 @@ NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -2,7 +2,7 @@
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
@@ -5,4 +5,4 @@ NX_VEGA_ENV=STAGNET1
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://stagnet1.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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
@@ -1,8 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
@@ -1,5 +1,5 @@
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
+NX_VEGA_URL=https://api.stagnet1.vega.xyz/graphql
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
-NX_VEGA_ENV=STAGNET3
+NX_VEGA_ENV=STAGNET1
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -1,5 +0,0 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
-NX_VEGA_ENV=STAGNET3
@@ -22,12 +22,11 @@ Example configurations are provided here:
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run multisig-signer:serve --env={env} # e.g. stagnet3
+yarn nx run multisig-signer:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -38,7 +38,7 @@
    "tranche_end": "2023-05-20T00:00:00.000Z",
    "total_added": "19242.125",
    "total_removed": "959.3245960538025",
-    "locked_amount": "10740.2904998553229338",
+    "locked_amount": "9937.5330975115729338",
    "deposits": [
      {
        "amount": "188",
@@ -845,7 +845,7 @@
    "tranche_end": "2023-05-06T00:00:00.000Z",
    "total_added": "14520",
    "total_removed": "5079.76864115505",
-    "locked_amount": "1328.5631944444439712",
+    "locked_amount": "722.8069444444451328",
    "deposits": [
      {
        "amount": "111",
@@ -1680,7 +1680,7 @@
    "tranche_start": "2023-03-06T00:00:00.000Z",
    "tranche_end": "2023-04-06T00:00:00.000Z",
    "total_added": "14099",
-    "total_removed": "3142.49002352036",
+    "total_removed": "3722.49002352036",
    "locked_amount": "0",
    "deposits": [
      {
@@ -2450,6 +2450,11 @@
        "user": "0xBe9F912Ad481C61B653463E8F1D2b2b310D49861",
        "tx": "0x191a1901917ada560c9c30efd3d24c0ec116b9dc131a6966cc67ad7e3701df3b"
      },
+      {
+        "amount": "580",
+        "user": "0xAA4110D07E062bAA025BECb15B795447F58B8d2E",
+        "tx": "0x795e8308c0001ad97f322ea94c382cc1799cfd8231a0c492fa8d54f16d2eef56"
+      },
      {
        "amount": "30",
        "user": "0x8499411Bff99ddE9A02903008F917EEa0E27B42A",
@@ -3599,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",
@@ -4703,7 +4715,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "86666.297",
    "total_removed": "0",
-    "locked_amount": "51226.896539776924515462",
+    "locked_amount": "50929.7231498068801776055",
    "deposits": [
      {
        "amount": "86666.297",
@@ -4769,7 +4781,7 @@
    "tranche_end": "2023-06-01T00:00:00.000Z",
    "total_added": "2500",
    "total_removed": "0",
-    "locked_amount": "394.848424145299",
+    "locked_amount": "377.65663156288155",
    "deposits": [
      {
        "amount": "2500",
@@ -4802,7 +4814,7 @@
    "tranche_end": "2023-11-01T00:00:00.000Z",
    "total_added": "15000.000000000000015",
    "total_removed": "0",
-    "locked_amount": "14816.165647644927014816165647644927",
+    "locked_amount": "14714.136096014493014714136096014493",
    "deposits": [
      {
        "amount": "1.5e-14",
@@ -4890,7 +4902,7 @@
    "tranche_end": "2023-09-01T00:00:00.000Z",
    "total_added": "17500",
    "total_removed": "0",
-    "locked_amount": "11483.8961541364725",
+    "locked_amount": "11364.8616772342995",
    "deposits": [
      {
        "amount": "12500",
@@ -5157,7 +5169,7 @@
    "tranche_end": "2023-08-01T00:00:00.000Z",
    "total_added": "37500",
    "total_removed": "17836.1796921",
-    "locked_amount": "18593.57015423572875",
+    "locked_amount": "18334.268531307550125",
    "deposits": [
      {
        "amount": "7500",
@@ -5565,7 +5577,7 @@
    "tranche_end": "2023-12-05T00:00:00.000Z",
    "total_added": "129999.45",
    "total_removed": "0",
-    "locked_amount": "51180.15844229965399674",
+    "locked_amount": "50883.256185656170147137",
    "deposits": [
      {
        "amount": "129999.45",
@@ -5598,7 +5610,7 @@
    "tranche_end": "2024-04-01T00:00:00.000Z",
    "total_added": "54144.7663",
    "total_removed": "0",
-    "locked_amount": "49373.06871247784644592557",
+    "locked_amount": "49187.91691173374041346364",
    "deposits": [
      {
        "amount": "54144.7663",
@@ -5631,7 +5643,7 @@
    "tranche_end": "2023-09-03T00:00:00.000Z",
    "total_added": "62600",
    "total_removed": "0",
-    "locked_amount": "21051.60226407915008",
+    "locked_amount": "20836.950722983256762",
    "deposits": [
      {
        "amount": "10000",
@@ -5824,7 +5836,7 @@
    "tranche_end": "2023-09-17T00:00:00.000Z",
    "total_added": "5000",
    "total_removed": "0",
-    "locked_amount": "1873.218702435312",
+    "locked_amount": "1856.07401065448985",
    "deposits": [
      {
        "amount": "5000",
@@ -6882,7 +6894,7 @@
    "tranche_end": "2023-06-02T00:00:00.000Z",
    "total_added": "1939928.38",
    "total_removed": "1709370.7872515768348",
-    "locked_amount": "158090.6912451388393129414",
+    "locked_amount": "151438.7964147451270015398",
    "deposits": [
      {
        "amount": "1852091.69",
@@ -40754,7 +40766,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "3732368.4671",
    "total_removed": "715655.108029600523393",
-    "locked_amount": "267431.675840398797767447499",
+    "locked_amount": "257209.934903168881888467304",
    "deposits": [
      {
        "amount": "1998.95815",
@@ -42146,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": "866687.25765937723884852",
-    "locked_amount": "6247983.1374161640607671780970752321127332",
+    "total_removed": "869802.17678213314859352",
+    "locked_amount": "6211737.5003512443867025914959180178169776",
    "deposits": [
      {
        "amount": "16249.93",
@@ -42696,6 +42708,16 @@
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
        "tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
      },
+      {
+        "amount": "923.531125735486125",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
+      },
+      {
+        "amount": "2191.38799702042362",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+      },
      {
        "amount": "981.387731774910625",
        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44840,6 +44862,12 @@
            "tranche_id": 2,
            "tx": "0x2e3b57da0245aea9164e96cd7421d82a3f34df2ab34bc9a64b91e629fb5cb31c"
          },
+          {
+            "amount": "923.531125735486125",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
+          },
          {
            "amount": "981.387731774910625",
            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46348,8 +46376,8 @@
          }
        ],
        "total_tokens": "259998.8875",
-        "withdrawn_tokens": "156789.08944273708375",
-        "remaining_tokens": "103209.79805726291625"
+        "withdrawn_tokens": "157712.620568472569875",
+        "remaining_tokens": "102286.266931527430125"
      },
      {
        "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46588,6 +46616,12 @@
            "tranche_id": 2,
            "tx": "0x9d12dadb940c59a796a405a4971e73f24d7ad284528ec7ce676ae361a4ac1f51"
          },
+          {
+            "amount": "2191.38799702042362",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+          },
          {
            "amount": "2873.74755113623213",
            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46860,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",
@@ -48724,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": "6168897.174282186485373182",
-    "locked_amount": "46652.9124232901388230326056764886",
+    "total_removed": "6169862.126766503085603932",
+    "locked_amount": "13191.17171553312990484487088804078",
    "deposits": [
      {
        "amount": "129284.449",
@@ -48984,6 +49018,11 @@
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
        "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
      },
+      {
+        "amount": "964.95248431660023075",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+      },
      {
        "amount": "1360.32447632896938825",
        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52326,6 +52365,12 @@
            "tranche_id": 3,
            "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
          },
+          {
+            "amount": "964.95248431660023075",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+          },
          {
            "amount": "1360.32447632896938825",
            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -55148,8 +55193,8 @@
          }
        ],
        "total_tokens": "359123.469575",
-        "withdrawn_tokens": "357792.4615146437139805",
-        "remaining_tokens": "1331.0080603562860195"
+        "withdrawn_tokens": "358757.41399896031421125",
+        "remaining_tokens": "366.05557603968578875"
      },
      {
        "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -58824,7 +58869,7 @@
    "tranche_end": "2023-06-05T00:00:00.000Z",
    "total_added": "472355.6199999996",
    "total_removed": "44078.8527972103416",
-    "locked_amount": "42376.077741542987921938344901044",
+    "locked_amount": "40756.38446007669418433357128362",
    "deposits": [
      {
        "amount": "3000",
@@ -144132,6 +144177,11 @@
      }
    ],
    "withdrawals": [
+      {
+        "amount": "0",
+        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+        "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+      },
      {
        "amount": "0",
        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -144422,6 +144472,12 @@
          }
        ],
        "withdrawals": [
+          {
+            "amount": "0",
+            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+            "tranche_id": 9,
+            "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+          },
          {
            "amount": "0",
            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-stagnet3.vega.rocks/graphql"]
-}
@@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL=''
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -5,7 +5,7 @@ NX_VEGA_CONFIG_URL=''
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -1,24 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_ENV=STAGNET3
-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://stagnet3.token.vega.xyz
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_WALLET_URL=http://localhost:1789
-
-CYPRESS_ETH_WALLET_MNEMONIC=
-CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
-CYPRESS_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-CYPRESS_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=1a18cd…0cf2e4
-CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=47836c…c7d278
-CYPRESS_VEGA_ENV=STAGNET3
-CYPRESS_VEGA_PUBLIC_KEY=1a18cdcaaa4f44a57b35a4e9b77e0701c17a476f2b407620f8c17371740cf2e4
-CYPRESS_VEGA_PUBLIC_KEY2=47836c253520d2661bf5bed6339c0de08fd02cf5d4db0efee3b4373f20c7d278
-CYPRESS_VEGA_TOKEN_URL=https://stagnet3.token.vega.xyz
-CYPRESS_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -180,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', () => {
@@ -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',
@@ -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);
          });
      });
@@ -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()
@@ -3,10 +3,10 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_ENV=STAGNET3
-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_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -4,8 +4,8 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=''
 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_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -4,7 +4,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
@@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -1,14 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_ENV=STAGNET3
-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_WALLET_URL=http://localhost:1789
-NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -5,7 +5,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 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_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
@@ -5,8 +5,8 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 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_NETWORKS={\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.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
@@ -21,12 +21,11 @@ Example configurations are provided here:
 - [Mainnet](./.env.mainnet)
 - [Devnet](./.env.devnet)
 - [Testnet](./.env.testnet)
- [Stagnet3](./.env.stagnet3)

 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn nx run token:serve --env={env} # e.g. stagnet3
+yarn nx run token:serve --env={env} # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -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';
@@ -58,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;
@@ -104,9 +147,42 @@ const MarketBottomPanel = memo(
        >
          <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
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="closed-orders" name={t('Closed')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Closed}
+                    onMarketClick={onMarketClick}
+                    onOrderTypeClick={onOrderTypeClick}
+                    enforceBottomPlaceholder
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="rejected-orders" name={t('Rejected')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Rejected}
+                    onMarketClick={onMarketClick}
+                    onOrderTypeClick={onOrderTypeClick}
+                    enforceBottomPlaceholder
+                  />
+                </VegaWalletContainer>
+              </Tab>
+              <Tab id="orders" name={t('All')}>
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
                    marketId={marketId}
                    onMarketClick={onMarketClick}
                    onOrderTypeClick={onOrderTypeClick}
@@ -116,7 +192,7 @@ const MarketBottomPanel = memo(
              </Tab>
              <Tab id="fills" name={t('Fills')}>
                <VegaWalletContainer>
-                  <TradingViews.Fills
+                  <TradingViews.fills.component
                    marketId={marketId}
                    onMarketClick={onMarketClick}
                  />
@@ -134,7 +210,7 @@ const MarketBottomPanel = memo(
            <Tabs storageKey="console-trade-grid-bottom-right">
              <Tab id="positions" name={t('Positions')}>
                <VegaWalletContainer>
-                  <TradingViews.Positions
+                  <TradingViews.positions.component
                    onMarketClick={onMarketClick}
                    noBottomPlaceholder
                  />
@@ -142,7 +218,7 @@ const MarketBottomPanel = memo(
              </Tab>
              <Tab id="accounts" name={t('Collateral')}>
                <VegaWalletContainer>
-                  <TradingViews.Collateral
+                  <TradingViews.collateral.component
                    pinnedAsset={pinnedAsset}
                    noBottomPlaceholder
                    hideButtons
@@ -158,12 +234,45 @@ 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} />
            </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
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="closed-orders" name={t('Closed')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
+                marketId={marketId}
+                filter={Filter.Closed}
+                onMarketClick={onMarketClick}
+                onOrderTypeClick={onOrderTypeClick}
+                enforceBottomPlaceholder
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="rejected-orders" name={t('Rejected')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
+                marketId={marketId}
+                filter={Filter.Rejected}
+                onMarketClick={onMarketClick}
+                onOrderTypeClick={onOrderTypeClick}
+                enforceBottomPlaceholder
+              />
+            </VegaWalletContainer>
+          </Tab>
+          <Tab id="orders" name={t('All')}>
+            <VegaWalletContainer>
+              <TradingViews.orders.component
                marketId={marketId}
                onMarketClick={onMarketClick}
                onOrderTypeClick={onOrderTypeClick}
@@ -173,7 +282,7 @@ const MarketBottomPanel = memo(
          </Tab>
          <Tab id="fills" name={t('Fills')}>
            <VegaWalletContainer>
-              <TradingViews.Fills
+              <TradingViews.fills.component
                marketId={marketId}
                onMarketClick={onMarketClick}
              />
@@ -181,7 +290,10 @@ const MarketBottomPanel = memo(
          </Tab>
          <Tab id="accounts" name={t('Collateral')}>
            <VegaWalletContainer>
-              <TradingViews.Collateral pinnedAsset={pinnedAsset} hideButtons />
+              <TradingViews.collateral.component
+                pinnedAsset={pinnedAsset}
+                hideButtons
+              />
            </VegaWalletContainer>
          </Tab>
        </Tabs>
@@ -221,13 +333,13 @@ const MainGrid = memo(
              <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>
@@ -240,13 +352,13 @@ const MainGrid = memo(
              <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>
@@ -259,10 +371,10 @@ const MainGrid = memo(
              <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>
@@ -330,7 +442,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;
@@ -339,7 +451,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}`);
@@ -388,7 +500,7 @@ export const TradePanels = ({
              className={className}
              key={key}
            >
-              {key}
+              {TradingViews[key as keyof typeof TradingViews].label}
            </button>
          );
        })}
@@ -24,6 +24,10 @@ import {
 import { Links, Routes } from '../../pages/client-router';
 import { createDocsLinks } from '@vegaprotocol/utils';
 import { SettingsButton } from '../../client-pages/settings';
+import {
+  ProtocolUpgradeCountdown,
+  ProtocolUpgradeCountdownMode,
+} from '@vegaprotocol/proposals';

 export const Navbar = ({
  theme = 'system',
@@ -45,11 +49,14 @@ export const Navbar = ({
      theme={theme}
      actions={
        <>
+          <ProtocolUpgradeCountdown
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
          <SettingsButton />
          <VegaWalletConnectButton />
        </>
      }
-      breakpoints={[521, 1067]}
+      breakpoints={[521, 1122]}
    >
      <NavigationList
        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
@@ -5,7 +5,5 @@ export const ViewingBanner = () => {
  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
  return isReadOnly ? (
    <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
-  ) : (
-    <div />
-  );
+  ) : null;
 };
@@ -20,7 +20,6 @@ describe('Risk notice dialog', () => {
    assertion     | network
    ${'displays'} | ${Networks.CUSTOM}
    ${'displays'} | ${Networks.DEVNET}
-    ${'displays'} | ${Networks.STAGNET3}
    ${'displays'} | ${Networks.TESTNET}
  `(
    '$assertion a generic message on $network',
@@ -35,8 +35,12 @@ import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
 import { ENV } from '../lib/config';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import { activeOrdersProvider } from '@vegaprotocol/orders';
+import { activeOrdersProvider, allOrdersProvider } from '@vegaprotocol/orders';
 import { useTelemetryApproval } from '../lib/hooks/use-telemetry-approval';
+import {
+  ProtocolUpgradeCountdownMode,
+  ProtocolUpgradeProposalNotification,
+} from '@vegaprotocol/proposals';

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

@@ -89,7 +93,12 @@ function AppBody({ Component }: AppProps) {
      <div className={gridClasses}>
        <AnnouncementBanner />
        <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} />
-        <ViewingBanner />
+        <div data-testid="banners">
+          <ProtocolUpgradeProposalNotification
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
+          <ViewingBanner />
+        </div>
        <main data-testid={location.pathname}>
          <Component />
        </main>
@@ -141,6 +150,11 @@ const PartyData = () => {
    variables,
    skip,
  });
+  useDataProvider({
+    dataProvider: allOrdersProvider,
+    variables,
+    skip,
+  });
  return null;
 };

@@ -37,9 +37,9 @@ export const AccountManager = ({
    variables,
  });
  const setId = useCallback(
-    (data: AccountFields) => ({
+    (data: AccountFields, id: string) => ({
      ...data,
-      asset: { ...data.asset, id: `${data.asset.id}-1` },
+      asset: { ...data.asset, id },
    }),
    []
  );
@@ -126,14 +126,20 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
      return currentPinnedAssetRow;
    }, [pinnedAssetId, props.pinnedAsset, props.rowData]);

-    const getRowHeight = useCallback(
-      (params: RowHeightParams) =>
-        params.node.rowPinned &&
-        params.data.asset.id === pinnedAssetId &&
-        new BigNumber(params.data.total).isLessThanOrEqualTo(0)
-          ? 32
-          : 24,
-      [pinnedAssetId]
+    const { getRowHeight } = props;
+
+    const getPinnedAssetRowHeight = useCallback(
+      (params: RowHeightParams) => {
+        if (
+          params.node.rowPinned &&
+          params.data.asset.id === pinnedAssetId &&
+          new BigNumber(params.data.total).isLessThanOrEqualTo(0)
+        ) {
+          return 32;
+        }
+        return getRowHeight ? getRowHeight(params) : undefined;
+      },
+      [pinnedAssetId, getRowHeight]
    );

    return (
@@ -155,7 +161,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
            sortable: true,
            comparator: accountValuesComparator,
          }}
-          getRowHeight={getRowHeight}
+          getRowHeight={getPinnedAssetRowHeight}
          pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined}
        >
          <AgGridColumn
@@ -1,13 +1,50 @@
 import { Option } from '@vegaprotocol/ui-toolkit';
 import type { AssetFieldsFragment } from './__generated__/Asset';
+import classNames from 'classnames';
+import { t } from '@vegaprotocol/i18n';
+import type { ReactNode } from 'react';

-export const AssetOption = ({ asset }: { asset: AssetFieldsFragment }) => {
+type AssetOptionProps = {
+  asset: AssetFieldsFragment;
+  balance?: ReactNode;
+};
+
+export const Balance = ({
+  balance,
+  symbol,
+}: {
+  balance?: string;
+  symbol: string;
+}) =>
+  balance ? (
+    <div className="mt-1 font-alpha">
+      {balance} {symbol}
+    </div>
+  ) : (
+    <div className="text-vega-orange-500">{t('Fetching balance…')}</div>
+  );
+
+export const AssetOption = ({ asset, balance }: AssetOptionProps) => {
  return (
    <Option key={asset.id} value={asset.id}>
      <div className="flex flex-col items-start">
-        <span>{asset.name}</span>
-        <div className="text-[10px] font-mono w-full text-left break-all">
-          <span className="text-gray-500">{asset.id} -</span> {asset.symbol}
+        <div className="flex flex-row align-baseline gap-2">
+          <span>{asset.name}</span>{' '}
+          <span
+            className={classNames(
+              'bg-vega-light-200 dark:bg-vega-dark-200',
+              'text-black dark:text-white text-xs',
+              'py-[2px] px-[4px] rounded'
+            )}
+          >
+            {asset.symbol}
+          </span>
+        </div>
+        {balance}
+        <div className="text-[12px] font-mono w-full text-left break-all">
+          <span className="text-vega-light-300 dark:text-vega-dark-300">
+            {asset.id}
+          </span>
        </div>
      </div>
    </Option>
@@ -1,8 +1,9 @@
 export * from './__generated__/Asset';
 export * from './__generated__/Assets';
 export * from './asset-data-provider';
-export * from './assets-data-provider';
 export * from './asset-details-dialog';
 export * from './asset-details-table';
 export * from './asset-option';
+export * from './assets-data-provider';
 export * from './constants';
+export * from './use-balances-store';
@@ -0,0 +1,69 @@
+import type BigNumber from 'bignumber.js';
+import type { AssetFieldsFragment } from './__generated__/Asset';
+import { create } from 'zustand';
+import * as Sentry from '@sentry/react';
+import { immer } from 'zustand/middleware/immer';
+
+type AssetWithBalance = {
+  asset: AssetFieldsFragment;
+  balanceOnEth?: BigNumber;
+  balanceOnVega?: BigNumber;
+  updatedAt: number;
+};
+
+type SetBalanceArgs = Omit<AssetWithBalance, 'updatedAt'> & {
+  ethBalanceFetcher?: () => Promise<BigNumber | undefined>;
+};
+
+type BalancesStore = {
+  balances: (AssetWithBalance & { fetchFromEth?: () => void })[];
+  getBalance: (assetId: string) => AssetWithBalance | undefined;
+  setBalance: (args: SetBalanceArgs) => void;
+  refetch: (assetId: string) => void;
+};
+
+export const useBalancesStore = create(
+  immer<BalancesStore>((set, get) => ({
+    balances: [],
+    getBalance: (assetId) =>
+      get().balances.find(({ asset: a }) => a.id === assetId),
+    setBalance: ({ asset, balanceOnEth, balanceOnVega, ethBalanceFetcher }) => {
+      set((state) => {
+        const found = state.balances.find(({ asset: a }) => a.id === asset.id);
+        const fetchFromEth = ethBalanceFetcher
+          ? () => {
+              if (!ethBalanceFetcher) return;
+              ethBalanceFetcher()
+                .then((balance) => {
+                  if (balance) {
+                    get().setBalance({ asset, balanceOnEth: balance });
+                  }
+                })
+                .catch((err) => {
+                  Sentry.captureException(err);
+                });
+            }
+          : undefined;
+
+        if (found) {
+          if (balanceOnEth) found.balanceOnEth = balanceOnEth;
+          if (balanceOnVega) found.balanceOnVega = balanceOnVega;
+          if (fetchFromEth) found.fetchFromEth = fetchFromEth;
+          found.updatedAt = Date.now();
+        } else {
+          state.balances.push({
+            asset,
+            balanceOnEth,
+            balanceOnVega,
+            fetchFromEth,
+            updatedAt: Date.now(),
+          });
+        }
+      });
+    },
+    refetch: (assetId) => {
+      const found = get().balances.find((a) => a.asset.id === assetId);
+      found?.fetchFromEth?.();
+    },
+  }))
+);
@@ -9,85 +9,90 @@ import {
 import type { IDoesFilterPassParams, IFilterParams } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';

-export const SetFilter = forwardRef((props: IFilterParams, ref) => {
-  const [value, setValue] = useState<string[]>([]);
-  const valueRef = useRef(value);
+export const SetFilter = forwardRef(
+  (props: IFilterParams & { readonly?: boolean }, ref) => {
+    const [value, setValue] = useState<string[]>([]);
+    const valueRef = useRef(value);
+    const { readonly } = props;
+    // expose AG Grid Filter Lifecycle callbacks
+    useImperativeHandle(ref, () => {
+      return {
+        doesFilterPass(params: IDoesFilterPassParams) {
+          const { api, colDef, column, columnApi, context } = props;
+          const { node } = params;
+          const getValue = props.valueGetter({
+            api,
+            colDef,
+            column,
+            columnApi,
+            context,
+            data: node.data,
+            getValue: (field) => node.data[field],
+            node,
+          });
+          return Array.isArray(value)
+            ? value.includes(getValue)
+            : getValue === value;
+        },

-  // expose AG Grid Filter Lifecycle callbacks
-  useImperativeHandle(ref, () => {
-    return {
-      doesFilterPass(params: IDoesFilterPassParams) {
-        const { api, colDef, column, columnApi, context } = props;
-        const { node } = params;
-        const getValue = props.valueGetter({
-          api,
-          colDef,
-          column,
-          columnApi,
-          context,
-          data: node.data,
-          getValue: (field) => node.data[field],
-          node,
-        });
-        return Array.isArray(value)
-          ? value.includes(getValue)
-          : getValue === value;
-      },
+        isFilterActive() {
+          return valueRef.current.length !== 0;
+        },

-      isFilterActive() {
-        return valueRef.current.length !== 0;
-      },
+        getModel() {
+          if (!this.isFilterActive()) {
+            return null;
+          }
+          return { value: valueRef.current };
+        },

-      getModel() {
-        if (!this.isFilterActive()) {
-          return null;
-        }
-        return { value: valueRef.current };
-      },
+        setModel(model?: { value: string[] } | null) {
+          valueRef.current = !model ? [] : model.value;
+          setValue(valueRef.current);
+        },
+      };
+    });

-      setModel(model?: { value: string[] } | null) {
-        valueRef.current = !model ? [] : model.value;
-        setValue(valueRef.current);
-      },
+    const onChange = (event: ChangeEvent<HTMLInputElement>) => {
+      valueRef.current = event.target.checked
+        ? [...value, event.target.value]
+        : value.filter((v) => v !== event.target.value);
+      setValue(valueRef.current);
    };
-  });

-  const onChange = (event: ChangeEvent<HTMLInputElement>) => {
-    valueRef.current = event.target.checked
-      ? [...value, event.target.value]
-      : value.filter((v) => v !== event.target.value);
-    setValue(valueRef.current);
-  };
-
-  useEffect(() => {
-    props.filterChangedCallback();
-  }, [value]); //eslint-disable-line react-hooks/exhaustive-deps
-
-  return (
-    <div className="ag-filter-body-wrapper">
-      <fieldset className="ag-simple-filter-body-wrapper">
-        {Object.keys(props.colDef.filterParams.set).map((key) => (
-          <label className="flex" key={key}>
-            <input
-              type="checkbox"
-              value={key}
-              className="mr-1"
-              checked={value.includes(key)}
-              onChange={onChange}
-            />
-            <span>{props.colDef.filterParams.set[key]}</span>
-          </label>
-        ))}
-      </fieldset>
-      <div className="ag-filter-apply-panel">
-        <button
-          type="button"
-          className="ag-standard-button ag-filter-apply-panel-button"
-          onClick={() => setValue((valueRef.current = []))}
-        >
-          {t('Reset')}
-        </button>
+    useEffect(() => {
+      props.filterChangedCallback();
+    }, [value]); //eslint-disable-line react-hooks/exhaustive-deps
+    return (
+      <div className="ag-filter-body-wrapper">
+        <fieldset className="ag-simple-filter-body-wrapper">
+          {Object.keys(props.colDef.filterParams.set).map((key) => (
+            <label className="flex" key={key}>
+              <input
+                type="checkbox"
+                value={key}
+                disabled={readonly}
+                className="mr-1"
+                checked={value.includes(key)}
+                onChange={onChange}
+              />
+              <span>{props.colDef.filterParams.set[key]}</span>
+            </label>
+          ))}
+        </fieldset>
+        {!readonly && (
+          <div className="ag-filter-apply-panel">
+            <button
+              type="button"
+              disabled={readonly}
+              className="ag-standard-button ag-filter-apply-panel-button"
+              onClick={() => setValue((valueRef.current = []))}
+            >
+              {t('Reset')}
+            </button>
+          </div>
+        )}
      </div>
-    </div>
-  );
-});
+    );
+  }
+);
@@ -0,0 +1,42 @@
+import { useCallback, useEffect } from 'react';
+import { useGetBalanceOfERC20Token } from './use-get-balance-of-erc20-token';
+import type { AssetFieldsFragment } from '@vegaprotocol/assets';
+import { useBalancesStore } from '@vegaprotocol/assets';
+import { Balance } from '@vegaprotocol/assets';
+import { isAssetTypeERC20 } from '@vegaprotocol/utils';
+import { useTokenContract } from '@vegaprotocol/web3';
+
+const REFETCH_DELAY = 5000;
+
+export const AssetBalance = ({ asset }: { asset: AssetFieldsFragment }) => {
+  const [setBalance, getBalance] = useBalancesStore((state) => [
+    state.setBalance,
+    state.getBalance,
+  ]);
+
+  const tokenContract = useTokenContract(
+    isAssetTypeERC20(asset) ? asset.source.contractAddress : undefined
+  );
+  const ethBalanceFetcher = useGetBalanceOfERC20Token(tokenContract, asset);
+
+  const fetchFromEth = useCallback(async () => {
+    const balance = await ethBalanceFetcher();
+    if (balance) {
+      setBalance({ asset, balanceOnEth: balance, ethBalanceFetcher });
+    }
+  }, [asset, ethBalanceFetcher, setBalance]);
+
+  useEffect(() => {
+    const balance = getBalance(asset.id);
+    if (!balance || Date.now() - balance.updatedAt > REFETCH_DELAY) {
+      fetchFromEth();
+    }
+  }, [asset.id, fetchFromEth, getBalance]);
+
+  return (
+    <Balance
+      balance={getBalance(asset.id)?.balanceOnEth?.toString()}
+      symbol={asset.symbol}
+    />
+  );
+};
@@ -41,6 +41,7 @@ import type { DepositBalances } from './use-deposit-balances';
 import { FaucetNotification } from './faucet-notification';
 import { ApproveNotification } from './approve-notification';
 import { usePersistentDeposit } from './use-persistent-deposit';
+import { AssetBalance } from './asset-balance';

 interface FormFields {
  asset: string;
@@ -253,9 +254,15 @@ export const DepositForm = ({
              value={selectedAsset?.id}
              hasError={Boolean(errors.asset?.message)}
            >
-              {assets.filter(isAssetTypeERC20).map((a) => (
-                <AssetOption asset={a} key={a.id} />
-              ))}
+              {assets
+                .filter((asset) => isAssetTypeERC20(asset))
+                .map((asset) => (
+                  <AssetOption
+                    asset={asset}
+                    key={asset.id}
+                    balance={<AssetBalance asset={asset} />}
+                  />
+                ))}
            </RichSelect>
          )}
        />
@@ -1,15 +1,16 @@
 export * from './__generated__/Deposit';
+export * from './asset-balance';
 export * from './deposit-container';
+export * from './deposit-dialog';
 export * from './deposit-form';
 export * from './deposit-limits';
 export * from './deposit-manager';
+export * from './deposits-provider';
 export * from './deposits-table';
 export * from './use-deposit-balances';
-export * from './deposits-provider';
 export * from './use-get-allowance';
 export * from './use-get-balance-of-erc20-token';
 export * from './use-get-deposit-maximum';
 export * from './use-get-deposited-amount';
 export * from './use-submit-approval';
 export * from './use-submit-faucet';
-export * from './deposit-dialog';
@@ -5,6 +5,7 @@ import {
 } from '@vegaprotocol/web3';
 import { isAssetTypeERC20 } from '@vegaprotocol/utils';
 import type { Asset } from '@vegaprotocol/assets';
+import { useBalancesStore } from '@vegaprotocol/assets';
 import { useEffect, useState } from 'react';

 export const useSubmitFaucet = (
@@ -25,8 +26,9 @@ export const useSubmitFaucet = (
  useEffect(() => {
    if (tx?.status === EthTxStatus.Confirmed) {
      getBalances();
+      if (asset) useBalancesStore.getState().refetch(asset.id);
    }
-  }, [tx?.status, getBalances]);
+  }, [tx?.status, getBalances, asset]);

  return {
    id,
@@ -14,12 +14,11 @@ jest.mock('../../hooks/use-environment');

 describe('Network switcher', () => {
  it.each`
-    network              | label
-    ${Networks.CUSTOM}   | ${envTriggerMapping[Networks.CUSTOM]}
-    ${Networks.DEVNET}   | ${envTriggerMapping[Networks.DEVNET]}
-    ${Networks.STAGNET3} | ${envTriggerMapping[Networks.STAGNET3]}
-    ${Networks.TESTNET}  | ${envTriggerMapping[Networks.TESTNET]}
-    ${Networks.MAINNET}  | ${envTriggerMapping[Networks.MAINNET]}
+    network             | label
+    ${Networks.CUSTOM}  | ${envTriggerMapping[Networks.CUSTOM]}
+    ${Networks.DEVNET}  | ${envTriggerMapping[Networks.DEVNET]}
+    ${Networks.TESTNET} | ${envTriggerMapping[Networks.TESTNET]}
+    ${Networks.MAINNET} | ${envTriggerMapping[Networks.MAINNET]}
  `(
    'displays the correct selection label for $network',
    ({ network, label }) => {
@@ -137,7 +136,6 @@ describe('Network switcher', () => {
      [Networks.MAINNET]: 'https://main.net',
      [Networks.TESTNET]: 'https://test.net',
      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
-      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
    };
@@ -154,12 +152,7 @@ describe('Network switcher', () => {
      screen.getByRole('menuitem', { name: t('Advanced') })
    );

-    [
-      Networks.MAINNET,
-      Networks.TESTNET,
-      Networks.STAGNET3,
-      Networks.DEVNET,
-    ].forEach((network) => {
+    [Networks.MAINNET, Networks.TESTNET, Networks.DEVNET].forEach((network) => {
      expect(
        screen.getByRole('link', { name: envNameMapping[network] })
      ).toHaveAttribute('href', VEGA_NETWORKS[network]);
@@ -176,7 +169,6 @@ describe('Network switcher', () => {
      [Networks.MAINNET]: 'https://main.net',
      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
      [Networks.TESTNET]: 'https://test.net',
-      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
    };
@@ -208,7 +200,6 @@ describe('Network switcher', () => {
      [Networks.MAINNET]: undefined,
      [Networks.VALIDATOR_TESTNET]: 'https://validator-test.net',
      [Networks.TESTNET]: 'https://test.net',
-      [Networks.STAGNET3]: 'https://stag3.net',
      [Networks.DEVNET]: 'https://dev.net',
      [Networks.STAGNET1]: 'https://stag1.net',
    };
@@ -18,7 +18,6 @@ export const envNameMapping: Record<Networks, string> = {
  [Networks.CUSTOM]: t('Custom'),
  [Networks.DEVNET]: t('Devnet'),
  [Networks.STAGNET1]: t('Stagnet'),
-  [Networks.STAGNET3]: t('Stagnet3'),
  [Networks.TESTNET]: t('Fairground testnet'),
  [Networks.MAINNET]: t('Mainnet'),
 };
@@ -33,7 +32,6 @@ export const envDescriptionMapping: Record<Networks, string> = {
  [Networks.VALIDATOR_TESTNET]: t('The validator deployed testnet'),
  [Networks.DEVNET]: t('The latest Vega code auto-deployed'),
  [Networks.STAGNET1]: t('A release candidate for the staging environment'),
-  [Networks.STAGNET3]: t('A staging environment with trading'),
  [Networks.TESTNET]: t(
    'Public testnet run by the Vega team, often used for incentives'
  ),
@@ -44,7 +42,6 @@ const standardNetworkKeys = [Networks.MAINNET, Networks.TESTNET];
 const advancedNetworkKeys = [
  Networks.MAINNET,
  Networks.TESTNET,
-  Networks.STAGNET3,
  Networks.DEVNET,
 ];

@@ -55,7 +55,6 @@ const mockEnvVars = {
  VEGA_NETWORKS: {
    DEVNET: 'https://devnet.url',
    TESTNET: 'https://testnet.url',
-    STAGNET3: 'https://stagnet3.url',
    MAINNET: 'https://mainnet.url',
  },
  VEGA_WALLET_URL: 'https://localhost:1234',
@@ -2,6 +2,7 @@ import trim from 'lodash/trim';
 import { useCallback } from 'react';
 import { Networks } from '../types';
 import { useEnvironment } from './use-environment';
+import { stripFullStops } from '@vegaprotocol/utils';

 type Net = Exclude<Networks, 'CUSTOM'>;
 export enum DApp {
@@ -18,7 +19,6 @@ const EmptyLinks: DAppLinks = {
  [Networks.VALIDATOR_TESTNET]: '',
  [Networks.DEVNET]: '',
  [Networks.STAGNET1]: '',
-  [Networks.STAGNET3]: '',
  [Networks.TESTNET]: '',
  [Networks.MAINNET]: '',
 };
@@ -33,14 +33,12 @@ const ExplorerLinks = {
 const ConsoleLinks = {
  ...EmptyLinks,
  [Networks.STAGNET1]: 'https://stagnet1.console.vega.xyz',
-  [Networks.STAGNET3]: 'https://stagnet3.console.vega.xyz',
  [Networks.TESTNET]: 'https://console.fairground.wtf',
 };

 const TokenLinks = {
  ...EmptyLinks,
  [Networks.DEVNET]: 'https://dev.token.vega.xyz',
-  [Networks.STAGNET3]: 'https://stagnet3.token.vega.xyz',
  [Networks.TESTNET]: 'https://token.fairground.wtf',
  [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.governance.vega.xyz',
  [Networks.MAINNET]: 'https://token.vega.xyz',
@@ -89,15 +87,31 @@ export const useEtherscanLink = () => {
 // Vega blog
 export const BLOG = 'https://blog.vega.xyz/';

-// Token pages
+// Governance pages
 export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market';
 export const TOKEN_NEW_NETWORK_PARAM_PROPOSAL =
  '/proposals/propose/network-parameter';
 export const TOKEN_GOVERNANCE = '/proposals';
 export const TOKEN_PROPOSALS = '/proposals';
 export const TOKEN_PROPOSAL = '/proposals/:id';
+export const TOKEN_PROTOCOL_UPGRADE_PROPOSAL =
+  '/proposals/protocol-upgrade/:tag';
 export const TOKEN_VALIDATOR = '/validators/:id';

+/**
+ * Generates link to the protocol upgrade proposal details on Governance
+ */
+export const useProtocolUpgradeProposalLink = () => {
+  const governance = useLinks(DApp.Token);
+  return (releaseTag: string) =>
+    governance(
+      TOKEN_PROTOCOL_UPGRADE_PROPOSAL.replace(
+        ':tag',
+        stripFullStops(releaseTag)
+      )
+    );
+};
+
 // Explorer pages
 export const EXPLORER_TX = '/txs/:hash';
 export const EXPLORER_ORACLE = '/oracles/:id';
@@ -7,7 +7,6 @@ export enum Networks {
  CUSTOM = 'CUSTOM',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
-  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
 }
@@ -5,7 +5,6 @@ export enum Networks {
  CUSTOM = 'CUSTOM',
  TESTNET = 'TESTNET',
  STAGNET1 = 'STAGNET1',
-  STAGNET3 = 'STAGNET3',
  DEVNET = 'DEVNET',
  MAINNET = 'MAINNET',
 }
@@ -62,7 +62,7 @@ export const FillsManager = ({
    scrolledToTop.current = event.top <= 0;
  }, []);

-  const { isFullWidthRow, fullWidthCellRenderer, rowClassRules } =
+  const { isFullWidthRow, fullWidthCellRenderer, rowClassRules, getRowHeight } =
    useBottomPlaceholder<Trade>({
      gridRef,
    });
@@ -82,6 +82,7 @@ export const FillsManager = ({
        isFullWidthRow={isFullWidthRow}
        fullWidthCellRenderer={fullWidthCellRenderer}
        rowClassRules={rowClassRules}
+        getRowHeight={getRowHeight}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -152,6 +152,16 @@ const fills = (id?: string): FillFieldsFragment[] => [
      id: id || 'buyer-id',
    },
  }),
+  fillFieldsFragment({
+    id: '4',
+    aggressor: Schema.Side.SIDE_UNSPECIFIED,
+    market: {
+      id: 'market-2',
+    },
+    buyer: {
+      id: id || 'buyer-id',
+    },
+  }),
 ];

 export const fillsEventSubscription = (
@@ -22,7 +22,6 @@ import type {
  LiquidityProvisionsQueryVariables,
  LiquidityProvisionsUpdateSubscription,
 } from './__generated__/MarketLiquidity';
-import type { IterableElement } from 'type-fest';

 export const liquidityProvisionsDataProvider = makeDataProvider<
  LiquidityProvisionsQuery,
@@ -39,8 +38,8 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
  ) => {
    return produce(data || [], (draft) => {
      deltas?.forEach((delta) => {
-        const id = getId(delta);
-        const index = draft.findIndex((a) => getId(a) === id);
+        const id = delta.id;
+        const index = draft.findIndex((a) => delta.id === id);
        if (index !== -1) {
          draft[index].commitmentAmount = delta.commitmentAmount;
          draft[index].fee = delta.fee;
@@ -76,27 +75,6 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
  },
 });

-function isLpFragment(
-  entry:
-    | LiquidityProvisionFieldsFragment
-    | IterableElement<
-        LiquidityProvisionsUpdateSubscription['liquidityProvisions']
-      >
-): entry is LiquidityProvisionFieldsFragment {
-  return entry.__typename === 'LiquidityProvision';
-}
-
-export const getId = (
-  entry:
-    | LiquidityProvisionFieldsFragment
-    | IterableElement<
-        LiquidityProvisionsUpdateSubscription['liquidityProvisions']
-      >
-) =>
-  isLpFragment(entry)
-    ? `${entry.party.id}${entry.status}${entry.createdAt}${entry.updatedAt}`
-    : `${entry.partyID}${entry.status}${entry.createdAt}${entry.updatedAt}`;
-
 export const marketLiquidityDataProvider = makeDataProvider<
  MarketLpQuery,
  MarketLpQuery,
@@ -17,7 +17,6 @@ import type { ValueFormatterParams } from 'ag-grid-community';
 import BigNumber from 'bignumber.js';
 import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
 import type { LiquidityProvisionData } from './liquidity-data-provider';
-import { getId } from './liquidity-data-provider';

 const percentageFormatter = ({ value }: ValueFormatterParams) => {
  if (!value) return '-';
@@ -56,7 +55,7 @@ export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
      <AgGrid
        style={{ width: '100%', height: '100%' }}
        overlayNoRowsTemplate={t('No liquidity provisions')}
-        getRowId={({ data }) => getId(data)}
+        getRowId={({ data }) => data.id}
        ref={ref}
        tooltipShowDelay={500}
        defaultColDef={{
@@ -198,4 +198,4 @@ export function useMarketInfoLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions
        }
 export type MarketInfoQueryHookResult = ReturnType<typeof useMarketInfoQuery>;
 export type MarketInfoLazyQueryHookResult = ReturnType<typeof useMarketInfoLazyQuery>;
-export type MarketInfoQueryResult = Apollo.QueryResult<MarketInfoQuery, MarketInfoQueryVariables>;
+export type MarketInfoQueryResult = Apollo.QueryResult<MarketInfoQuery, MarketInfoQueryVariables>;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	4e5736274f	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/lp-rows-duplicated	2023-05-04 18:35:28 +01:00
Madalina Raicu	6175d4fa9f	fix: use LP order ID as ag-grid row key	2023-05-04 18:33:30 +01:00
m.ray	b1b9695998	fix(liquidity): rows duplicated wrong ag-grid row ID (#3614 )	2023-05-04 17:23:52 +00:00
Edd	6b8b33a78b	chore(explorer,trading,governance): remove stagnet3 (#3608 )	2023-05-04 16:50:39 +00:00
Madalina Raicu	2d135c67f5	fix(liquidity): liquidity table rows are duplicated because they're getting original ids	2023-05-04 17:50:04 +01:00
Mikołaj Młodzikowski	4fd0f6819a	feat(ci): deploy develop to stagnet1 (#3609 )	2023-05-04 14:29:31 +00:00
Mikołaj Młodzikowski	5032d87f98	feat(ci): define max lenght of a branch (#3607 )	2023-05-04 16:06:46 +02:00
Matthew Russell	b15d9cb7dc	fix(governance,trading): validator testnet link for governance app (#3599 )	2023-05-04 15:21:24 +02:00
dexturr	6aa7cc5bab	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 12:09:32 +00:00
Bartłomiej Głownia	c37f9ebe66	feat(trading): divide order tab into open, closed, rejected and all (#3541 )	2023-05-04 12:09:55 +02:00
Art	768b3b29f0	feat(trading): protocol upgrade notification (#3517 )	2023-05-04 09:51:24 +02:00
dexturr	378946f22b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 06:07:49 +00:00
dexturr	523598645a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-04 00:13:39 +00:00
Art	a9267de653	feat(trading): asset balances inside asset selector (deposit, withdraw form) (#3590 )	2023-05-03 20:35:05 +01:00
dexturr	ce22da1c9a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-03 18:09:05 +00:00
Matthew Russell	2460a62a3e	fix(governance): add custom styles for validators table (#3597 )	2023-05-03 08:05:55 -07:00
daro-maj	f37a8720a2	test(trading): handle unspecified side in fills table - e2e tests (#3594 )	2023-05-03 13:16:55 +01:00
dexturr	f5fe3cc18d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-03 12:10:31 +00:00
Joe Tsang	288f075cac	test(governance): e2e tests updated to cypress 12 (#3582 )	2023-05-03 11:23:17 +01:00
Sam Keen	ca46861fd8	feat(governance): add local time zone abbreviation data to proposal form (#3577 )	2023-05-03 11:23:03 +01:00
m.ray	2cb6ede492	feat(oracles): oracle basic profile (#3544 )	2023-05-03 12:07:39 +02:00
Madalina Raicu	8b3028bd88	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-04-27 14:06:59 +03:00
Madalina Raicu	824b1921e7	fix(fills): side_unspecified added for the aggresor	2023-04-26 14:28:32 +03:00