chore: add restrict import rules for utils and react helpers

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

.github/workflows/branch-length.yml

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

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

@@ -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"

.github/workflows/publish-dist.yml

@@ -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

.prettierignore

@@ -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

apps/explorer-e2e/.env.stagnet3

@@ -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

apps/explorer/.env

@@ -1,13 +1,18 @@
-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_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+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

apps/explorer/.env.capsule

@@ -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

apps/explorer/.env.stagnet1

@@ -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

apps/explorer/.env.stagnet3

@@ -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

apps/explorer/README.md

@@ -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:

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

@@ -14,10 +14,72 @@ import {
   SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
+import isEqual from 'lodash/isEqual';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
 
+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  const terminationData =
+    market.tradableInstrument.instrument.product
+      .dataSourceSpecForTradingTermination.data;
+
+  const getSigners = (data: DataSourceDefinition) => {
+    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
+      const signers = data.sourceType.sourceType.signers || [];
+
+      return signers.map(({ signer }, i) => {
+        return (
+          (signer.__typename === 'ETHAddress' && signer.address) ||
+          (signer.__typename === 'PubKey' && signer.key)
+        );
+      });
+    }
+    return [];
+  };
+
+  const oraclePanels = isEqual(
+    getSigners(settlementData),
+    getSigners(terminationData)
+  )
+    ? [
+        {
+          title: t('Settlement Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="settlementData"
+            />
+          ),
+        },
+        {
+          title: t('Termination Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="termination"
+            />
+          ),
+        },
+      ]
+    : [
+        {
+          title: t('Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="settlementData"
+            />
+          ),
+        },
+      ];
+
   const panels = [
     {
       title: t('Key details'),
@@ -95,22 +157,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
         <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
       ),
     },
-    {
-      title: t('Settlement Oracle'),
-      content: (
-        <OracleInfoPanel
-          noBorder={false}
-          market={market}
-          type="settlementData"
-        />
-      ),
-    },
-    {
-      title: t('Termination Oracle'),
-      content: (
-        <OracleInfoPanel noBorder={false} market={market} type="termination" />
-      ),
-    },
+    ...oraclePanels,
   ];
 
   return (

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

@@ -12,7 +12,10 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';

apps/explorer/src/app/routes/governance/proposals-page.tsx

@@ -1,6 +1,6 @@
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalsTable } from '../../components/proposals/proposals-table';
 import { RouteTitle } from '../../components/route-title';

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';

apps/explorer/src/app/routes/markets/markets-page.tsx

@@ -4,7 +4,7 @@ import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketsTable } from '../../components/markets/markets-table';
 
 export const MarketsPage = () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParametersTable } from './network-parameters';
 
 describe('NetworkParametersTable', () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -13,8 +13,8 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
 import orderBy from 'lodash/orderBy';
-import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 

apps/governance-e2e/.env

@@ -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

apps/governance-e2e/.env.stagnet3

@@ -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

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

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

apps/governance/.env

@@ -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
 

apps/governance/.env.capsule

@@ -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

apps/governance/.env.devnet

@@ -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

apps/governance/.env.mainnet

@@ -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

apps/governance/.env.stagnet1

@@ -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

apps/governance/.env.stagnet3

@@ -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

apps/governance/.env.testnet

@@ -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

apps/governance/.env.validator-testnet

@@ -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

apps/governance/README.md

@@ -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:

apps/governance/src/app.tsx

@@ -20,12 +20,17 @@ import type { EthereumConfig } from '@vegaprotocol/web3';
 import {
   createConnectors,
   useEthTransactionManager,
+  useEthTransactionUpdater,
   useEthWithdrawApprovalsManager,
   useWeb3ConnectStore,
 } from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';
+import {
+  useVegaTransactionManager,
+  useVegaTransactionUpdater,
+  VegaWalletProvider,
+} from '@vegaprotocol/wallet';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import {
@@ -37,6 +42,7 @@ import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
+import { ToastsManager } from './toasts-manager';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -81,7 +87,10 @@ const Web3Container = ({
   providerUrl: string;
 }) => {
   const InitializeHandlers = () => {
+    useVegaTransactionManager();
+    useVegaTransactionUpdater();
     useEthTransactionManager();
+    useEthTransactionUpdater();
     useEthWithdrawApprovalsManager();
     return null;
   };
@@ -135,6 +144,7 @@ const Web3Container = ({
                       <NetworkInfo />
                     </footer>
                   </AppLayout>
+                  <ToastsManager />
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />

apps/governance/src/config/env.ts

@@ -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

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

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

apps/governance/src/routes/proposals/components/current-proposal-status/current-proposal-status.spec.tsx

@@ -2,8 +2,8 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { render, screen } from '@testing-library/react';
 import { ProposalRejectionReason, ProposalState } from '@vegaprotocol/types';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { CurrentProposalStatus } from './current-proposal-status';

apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx

@@ -3,8 +3,8 @@ import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_asset_minVoterBalance: '1',

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -1,4 +1,7 @@
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';

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

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

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

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

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

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

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

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

apps/governance/src/routes/proposals/hooks/use-proposal-network-params.spec.ts

@@ -3,8 +3,8 @@ import { BigNumber } from '../../../lib/bignumber';
 import { useProposalNetworkParams } from './use-proposal-network-params';
 import { generateProposal } from '../test-helpers/generate-proposals';
 
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_updateMarket_requiredMajority: '0.1',

apps/governance/src/routes/proposals/hooks/use-proposal-network-params.ts

@@ -1,4 +1,7 @@
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { BigNumber } from '../../../lib/bignumber';
 import type { ProposalFieldsFragment } from '../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../proposal/__generated__/Proposal';

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

@@ -28,8 +28,8 @@ jest.mock('../../../contexts/app-state/app-state-context', () => ({
   }),
 }));
 
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  ...jest.requireActual('@vegaprotocol/react-helpers'),
+jest.mock('@vegaprotocol/network-parameters', () => ({
+  ...jest.requireActual('@vegaprotocol/network-parameters'),
   useNetworkParams: jest.fn(() => ({
     params: {
       governance_proposal_updateMarket_requiredMajority: '0.5',

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

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

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.spec.tsx

@@ -5,9 +5,9 @@ import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MemoryRouter as Router } from 'react-router-dom';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -19,7 +19,10 @@ import { ProposalMinRequirements } from '../../components/shared';
 import { AsyncRenderer, ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
 import { createDocsLinks } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalUserAction } from '../../components/shared';
 import { downloadJson } from '../../../../lib/download-json';
 

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.spec.tsx

@@ -5,8 +5,8 @@ import { mockWalletContext } from '../../test-helpers/mocks';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { MemoryRouter as Router } from 'react-router-dom';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
 
 jest.mock('@vegaprotocol/environment', () => ({

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -5,7 +5,7 @@ import {
   createDocsLinks,
   suitableForSyntaxHighlighter,
 } from '@vegaprotocol/utils';
-import { useNetworkParams } from '@vegaprotocol/react-helpers';
+import { useNetworkParams } from '@vegaprotocol/network-parameters';
 import {
   getClosingTimestamp,
   getEnactmentTimestamp,

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.spec.tsx

@@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeNewAsset } from './propose-new-asset';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -9,7 +9,10 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

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

@@ -6,8 +6,8 @@ import { AppStateProvider } from '../../../../contexts/app-state/app-state-provi
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { BrowserRouter as Router } from 'react-router-dom';
 import type { MockedResponse } from '@apollo/client/testing';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -8,7 +8,10 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

apps/governance/src/routes/proposals/propose/raw/proposal-raw.spec.tsx

@@ -10,8 +10,8 @@ import { ProposeRaw } from './propose-raw';
 import { ProposalEventDocument } from '@vegaprotocol/proposals';
 import type { ProposalEventSubscription } from '@vegaprotocol/proposals';
 
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 const paramsDelay = 20;
 

apps/governance/src/routes/proposals/propose/raw/propose-raw.tsx

@@ -10,7 +10,10 @@ import {
   TextArea,
 } from '@vegaprotocol/ui-toolkit';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { useProposalSubmit } from '@vegaprotocol/proposals';
 import {
   ProposalFormSubmit,

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

@@ -5,9 +5,9 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateAsset } from './propose-update-asset';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 
 jest.mock('@vegaprotocol/environment', () => ({
   useEnvironment: () => ({

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

@@ -8,7 +8,10 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,

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

@@ -6,8 +6,8 @@ import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateMarket } from './propose-update-market';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
 import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket';
 import { ProposalState } from '@vegaprotocol/types';

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

@@ -9,7 +9,10 @@ import {
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import {
   ProposalFormDescription,
   ProposalFormDownloadJson,

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

@@ -1,59 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ProtocolUpgradeProposalFieldsFragment = { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus };
-
-export type ProtocolUpgradesQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ProtocolUpgradesQuery = { __typename?: 'Query', lastBlockHeight: string, protocolUpgradeProposals?: { __typename?: 'ProtocolUpgradeProposalConnection', edges?: Array<{ __typename?: 'ProtocolUpgradeProposalEdge', node: { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus } }> | null } | null };
-
-export const ProtocolUpgradeProposalFieldsFragmentDoc = gql`
-    fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-    `;
-export const ProtocolUpgradesDocument = gql`
-    query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
-    ${ProtocolUpgradeProposalFieldsFragmentDoc}`;
-
-/**
- * __useProtocolUpgradesQuery__
- *
- * To run a query within a React component, call `useProtocolUpgradesQuery` and pass it any options that fit your needs.
- * When your component renders, `useProtocolUpgradesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useProtocolUpgradesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProtocolUpgradesQuery(baseOptions?: Apollo.QueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-      }
-export function useProtocolUpgradesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-        }
-export type ProtocolUpgradesQueryHookResult = ReturnType<typeof useProtocolUpgradesQuery>;
-export type ProtocolUpgradesLazyQueryHookResult = ReturnType<typeof useProtocolUpgradesLazyQuery>;
-export type ProtocolUpgradesQueryResult = Apollo.QueryResult<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>;

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

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

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

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

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

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

apps/governance/src/routes/proposals/test-helpers/mocks.ts

@@ -1,6 +1,6 @@
-import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
+import { NetworkParamsDocument } from '@vegaprotocol/network-parameters';
 import type { MockedResponse } from '@apollo/client/testing';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import type { PubKey } from '@vegaprotocol/wallet';
 
 export const mockPubkey: PubKey = {

apps/governance/src/routes/rewards/home/rewards-page.tsx

@@ -12,7 +12,10 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { createDocsLinks } from '@vegaprotocol/utils';
-import { useNetworkParams, NetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  useNetworkParams,
+  NetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { useEpochQuery } from './__generated__/Rewards';
 import { EpochCountdown } from '../../../components/epoch-countdown';
 import { Heading, SubHeading } from '../../../components/heading';

apps/governance/src/routes/staking/node/staking-form.tsx

@@ -23,7 +23,10 @@ import {
   addDecimal,
   removePaginationWrapper,
 } from '@vegaprotocol/utils';
-import { useNetworkParam, NetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  useNetworkParam,
+  NetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { useBalances } from '../../../lib/balances/balances-store';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { SubHeading } from '../../../components/heading';

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

@@ -10,7 +10,7 @@ import {
   WithdrawalsTable,
 } from '@vegaprotocol/withdraws';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import type { RouteChildProps } from '../index';
 

apps/governance/src/toasts-manager.tsx

@@ -0,0 +1,17 @@
+import { ToastsContainer, useToasts } from '@vegaprotocol/ui-toolkit';
+import {
+  useEthereumTransactionToasts,
+  useEthereumWithdrawApprovalsToasts,
+  useVegaTransactionToasts,
+} from '@vegaprotocol/web3';
+
+export const ToastsManager = () => {
+  useVegaTransactionToasts();
+  useEthereumTransactionToasts();
+  useEthereumWithdrawApprovalsToasts();
+
+  const toasts = useToasts((store) => store.toasts);
+  return <ToastsContainer order="desc" toasts={toasts} />;
+};
+
+export default ToastsManager;

apps/liquidity-provision-dashboard/.env

@@ -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

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

@@ -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

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

@@ -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\"}

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

@@ -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\"}

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

@@ -1,7 +1,7 @@
 import { useParams } from 'react-router-dom';
-import { makeDerivedDataProvider } from '@vegaprotocol/utils';
+import { makeDerivedDataProvider } from '@vegaprotocol/data-provider';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 
 import {

apps/liquidity-provision-dashboard/src/app/components/detail/last-24h-volume/last-24h-volume.tsx

@@ -1,7 +1,8 @@
 import { useState, useMemo, useRef, useCallback } from 'react';
 import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
-import { useYesterday, useDataProvider } from '@vegaprotocol/react-helpers';
+import { useYesterday } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';
 import {
   calcDayVolume,

apps/multisig-signer/.env

@@ -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

apps/multisig-signer/.env.stagnet3

@@ -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

apps/multisig-signer/README.md

@@ -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:

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

@@ -1,4 +1,15 @@
 [
+  {
+    "tranche_id": 58,
+    "tranche_start": "2023-05-11T00:00:00.000Z",
+    "tranche_end": "2023-06-11T00:00:00.000Z",
+    "total_added": "0",
+    "total_removed": "0",
+    "locked_amount": "0",
+    "deposits": [],
+    "withdrawals": [],
+    "users": []
+  },
   {
     "tranche_id": 57,
     "tranche_start": "2024-04-01T00:00:00.000Z",
@@ -37,8 +48,8 @@
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
     "total_added": "19242.125",
-    "total_removed": "959.3245960538025",
-    "locked_amount": "10578.4844209587189695125",
+    "total_removed": "1214.9959502191275",
+    "locked_amount": "9295.5944273726850283975",
     "deposits": [
       {
         "amount": "188",
@@ -236,6 +247,11 @@
         "amount": "422.1034736680125",
         "user": "0xf915Da10e5136352Ba049acB0545Deb119054256",
         "tx": "0x5932f574afe019060f5812fc89c7298ab9f768cddebe0a803c27e9914b45dc3d"
+      },
+      {
+        "amount": "255.671354165325",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914"
       }
     ],
     "users": [
@@ -297,11 +313,17 @@
             "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
             "tranche_id": 56,
             "tx": "0x5f544a659ae728cc7b1a29dcda14740425cadf1f47aa74bae92bf2ade3c8093d"
+          },
+          {
+            "amount": "255.671354165325",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x92cd553dcee22eb58abadc7aab2dc8d4d9b2285943b41aacea8ed09eff5a0914"
           }
         ],
         "total_tokens": "1207.5",
-        "withdrawn_tokens": "341.3307146949",
-        "remaining_tokens": "866.1692853051"
+        "withdrawn_tokens": "597.002068860225",
+        "remaining_tokens": "610.497931139775"
       },
       {
         "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
@@ -845,7 +867,7 @@
     "tranche_end": "2023-05-06T00:00:00.000Z",
     "total_added": "14520",
     "total_removed": "5079.76864115505",
-    "locked_amount": "1206.465231481482324",
+    "locked_amount": "238.4036111111108718",
     "deposits": [
       {
         "amount": "111",
@@ -4715,7 +4737,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "51166.9974210106919556663",
+    "locked_amount": "50692.0833719598561288655",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4781,7 +4803,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "391.38319724257215",
+    "locked_amount": "363.908920940171075",
     "deposits": [
       {
         "amount": "2500",
@@ -4814,7 +4836,7 @@
     "tranche_end": "2023-11-01T00:00:00.000Z",
     "total_added": "15000.000000000000015",
     "total_removed": "0",
-    "locked_amount": "14795.60027928744001479560027928744",
+    "locked_amount": "14632.5464221014495146325464221014495",
     "deposits": [
       {
         "amount": "1.5e-14",
@@ -4902,7 +4924,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "11459.903224386071",
+    "locked_amount": "11269.67372433574875",
     "deposits": [
       {
         "amount": "12500",
@@ -5168,8 +5190,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "17836.1796921",
-    "locked_amount": "18541.30457719459875",
+    "total_removed": "18077.0118744",
+    "locked_amount": "18126.91355893186125",
     "deposits": [
       {
         "amount": "7500",
@@ -5198,6 +5220,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
       },
+      {
+        "amount": "240.8321823",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xe27cfead07bc34f4270f7f87b9146e9f6fa35d0cc5e20b2378a03265de432289"
+      },
       {
         "amount": "126.30064455",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5368,6 +5395,12 @@
             "tranche_id": 34,
             "tx": "0x6bb6303a6a322698e6e295ad38b2a22bd20d8b44306d423a3e513bb0b858ad56"
           },
+          {
+            "amount": "240.8321823",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0xe27cfead07bc34f4270f7f87b9146e9f6fa35d0cc5e20b2378a03265de432289"
+          },
           {
             "amount": "126.30064455",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5532,8 +5565,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "3626.4210213",
-        "remaining_tokens": "3873.5789787"
+        "withdrawn_tokens": "3867.2532036",
+        "remaining_tokens": "3632.7467964"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5577,7 +5610,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "51120.313973942497539045",
+    "locked_amount": "50645.8332242054391795015",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5610,7 +5643,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "49335.74898575644407623565",
+    "locked_amount": "49039.85711135509392504979",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5643,7 +5676,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "21008.336485286656638",
+    "locked_amount": "20665.30095129376038",
     "deposits": [
       {
         "amount": "10000",
@@ -5836,7 +5869,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "1869.76296930492115",
+    "locked_amount": "1842.3639649923895",
     "deposits": [
       {
         "amount": "5000",
@@ -6376,7 +6409,7 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "7438.558452225",
+    "total_removed": "7500",
     "locked_amount": "0",
     "deposits": [
       {
@@ -6401,6 +6434,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
       },
+      {
+        "amount": "61.441547775",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xbf247e382e7cbfd131b20942525b6a11a8d71b5dae727cf8ad0f0801a48572b7"
+      },
       {
         "amount": "126.2948895",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6626,6 +6664,12 @@
             "tranche_id": 33,
             "tx": "0xb76564ca91603758216069d7b139c683037029425e10b1694af25b478c19e26f"
           },
+          {
+            "amount": "61.441547775",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xbf247e382e7cbfd131b20942525b6a11a8d71b5dae727cf8ad0f0801a48572b7"
+          },
           {
             "amount": "126.2948895",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6868,8 +6912,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "7438.558452225",
-        "remaining_tokens": "61.441547775"
+        "withdrawn_tokens": "7500",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -6894,7 +6938,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "1709370.7872515768348",
-    "locked_amount": "156749.9162904687626235986",
+    "locked_amount": "146119.4950805440611341152",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40766,7 +40810,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "265371.371543329369775774863",
+    "locked_amount": "249036.115263241476836903328",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -42158,8 +42202,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "867610.78878511272497352",
-    "locked_amount": "6240677.4306629368200704822080834181008381",
+    "total_removed": "870712.39693462448509352",
+    "locked_amount": "6182753.66071744239145030977234379973803727",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42713,6 +42757,16 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
       },
+      {
+        "amount": "2191.38799702042362",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+      },
+      {
+        "amount": "910.2201524913365",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x24d004bb729a8d3e7df9be45895e411b7c3f8341a08737d41284acf79b3e9e53"
+      },
       {
         "amount": "981.387731774910625",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44863,6 +44917,12 @@
             "tranche_id": 2,
             "tx": "0xc5cea08b124cdf6264d5b0c7494d63d9de264b429822d9a4e4cfadc43e611a1b"
           },
+          {
+            "amount": "910.2201524913365",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x24d004bb729a8d3e7df9be45895e411b7c3f8341a08737d41284acf79b3e9e53"
+          },
           {
             "amount": "981.387731774910625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -46371,8 +46431,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "157712.620568472569875",
-        "remaining_tokens": "102286.266931527430125"
+        "withdrawn_tokens": "158622.840720963906375",
+        "remaining_tokens": "101376.046779036093625"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46611,6 +46671,12 @@
             "tranche_id": 2,
             "tx": "0x9d12dadb940c59a796a405a4971e73f24d7ad284528ec7ce676ae361a4ac1f51"
           },
+          {
+            "amount": "2191.38799702042362",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0xa809dbfa0c31522127924306a6117331a578dfc402cf5fa464832baec46e4ac2"
+          },
           {
             "amount": "2873.74755113623213",
             "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46883,8 +46949,8 @@
           }
         ],
         "total_tokens": "150551.801",
-        "withdrawn_tokens": "89385.81693579122338",
-        "remaining_tokens": "61165.98406420877662"
+        "withdrawn_tokens": "91577.204932811647",
+        "remaining_tokens": "58974.596067188353"
       },
       {
         "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -48747,8 +48813,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": "39908.33059608817917720398993360406",
+    "total_removed": "6170228.182342542771392682",
+    "locked_amount": "0",
     "deposits": [
       {
         "amount": "129284.449",
@@ -49007,6 +49073,16 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
       },
+      {
+        "amount": "964.95248431660023075",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+      },
+      {
+        "amount": "366.05557603968578875",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0xf03a210cb8c386c7bae72a07c1d20e50eb9a9743c5cd5df4b5e016f1e103f73f"
+      },
       {
         "amount": "1360.32447632896938825",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -52349,6 +52425,18 @@
             "tranche_id": 3,
             "tx": "0x53d67a8df4d069f956ae1eb76d5e099642dcc8d7e40fa9357be0b8ae879b90c4"
           },
+          {
+            "amount": "964.95248431660023075",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x35f722557b9bc3a2dc314f9fac173013697c484059bd8d5c65497f8df72b9097"
+          },
+          {
+            "amount": "366.05557603968578875",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0xf03a210cb8c386c7bae72a07c1d20e50eb9a9743c5cd5df4b5e016f1e103f73f"
+          },
           {
             "amount": "1360.32447632896938825",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -55171,8 +55259,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "357792.4615146437139805",
-        "remaining_tokens": "1331.0080603562860195"
+        "withdrawn_tokens": "359123.469575",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -58846,8 +58934,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "44078.8527972103416",
-    "locked_amount": "42049.610748470926039581595332312",
+    "total_removed": "44110.3307271943416",
+    "locked_amount": "39461.19601458522069398354033484",
     "deposits": [
       {
         "amount": "3000",
@@ -65501,6 +65589,11 @@
         "user": "0x4d4AA3f302cbA998AAFC03F9d73484434ed9Fd53",
         "tx": "0x1e4902d0a3cb7b4f2ba7119dfcaa681a784e1d724c984961767e9feaa078fe54"
       },
+      {
+        "amount": "31.477929984",
+        "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
+        "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02"
+      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -84326,6 +84419,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "31.477929984",
+            "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
+            "tranche_id": 5,
+            "tx": "0x1b9ddd24634b4c6eab202f0a65dc0d3119fbc5502cbac5086352eab14ebd7b02"
+          },
           {
             "amount": "19.918569252",
             "user": "0xcB555C5602cC0b2434A27d277e14Cb5C7bF4Ead1",
@@ -84370,8 +84469,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "334.458891424",
-        "remaining_tokens": "65.541108576"
+        "withdrawn_tokens": "365.936821408",
+        "remaining_tokens": "34.063178592"
       },
       {
         "address": "0x3738bec36216eA2F11B954891C65AAd1Bc852156",
@@ -144155,6 +144254,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "0",
+        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+        "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+      },
       {
         "amount": "0",
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -144445,6 +144549,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "0",
+            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+            "tranche_id": 9,
+            "tx": "0xbc31dbb6851f0e1a856afaedfe96fba29ed357ba1da151eb27c495aa49ab1f39"
+          },
           {
             "amount": "0",
             "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",

apps/static/src/assets/stagnet3-network.json

@@ -1,3 +0,0 @@
-{
-  "hosts": ["https://api-stagnet3.vega.rocks/graphql"]
-}

apps/trading-e2e/.env

@@ -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

apps/trading-e2e/.env.capsule

@@ -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

apps/trading-e2e/.env.stagnet3

@@ -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=

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

@@ -184,17 +184,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
       .getByTestId('provider-name')
       .and('contain', 'Another oracle');
 
-    cy.getByTestId(accordionContent)
-      .getByTestId('signed-proofs')
-      .and('contain', '1');
-
     cy.getByTestId(accordionContent)
       .getByTestId('verified-proofs')
       .and('contain', '1');
-
-    cy.getByTestId(accordionContent)
-      .getByTestId('signed-proofs')
-      .and('contain', '1');
   });
 
   it('proposal displayed', () => {

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

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

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

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

apps/trading/.env

@@ -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

apps/trading/.env.capsule

@@ -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

apps/trading/.env.devnet

@@ -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

apps/trading/.env.mainnet

@@ -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

apps/trading/.env.stagnet1

@@ -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

apps/trading/.env.stagnet3

@@ -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

apps/trading/.env.testnet

@@ -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

apps/trading/.env.validator-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

apps/trading/README.md

@@ -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:

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

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { marketsWithDataProvider } from '@vegaprotocol/market-list';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';

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

@@ -12,12 +12,12 @@ import {
   formatNumberPercentage,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import { updateGridData } from '@vegaprotocol/react-helpers';
 import {
   NetworkParams,
-  useDataProvider,
   useNetworkParams,
-  updateGridData,
-} from '@vegaprotocol/react-helpers';
+} from '@vegaprotocol/network-parameters';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import {
   AsyncRenderer,
   Tab,

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

@@ -1,11 +1,11 @@
 import React, { useEffect, useMemo } from 'react';
 import { addDecimalsFormatNumber, titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import {
   useDataProvider,
-  useScreenDimensions,
   useThrottledDataProvider,
-} from '@vegaprotocol/react-helpers';
+} from '@vegaprotocol/data-provider';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
 import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';

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

@@ -1,7 +1,8 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
 import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
-import { OrderListContainer } from '@vegaprotocol/orders';
+import { OrderListContainer, Filter } from '@vegaprotocol/orders';
+import type { OrderListContainerProps } from '@vegaprotocol/orders';
 import { FillsContainer } from '@vegaprotocol/fills';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { TradesContainer } from '@vegaprotocol/trades';
@@ -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>
           );
         })}

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

@@ -20,7 +20,7 @@ import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 
 type SettlementAsset =

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -24,7 +24,8 @@ import { PriceChart } from 'pennant';
 import 'pennant/dist/style.css';
 import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
-import { useDataProvider, useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import type { Market } from '@vegaprotocol/market-list';
 
 const DateRange = {

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

@@ -2,10 +2,8 @@ import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
-import {
-  useDataProvider,
-  useBottomPlaceholder,
-} from '@vegaprotocol/react-helpers';
+import { useBottomPlaceholder } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useRef } from 'react';
 import type { AgGridReact } from 'ag-grid-react';

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

@@ -6,7 +6,7 @@ import {
 } from '@vegaprotocol/withdraws';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 
 export const WithdrawalsContainer = () => {