feat(trading): add oracle banner to TradePanels

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

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

@@ -26,7 +26,7 @@ jobs:
         with:
           path: node_modules
           key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-          # comment out "resotre-keys" if you need to rebuild yarn from 0
+          # comment out "restore-keys" if you need to rebuild yarn from 0
           restore-keys: |
             ${{ runner.os }}-cache-node-modules-
 
@@ -50,7 +50,7 @@ jobs:
     secrets: inherit
 
   lint-test-build:
-    timeout-minutes: 20
+    timeout-minutes: 35
     needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
@@ -105,19 +105,44 @@ jobs:
           affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
           echo -n "Affected projects: $affected"
 
+          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
           projects_e2e=""
-          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
-          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          preview_governance="not deployed"
+          preview_trading="not deployed"
+          preview_explorer="not deployed"
+          if [[ -z "$projects_e2e" ]]; then
+            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
+          fi
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]
           echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
           echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
+          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
+          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
 
     outputs:
       projects: ${{ env.PROJECTS }}
       projects-e2e: ${{ env.PROJECTS_E2E }}
+      preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
+      preview_trading: ${{ env.PREVIEW_TRADING }}
+      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
 
   cypress:
     needs: lint-test-build
@@ -140,7 +165,9 @@ jobs:
 
   dist-check:
     runs-on: ubuntu-latest
-    needs: publish-dist
+    needs:
+      - publish-dist
+      - lint-test-build
     if: ${{ github.event_name == 'pull_request' }}
     name: '(CD) comment preview links'
     steps:
@@ -151,22 +178,16 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
       - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
         uses: peter-evans/create-or-update-comment@v3
+        if: ${{ steps.fc.outputs.comment-id == 0 }}
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
+            Previews:
+            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
+            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
+            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
 
   cypress-check:
     name: '(CI) cypress - check'

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 30
+    timeout-minutes: 40
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -93,3 +93,9 @@ jobs:
         with:
           name: logs-${{ matrix.project }}
           path: /home/runner/.vegacapsule/testnet/logs
+
+      - uses: actions/upload-artifact@v3
+        if: ${{ failure() }}
+        with:
+          name: test-report-${{ matrix.project }}
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

.github/workflows/publish-dist.yml

@@ -15,7 +15,7 @@ jobs:
         app: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.app }}
     runs-on: ubuntu-22.04
-    timeout-minutes: 20
+    timeout-minutes: 25
     steps:
       - name: Check out code
         uses: actions/checkout@v3

.gitignore

@@ -46,3 +46,6 @@ cypress.env.json
 
 # Next.js
 .next
+
+#cypress
+/apps/trading-e2e/cypress/reports/

Jenkinsfile

@@ -1,20 +1,2 @@
 @Library('vega-shared-library') _
-
-def commitHash = 'UNKNOWN'
-
-pipeline {
-  agent any
-  options {
-    skipDefaultCheckout true
-    parallelsAlwaysFailFast()
-  }
-  stages {
-    stage('approbation') {
-      steps {
-        sh 'printenv'
-        checkout scm
-        runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
-      }
-    }
-  }
-}
+runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'

README.md

@@ -72,7 +72,7 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<
 In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.
 
 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n07.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```
 

apps/explorer-e2e/.env.testnet

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

apps/explorer-e2e/cypress.config.js

@@ -21,6 +21,7 @@ module.exports = defineConfig({
     chromeWebSecurity: false,
     viewportWidth: 1440,
     viewportHeight: 900,
+    testIsolation: false,
   },
   env: {
     environment: 'CUSTOM',

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

@@ -60,9 +60,11 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
         <>
           <MarketInfoTable
             noBorder={false}
-            data={trigger}
+            data={{
+              maxValidPrice: trigger.maxValidPrice,
+              minValidPrice: trigger.minValidPrice,
+            }}
             decimalPlaces={market.decimalPlaces}
-            omits={['referencePrice', '__typename']}
           />
           <MarketInfoTable
             noBorder={false}

apps/governance-e2e/.env

@@ -10,11 +10,13 @@ NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 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_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
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance-e2e/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/governance-e2e/cypress.config.js

@@ -25,6 +25,7 @@ module.exports = defineConfig({
     viewportWidth: 1440,
     viewportHeight: 900,
     numTestsKeptInMemory: 5,
+    testIsolation: false,
   },
   env: {
     ethProviderUrl: 'http://localhost:8545/',

apps/governance-e2e/src/fixtures/mocks/network-upgrade.ts

@@ -0,0 +1,38 @@
+export const upgradeProposalsData = {
+  lastBlockHeight: '2014133',
+  protocolUpgradeProposals: {
+    edges: [
+      {
+        node: {
+          upgradeBlockHeight: '2015942',
+          vegaReleaseTag: 'v1',
+          approvers: [
+            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
+            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
+            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
+            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
+          ],
+          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
+          __typename: 'ProtocolUpgradeProposal',
+        },
+        __typename: 'ProtocolUpgradeProposalEdge',
+      },
+      {
+        node: {
+          upgradeBlockHeight: '1955065',
+          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
+          approvers: [
+            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
+            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
+            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
+            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
+          ],
+          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
+          __typename: 'ProtocolUpgradeProposal',
+        },
+        __typename: 'ProtocolUpgradeProposalEdge',
+      },
+    ],
+    __typename: 'ProtocolUpgradeProposalConnection',
+  },
+};

apps/governance-e2e/src/fixtures/mocks/nodes.ts

@@ -0,0 +1,117 @@
+export const nodeData = {
+  epoch: {
+    id: '204731',
+    timestamps: {
+      start: '2023-04-14T09:30:09.452005Z',
+      end: null,
+      expiry: '2023-04-14T09:31:09.452005Z',
+      __typename: 'EpochTimestamps',
+    },
+    __typename: 'Epoch',
+  },
+  nodesConnection: {
+    edges: [
+      {
+        node: {
+          avatarUrl:
+            'https://www.gravatar.com/avatar/y2hwc4xjds7zvlam3y4in94q2rcdimsn?d=identicon',
+          id: 'f337b5cc50c49a928e49129a2eca62277a81b4b7336b6e4131f8f0431e8db029',
+          name: 'lovely-fisherman',
+          pubkey:
+            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
+          stakedByOperator: '3000000000000000000000',
+          stakedByDelegates: '0',
+          stakedTotal: '3000000000000000000000',
+          pendingStake: '0',
+          rankingScore: {
+            rankingScore: '0.4999166805532412',
+            stakeScore: '0.2499583402766206',
+            performanceScore: '1',
+            votingPower: '2499',
+            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
+            __typename: 'RankingScore',
+          },
+          __typename: 'Node',
+        },
+        __typename: 'NodeEdge',
+      },
+      {
+        node: {
+          avatarUrl:
+            'https://www.gravatar.com/avatar/g1tw70qnoo0tf8ror30jefwhae92zy16?d=identicon',
+          id: 'cdadcf885556e372b6b39679d6ad46854d1d9c1e982da7ff2929544df01f9088',
+          name: 'magnificent-door',
+          pubkey:
+            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
+          stakedByOperator: '3000000000000000000000',
+          stakedByDelegates: '0',
+          stakedTotal: '3000000000000000000000',
+          pendingStake: '0',
+          rankingScore: {
+            rankingScore: '0.4999166805532412',
+            stakeScore: '0.2499583402766206',
+            performanceScore: '1',
+            votingPower: '2499',
+            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
+            __typename: 'RankingScore',
+          },
+          __typename: 'Node',
+        },
+        __typename: 'NodeEdge',
+      },
+      {
+        node: {
+          avatarUrl:
+            'https://www.gravatar.com/avatar/s2e7hp7soq5zdhxeap7p21onetsjiy6w?d=identicon',
+          id: '9a13de2548fef30d928e71e76004c98ec7ad9d8fc3ddcd16ddee210b28ea4cfc',
+          name: 'helpful-tree',
+          pubkey:
+            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
+          stakedByOperator: '3000000000000000000000',
+          stakedByDelegates: '2000000000000000000',
+          stakedTotal: '3002000000000000000000',
+          pendingStake: '0',
+          rankingScore: {
+            rankingScore: '0.5002499583402766',
+            stakeScore: '0.2501249791701383',
+            performanceScore: '1',
+            votingPower: '2501',
+            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
+            __typename: 'RankingScore',
+          },
+          __typename: 'Node',
+        },
+        __typename: 'NodeEdge',
+      },
+      {
+        node: {
+          avatarUrl:
+            'https://www.gravatar.com/avatar/3gop683kg2cvd8rpv286hzagqt3yjsdq?d=identicon',
+          id: '93ac271ab95038333587e47d11461e6edc0126e6e77156281c545f4c5650a6d0',
+          name: 'easy-cookie',
+          pubkey:
+            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
+          stakedByOperator: '3000000000000000000000',
+          stakedByDelegates: '0',
+          stakedTotal: '3000000000000000000000',
+          pendingStake: '0',
+          rankingScore: {
+            rankingScore: '0.4999166805532412',
+            stakeScore: '0.2499583402766206',
+            performanceScore: '1',
+            votingPower: '2499',
+            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
+            __typename: 'RankingScore',
+          },
+          __typename: 'Node',
+        },
+        __typename: 'NodeEdge',
+      },
+    ],
+    __typename: 'NodesConnection',
+  },
+  nodeData: {
+    stakedTotal: '12002000000000000000000',
+    __typename: 'NodeData',
+  },
+};

apps/governance-e2e/src/fixtures/mocks/proposals.ts

@@ -0,0 +1,325 @@
+export const proposalsData = {
+  proposalsConnection: {
+    edges: [
+      {
+        node: {
+          id: 'e8ba9d268e12514644fd1fc7ff289292f4ce6489cc32cc73133aea52c04aef89',
+          rationale: {
+            title: 'Add asset Wrapped Ether',
+            description: 'Proposal to add asset WETH to Vega network',
+            __typename: 'ProposalRationale',
+          },
+          reference: '',
+          state: 'STATE_OPEN',
+          datetime: '2026-12-01T11:41:28.654288Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2026-12-01T11:45:33Z',
+            enactmentDatetime: '2026-12-01T11:45:43Z',
+            change: {
+              name: 'Wrapped Ether',
+              symbol: 'WETH',
+              decimals: 18,
+              quantum: '0.0008',
+              source: {
+                contractAddress: '0x9B18C6CaD886D5653783E2B25759124760F4407F',
+                withdrawThreshold: '1',
+                lifetimeLimit: '400000000000000000',
+                __typename: 'ERC20',
+              },
+              __typename: 'NewAsset',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
+          id: 'd848fc7881f13d366df5f61ab139d5fcfa72bf838151bb51b54381870e357931',
+          rationale: {
+            title: 'Add asset Dai Stablecoin',
+            description: 'Proposal to add asset DAI to Vega network',
+            __typename: 'ProposalRationale',
+          },
+          reference: '',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-29T15:49:57.80978Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2023-04-13T15:52:58Z',
+            enactmentDatetime: '2023-04-13T15:53:08Z',
+            change: {
+              name: 'Dai Stablecoin',
+              symbol: 'DAI',
+              decimals: 18,
+              quantum: '1',
+              source: {
+                contractAddress: '0xad018fB8ec00bfd622B91C83E684a6AC7bB8fbA4',
+                withdrawThreshold: '1',
+                lifetimeLimit: '500000000000000000000',
+                __typename: 'ERC20',
+              },
+              __typename: 'NewAsset',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
+          id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
+          rationale: {
+            title: 'New DAI market',
+            description: 'New DAI market',
+            __typename: 'ProposalRationale',
+          },
+          reference: '0VFQusmmESdrP5GuL8naB6lxfoE3RPGaEeo7abdN',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-26T19:36:19.26034Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-26T19:36:42Z',
+            enactmentDatetime: '2023-03-22T13:57:37Z',
+            change: {
+              instrument: {
+                name: 'UNIDAI Monthly (Dec 2022)',
+                code: 'UNIDAI.MF21',
+                futureProduct: {
+                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
+                  __typename: 'FutureProduct',
+                },
+                __typename: 'InstrumentConfiguration',
+              },
+              __typename: 'NewMarket',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
+          id: 'bc70383f0e9515b15542cf4c63590cd2ca46b3363ba7c4a72af0e62112b3951b',
+          rationale: {
+            title: 'USDC-III',
+            description: 'USDC-III D List test',
+            __typename: 'ProposalRationale',
+          },
+          reference: '',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-22T15:17:28.829605Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-22T15:18:56Z',
+            enactmentDatetime: '2022-11-22T15:19:06Z',
+            change: {
+              name: 'USDC-III',
+              symbol: 'USDC-III',
+              decimals: 18,
+              quantum: '1',
+              source: {
+                contractAddress: '0x1F1A067aEC530b66BA5128C9Db76825eC22c3C6b',
+                withdrawThreshold: '100000000000000000000000000',
+                lifetimeLimit: '1000000000000000000000000000',
+                __typename: 'ERC20',
+              },
+              __typename: 'NewAsset',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
+          id: '9d9b2a9d0179d0e4ccb317f6c4a5db0b905d893190bfb5e5499985ef313281c8',
+          rationale: {
+            title: 'New BTC market',
+            description: 'New BTC market',
+            __typename: 'ProposalRationale',
+          },
+          reference: 'AXeRWS3TvLBFDgWOSHQpKFJf3NTbnWK6310q02fZ',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-26T19:36:19.26034Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-26T19:36:42Z',
+            enactmentDatetime: '2023-03-22T13:57:37Z',
+            change: {
+              instrument: {
+                name: 'ETHBTC Quarterly (Feb 2023)',
+                code: 'ETHBTC.QM21',
+                futureProduct: {
+                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
+                  __typename: 'FutureProduct',
+                },
+                __typename: 'InstrumentConfiguration',
+              },
+              __typename: 'NewMarket',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+      {
+        node: {
+          id: '9c48796e7988769ededc2b2b02220b00e93f65f23e8141bf1fd23a6983d95943',
+          rationale: {
+            title: 'Update governance.proposal.asset.requiredMajority',
+            description:
+              'Proposal to update governance.proposal.asset.requiredMajority to 300}',
+            __typename: 'ProposalRationale',
+          },
+          reference: '',
+          state: 'STATE_ENACTED',
+          datetime: '2022-11-22T13:22:52.370655Z',
+          rejectionReason: null,
+          party: {
+            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+            __typename: 'Party',
+          },
+          errorDetails: null,
+          terms: {
+            closingDatetime: '2022-11-22T13:27:13Z',
+            enactmentDatetime: '2022-11-22T13:27:33Z',
+            change: {
+              networkParameter: {
+                key: 'governance.proposal.asset.requiredParticipation',
+                value: '0.000001',
+                __typename: 'NetworkParameter',
+              },
+              __typename: 'UpdateNetworkParameter',
+            },
+            __typename: 'ProposalTerms',
+          },
+          votes: {
+            yes: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            no: {
+              totalTokens: '0',
+              totalNumber: '0',
+              totalEquityLikeShareWeight: '0',
+              __typename: 'ProposalVoteSide',
+            },
+            __typename: 'ProposalVotes',
+          },
+          __typename: 'Proposal',
+        },
+        __typename: 'ProposalEdge',
+      },
+    ],
+    __typename: 'ProposalsConnection',
+  },
+};

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

@@ -40,18 +40,22 @@ const stakeAddStakeRadioButton = 'add-stake-radio';
 const stakeMaximumTokens = 'token-amount-use-maximum';
 const vegaWalletAssociatedBalance = 'currency-value';
 const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const ethWalletContainer = 'ethereum-wallet';
+const ethWallet = 'ethereum-wallet';
 const vegaWallet = 'vega-wallet';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 
+const getEthereumWallet = () => cy.get(`[data-testid="${ethWallet}"]:visible`);
+const getVegaWallet = () => cy.get(`[data-testid="${vegaWallet}"]:visible`);
+
 context(
   'Staking Tab - with eth and vega wallets connected',
   { tags: '@slow' },
   function () {
     // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
+      cy.clearAllLocalStorage();
       cy.visit('/');
       ethereumWalletConnect();
       // this is a workaround for #2422 which can be removed once issue is resolved
@@ -187,31 +191,35 @@ context(
           .should('contain', 1.0, txTimeout);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        cy.get(`[row-id="${0}"]`).within(() => {
-          cy.getByTestId(stakeValidatorListTotalStake)
-            .should('have.text', '2.00')
-            .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalShare)
-            .should('have.text', '66.67%')
-            .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalStake)
-            .scrollIntoView()
-            .should('have.text', '2.00')
-            .and('be.visible');
-        });
-        cy.get(`[row-id="${1}"]`).within(() => {
-          cy.getByTestId(stakeValidatorListTotalStake)
-            .scrollIntoView()
-            .should('have.text', '1.00')
-            .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalShare)
-            .should('have.text', '33.33%')
-            .and('be.visible');
-          cy.getByTestId(stakeValidatorListTotalStake)
-            .scrollIntoView()
-            .should('have.text', '1.00')
-            .and('be.visible');
-        });
+        cy.get(`[row-id="${0}"]`)
+          .eq(1)
+          .within(() => {
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .should('have.text', '2.00')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalShare)
+              .should('have.text', '66.67%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '2.00')
+              .and('be.visible');
+          });
+        cy.get(`[row-id="${1}"]`)
+          .eq(1)
+          .within(() => {
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '1.00')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalShare)
+              .should('have.text', '33.33%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '1.00')
+              .and('be.visible');
+          });
       });
 
       // 2001-STKE-041
@@ -329,11 +337,11 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens();
-        cy.getByTestId(ethWalletContainer).within(() => {
+        getEthereumWallet().within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.getByTestId(vegaWallet).within(() => {
+        getVegaWallet().within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
@@ -357,11 +365,11 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens('contract');
-        cy.getByTestId(ethWalletContainer).within(() => {
+        getEthereumWallet().within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        cy.getByTestId(vegaWallet).within(() => {
+        getVegaWallet().within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
@@ -386,7 +394,7 @@ context(
         closeStakingDialog();
         stakingPageDisassociateTokens('1');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.getByTestId(vegaWallet).within(() => {
+        getVegaWallet().within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '2.00'
@@ -453,7 +461,7 @@ context(
         verifyUnstakedBalance(0.0);
         closeStakingDialog();
         stakingPageAssociateTokens('6');
-        cy.getByTestId(vegaWallet).within(() => {
+        getVegaWallet().within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '12.00'

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

@@ -15,7 +15,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       });
     });
 
-    it.skip('should display announcement banner', function () {
+    it('should display announcement banner', function () {
       cy.getByTestId('app-announcement')
         .should('contain.text', 'TEST ANNOUNCEMENT!')
         .within(() => {

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

@@ -3,11 +3,14 @@ import {
   navigation,
   verifyPageHeader,
   verifyTabHighlighted,
-  waitForSpinner,
 } from '../../support/common.functions';
+import {
+  goToMakeNewProposal,
+  governanceProposalType,
+} from '../../support/governance.functions';
+import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';
 
 const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
-const newProposalButton = '[data-testid="new-proposal-link"]';
 const newProposalLink = '[data-testid="new-proposal-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
@@ -21,56 +24,140 @@ context(
       navigateTo(navigation.proposals);
     });
 
-    describe('with no network change proposals', function () {
-      it('should have governance tab highlighted', function () {
-        verifyTabHighlighted(navigation.proposals);
+    it('should have governance tab highlighted', function () {
+      verifyTabHighlighted(navigation.proposals);
+    });
+
+    it('should have GOVERNANCE header visible', function () {
+      verifyPageHeader('Proposals');
+    });
+
+    it('should be able to see a working link for - find out more about Vega governance', function () {
+      // 3001-VOTE-001
+      cy.get(proposalDocumentationLink)
+        .should('be.visible')
+        .and('have.text', 'Find out more about Vega governance')
+        .and('have.attr', 'href')
+        .and('equal', governanceDocsUrl);
+
+      // 3002-PROP-001
+      cy.request(governanceDocsUrl)
+        .its('body')
+        .then((body) => {
+          if (!body.includes('Govern the network')) {
+            assert.include(
+              body,
+              'Govern the network',
+              `Checking that governance link destination includes 'Govern the network' text`
+            );
+          }
+        });
+    });
+
+    it('should be able to see button for - new proposal', function () {
+      // 3001-VOTE-002
+      cy.get(newProposalLink)
+        .should('be.visible')
+        .and('have.text', 'New proposal')
+        .and('have.attr', 'href')
+        .and('equal', '/proposals/propose');
+    });
+
+    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
+      cy.get(connectToVegaWalletButton)
+        .should('be.visible')
+        .and('have.text', 'Connect Vega wallet');
+    });
+
+    it('should see open network upgrade proposal on homepage', function () {
+      mockNetworkUpgradeProposal();
+      cy.visit('/');
+      cy.getByTestId('home-proposal-list').within(() => {
+        cy.getByTestId('protocol-upgrade-proposals-list-item').should('exist');
+        cy.getByTestId('protocol-upgrade-proposal-title').should(
+          'have.text',
+          'Vega release v1'
+        );
       });
+    });
 
-      it('should have GOVERNANCE header visible', function () {
-        verifyPageHeader('Proposals');
-      });
-
-      it('should be able to see a working link for - find out more about Vega governance', function () {
-        // 3001-VOTE-001
-        cy.get(proposalDocumentationLink)
-          .should('be.visible')
-          .and('have.text', 'Find out more about Vega governance')
-          .and('have.attr', 'href')
-          .and('equal', governanceDocsUrl);
-
-        // 3002-PROP-001
-        cy.request(governanceDocsUrl)
-          .its('body')
-          .then((body) => {
-            if (!body.includes('Govern the network')) {
-              assert.include(
-                body,
-                'Govern the network',
-                `Checking that governance link destination includes 'Govern the network' text`
-              );
-            }
+    it('should see network upgrade proposals in proposals list', function () {
+      mockNetworkUpgradeProposal();
+      navigateTo(navigation.proposals);
+      cy.getByTestId('open-proposals').within(() => {
+        cy.get('li')
+          .eq(0)
+          .should(
+            'have.attr',
+            'data-testid',
+            'protocol-upgrade-proposals-list-item'
+          )
+          .within(() => {
+            cy.get('h2').should('have.text', 'Vega release v1');
+            cy.getByTestId('protocol-upgrade-proposal-type').should(
+              'have.text',
+              'Network Upgrade'
+            );
+            cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
+              'have.text',
+              'Vega release tagv1'
+            );
+            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
+              'have.text',
+              'Upgrade block height2015942'
+            );
+            cy.getByTestId('protocol-upgrade-proposal-status').should(
+              'have.text',
+              'Approved'
+            );
           });
       });
-
-      it('should be able to see button for - new proposal', function () {
-        // 3001-VOTE-002
-        cy.get(newProposalLink)
-          .should('be.visible')
-          .and('have.text', 'New proposal')
-          .and('have.attr', 'href')
-          .and('equal', '/proposals/propose');
+      cy.getByTestId('closed-proposals').within(() => {
+        cy.getByTestId('protocol-upgrade-proposals-list-item').should(
+          'have.length',
+          1
+        );
       });
+    });
 
-      // Skipping this test for now, the new proposal button no longer takes a user directly
-      // to a proposal form, instead it takes them to a page where they can select a proposal type.
-      // Keeping this test here for now as it can be repurposed to test the new proposal forms.
-      it.skip('should be able to see a connect wallet button - if vega wallet disconnected and new proposal button selected', function () {
-        cy.get(newProposalButton).should('be.visible').click();
-        cy.get(connectToVegaWalletButton)
-          .should('be.visible')
-          .and('have.text', 'Connect Vega wallet');
-        navigateTo(navigation.proposals);
-        waitForSpinner();
+    it('should see details of network upgrade proposal', function () {
+      mockNetworkUpgradeProposal();
+      navigateTo(navigation.proposals);
+      cy.getByTestId('protocol-upgrade-proposals-list-item')
+        .first()
+        .find('[data-testid="view-proposal-btn"]')
+        .click();
+      cy.getByTestId('protocol-upgrade-proposal').within(() => {
+        cy.get('h1').should('have.text', 'Vega Release v1');
+        cy.getByTestId('protocol-upgrade-block-height').should(
+          'have.text',
+          '2015942 (currently 2014133)'
+        );
+        cy.getByTestId('protocol-upgrade-state').should(
+          'have.text',
+          'Approved'
+        );
+        cy.getByTestId('protocol-upgrade-release-tag').should(
+          'have.text',
+          'v1'
+        );
+        cy.getByTestId('protocol-upgrade-approval-status')
+          .should('contain.text', '99.98% approval (% validator voting power)')
+          .and('contain.text', '(67% voting power required)');
+        cy.get('h2').should('contain.text', 'Approvers (4/4 validators)');
+        cy.getByTestId('validator-name')
+          .should('have.length', 4)
+          .each(($validator) => {
+            cy.wrap($validator).find('a').should('have.attr', 'href');
+          });
+        cy.getByTestId('validator-voting-power').each(
+          ($validatorVotingPower) => {
+            cy.wrap($validatorVotingPower)
+              .invoke('text')
+              .should('contain', '%');
+          }
+        );
       });
     });
   }

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

@@ -45,10 +45,12 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     navigateTo(navigation.proposals);
     goToMakeNewProposal('Freeform');
     enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
-    cy.getByTestId('dialog-content').within(() => {
-      cy.get('h1').should('have.text', 'Transaction failed');
-      cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-    });
+    cy.getByTestId('dialog-content')
+      .first()
+      .within(() => {
+        cy.get('h1').should('have.text', 'Transaction failed');
+        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+      });
   });
 
   it('Able to disconnect via banner', function () {

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

@@ -3,6 +3,7 @@ import {
   navigation,
   verifyPageHeader,
 } from '../../support/common.functions';
+import { waitForBeginningOfEpoch } from '../../support/staking.functions';
 
 const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
 const warning = '[data-testid="callout"]';
@@ -37,6 +38,41 @@ context(
       it('should have toggle for seeing total vs individual rewards', function () {
         cy.get(viewToggle).should('be.visible');
       });
+
+      // Skipping due to bug #3471 causing flaky failuress
+      it.skip('should have option to view go to next and previous page', function () {
+        waitForBeginningOfEpoch();
+        cy.getByTestId('page-info')
+          .should('contain.text', 'Page ')
+          .invoke('text')
+          .then(($currentPage) => {
+            const currentPageNumber = Number($currentPage.slice(5));
+            cy.getByTestId('goto-next-page').click();
+            cy.getByTestId('page-info')
+              .invoke('text')
+              .then(($newPageNumber) => {
+                const newPageNumber = Number($newPageNumber.slice(5));
+                expect(newPageNumber).to.be.greaterThan(currentPageNumber);
+                cy.getByTestId('goto-previous-page').click();
+                cy.getByTestId('page-info').should(
+                  'contain.text',
+                  $currentPage
+                );
+              });
+          });
+      });
+
+      it('should have option to go to last and newest page', function () {
+        waitForBeginningOfEpoch();
+        cy.getByTestId('goto-last-page').click();
+        cy.getByTestId('epoch-total-rewards-table')
+          .last()
+          .find('h2')
+          .first()
+          .should('have.text', 'EPOCH 1');
+        cy.getByTestId('goto-first-page').click();
+        cy.get('h2').should('not.contain.text', 'EPOCH 1');
+      });
     });
   }
 );

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

@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 
 import {
-  navigateTo,
   navigation,
   verifyPageHeader,
   verifyTabHighlighted,
@@ -34,8 +33,8 @@ const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', function () {
-    cy.visit('/');
-    navigateTo(navigation.validators);
+    cy.clearAllLocalStorage();
+    cy.visit('/validators');
   });
 
   describe('with wallets disconnected', { tags: '@smoke' }, function () {

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

@@ -43,23 +43,25 @@ context(
 
       // 1005-VEST-020 1005-VEST-021
       it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
-        cy.getByTestId('vega-in-vesting-contract').within(() => {
-          cy.getByTestId('currency-title')
-            .should('contain.text', 'VEGA')
-            .and('contain.text', 'In vesting contract');
-          cy.get('[data-testid="currency-value"]:visible').should(
-            'have.text',
-            lockedTokensInVestingContract
-          );
-          cy.get('[data-testid="currency-locked"]:visible').should(
-            'have.text',
-            lockedTokensInVestingContract
-          );
-          cy.get('[data-testid="currency-unlocked"]:visible').should(
-            'have.text',
-            '0.00'
-          );
-        });
+        cy.get('[data-testid="vega-in-vesting-contract"]:visible').within(
+          () => {
+            cy.getByTestId('currency-title')
+              .should('contain.text', 'VEGA')
+              .and('contain.text', 'In vesting contract');
+            cy.get('[data-testid="currency-value"]:visible').should(
+              'have.text',
+              lockedTokensInVestingContract
+            );
+            cy.get('[data-testid="currency-locked"]:visible').should(
+              'have.text',
+              lockedTokensInVestingContract
+            );
+            cy.get('[data-testid="currency-unlocked"]:visible').should(
+              'have.text',
+              '0.00'
+            );
+          }
+        );
       });
       // 1005-VEST-022 1005-VEST-023
       it('Tokens amount displayed in vesting page', function () {

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

@@ -17,7 +17,7 @@ const vegaInWallet = '[data-testid="vega-in-wallet"]:visible';
 const progressBar = '[data-testid="progress-bar"]:visible';
 const currencyLocked = '[data-testid="currency-locked"]:visible';
 const currencyUnlocked = '[data-testid="currency-unlocked"]:visible';
-const dialog = '[role="dialog"]';
+const dialog = '[role="dialog"]:visible';
 const dialogHeader = '[data-testid="dialog-title"]';
 const dialogCloseBtn = '[data-testid="dialog-close"]';
 
@@ -68,8 +68,10 @@ context(
       it('should have connector list visible', function () {
         const connectList = [
           'Unknown',
-          'MetaMask, Brave or other injected web wallet',
+          'MetaMask',
+          'Coinbase',
           'WalletConnect',
+          'WalletConnect Legacy',
         ];
         cy.get(connectorList).within(() => {
           cy.get('button').each(($btn, i) => {

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

@@ -7,7 +7,7 @@ const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectButton = '[data-testid="connect-vega-wallet"]';
 const getVegaLink = '[data-testid="link"]';
-const dialog = '[role="dialog"]';
+const dialog = '[role="dialog"]:visible';
 const dialogHeader = '[data-testid="dialog-title"]';
 const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
 const connectorsList = '[data-testid="connectors-list"]';
@@ -35,6 +35,7 @@ context(
   { tags: '@regression' },
   () => {
     before('visit token home page', () => {
+      cy.clearAllLocalStorage();
       cy.visit('/');
       cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });
@@ -333,11 +334,8 @@ context(
                 .parent()
                 .siblings()
                 .invoke('text')
-                .should('have.length.above', 3)
-                .then((el) => {
-                  const value = parseFloat(el);
-                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
-                });
+                .then(parseFloat)
+                .should('be.gte', parseFloat(expectedAmount));
 
               cy.get(vegaWalletCurrencyTitle)
                 .contains(id)

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

@@ -12,6 +12,7 @@ context(
   { tags: '@smoke' },
   function () {
     before('navigate to withdrawals page', function () {
+      cy.clearAllLocalStorage();
       cy.visit('/');
       navigateTo(navigation.withdraw);
     });

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

@@ -26,9 +26,11 @@ const topLevelRoutes = [
 export function navigateTo(page: navigation) {
   if (!topLevelRoutes.includes(page)) {
     cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
-    cy.getByTestId('token-dropdown').within(() => {
-      cy.get(page).eq(0).click();
-    });
+    cy.getByTestId('token-dropdown')
+      .first()
+      .within(() => {
+        cy.get(page).eq(0).click();
+      });
   } else {
     return cy.get(navigation.section, { timeout: 10000 }).within(() => {
       cy.get(page).eq(0).click();

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

@@ -1,5 +1,9 @@
 import { addSeconds, millisecondsToSeconds } from 'date-fns';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { upgradeProposalsData } from '../fixtures/mocks/network-upgrade';
+import { proposalsData } from '../fixtures/mocks/proposals';
+import { nodeData } from '../fixtures/mocks/nodes';
 
 export function createUpdateNetworkProposalTxBody(): ProposalSubmissionBody {
   const MIN_CLOSE_SEC = 5;
@@ -80,3 +84,11 @@ export function createFreeFormProposalTxBody(): ProposalSubmissionBody {
     },
   };
 }
+
+export function mockNetworkUpgradeProposal() {
+  cy.mockGQL((req) => {
+    aliasGQLQuery(req, 'Nodes', nodeData);
+    aliasGQLQuery(req, 'Proposals', proposalsData);
+    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
+  });
+}

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

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

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

@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';
 
 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');

apps/governance/.env

@@ -14,6 +14,7 @@ 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_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.capsule

@@ -20,3 +20,4 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false
+

apps/governance/.env.testnet

@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

apps/governance/src/app.tsx

@@ -3,7 +3,7 @@ import './i18n';
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
-import { BrowserRouter as Router } from 'react-router-dom';
+import { BrowserRouter as Router, useLocation } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -17,6 +17,12 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
+import {
+  createConnectors,
+  useEthTransactionManager,
+  useEthWithdrawApprovalsManager,
+  useWeb3ConnectStore,
+} from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
 import { VegaWalletProvider } from '@vegaprotocol/wallet';
@@ -27,10 +33,10 @@ import {
   NetworkLoader,
   useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { createConnectors } from './lib/web3-connectors';
-import { ENV } from './config/env';
+import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
+import { SplashLoader } from './components/splash-loader';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -70,20 +76,52 @@ const cache: InMemoryCacheConfig = {
 
 const Web3Container = ({
   chainId,
-  providerUrl,
 }: {
   chainId: number;
   providerUrl: string;
 }) => {
+  const InitializeHandlers = () => {
+    useEthTransactionManager();
+    useEthWithdrawApprovalsManager();
+    return null;
+  };
+  const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
+    store.connectors,
+    store.initialize,
+  ]);
+  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
+    useEnvironment();
+  useEffect(() => {
+    if (chainId) {
+      return initializeConnectors(
+        createConnectors(
+          ETHEREUM_PROVIDER_URL,
+          Number(chainId),
+          ETH_LOCAL_PROVIDER_URL,
+          ETH_WALLET_MNEMONIC
+        ),
+        Number(chainId)
+      );
+    }
+  }, [
+    chainId,
+    ETHEREUM_PROVIDER_URL,
+    initializeConnectors,
+    ETH_LOCAL_PROVIDER_URL,
+    ETH_WALLET_MNEMONIC,
+  ]);
   const sideBar = React.useMemo(() => {
     return [<EthWallet />, <VegaWallet />];
   }, []);
-  const Connectors = React.useMemo(() => {
-    return createConnectors(providerUrl, Number(chainId));
-  }, [chainId, providerUrl]);
+
+  if (connectors.length === 0) {
+    // Prevent loading when the connectors are not initialized
+    return <SplashLoader />;
+  }
+
   return (
-    <Web3Provider connectors={Connectors}>
-      <Web3Connector connectors={Connectors} chainId={Number(chainId)}>
+    <Web3Provider connectors={connectors}>
+      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
         <VegaWalletProvider>
           <ContractsProvider>
             <AppLoader>
@@ -97,6 +135,7 @@ const Web3Container = ({
                       <NetworkInfo />
                     </footer>
                   </AppLayout>
+                  <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
                   <WithdrawalDialog />
@@ -110,6 +149,20 @@ const Web3Container = ({
   );
 };
 
+const ScrollToTop = () => {
+  const { pathname } = useLocation();
+
+  useEffect(() => {
+    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
+    document.documentElement.scrollTo({
+      top: 0,
+      left: 0,
+    });
+  }, [pathname]);
+
+  return null;
+};
+
 const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -144,6 +197,7 @@ const AppContainer = () => {
 
   return (
     <Router>
+      <ScrollToTop />
       <AppStateProvider>
         <div className="grid min-h-full text-white">
           <AsyncRenderer<EthereumConfig | null>

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

@@ -26,6 +26,7 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
+import { useWeb3Disconnect } from '@vegaprotocol/web3';
 
 const removeLeadingAddressSymbol = (key: string) => {
   if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -184,6 +185,7 @@ export const EthWallet = () => {
   const { appDispatch } = useAppState();
   const { account, connector } = useWeb3React();
   const pendingTxs = usePendingTransactions();
+  const disconnect = useWeb3Disconnect(connector);
 
   return (
     <WalletCard>
@@ -239,7 +241,7 @@ export const EthWallet = () => {
             <div className="flex justify-end">
               <button
                 className="underline"
-                onClick={() => connector.deactivate()}
+                onClick={() => disconnect()}
                 data-testid="disconnect-from-eth-wallet-button"
               >
                 {t('disconnect')}

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

@@ -1,5 +1,10 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
-import { getChainName, Web3ConnectDialog } from '@vegaprotocol/web3';
+import {
+  getChainName,
+  useWeb3ConnectStore,
+  useWeb3Disconnect,
+  Web3ConnectDialog,
+} from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
 import { useCallback, useEffect } from 'react';
@@ -51,7 +56,9 @@ interface Web3ContentProps {
 }
 
 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
-  const { error, connector, chainId } = useWeb3React();
+  const { connector, chainId } = useWeb3React();
+  const error = useWeb3ConnectStore((store) => store.error);
+  const disconnect = useWeb3Disconnect(connector);
 
   useEffect(() => {
     if (connector?.connectEagerly) {
@@ -67,7 +74,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
       <Splash>
         <div className="flex flex-col items-center gap-12">
           <p className="text-white">Something went wrong: {error.message}</p>
-          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+          <Button onClick={() => disconnect()}>Disconnect</Button>
         </div>
       </Splash>
     );
@@ -80,7 +87,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
           <p className="text-white">
             This app only works on {getChainName(appChainId)}
           </p>
-          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+          <Button onClick={() => disconnect()}>Disconnect</Button>
         </div>
       </Splash>
     );

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

@@ -789,5 +789,6 @@
   "approvers": "Approvers",
   "approval (% validator voting power)": "approval (% validator voting power)",
   "67% voting power required": "67% voting power required",
-  "Token": "Token"
+  "Token": "Token",
+  "associateVegaNow": "Associate $VEGA now"
 }

apps/governance/src/lib/web3-connectors.ts

@@ -1,20 +1,17 @@
 import { ethers } from 'ethers';
 import type { Web3ReactHooks } from '@web3-react/core';
-import { initializeConnector } from '@web3-react/core';
-import { MetaMask } from '@web3-react/metamask';
-import { WalletConnect } from '@web3-react/walletconnect';
 import type { Connector } from '@web3-react/types';
 import { ENV } from '../config/env';
-import { UrlConnector } from '@vegaprotocol/web3';
+import {
+  initializeMetaMaskConnector,
+  initializeWalletConnector,
+  initializeWalletConnectLegacyConnector,
+  initializeCoinbaseConnector,
+  WALLETCONNECT_PROJECT_ID,
+  initializeUrlConnector,
+} from '@vegaprotocol/web3';
 
-const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
-  (actions) => new MetaMask(actions)
-);
-
-const [urlConnector, urlHooks] = initializeConnector<UrlConnector>(
-  (actions) =>
-    new UrlConnector(actions, ENV.localProviderUrl, ENV.ethWalletMnemonic)
-);
+initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic);
 
 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
   return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -24,19 +21,14 @@ export const createConnectors = (providerUrl: string, chainId: number) => {
   if (isNaN(chainId)) {
     throw new Error('Invalid Ethereum chain ID for environment');
   }
-  const [walletconnect, walletconnectHooks] =
-    initializeConnector<WalletConnect>(
-      (actions) =>
-        new WalletConnect(actions, {
-          rpc: {
-            [chainId]: providerUrl,
-          },
-        }),
-      [chainId]
-    );
+
   return [
-    ENV.urlConnect ? [urlConnector, urlHooks] : null,
-    [metamask, metamaskHooks],
-    [walletconnect, walletconnectHooks],
-  ].filter(Boolean) as [Connector, Web3ReactHooks][];
+    ENV.urlConnect
+      ? initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic)
+      : null,
+    initializeMetaMaskConnector(),
+    initializeCoinbaseConnector(providerUrl),
+    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
+    initializeWalletConnectLegacyConnector(chainId, providerUrl),
+  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
 };

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

@@ -57,10 +57,7 @@ export const ProtocolUpdateProposalDetailApprovals = ({
                 noBorder={index === consensusApprovals?.length - 1}
                 key={validator.pubkey}
               >
-                <div
-                  className="-mb-3 mt-1"
-                  data-testid={`validator-${validator.id}`}
-                >
+                <div className="-mb-3 mt-1" data-testid={'validator-name'}>
                   <ValidatorDetailsLink
                     id={validator.id}
                     avatarUrl={validator.avatarUrl}
@@ -68,7 +65,7 @@ export const ProtocolUpdateProposalDetailApprovals = ({
                   />
                 </div>
 
-                <span>
+                <span data-testid="validator-voting-power">
                   {getNormalisedVotingPower(
                     validator.rankingScore.votingPower,
                     2

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

@@ -63,7 +63,7 @@ describe('ProtocolUpdateProposalDetailApprovals', () => {
 
   it('renders the correct number of consensus approvers', () => {
     renderComponent();
-    const validators = screen.getAllByTestId(/validator-/i);
+    const validators = screen.getAllByTestId(/validator-name/);
     expect(validators.length).toBe(mockValidators.length);
   });
 

apps/governance/src/routes/staking/home/epoch-data.tsx

@@ -6,6 +6,7 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { ENV } from '../../../config';
 
 export const EpochData = () => {
   // errorPolicy due to vegaprotocol/vega issue 5898
@@ -14,11 +15,23 @@ export const EpochData = () => {
     data: nodesData,
     error: nodesError,
     loading: nodesLoading,
-    refetch,
+    refetch: nodesRefetch,
   } = useNodesQuery();
-  const { data: userStakingData } = useStakingQuery({
+
+  const { delegationsPagination } = ENV;
+  const {
+    data: userStakingData,
+    error: userStakingError,
+    loading: userStakingLoading,
+    refetch: userStakingRefetch,
+  } = useStakingQuery({
     variables: {
       partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
     },
   });
   const { data: previousEpochData } = usePreviousEpochQuery({
@@ -28,10 +41,17 @@ export const EpochData = () => {
     skip: !nodesData?.epoch.id,
   });
 
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, () => {
+    nodesRefetch();
+    userStakingRefetch();
+  });
 
   return (
-    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
+    <AsyncRenderer
+      loading={nodesLoading || userStakingLoading}
+      error={nodesError || userStakingError}
+      data={nodesData}
+    >
       {nodesData?.epoch &&
         nodesData.epoch.timestamps.start &&
         nodesData?.epoch.timestamps.expiry && (

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

@@ -211,7 +211,7 @@ export const ConsensusValidatorsTable = ({
               : undefined,
             [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
             [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
               : undefined,
           };
         }

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

@@ -59,9 +59,9 @@ export const addUserDataToValidator = (
       : undefined,
     [ValidatorFields.USER_STAKE_SHARE]:
       currentEpochUserStaking && Number(currentEpochUserStaking.amount) > 0
-        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
-            new BigNumber(currentUserStakeAvailable)
-          )
+        ? new BigNumber(currentEpochUserStaking.amount)
+            .dividedBy(new BigNumber(currentUserStakeAvailable))
+            .times(100)
         : undefined,
   };
 };

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

@@ -26,7 +26,11 @@ import {
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
 import type { ValidatorsTableProps } from './shared';
-import { formatNumber, toBigNum } from '@vegaprotocol/utils';
+import {
+  formatNumber,
+  formatNumberPercentage,
+  toBigNum,
+} from '@vegaprotocol/utils';
 
 interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
   stakeNeededForPromotion: string | undefined;
@@ -163,7 +167,7 @@ export const StandbyPendingValidatorsTable = ({
               : undefined,
             [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
             [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? stakedTotalPercentage(userStakeShare)
+              ? formatNumberPercentage(new BigNumber(userStakeShare))
               : undefined,
           };
         }

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

@@ -13,6 +13,8 @@ import { StakingFormTxStatuses } from './staking-form-tx-statuses';
 import {
   ButtonLink,
   FormGroup,
+  Intent,
+  Notification,
   Radio,
   RadioGroup,
 } from '@vegaprotocol/ui-toolkit';
@@ -29,6 +31,7 @@ import type {
   DelegateSubmissionBody,
   UndelegateSubmissionBody,
 } from '@vegaprotocol/wallet';
+import Routes from '../../routes';
 
 export enum FormState {
   Default,
@@ -191,51 +194,65 @@ export const StakingForm = ({
   }, [isDialogVisible]);
 
   return (
-    <>
+    <div className="my-8">
       <SubHeading title={t('Manage your stake')} />
       {formState === FormState.Default &&
         availableStakeToAdd.isEqualTo(0) &&
         availableStakeToRemove.isEqualTo(0) && (
           <div className="mb-4">
             {lien.isGreaterThan(0) ? (
-              <span className="text-vega-pink">
-                {t('stakeNodeWrongVegaKey')}
-              </span>
+              <Notification
+                intent={Intent.Warning}
+                message={t('stakeNodeWrongVegaKey')}
+              />
             ) : (
-              <span className="text-vega-orange">{t('stakeNodeNone')}</span>
+              <Notification
+                message={t('stakeNodeNone')}
+                intent={Intent.Warning}
+                buttonProps={{
+                  text: t('associateVegaNow'),
+                  action: () => navigate(Routes.ASSOCIATE),
+                  className: 'py-1',
+                  size: 'sm',
+                }}
+              />
             )}
           </div>
         )}
-      <FormGroup
-        label={t('Select if you want to add or remove stake')}
-        labelFor="radio-stake-options"
-        hideLabel={true}
-      >
-        <RadioGroup
-          name="radio-stake-options"
-          onChange={(value) => {
-            // @ts-ignore value does exist on target
-            setAction(value);
-            navigate(`?action=${value}`, {
-              replace: true,
-            });
-          }}
-          value={action}
+
+      <div className="mb-8">
+        <FormGroup
+          label={t('Select if you want to add or remove stake')}
+          labelFor="radio-stake-options"
+          hideLabel={true}
         >
-          <Radio
-            disabled={availableStakeToAdd.isEqualTo(0)}
-            value={Actions.Add}
-            label="Add"
-            id="add-stake-radio"
-          />
-          <Radio
-            disabled={availableStakeToRemove.isEqualTo(0)}
-            value={Actions.Remove}
-            label="Remove"
-            id="remove-stake-radio"
-          />
-        </RadioGroup>
-      </FormGroup>
+          <RadioGroup
+            name="radio-stake-options"
+            onChange={(value) => {
+              // @ts-ignore value does exist on target
+              setAction(value);
+              navigate(`?action=${value}`, {
+                replace: true,
+              });
+            }}
+            value={action}
+          >
+            <Radio
+              disabled={availableStakeToAdd.isEqualTo(0)}
+              value={Actions.Add}
+              label="Add"
+              id="add-stake-radio"
+            />
+            <Radio
+              disabled={availableStakeToRemove.isEqualTo(0)}
+              value={Actions.Remove}
+              label="Remove"
+              id="remove-stake-radio"
+            />
+          </RadioGroup>
+        </FormGroup>
+      </div>
+
       {action !== undefined && (
         // eslint-disable-next-line
         <>
@@ -314,6 +331,6 @@ export const StakingForm = ({
         toggleDialog={toggleDialog}
         error={error}
       />
-    </>
+    </div>
   );
 };

apps/liquidity-provision-dashboard/.env

@@ -19,7 +19,7 @@ NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
+NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

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

@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8

apps/multisig-signer/.env

@@ -2,4 +2,4 @@ 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_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
-
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

apps/multisig-signer/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET

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

@@ -9,6 +9,7 @@ import {
 } from '@vegaprotocol/environment';
 import { AsyncRenderer, Button, Lozenge } from '@vegaprotocol/ui-toolkit';
 import type { EthereumConfig } from '@vegaprotocol/web3';
+import { useWeb3Disconnect } from '@vegaprotocol/web3';
 import { useEthereumConfig, Web3Provider } from '@vegaprotocol/web3';
 import { t } from '@vegaprotocol/i18n';
 import { ENV } from './config/env';
@@ -34,6 +35,7 @@ const pageWrapperClasses = classnames(
 
 const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
   const { account, connector } = useWeb3React();
+  const disconnect = useWeb3Disconnect(connector);
   return (
     <main className="w-full max-w-3xl px-5 justify-self-center">
       <h1>{t('Multisig signer')}</h1>
@@ -41,7 +43,7 @@ const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
         <p>
           Connected to Eth wallet: <Lozenge>{account}</Lozenge>
         </p>
-        <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+        <Button onClick={() => disconnect()}>Disconnect</Button>
       </div>
       <ContractDetails config={config} />
       <h2>{t('Add or remove signer')}</h2>

apps/multisig-signer/src/app/components/web3-connector/web3-connector.tsx

@@ -1,5 +1,10 @@
 import { useEnvironment } from '@vegaprotocol/environment';
-import { getChainName, useEthereumConfig } from '@vegaprotocol/web3';
+import {
+  getChainName,
+  useEthereumConfig,
+  useWeb3ConnectStore,
+  useWeb3Disconnect,
+} from '@vegaprotocol/web3';
 import { Button, Splash, AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Web3ConnectDialog } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
@@ -55,7 +60,9 @@ export const Web3Content = ({
   appChainId,
   setDialogOpen,
 }: Web3ContentProps) => {
-  const { error, connector, chainId } = useWeb3React();
+  const { connector, chainId } = useWeb3React();
+  const error = useWeb3ConnectStore((store) => store.error);
+  const disconnect = useWeb3Disconnect(connector);
 
   useEffect(() => {
     if (connector?.connectEagerly) {
@@ -71,7 +78,7 @@ export const Web3Content = ({
       <Splash>
         <div className="flex flex-col items-center gap-12">
           <p className="text-white">Something went wrong: {error.message}</p>
-          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+          <Button onClick={() => disconnect()}>Disconnect</Button>
         </div>
       </Splash>
     );
@@ -84,7 +91,7 @@ export const Web3Content = ({
           <p className="text-white">
             This app only works on {getChainName(appChainId)}
           </p>
-          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
+          <Button onClick={() => disconnect()}>Disconnect</Button>
         </div>
       </Splash>
     );

apps/multisig-signer/src/app/lib/web3-connectors.ts

@@ -1,13 +1,13 @@
 import { ethers } from 'ethers';
 import type { Web3ReactHooks } from '@web3-react/core';
-import { initializeConnector } from '@web3-react/core';
-import { MetaMask } from '@web3-react/metamask';
-import { WalletConnect } from '@web3-react/walletconnect';
 import type { Connector } from '@web3-react/types';
-
-const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
-  (actions) => new MetaMask(actions)
-);
+import {
+  WALLETCONNECT_PROJECT_ID,
+  initializeCoinbaseConnector,
+  initializeMetaMaskConnector,
+  initializeWalletConnectLegacyConnector,
+  initializeWalletConnector,
+} from '@vegaprotocol/web3';
 
 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
   return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -17,18 +17,11 @@ export const createConnectors = (providerUrl: string, chainId: number) => {
   if (isNaN(chainId)) {
     throw new Error('Invalid Ethereum chain ID for environment');
   }
-  const [walletconnect, walletconnectHooks] =
-    initializeConnector<WalletConnect>(
-      (actions) =>
-        new WalletConnect(actions, {
-          rpc: {
-            [chainId]: providerUrl,
-          },
-        }),
-      [chainId]
-    );
+
   return [
-    [metamask, metamaskHooks],
-    [walletconnect, walletconnectHooks],
-  ] as [Connector, Web3ReactHooks][];
+    initializeMetaMaskConnector(),
+    initializeCoinbaseConnector(providerUrl),
+    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
+    initializeWalletConnectLegacyConnector(chainId, providerUrl),
+  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
 };

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

@@ -1,17 +1,3 @@
 {
-  "hosts": [
-    "https://vega-data-graphql.chorus.one/query",
-    "https://vega.xprv.io/datanode/query",
-    "http://nala.mainnet.vega.community:3008/query",
-    "http://commodum.mainnet.vega.community:3008/query",
-    "http://lovali.mainnet.vega.community:3008/query",
-    "http://b-harvest.mainnet.vega.community:3008/query",
-    "http://staking-facilities.mainnet.vega.community:3008/query",
-    "http://figment.mainnet.vega.community:3008/query",
-    "http://nodes-guru.mainnet.vega.community:3008/query",
-    "http://p2p.mainnet.vega.community:3008/query",
-    "http://rockaway.mainnet.vega.community:3008/query",
-    "http://greenfield-one.mainnet.vega.community:3008/query",
-    "http://ryabina.mainnet.vega.community:3008/query"
-  ]
+  "hosts": ["https://vega.xprv.io/datanode/query"]
 }

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

@@ -36,10 +36,40 @@
     "tranche_id": 56,
     "tranche_start": "2023-04-20T00:00:00.000Z",
     "tranche_end": "2023-05-20T00:00:00.000Z",
-    "total_added": "15761.125",
-    "total_removed": "0",
-    "locked_amount": "15761.125",
+    "total_added": "19242.125",
+    "total_removed": "397.984073768865",
+    "locked_amount": "15068.736736207562060975",
     "deposits": [
+      {
+        "amount": "188",
+        "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "tx": "0xefa5cb034a994bd2cf2b100b1ecca1877038e7b1188fab4ebf2065cb165027e4"
+      },
+      {
+        "amount": "50",
+        "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+        "tx": "0xc1ede6de1653f205e0a743f609835648a67287a271a994cd141911ce13d5cac7"
+      },
+      {
+        "amount": "1207.5",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+      },
+      {
+        "amount": "690",
+        "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+      },
+      {
+        "amount": "914.25",
+        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "tx": "0xa4b11dd967e1726d3f10d1a8330d3cac2338a93b3f8ea5db2f58a6c653ff8a1f"
+      },
+      {
+        "amount": "431.25",
+        "user": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+        "tx": "0xcad28318a71f2c8c6f4d505b8c2029c44aa83a249c5428e97110d9c0071ab9e3"
+      },
       {
         "amount": "241.5",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -181,8 +211,123 @@
         "tx": "0x679fcc1c3a29bdc259b6a4c044579a89c5357f42ed1963221669ebf43cc545b0"
       }
     ],
-    "withdrawals": [],
+    "withdrawals": [
+      {
+        "amount": "202.093666077975",
+        "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+      },
+      {
+        "amount": "195.89040769089",
+        "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "tx": "0x338ca1f2a725add8aa5328efa43ac7cb1e91c35bf01a2312431c0dbb57137387"
+      }
+    ],
     "users": [
+      {
+        "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "deposits": [
+          {
+            "amount": "188",
+            "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+            "tranche_id": 56,
+            "tx": "0xefa5cb034a994bd2cf2b100b1ecca1877038e7b1188fab4ebf2065cb165027e4"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "188",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "188"
+      },
+      {
+        "address": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+        "deposits": [
+          {
+            "amount": "50",
+            "user": "0xAc1c2783d64c29CDB79608f5B66a37Fd1ea35dD6",
+            "tranche_id": 56,
+            "tx": "0xc1ede6de1653f205e0a743f609835648a67287a271a994cd141911ce13d5cac7"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "50",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "50"
+      },
+      {
+        "address": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+        "deposits": [
+          {
+            "amount": "1207.5",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x9092eaf46d5cdba3b2219aa7187da4e1623004434c33a915956aa45d04d561f2"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "202.093666077975",
+            "user": "0x1447Efc62d5077d7AbB20492dF831Dd6c9Eb1756",
+            "tranche_id": 56,
+            "tx": "0x300c18b4220d3bc357f054792cb65f05d4005912bf8e5d9580b5b830cc3c0845"
+          }
+        ],
+        "total_tokens": "1207.5",
+        "withdrawn_tokens": "202.093666077975",
+        "remaining_tokens": "1005.406333922025"
+      },
+      {
+        "address": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+        "deposits": [
+          {
+            "amount": "690",
+            "user": "0x33Ce1D9E53AFb7367E34749517C086405a651a95",
+            "tranche_id": 56,
+            "tx": "0xa717d720df95537c07c8f24591d49fb35d2b2d935ec25da4b23a0819a78b499d"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "690",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "690"
+      },
+      {
+        "address": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+        "deposits": [
+          {
+            "amount": "914.25",
+            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+            "tranche_id": 56,
+            "tx": "0xa4b11dd967e1726d3f10d1a8330d3cac2338a93b3f8ea5db2f58a6c653ff8a1f"
+          }
+        ],
+        "withdrawals": [
+          {
+            "amount": "195.89040769089",
+            "user": "0xDd7a98557586ce21f770662319C2047C5a3bD605",
+            "tranche_id": 56,
+            "tx": "0x338ca1f2a725add8aa5328efa43ac7cb1e91c35bf01a2312431c0dbb57137387"
+          }
+        ],
+        "total_tokens": "914.25",
+        "withdrawn_tokens": "195.89040769089",
+        "remaining_tokens": "718.35959230911"
+      },
+      {
+        "address": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+        "deposits": [
+          {
+            "amount": "431.25",
+            "user": "0x9573BDF7FfC5519912d293e4D1f750eab2E471E7",
+            "tranche_id": 56,
+            "tx": "0xcad28318a71f2c8c6f4d505b8c2029c44aa83a249c5428e97110d9c0071ab9e3"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "431.25",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "431.25"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -664,10 +809,15 @@
     "tranche_id": 54,
     "tranche_start": "2023-04-06T00:00:00.000Z",
     "tranche_end": "2023-05-06T00:00:00.000Z",
-    "total_added": "8865",
-    "total_removed": "362.31015740205",
-    "locked_amount": "4874.1459548611110345",
+    "total_added": "8976",
+    "total_removed": "596.64743517951",
+    "locked_amount": "2840.4122592592591152",
     "deposits": [
+      {
+        "amount": "111",
+        "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
+      },
       {
         "amount": "33",
         "user": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
@@ -805,6 +955,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "106.53500000286",
+        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+        "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+      },
       {
         "amount": "5.46866782407",
         "user": "0x92A1e98C6f09970e45645Cbe57c6DcaF4547c8FE",
@@ -825,6 +980,11 @@
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
         "tx": "0x05d086879e23724f1397d41adcbe2f3316dd4039c240edbc3cbbcacf1ca1d00e"
       },
+      {
+        "amount": "127.8022777746",
+        "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+        "tx": "0xb67468e99866887e95c5a211fe8611d107b02ef094d9b90343820366a5e8c7a0"
+      },
       {
         "amount": "52.2185023074",
         "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -832,6 +992,21 @@
       }
     ],
     "users": [
+      {
+        "address": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+        "deposits": [
+          {
+            "amount": "111",
+            "user": "0x90Cf7B9958C3BbBCddAb52Ecc408535D4f3C4241",
+            "tranche_id": 54,
+            "tx": "0x1229e077f48b796678436bfa8143cea3ae71df58b589ac922be205c4482be235"
+          }
+        ],
+        "withdrawals": [],
+        "total_tokens": "111",
+        "withdrawn_tokens": "0",
+        "remaining_tokens": "111"
+      },
       {
         "address": "0xBf1AaB792D729fA125e6D7122D4b916a1E1C44B1",
         "deposits": [
@@ -1038,6 +1213,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "106.53500000286",
+            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+            "tranche_id": 54,
+            "tx": "0x4027743264e01043ddb16676c6f7914c110df9e7212bd3f21cb6842614ce238f"
+          },
           {
             "amount": "155.03186111556",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1050,6 +1231,12 @@
             "tranche_id": 54,
             "tx": "0x05d086879e23724f1397d41adcbe2f3316dd4039c240edbc3cbbcacf1ca1d00e"
           },
+          {
+            "amount": "127.8022777746",
+            "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
+            "tranche_id": 54,
+            "tx": "0xb67468e99866887e95c5a211fe8611d107b02ef094d9b90343820366a5e8c7a0"
+          },
           {
             "amount": "52.2185023074",
             "user": "0x6F32AA5A6198329c16e438512F992a0548C856f9",
@@ -1058,8 +1245,8 @@
           }
         ],
         "total_tokens": "858",
-        "withdrawn_tokens": "296.67303008772",
-        "remaining_tokens": "561.32696991228"
+        "withdrawn_tokens": "531.01030786518",
+        "remaining_tokens": "326.98969213482"
       },
       {
         "address": "0x0bBf7580e036eA5D69ABe679CC90117EeC2e3dc1",
@@ -4407,7 +4594,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "86666.297",
     "total_removed": "0",
-    "locked_amount": "54491.6293588377368963476",
+    "locked_amount": "52829.2474338382140338349",
     "deposits": [
       {
         "amount": "86666.297",
@@ -4473,7 +4660,7 @@
     "tranche_end": "2023-06-01T00:00:00.000Z",
     "total_added": "2500",
     "total_removed": "0",
-    "locked_amount": "583.71664504477005",
+    "locked_amount": "487.54610551485555",
     "deposits": [
       {
         "amount": "2500",
@@ -4594,7 +4781,7 @@
     "tranche_end": "2023-09-01T00:00:00.000Z",
     "total_added": "17500",
     "total_removed": "0",
-    "locked_amount": "12791.60329232085475",
+    "locked_amount": "12125.7268392713355",
     "deposits": [
       {
         "amount": "12500",
@@ -4860,8 +5047,8 @@
     "tranche_start": "2023-02-01T00:00:00.000Z",
     "tranche_end": "2023-08-01T00:00:00.000Z",
     "total_added": "37500",
-    "total_removed": "12294.731717775",
-    "locked_amount": "21442.24553023327125",
+    "total_removed": "12704.026146825",
+    "locked_amount": "19991.71750306936875",
     "deposits": [
       {
         "amount": "7500",
@@ -4875,6 +5062,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "164.727209925",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
+      },
       {
         "amount": "126.30064455",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -4890,6 +5082,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x2c8a0681fe27258861489cd7a891cf213c7ab930d86b1bf08cd54f2f3739a8b5"
       },
+      {
+        "amount": "244.567219125",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x4bc7559edf36b6ecda7656f8066479395ea441daf0ad37ad4324814348e41643"
+      },
       {
         "amount": "158.943370125",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5028,6 +5225,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "164.727209925",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x4dc6eefb43f5b1704894582aa926f0c6ecd94550ac354b7d5b5f49b0f17261fd"
+          },
           {
             "amount": "126.30064455",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5046,6 +5249,12 @@
             "tranche_id": 34,
             "tx": "0x2c8a0681fe27258861489cd7a891cf213c7ab930d86b1bf08cd54f2f3739a8b5"
           },
+          {
+            "amount": "244.567219125",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 34,
+            "tx": "0x4bc7559edf36b6ecda7656f8066479395ea441daf0ad37ad4324814348e41643"
+          },
           {
             "amount": "158.943370125",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -5186,8 +5395,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "3059.282439375",
-        "remaining_tokens": "4440.717560625"
+        "withdrawn_tokens": "3468.576868425",
+        "remaining_tokens": "4031.423131575"
       },
       {
         "address": "0x0B4e6fcE839B01ef43DA6F890FAC7B1Afb004600",
@@ -5225,7 +5434,7 @@
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "129999.45",
     "total_removed": "0",
-    "locked_amount": "54441.912603447519962385",
+    "locked_amount": "52781.047392785629516053",
     "deposits": [
       {
         "amount": "129999.45",
@@ -5258,7 +5467,7 @@
     "tranche_end": "2024-04-01T00:00:00.000Z",
     "total_added": "54144.7663",
     "total_removed": "0",
-    "locked_amount": "51407.13764596631692808494",
+    "locked_amount": "50371.40222238362540059014",
     "deposits": [
       {
         "amount": "54144.7663",
@@ -5291,7 +5500,7 @@
     "tranche_end": "2023-09-03T00:00:00.000Z",
     "total_added": "62600",
     "total_removed": "0",
-    "locked_amount": "23409.75395104008482",
+    "locked_amount": "22208.997577371892778",
     "deposits": [
       {
         "amount": "10000",
@@ -5484,7 +5693,7 @@
     "tranche_end": "2023-09-17T00:00:00.000Z",
     "total_added": "5000",
     "total_removed": "0",
-    "locked_amount": "2061.56947615423635",
+    "locked_amount": "1965.6624175545405",
     "deposits": [
       {
         "amount": "5000",
@@ -6024,8 +6233,8 @@
     "tranche_start": "2022-11-01T00:00:00.000Z",
     "tranche_end": "2023-05-01T00:00:00.000Z",
     "total_added": "22500",
-    "total_removed": "6871.43713545",
-    "locked_amount": "1428.88322974217355",
+    "total_removed": "7280.725809525",
+    "locked_amount": "558.56641344383115",
     "deposits": [
       {
         "amount": "7500",
@@ -6039,6 +6248,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "164.727209925",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
+      },
       {
         "amount": "126.2948895",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6054,6 +6268,11 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0x15840e283faffb39a5d0e3389137ec92cec3deee7df535a534908ccd7d6b0873"
       },
+      {
+        "amount": "244.56146415",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x00275dfbd06b609e69b430eef7fe04c7bb64314904a0478a0e55b643f7f0bc09"
+      },
       {
         "amount": "158.9433702",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6247,6 +6466,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "164.727209925",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0xa9dd827abcfaa4b289c6bcf5923d455380c1d4f9ce4ce615415a513df60b1ea8"
+          },
           {
             "amount": "126.2948895",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6265,6 +6490,12 @@
             "tranche_id": 33,
             "tx": "0x15840e283faffb39a5d0e3389137ec92cec3deee7df535a534908ccd7d6b0873"
           },
+          {
+            "amount": "244.56146415",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 33,
+            "tx": "0x00275dfbd06b609e69b430eef7fe04c7bb64314904a0478a0e55b643f7f0bc09"
+          },
           {
             "amount": "158.9433702",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -6483,8 +6714,8 @@
           }
         ],
         "total_tokens": "7500",
-        "withdrawn_tokens": "6871.43713545",
-        "remaining_tokens": "628.56286455"
+        "withdrawn_tokens": "7280.725809525",
+        "remaining_tokens": "219.274190475"
       },
       {
         "address": "0x2539b51EbDE65a75672aBcfE9439a706a99D18D1",
@@ -6509,7 +6740,7 @@
     "tranche_end": "2023-06-02T00:00:00.000Z",
     "total_added": "1939928.38",
     "total_removed": "928642.9598472029154",
-    "locked_amount": "231168.093511598737240552",
+    "locked_amount": "193957.5285476244010738806",
     "deposits": [
       {
         "amount": "1852091.69",
@@ -40325,7 +40556,7 @@
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "3732368.4671",
     "total_removed": "715655.108029600523393",
-    "locked_amount": "379726.105748070797206746073",
+    "locked_amount": "322546.517267879190806982098",
     "deposits": [
       {
         "amount": "1998.95815",
@@ -41717,8 +41948,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-12-05T00:00:00.000Z",
     "total_added": "15870102.715470999700000001",
-    "total_removed": "835090.78677275839915352",
-    "locked_amount": "6646171.9758772447834505578413098637685861",
+    "total_removed": "863956.20182679498584852",
+    "locked_amount": "6443416.82640696362856446483297671260124354",
     "deposits": [
       {
         "amount": "16249.93",
@@ -42222,6 +42453,31 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "10150.87581603206683",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0x2ee57ee8a712525955ad807f4d45eeaa5f6388bf0b4fceabc7de6871899f736e"
+      },
+      {
+        "amount": "913.910324501590625",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x455d2e8214a5071fd4de1642939780068d4694cc2a774e7a3ab9283c4d52e847"
+      },
+      {
+        "amount": "972.3599906033915",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0x715201656de8957c81817e491e18394abf8bc419d96c86c5106ef3f30d7625e9"
+      },
+      {
+        "amount": "1784.722222",
+        "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
+        "tx": "0x0b45b329eb6c3793425d9169b07ed6a7db7db303e4930ffaed75e3a1772a6a9c"
+      },
+      {
+        "amount": "819.57170977716749",
+        "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+        "tx": "0x9d12dadb940c59a796a405a4971e73f24d7ad284528ec7ce676ae361a4ac1f51"
+      },
       {
         "amount": "981.387731774910625",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -42277,6 +42533,21 @@
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
         "tx": "0xa56a064890829624fb37f887adb87987dfafd709ebea2cdf423c91a38e91b82f"
       },
+      {
+        "amount": "984.287150968688875",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xbf3e00aef8ae756fb2f5de5d3eec6f925e9005c7acca1a6c2f88a84ad1e44fba"
+      },
+      {
+        "amount": "12786.192214",
+        "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
+        "tx": "0x57c9c9396f67fb377f2d7cca30a1a6e6b73267408efde1239cbfdfd99c333345"
+      },
+      {
+        "amount": "453.495626153681375",
+        "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+        "tx": "0xdad160466fa0b4805f3a12ff558d429bf48f81f9b99653dbce172d261861f1d0"
+      },
       {
         "amount": "998.454771147362375",
         "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44315,6 +44586,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "913.910324501590625",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x455d2e8214a5071fd4de1642939780068d4694cc2a774e7a3ab9283c4d52e847"
+          },
+          {
+            "amount": "972.3599906033915",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0x715201656de8957c81817e491e18394abf8bc419d96c86c5106ef3f30d7625e9"
+          },
           {
             "amount": "981.387731774910625",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -44375,6 +44658,18 @@
             "tranche_id": 2,
             "tx": "0xa56a064890829624fb37f887adb87987dfafd709ebea2cdf423c91a38e91b82f"
           },
+          {
+            "amount": "984.287150968688875",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xbf3e00aef8ae756fb2f5de5d3eec6f925e9005c7acca1a6c2f88a84ad1e44fba"
+          },
+          {
+            "amount": "453.495626153681375",
+            "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
+            "tranche_id": 2,
+            "tx": "0xdad160466fa0b4805f3a12ff558d429bf48f81f9b99653dbce172d261861f1d0"
+          },
           {
             "amount": "998.454771147362375",
             "user": "0x20CD77B9FC2f1fEDfb6F184E25f7127BFE991C8b",
@@ -45811,8 +46106,8 @@
           }
         ],
         "total_tokens": "259998.8875",
-        "withdrawn_tokens": "150733.980517927478375",
-        "remaining_tokens": "109264.906982072521625"
+        "withdrawn_tokens": "154058.03361015483075",
+        "remaining_tokens": "105940.85388984516925"
       },
       {
         "address": "0x89051CAb67Bc7F8CC44F7e270c6EDaf1EC57676c",
@@ -46039,6 +46334,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "10150.87581603206683",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0x2ee57ee8a712525955ad807f4d45eeaa5f6388bf0b4fceabc7de6871899f736e"
+          },
+          {
+            "amount": "819.57170977716749",
+            "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
+            "tranche_id": 2,
+            "tx": "0x9d12dadb940c59a796a405a4971e73f24d7ad284528ec7ce676ae361a4ac1f51"
+          },
           {
             "amount": "2873.74755113623213",
             "user": "0xe3eB4CF43C072658401996b71D43eE26E573562D",
@@ -46311,8 +46618,8 @@
           }
         ],
         "total_tokens": "150551.801",
-        "withdrawn_tokens": "78415.36940998198906",
-        "remaining_tokens": "72136.43159001801094"
+        "withdrawn_tokens": "89385.81693579122338",
+        "remaining_tokens": "61165.98406420877662"
       },
       {
         "address": "0x4d982Ab0823fD2f48e934a7be2bb0a5374a26148",
@@ -46532,6 +46839,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "1784.722222",
+            "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
+            "tranche_id": 2,
+            "tx": "0x0b45b329eb6c3793425d9169b07ed6a7db7db303e4930ffaed75e3a1772a6a9c"
+          },
+          {
+            "amount": "12786.192214",
+            "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
+            "tranche_id": 2,
+            "tx": "0x57c9c9396f67fb377f2d7cca30a1a6e6b73267408efde1239cbfdfd99c333345"
+          },
           {
             "amount": "934.96553",
             "user": "0xF4c75FdbAe821C6B5DBB9f001bB23cBA58D1bA37",
@@ -46780,8 +47099,8 @@
           }
         ],
         "total_tokens": "200000",
-        "withdrawn_tokens": "104171.325864",
-        "remaining_tokens": "95828.674136"
+        "withdrawn_tokens": "118742.2403",
+        "remaining_tokens": "81257.7597"
       },
       {
         "address": "0x1b956E6c00E238194B331eddEFF72Cb5f28A8d01",
@@ -48163,8 +48482,8 @@
     "tranche_start": "2021-11-05T00:00:00.000Z",
     "tranche_end": "2023-05-05T00:00:00.000Z",
     "total_added": "14597706.0446472999",
-    "total_removed": "5845111.643096907348272126",
-    "locked_amount": "414258.305630822730645455902270797",
+    "total_removed": "5849351.477870348891944626",
+    "locked_amount": "227076.0462437110259876403850980756",
     "deposits": [
       {
         "amount": "129284.449",
@@ -48373,6 +48692,16 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "1257.7360413991436375",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x42fa522871101c2d402faba52603df54599654f29ef5fe1211a9ea058b7eaad9"
+      },
+      {
+        "amount": "1359.59366006838426325",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x4aef9b3e2f51d9ed88eb15f4553ae6f8388122b113571035da8ccb9f25ba68aa"
+      },
       {
         "amount": "1360.32447632896938825",
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -48448,6 +48777,16 @@
         "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
         "tx": "0xc4a521e74b6b9c9c01e7fbd950f4096d3e6473a773818b4fdf0c9d974ee5fc7e"
       },
+      {
+        "amount": "993.45434720929767175",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x6b1bd1880e5539566cb7110e80ef3e877e3c46a2fcd88798e82211a962dd2b7b"
+      },
+      {
+        "amount": "629.0507247647181",
+        "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+        "tx": "0x537a8c34bee648cc1e658c0e55d30202694887899bfcbe529f9cf8284a4e90eb"
+      },
       {
         "amount": "37462.74710421168752574",
         "user": "0x66827bCD635f2bB1779d68c46aEB16541bCA6ba8",
@@ -51663,6 +52002,18 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "1257.7360413991436375",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x42fa522871101c2d402faba52603df54599654f29ef5fe1211a9ea058b7eaad9"
+          },
+          {
+            "amount": "1359.59366006838426325",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x4aef9b3e2f51d9ed88eb15f4553ae6f8388122b113571035da8ccb9f25ba68aa"
+          },
           {
             "amount": "1360.32447632896938825",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -51735,6 +52086,18 @@
             "tranche_id": 3,
             "tx": "0xc4a521e74b6b9c9c01e7fbd950f4096d3e6473a773818b4fdf0c9d974ee5fc7e"
           },
+          {
+            "amount": "993.45434720929767175",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x6b1bd1880e5539566cb7110e80ef3e877e3c46a2fcd88798e82211a962dd2b7b"
+          },
+          {
+            "amount": "629.0507247647181",
+            "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
+            "tranche_id": 3,
+            "tx": "0x537a8c34bee648cc1e658c0e55d30202694887899bfcbe529f9cf8284a4e90eb"
+          },
           {
             "amount": "1383.345213676043696",
             "user": "0x4Aa3c35F6CC2d507E5C18205ee57099A4C80B19b",
@@ -54473,8 +54836,8 @@
           }
         ],
         "total_tokens": "359123.469575",
-        "withdrawn_tokens": "348774.8193074565797845",
-        "remaining_tokens": "10348.6502675434202155"
+        "withdrawn_tokens": "353014.654080898123457",
+        "remaining_tokens": "6108.815494101876543"
       },
       {
         "address": "0xBdd412797c1B78535Afc5F71503b91fAbD0160fB",
@@ -55925,7 +56288,7 @@
     "tranche_start": "2021-10-05T00:00:00.000Z",
     "tranche_end": "2023-04-05T00:00:00.000Z",
     "total_added": "5778205.3912159303",
-    "total_removed": "3421810.610823310514313769",
+    "total_removed": "3480709.486904665102263769",
     "locked_amount": "0",
     "deposits": [
       {
@@ -56070,6 +56433,11 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "58898.87608135458795",
+        "user": "0x83b1a48376E045D26420200345414e6b93066396",
+        "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+      },
       {
         "amount": "219.945520329711288",
         "user": "0xafa64cCa337eFEE0AD827F6C2684e69275226e90",
@@ -57587,6 +57955,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "58898.87608135458795",
+            "user": "0x83b1a48376E045D26420200345414e6b93066396",
+            "tranche_id": 4,
+            "tx": "0xeb193da202cd833a574a524eff7f1dd13a0ee8669e51a7db36984ef4d6735fd6"
+          },
           {
             "amount": "66753.39849271259062",
             "user": "0x83b1a48376E045D26420200345414e6b93066396",
@@ -57655,8 +58029,8 @@
           }
         ],
         "total_tokens": "1104995.291",
-        "withdrawn_tokens": "1046096.41491864541205",
-        "remaining_tokens": "58898.87608135458795"
+        "withdrawn_tokens": "1104995.291",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x5565d64f29Ea17355106DF3bA5903Eb793B3e139",
@@ -58108,8 +58482,8 @@
     "tranche_start": "2022-06-05T00:00:00.000Z",
     "tranche_end": "2023-06-05T00:00:00.000Z",
     "total_added": "472355.6199999996",
-    "total_removed": "43120.0853616251849",
-    "locked_amount": "60169.7720627409513147623313039",
+    "total_removed": "43542.8634352159416",
+    "locked_amount": "51109.339415592305104943735362752",
     "deposits": [
       {
         "amount": "3000",
@@ -64728,6 +65102,21 @@
       }
     ],
     "withdrawals": [
+      {
+        "amount": "182.662252664",
+        "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
+        "tx": "0xc182a183d124ab4faa413e71faa8c764fc265b4c568a5025ead367fbb86da331"
+      },
+      {
+        "amount": "62.6607306",
+        "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+        "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+      },
+      {
+        "amount": "177.4550903267567",
+        "user": "0x1ee93BF13d1D1d876330B011B28c507e392bc5E1",
+        "tx": "0xe4864b2d0f69c08809883553089d90b5a2318c4bc3c95ab5433db46cbd797bae"
+      },
       {
         "amount": "168.502276762",
         "user": "0x38A292CB98Dc602ECAFF94E8E5fADD9800e4bA13",
@@ -83278,6 +83667,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "62.6607306",
+            "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
+            "tranche_id": 5,
+            "tx": "0xb13444d5ef684a442be6c285a6c38dcbc9959ff2eacc31474531826efe28c20a"
+          },
           {
             "amount": "152.077625568",
             "user": "0x7345AaA0D0e4C4A46d921fA9323973956F2b7392",
@@ -83334,8 +83729,8 @@
           }
         ],
         "total_tokens": "1200",
-        "withdrawn_tokens": "1002.094025868",
-        "remaining_tokens": "197.905974132"
+        "withdrawn_tokens": "1064.754756468",
+        "remaining_tokens": "135.245243532"
       },
       {
         "address": "0x47181cf36aDFb0b5dB7EfDB123f403D890607841",
@@ -85372,10 +85767,17 @@
             "tx": "0xc8541da6a57f410b6faba47a5e5184bae700193b7bd042914fffc562114d92f5"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "177.4550903267567",
+            "user": "0x1ee93BF13d1D1d876330B011B28c507e392bc5E1",
+            "tranche_id": 5,
+            "tx": "0xe4864b2d0f69c08809883553089d90b5a2318c4bc3c95ab5433db46cbd797bae"
+          }
+        ],
         "total_tokens": "199.19",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "199.19"
+        "withdrawn_tokens": "177.4550903267567",
+        "remaining_tokens": "21.7349096732433"
       },
       {
         "address": "0xEeE68cBdc1cB918087ebf3ea7bce8D326766985B",
@@ -86303,6 +86705,12 @@
           }
         ],
         "withdrawals": [
+          {
+            "amount": "182.662252664",
+            "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
+            "tranche_id": 5,
+            "tx": "0xc182a183d124ab4faa413e71faa8c764fc265b4c568a5025ead367fbb86da331"
+          },
           {
             "amount": "78.04403856",
             "user": "0xb1169C6daAc76bAcaf0D8f87641Fc38fbabe569F",
@@ -86317,8 +86725,8 @@
           }
         ],
         "total_tokens": "400",
-        "withdrawn_tokens": "171.538952308",
-        "remaining_tokens": "228.461047692"
+        "withdrawn_tokens": "354.201204972",
+        "remaining_tokens": "45.798795028"
       },
       {
         "address": "0xF53D81D9f3A1465df9AD1b12ddDB5cC585D96877",
@@ -87795,7 +88203,7 @@
     "tranche_start": "2021-12-05T00:00:00.000Z",
     "tranche_end": "2022-06-05T00:00:00.000Z",
     "total_added": "171288.42",
-    "total_removed": "69390.5995794947989",
+    "total_removed": "69890.5995794947989",
     "locked_amount": "0",
     "deposits": [
       {
@@ -92035,6 +92443,16 @@
         "user": "0x0715B8bA27dB75F7601A9D8E22c15dcA1487FB70",
         "tx": "0x11c685c41ff0c2d5f1d7fe3b08dc84a7ddb9160764a45bc61b8f39df94729634"
       },
+      {
+        "amount": "250",
+        "user": "0xf8Ec254406f878dA2BEd160730d238524Af3D5F6",
+        "tx": "0xb79fdf2dddc0ac091d7cdc737800683482d24367f18daaf5ab98c703b30bfee5"
+      },
+      {
+        "amount": "250",
+        "user": "0xBD1da3A721510B6d76f5b2C553d31753cc148bEC",
+        "tx": "0x17504994220684f4ba61ec374fdd5b0e4c0e0a9cfb15aa6794338b5a4de9eb68"
+      },
       {
         "amount": "1250",
         "user": "0x9405F540EcC1204801De5C4444D06386BD6693F0",
@@ -99185,10 +99603,17 @@
             "tx": "0x75de6ca47e0da361181d14aceb5d08e572754861465caa67a12b528886d55307"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xBD1da3A721510B6d76f5b2C553d31753cc148bEC",
+            "tranche_id": 6,
+            "tx": "0x17504994220684f4ba61ec374fdd5b0e4c0e0a9cfb15aa6794338b5a4de9eb68"
+          }
+        ],
         "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
       },
       {
         "address": "0x4e8bA6747F20009163e51Ff1b5D3edd3Ef7c6C90",
@@ -99222,10 +99647,17 @@
             "tx": "0x75de6ca47e0da361181d14aceb5d08e572754861465caa67a12b528886d55307"
           }
         ],
-        "withdrawals": [],
+        "withdrawals": [
+          {
+            "amount": "250",
+            "user": "0xf8Ec254406f878dA2BEd160730d238524Af3D5F6",
+            "tranche_id": 6,
+            "tx": "0xb79fdf2dddc0ac091d7cdc737800683482d24367f18daaf5ab98c703b30bfee5"
+          }
+        ],
         "total_tokens": "250",
-        "withdrawn_tokens": "0",
-        "remaining_tokens": "250"
+        "withdrawn_tokens": "250",
+        "remaining_tokens": "0"
       },
       {
         "address": "0xd995e89D6cCB2252388b9BaE0173981b5EfA0817",
@@ -143316,6 +143748,11 @@
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
         "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
       },
+      {
+        "amount": "0",
+        "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+        "tx": "0x2e48ba2e6ca4994286e85e57d26b578fb0fd625f44a6fd27202476bb18575a40"
+      },
       {
         "amount": "0",
         "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
@@ -143604,6 +144041,12 @@
             "tranche_id": 9,
             "tx": "0x11aafa8a2fb510a50d52e5d1e149c5c2027ad2c3dc2d9ef67c18d391c0331c49"
           },
+          {
+            "amount": "0",
+            "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",
+            "tranche_id": 9,
+            "tx": "0x2e48ba2e6ca4994286e85e57d26b578fb0fd625f44a6fd27202476bb18575a40"
+          },
           {
             "amount": "0",
             "user": "0x759C9ABABA492500c4c730bEB568B5b851Dec2c7",

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

@@ -1,11 +1,7 @@
 {
   "hosts": [
+    "https://api-n00.testnet.vega.rocks/graphql",
     "https://api-n06.testnet.vega.rocks/graphql",
-    "https://api-n07.testnet.vega.rocks/graphql",
-    "https://api-n08.testnet.vega.rocks/graphql",
-    "https://api-n09.testnet.vega.rocks/graphql",
-    "https://api-n10.testnet.vega.rocks/graphql",
-    "https://api-n11.testnet.vega.rocks/graphql",
-    "https://api-n12.testnet.vega.rocks/graphql"
+    "https://api-n07.testnet.vega.rocks/graphql"
   ]
 }

apps/trading-e2e/.env

@@ -12,6 +12,7 @@ NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session

apps/trading-e2e/cypress.config.js

@@ -1,8 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
+  reporter: '../../node_modules/cypress-mochawesome-reporter',
   e2e: {
     setupNodeEvents(on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },
@@ -23,6 +25,7 @@ module.exports = defineConfig({
     responseTimeout: 50000,
     requestTimeout: 20000,
     retries: 2,
+    testIsolation: false,
   },
   env: {
     ETHERSCAN_URL: 'https://sepolia.etherscan.io',

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

@@ -1,4 +1,5 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 
 const marketInfoBtn = 'Info';
 const row = 'key-value-table-row';
@@ -12,7 +13,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   });
 
   before(() => {
-    cy.mockTradingPage();
+    cy.mockTradingPage(
+      MarketState.STATE_ACTIVE,
+      undefined,
+      undefined,
+      'COMPROMISED'
+    );
     cy.mockSubscription();
     cy.visit('/#/markets/market-0');
     cy.wait('@Markets');
@@ -20,6 +26,11 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     cy.wait('@MarketInfo');
   });
 
+  it('show oracle banner', () => {
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+    cy.getByTestId('oracle-status').should('contain.text', 'COMPROMISED');
+  });
+
   it('current fees displayed', () => {
     cy.getByTestId(marketTitle).contains('Current fees').click();
     validateMarketDataRow(0, 'Maker Fee', '0.02%');
@@ -108,18 +119,14 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
 
   it('risk model displayed', () => {
     cy.getByTestId(marketTitle).contains('Risk model').click();
-
-    validateMarketDataRow(0, 'Typename', 'LogNormalRiskModel');
-    validateMarketDataRow(1, 'Tau', '0.0001140771161');
-    validateMarketDataRow(2, 'Risk Aversion Parameter', '0.01');
+    validateMarketDataRow(0, 'Tau', '0.0001140771161');
+    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
   });
 
   it('risk parameters displayed', () => {
     cy.getByTestId(marketTitle).contains('Risk parameters').click();
-
-    validateMarketDataRow(0, 'Typename', 'LogNormalModelParams');
-    validateMarketDataRow(1, 'R', '0.016');
-    validateMarketDataRow(2, 'Sigma', '0.3');
+    validateMarketDataRow(0, 'R', '0.016');
+    validateMarketDataRow(1, 'Sigma', '0.3');
   });
 
   it('risk factors displayed', () => {

apps/trading-e2e/src/integration/market-proposal-notification.cy.ts

@@ -0,0 +1,47 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
+import * as Schema from '@vegaprotocol/types';
+
+const marketSummaryBlock = 'header-summary';
+
+describe('Market proposal notification', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.mockGQL((req) => {
+      aliasGQLQuery(
+        req,
+        'ProposalsList',
+        proposalListQuery({
+          proposalsConnection: {
+            edges: [{ node: marketUpdateProposal }],
+          },
+        })
+      );
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(marketSummaryBlock).should('be.visible');
+  });
+
+  it('should display market proposal notification if proposal found', () => {
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('market-proposal-notification').should(
+        'contain.text',
+        'Changes have been proposed for this market'
+      );
+      cy.getByTestId('market-proposal-notification').within(() => {
+        cy.getByTestId('external-link').should(
+          'have.attr',
+          'href',
+          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
+        );
+      });
+    });
+  });
+});

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

@@ -0,0 +1,41 @@
+describe('market bottom panel', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+  });
+
+  it('on xxl screen should be splitted out into two tables', () => {
+    cy.getByTestId('tab-positions').should('have.attr', 'data-state', 'active');
+    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',
+      'data-state',
+      'inactive'
+    );
+
+    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-fills').should('have.attr', 'data-state', 'inactive');
+    cy.getByTestId('tab-accounts').should(
+      'have.attr',
+      'data-state',
+      'inactive'
+    );
+
+    cy.getByTestId('Fills').click();
+    cy.getByTestId('Collateral').click();
+    cy.getByTestId('tab-positions').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', 'active');
+    cy.getByTestId('tab-accounts').should('have.attr', 'data-state', 'active');
+  });
+});

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

@@ -1,5 +1,3 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';
 
 const marketSummaryBlock = 'header-summary';
@@ -15,50 +13,9 @@ const priceChangeValue = 'price-change';
 const itemHeader = 'item-header';
 const itemValue = 'item-value';
 
-describe('Market proposal notification', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.mockGQL((req) => {
-      aliasGQLQuery(
-        req,
-        'ProposalsList',
-        proposalListQuery({
-          proposalsConnection: {
-            edges: [{ node: marketUpdateProposal }],
-          },
-        })
-      );
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(marketSummaryBlock).should('be.visible');
-  });
-
-  it('should display market proposal notification if proposal found', () => {
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('market-proposal-notification').should(
-        'contain.text',
-        'Changes have been proposed for this market'
-      );
-      cy.getByTestId('market-proposal-notification').within(() => {
-        cy.getByTestId('external-link').should(
-          'have.attr',
-          'href',
-          `${Cypress.env('VEGA_TOKEN_URL')}/proposals/123`
-        );
-      });
-    });
-  });
-});
-
 describe('Market trading page', () => {
   before(() => {
+    cy.clearAllLocalStorage();
     cy.mockTradingPage(
       Schema.MarketState.STATE_ACTIVE,
       Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -165,6 +122,7 @@ describe('Market trading page', () => {
         });
       });
       cy.getByTestId('expiry-tooltip')
+        .eq(0)
         .should(
           'contain.text',
           'This market expires when triggered by its oracle, not on a set date.'
@@ -202,6 +160,7 @@ describe('Market trading page', () => {
           'contain.text',
           'This market is in auction until it reaches sufficient liquidity.'
         )
+        .eq(0)
         .within(() => {
           cy.getByTestId('external-link')
             .should('have.attr', 'href')
@@ -216,93 +175,4 @@ describe('Market trading page', () => {
         });
     });
   });
-
-  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-orders').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-      cy.getByTestId('tab-fills').should('have.attr', 'data-state', 'inactive');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-
-      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-fills').should('have.attr', 'data-state', 'inactive');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'inactive'
-      );
-
-      cy.getByTestId('Fills').click();
-      cy.getByTestId('Collateral').click();
-      cy.getByTestId('tab-positions').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', 'active');
-      cy.getByTestId('tab-accounts').should(
-        'have.attr',
-        'data-state',
-        'active'
-      );
-    });
-  });
-});
-
-describe('market states not accepting orders', { tags: '@smoke' }, function () {
-  //7002-SORD-062
-  //7002-SORD-063
-  //7002-SORD-066
-
-  const states = [
-    Schema.MarketState.STATE_REJECTED,
-    Schema.MarketState.STATE_CANCELLED,
-    Schema.MarketState.STATE_CLOSED,
-    Schema.MarketState.STATE_SETTLED,
-    Schema.MarketState.STATE_TRADING_TERMINATED,
-  ];
-
-  states.forEach((marketState) => {
-    describe(marketState, function () {
-      beforeEach(function () {
-        cy.mockTradingPage(marketState);
-        cy.mockSubscription();
-        cy.setVegaWallet();
-        cy.visit('/#/markets/market-0');
-      });
-      it('must display that market is not accepting orders', function () {
-        cy.getByTestId('dealticket-error-message-summary').should(
-          'have.text',
-          `This market is ${marketState
-            .split('_')
-            .pop()
-            ?.toLowerCase()} and not accepting orders`
-        );
-        cy.getByTestId('place-order').should('be.disabled');
-      });
-    });
-  });
 });

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

@@ -1,27 +1,32 @@
 import { mockConnectWallet } from '@vegaprotocol/cypress';
 
-beforeEach(() => {
-  cy.mockTradingPage();
-  cy.mockSubscription();
-  cy.visit('/');
-  cy.wait('@Markets');
-  cy.wait('@MarketsData');
-  cy.wait('@MarketsCandles');
-  cy.getByTestId('dialog-close').click();
-});
+describe('Navbar', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/');
+    cy.wait('@Markets');
+    cy.wait('@MarketsData');
+    cy.wait('@MarketsCandles');
+    // close welcome dialog
+    cy.getByTestId('dialog-close').click();
+  });
 
-describe('Desktop view', { tags: '@smoke' }, () => {
-  describe('Navbar', () => {
-    const links = ['Markets', 'Trading', 'Portfolio'];
-    const hashes = ['#/markets/all', '#/markets/market-1', '#/portfolio'];
+  const pages = [
+    { name: 'Markets', link: '#/markets/all' },
+    { name: 'Trading', link: '#/markets' },
+    { name: 'Portfolio', link: '#/portfolio' },
+  ];
 
-    links.forEach((link, index) => {
-      it(`${link} should be correctly rendered`, () => {
+  describe('desktop view', () => {
+    pages.forEach(({ name, link }) => {
+      it(`${name} should be correctly rendered`, () => {
         cy.get('nav')
-          .find(`a[data-testid=${link}]:visible`)
+          .find(`a[data-testid=${name}]:visible`)
           .then((element) => {
             cy.wrap(element).click();
-            cy.location('hash').should('equal', hashes[index]);
+            cy.location('hash').should('contain', link);
           });
       });
     });
@@ -43,73 +48,61 @@ describe('Desktop view', { tags: '@smoke' }, () => {
       });
     });
   });
-});
 
-describe('Mobile view', { tags: '@smoke' }, () => {
-  const viewportHeight = Cypress.config('viewportHeight');
-  const viewportWidth = Cypress.config('viewportWidth');
-  before(() => {
-    // a little hack to keep the viewport size between tests (cypress bug)
-    Cypress.config({
-      viewportWidth: 560,
-      viewportHeight: 890,
+  describe('mobile view', () => {
+    const viewportHeight = Cypress.config('viewportHeight');
+    const viewportWidth = Cypress.config('viewportWidth');
+    before(() => {
+      // a little hack to keep the viewport size between tests (cypress bug)
+      Cypress.config({
+        viewportWidth: 560,
+        viewportHeight: 890,
+      });
+      cy.viewport(560, 890);
     });
-    cy.viewport(560, 890);
-  });
 
-  describe('wallet drawer', () => {
-    it('wallet drawer should be correctly rendered', () => {
-      mockConnectWallet();
-      cy.connectVegaWallet(true);
-      cy.getByTestId('connect-vega-wallet-mobile').click();
-      cy.getByTestId('wallets-drawer').should('be.visible');
-      cy.getByTestId('wallets-drawer').within((el) => {
-        cy.wrap(el).get('button').contains('Disconnect').click();
-      });
-      cy.getByTestId('wallets-drawer').should('not.be.visible');
-    });
-  });
-
-  describe('menu drawer', () => {
-    it('Markets should be correctly rendered', () => {
-      cy.getByTestId('button-menu-drawer').click();
-      cy.getByTestId('menu-drawer').should('be.visible');
-      cy.getByTestId('menu-drawer').within((el) => {
-        cy.wrap(el).getByTestId('Markets').click();
-        cy.location('hash').should('equal', '#/markets/all');
-      });
-    });
-    it('Trading should be correctly rendered', () => {
-      cy.getByTestId('button-menu-drawer').click();
-      cy.getByTestId('menu-drawer').within((el) => {
-        cy.wrap(el).getByTestId('Trading').click();
-        cy.location('hash').should('equal', '#/markets/market-1');
-      });
-    });
-    it('Portfolio should be correctly rendered', () => {
-      cy.getByTestId('button-menu-drawer').click();
-      cy.getByTestId('menu-drawer').within((el) => {
-        cy.wrap(el).getByTestId('Portfolio').click();
-        cy.location('hash').should('equal', '#/portfolio');
+    describe('wallet drawer', () => {
+      it('wallet drawer should be correctly rendered', () => {
+        mockConnectWallet();
+        cy.connectVegaWallet(true);
+        cy.getByTestId('connect-vega-wallet-mobile').click();
+        cy.getByTestId('wallets-drawer').should('be.visible');
+        cy.getByTestId('wallets-drawer').within((el) => {
+          cy.wrap(el).get('button').contains('Disconnect').click();
+        });
+        cy.getByTestId('wallets-drawer').should('not.be.visible');
       });
     });
 
-    it('Menu drawer should not be visible until opened', () => {
-      cy.getByTestId('menu-drawer').should('not.be.visible');
-      cy.getByTestId('button-menu-drawer').click();
-      cy.getByTestId('menu-drawer').should('be.visible');
-      cy.getByTestId('menu-drawer')
-        .find('[data-testid="theme-switcher"]')
-        .should('be.visible');
-      cy.getByTestId('button-menu-drawer').click();
-      cy.getByTestId('menu-drawer').should('not.be.visible');
+    describe('menu drawer', () => {
+      pages.forEach(({ name, link }) => {
+        it(`${name} should be correctly rendered`, () => {
+          cy.getByTestId('button-menu-drawer').click();
+          cy.getByTestId('menu-drawer').should('be.visible');
+          cy.getByTestId('menu-drawer').within((el) => {
+            cy.wrap(el).getByTestId(name).click();
+            cy.location('hash').should('contain', link);
+          });
+        });
+      });
+
+      it('Menu drawer should not be visible until opened', () => {
+        cy.getByTestId('menu-drawer').should('not.be.visible');
+        cy.getByTestId('button-menu-drawer').click();
+        cy.getByTestId('menu-drawer').should('be.visible');
+        cy.getByTestId('menu-drawer')
+          .find('[data-testid="theme-switcher"]')
+          .should('be.visible');
+        cy.getByTestId('button-menu-drawer').click();
+        cy.getByTestId('menu-drawer').should('not.be.visible');
+      });
     });
-  });
-  after(() => {
-    // a little hack to keep the viewport size between tests (cypress bug)
-    Cypress.config({
-      viewportWidth,
-      viewportHeight,
+    after(() => {
+      // a little hack to keep the viewport size between tests (cypress bug)
+      Cypress.config({
+        viewportWidth,
+        viewportHeight,
+      });
     });
   });
 });

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

@@ -1,14 +1,16 @@
 import { checkSorting } from '@vegaprotocol/cypress';
 
-beforeEach(() => {
-  cy.mockTradingPage();
-  cy.mockWeb3Provider();
-  cy.mockSubscription();
-  cy.setVegaWallet();
-  cy.visit('/#/markets/market-0');
-});
-
 describe('accounts', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage();
+    cy.mockWeb3Provider();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Assets');
+  });
+
   it('renders accounts', () => {
     const tradingAccountRowId = '[row-id="t-0"]';
     cy.getByTestId('Collateral').click();
@@ -41,13 +43,21 @@ describe('accounts', { tags: '@smoke' }, () => {
       .should('have.text', '100,001.01');
   });
 
-  it('asset detail should be properly rendered', () => {
-    cy.getByTestId('Collateral').click();
+  it('should open asset details dialog when clicked on symbol', () => {
     cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid$="_label"]').should('have.length', 16);
+    cy.get('[data-testid="dialog-content"]:visible').should('exist');
+    cy.get('[data-testid="dialog-close"]:visible').click();
   });
 
   describe('sorting by ag-grid columns should work well', () => {
+    before(() => {
+      const dialogs = Cypress.$('[data-testid="dialog-close"]:visible');
+      if (dialogs.length > 0) {
+        dialogs.each((btn) => {
+          cy.wrap(btn).click();
+        });
+      }
+    });
     it('sorting by asset', () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];

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

@@ -0,0 +1,110 @@
+import * as Schema from '@vegaprotocol/types';
+import { testOrderSubmission } from '../support/order-validation';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+describe('must submit order', { tags: '@smoke' }, () => {
+  // 7002-SORD-039
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('successfully places market buy order', () => {
+    // 7002-SORD-010
+    // 0003-WTXN-012
+    // 0003-WTXN-003
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_MARKET,
+      side: Schema.Side.SIDE_BUY,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+      postOnly: false,
+      reduceOnly: false,
+      size: '100',
+    };
+    createOrder(order);
+    testOrderSubmission(order);
+  });
+
+  it('successfully places market sell order', () => {
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_MARKET,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+    };
+    createOrder(order);
+    testOrderSubmission(order);
+  });
+
+  it('successfully places limit buy order', () => {
+    // 7002-SORD-017
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_BUY,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+      price: '200',
+    };
+    createOrder(order);
+    testOrderSubmission(order, { price: '20000000' });
+  });
+
+  it('successfully places limit sell order', () => {
+    cy.mockVegaWalletTransaction();
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
+      size: '100',
+      postOnly: false,
+      reduceOnly: false,
+      price: '50000',
+    };
+    createOrder(order);
+    testOrderSubmission(order, { price: '5000000000' });
+  });
+
+  it('successfully places GTT limit buy order', () => {
+    cy.mockVegaWalletTransaction();
+    const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000);
+    const order: OrderSubmission = {
+      marketId: 'market-0',
+      type: Schema.OrderType.TYPE_LIMIT,
+      side: Schema.Side.SIDE_SELL,
+      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+      size: '100',
+      price: '1.00',
+      expiresAt: expiresAt.toISOString().substring(0, 16),
+      postOnly: false,
+      reduceOnly: false,
+    };
+
+    createOrder(order);
+    testOrderSubmission(order, {
+      price: '100000',
+      expiresAt:
+        new Date(order.expiresAt as string).getTime().toString() + '000000',
+      postOnly: false,
+      reduceOnly: false,
+    });
+  });
+});

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

@@ -0,0 +1,96 @@
+import * as Schema from '@vegaprotocol/types';
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+import {
+  orderPriceField,
+  placeOrderBtn,
+  toggleLimit,
+  toggleLong,
+  toggleMarket,
+  toggleShort,
+} from '../support/deal-ticket';
+
+describe('deal ticket basics', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.clearAllLocalStorage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must show place order button and connect wallet if wallet is not connected', () => {
+    // 0003-WTXN-001
+    cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
+    cy.getByTestId(placeOrderBtn).should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
+  });
+
+  it('must be able to select order direction - long/short', function () {
+    // 7002-SORD-004
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
+  });
+
+  it('must be able to select order type - limit/market', function () {
+    // 7002-SORD-005
+    // 7002-SORD-006
+    // 7002-SORD-007
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
+  });
+
+  it('order connect vega wallet button should connect', () => {
+    mockConnectWallet();
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('101');
+    cy.getByTestId('order-connect-wallet').click();
+    cy.getByTestId('dialog-content').should('be.visible');
+    cy.getByTestId('connectors-list')
+      .find('[data-testid="connector-jsonRpc"]')
+      .click();
+    cy.wait('@walletReq');
+    cy.getByTestId(placeOrderBtn).should('be.visible');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
+    cy.getByTestId(orderPriceField).should('have.value', '101');
+  });
+});
+
+describe(
+  'market states not accepting orders',
+  { tags: '@smoke', testIsolation: true },
+  function () {
+    //7002-SORD-062
+    //7002-SORD-063
+    //7002-SORD-066
+
+    const states = [
+      Schema.MarketState.STATE_REJECTED,
+      Schema.MarketState.STATE_CANCELLED,
+      Schema.MarketState.STATE_CLOSED,
+      Schema.MarketState.STATE_SETTLED,
+      Schema.MarketState.STATE_TRADING_TERMINATED,
+    ];
+
+    states.forEach((marketState) => {
+      describe(marketState, function () {
+        beforeEach(function () {
+          cy.mockTradingPage(marketState);
+          cy.mockSubscription();
+          cy.setVegaWallet();
+          cy.visit('/#/markets/market-0');
+        });
+        it('must display that market is not accepting orders', function () {
+          cy.getByTestId('dealticket-error-message-summary').should(
+            'have.text',
+            `This market is ${marketState
+              .split('_')
+              .pop()
+              ?.toLowerCase()} and not accepting orders`
+          );
+          cy.getByTestId('place-order').should('be.disabled');
+        });
+      });
+    });
+  }
+);

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

@@ -0,0 +1,92 @@
+import {
+  orderPriceField,
+  orderSizeField,
+  orderTIFDropDown,
+  placeOrderBtn,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+
+describe('deal ticker order validation', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  describe('limit order', () => {
+    before(() => {
+      cy.getByTestId(toggleLimit).click();
+    });
+
+    it('must see the price unit', function () {
+      // 7002-SORD-018
+      cy.getByTestId(orderPriceField)
+        .siblings('label')
+        .should('have.text', 'Price (DAI)');
+    });
+
+    it('must see warning when placing an order with expiry date in past', () => {
+      const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
+      const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderPriceField).clear().type('0.1');
+      cy.getByTestId(orderSizeField).clear().type('1');
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+
+      cy.log('choosing yesterday');
+      cy.getByTestId('date-picker-field').type(expiresAtInputValue);
+
+      cy.getByTestId(placeOrderBtn).click();
+
+      cy.getByTestId('dealticket-error-message-expiry').should(
+        'have.text',
+        'The expiry date that you have entered appears to be in the past'
+      );
+    });
+
+    it('must see warning if price has too many digits after decimal place', function () {
+      // 7002-SORD-059
+      cy.getByTestId(toggleLimit).click();
+      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
+      cy.getByTestId(orderSizeField).clear().type('1');
+      cy.getByTestId(orderPriceField).clear().type('1.123456');
+      cy.getByTestId('dealticket-error-message-price-limit').should(
+        'have.text',
+        'Price accepts up to 5 decimal places'
+      );
+    });
+  });
+
+  describe('market order', () => {
+    before(() => {
+      cy.getByTestId(toggleMarket).click();
+    });
+
+    it('must not see the price unit', function () {
+      // 7002-SORD-019
+      cy.getByTestId(orderPriceField).should('not.exist');
+    });
+
+    it('must warn if order size input has too many digits after the decimal place', function () {
+      // 7002-SORD-016
+      cy.getByTestId(orderSizeField).clear().type('1.234');
+      cy.getByTestId(placeOrderBtn).should('be.disabled');
+      cy.getByTestId('dealticket-error-message-size-market').should(
+        'have.text',
+        'Size must be whole numbers for this market'
+      );
+    });
+
+    it('must warn if order size is set to 0', function () {
+      cy.getByTestId(orderSizeField).clear().type('0');
+      cy.getByTestId(placeOrderBtn).should('be.disabled');
+      cy.getByTestId('dealticket-error-message-size-market').should(
+        'have.text',
+        'Size cannot be lower than 1'
+      );
+    });
+  });
+});

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

@@ -0,0 +1,173 @@
+import * as Schema from '@vegaprotocol/types';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import {
+  accountsQuery,
+  amendGeneralAccountBalance,
+  estimateOrderQuery,
+} from '@vegaprotocol/mock';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+describe(
+  'account validation',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    describe('zero balance error', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '0');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('should show an error if your balance is zero', () => {
+        cy.getByTestId('place-order').should('be.disabled');
+        // 7002-SORD-003
+        cy.getByTestId('dealticket-error-message-zero-balance').should(
+          'have.text',
+          'You need ' +
+            'tDAI' +
+            ' in your wallet to trade in this market.See all your collateral.Make a deposit'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
+      });
+    });
+
+    describe('not enough balance warning', () => {
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        const accounts = accountsQuery();
+        amendGeneralAccountBalance(accounts, 'market-0', '100000000');
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'Accounts', accounts);
+        });
+        cy.mockGQL((req) => {
+          aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
+        });
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('should display info and button for deposit', () => {
+        // 7002-SORD-003
+
+        // warning should show immediately
+        cy.getByTestId('dealticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position'
+        );
+        cy.getByTestId('dealticket-warning-margin').should(
+          'contain.text',
+          'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
+        );
+        cy.getByTestId('deal-ticket-deposit-dialog-button').click();
+        cy.getByTestId('dialog-content')
+          .find('h1')
+          .eq(0)
+          .should('have.text', 'Deposit');
+      });
+    });
+
+    describe('must submit order', { tags: '@smoke' }, () => {
+      // 7002-SORD-039
+      beforeEach(() => {
+        cy.setVegaWallet();
+        cy.mockTradingPage();
+        cy.mockSubscription();
+        cy.visit('/#/markets/market-0');
+        cy.wait('@Markets');
+      });
+
+      it('must see a prompt to check connected vega wallet to approve transaction', () => {
+        // 0003-WTXN-002
+        cy.mockVegaWalletTransaction(1000);
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'Please go to your Vega wallet application and approve or reject the transaction.'
+        );
+      });
+
+      it('must show error returned by wallet ', () => {
+        // 0003-WTXN-009
+        // 0003-WTXN-011
+        // 0002-WCON-016
+        // 0003-WTXN-008
+
+        //trigger error from the wallet
+        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+          req.on('response', (res) => {
+            res.send({
+              jsonrpc: '2.0',
+              id: '1',
+            });
+          });
+        });
+
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'The connection to your Vega Wallet has been lost.'
+        );
+        cy.getByTestId('connect-vega-wallet').click();
+        cy.getByTestId('dialog-content').should('be.visible');
+      });
+
+      it('must see that the order was rejected by the connected wallet', () => {
+        // 0003-WTXN-007
+
+        //trigger rejection error from the wallet
+        cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
+          req.alias = 'client.send_transaction';
+          req.reply({
+            statusCode: 400,
+            body: {
+              jsonrpc: '2.0',
+              error: {
+                code: 3001,
+                data: 'the user rejected the wallet connection',
+                message: 'User error',
+              },
+              id: '0',
+            },
+          });
+        });
+
+        const order: OrderSubmission = {
+          marketId: 'market-0',
+          type: Schema.OrderType.TYPE_MARKET,
+          side: Schema.Side.SIDE_BUY,
+          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+          size: '100',
+        };
+        createOrder(order);
+        cy.getByTestId('toast-content').should(
+          'contain.text',
+          'Error occurredthe user rejected the wallet connection'
+        );
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts

@@ -0,0 +1,87 @@
+import * as Schema from '@vegaprotocol/types';
+import { testOrderSubmission } from '../support/order-validation';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+const displayTomorrow = () => {
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  return tomorrow.toISOString().substring(0, 16);
+};
+
+describe(
+  'must submit order for market in batch auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '50000',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        postOnly: false,
+        reduceOnly: false,
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts

@@ -0,0 +1,85 @@
+import * as Schema from '@vegaprotocol/types';
+import { testOrderSubmission } from '../support/order-validation';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+const displayTomorrow = () => {
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  return tomorrow.toISOString().substring(0, 16);
+};
+
+describe(
+  'must submit order for market in monitoring auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        price: '50000',
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);

apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts

@@ -0,0 +1,85 @@
+import * as Schema from '@vegaprotocol/types';
+import { testOrderSubmission } from '../support/order-validation';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+import { createOrder } from '../support/create-order';
+
+const displayTomorrow = () => {
+  const tomorrow = new Date();
+  tomorrow.setDate(tomorrow.getDate() + 1);
+  return tomorrow.toISOString().substring(0, 16);
+};
+
+describe(
+  'must submit order for market in opening auction',
+  { tags: '@regression' },
+  () => {
+    before(() => {
+      cy.setVegaWallet();
+      cy.mockTradingPage(
+        Schema.MarketState.STATE_SUSPENDED,
+        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
+        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+      );
+      cy.mockSubscription();
+      cy.visit('/#/markets/market-0');
+      cy.wait('@Markets');
+    });
+
+    beforeEach(() => {
+      cy.setVegaWallet();
+    });
+
+    it('successfully places limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_BUY,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '200',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '20000000' });
+    });
+
+    it('successfully places limit sell order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+        size: '100',
+        postOnly: false,
+        reduceOnly: false,
+        price: '50000',
+      };
+      createOrder(order);
+      testOrderSubmission(order, { price: '5000000000' });
+    });
+
+    it('successfully places GTT limit buy order', () => {
+      cy.mockVegaWalletTransaction();
+      const order: OrderSubmission = {
+        marketId: 'market-0',
+        type: Schema.OrderType.TYPE_LIMIT,
+        side: Schema.Side.SIDE_SELL,
+        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
+        size: '100',
+        price: '1.00',
+        expiresAt: displayTomorrow(),
+        postOnly: false,
+        reduceOnly: false,
+      };
+      createOrder(order);
+      testOrderSubmission(order, {
+        price: '100000',
+        expiresAt:
+          new Date(order.expiresAt as string).getTime().toString() + '000000',
+      });
+    });
+  }
+);

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

@@ -0,0 +1,68 @@
+import * as Schema from '@vegaprotocol/types';
+import {
+  TIFlist,
+  orderPriceField,
+  orderSizeField,
+  orderTIFDropDown,
+  placeOrderBtn,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { accountsQuery } from '@vegaprotocol/mock';
+
+describe('suspended market validation', { tags: '@regression' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_SUSPENDED,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    const accounts = accountsQuery();
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Accounts', accounts);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
+  });
+
+  it('should show warning for market order', function () {
+    cy.getByTestId(toggleMarket).click();
+    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
+    cy.getByTestId(placeOrderBtn).click();
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-type').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
+    );
+  });
+
+  it('should show info for allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderPriceField).clear().type('0.1');
+    cy.getByTestId(orderSizeField).clear().type('1');
+    cy.getByTestId(placeOrderBtn).should('be.enabled');
+    cy.getByTestId('dealticket-warning-auction').should(
+      'have.text',
+      'Any orders placed now will not trade until the auction ends'
+    );
+  });
+
+  it('should show warning for not allowed TIF', function () {
+    cy.getByTestId(toggleLimit).click();
+    cy.getByTestId(orderTIFDropDown).select(
+      TIFlist.filter((item) => item.code === 'FOK')[0].value
+    );
+    cy.getByTestId(placeOrderBtn).should('be.disabled');
+    cy.getByTestId('dealticket-error-message-tif').should(
+      'have.text',
+      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
+    );
+  });
+});

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

@@ -1,580 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { testOrderSubmission } from '../support/order-validation';
-import type { OrderSubmission } from '@vegaprotocol/wallet';
-import {
-  accountsQuery,
-  estimateOrderQuery,
-  amendGeneralAccountBalance,
-} from '@vegaprotocol/mock';
-import { createOrder } from '../support/create-order';
-
-const orderSizeField = 'order-size';
-const orderPriceField = 'order-price';
-const orderTIFDropDown = 'order-tif';
-const placeOrderBtn = 'place-order';
-const toggleLimit = 'order-type-TYPE_LIMIT';
-const toggleMarket = 'order-type-TYPE_MARKET';
-
-const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
-  return {
-    code: Schema.OrderTimeInForceCode[value],
-    value,
-    text: Schema.OrderTimeInForceMapping[value],
-  };
-});
-
-const displayTomorrow = () => {
-  const tomorrow = new Date();
-  tomorrow.setDate(tomorrow.getDate() + 1);
-  return tomorrow.toISOString().substring(0, 16);
-};
-
-describe('must submit order', { tags: '@smoke' }, () => {
-  // 7002-SORD-039
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('successfully places market buy order', () => {
-    // 7002-SORD-010
-    // 0003-WTXN-012
-    // 0003-WTXN-003
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_MARKET,
-      side: Schema.Side.SIDE_BUY,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      postOnly: false,
-      reduceOnly: false,
-      size: '100',
-    };
-    createOrder(order);
-    testOrderSubmission(order);
-  });
-
-  it('successfully places market sell order', () => {
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_MARKET,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-    };
-    createOrder(order);
-    testOrderSubmission(order);
-  });
-
-  it('successfully places limit buy order', () => {
-    // 7002-SORD-017
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_BUY,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-      price: '200',
-    };
-    createOrder(order);
-    testOrderSubmission(order, { price: '20000000' });
-  });
-
-  it('successfully places limit sell order', () => {
-    cy.mockVegaWalletTransaction();
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
-      size: '100',
-      postOnly: false,
-      reduceOnly: false,
-      price: '50000',
-    };
-    createOrder(order);
-    testOrderSubmission(order, { price: '5000000000' });
-  });
-
-  it('successfully places GTT limit buy order', () => {
-    cy.mockVegaWalletTransaction();
-    const expiresAt = new Date(Date.now() + 24 * 60 * 60 * 1000);
-    const order: OrderSubmission = {
-      marketId: 'market-0',
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_SELL,
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-      size: '100',
-      price: '1.00',
-      expiresAt: expiresAt.toISOString().substring(0, 16),
-      postOnly: false,
-      reduceOnly: false,
-    };
-
-    createOrder(order);
-    testOrderSubmission(order, {
-      price: '100000',
-      expiresAt:
-        new Date(order.expiresAt as string).getTime().toString() + '000000',
-      postOnly: false,
-      reduceOnly: false,
-    });
-  });
-});
-
-describe(
-  'must submit order for market in batch auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        postOnly: false,
-        reduceOnly: false,
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
-
-describe(
-  'must submit order for market in opening auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '50000',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
-
-describe(
-  'must submit order for market in monitoring auction',
-  { tags: '@regression' },
-  () => {
-    before(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage(
-        Schema.MarketState.STATE_SUSPENDED,
-        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-      );
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    beforeEach(() => {
-      cy.setVegaWallet();
-    });
-
-    it('successfully places limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        postOnly: false,
-        reduceOnly: false,
-        price: '200',
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '20000000' });
-    });
-
-    it('successfully places limit sell order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-        size: '100',
-        price: '50000',
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, { price: '5000000000' });
-    });
-
-    it('successfully places GTT limit buy order', () => {
-      cy.mockVegaWalletTransaction();
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_LIMIT,
-        side: Schema.Side.SIDE_SELL,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        size: '100',
-        price: '1.00',
-        expiresAt: displayTomorrow(),
-        postOnly: false,
-        reduceOnly: false,
-      };
-      createOrder(order);
-      testOrderSubmission(order, {
-        price: '100000',
-        expiresAt:
-          new Date(order.expiresAt as string).getTime().toString() + '000000',
-      });
-    });
-  }
-);
-
-describe('suspended market validation', { tags: '@regression' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_SUSPENDED,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    const accounts = accountsQuery();
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'Accounts', accounts);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('should show warning for market order', function () {
-    cy.getByTestId(toggleMarket).click();
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-type').should(
-      'have.text',
-      'This market is in auction until it reaches sufficient liquidity. Only limit orders are permitted when market is in auction'
-    );
-  });
-
-  it('should show info for allowed TIF', function () {
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId('dealticket-warning-auction').should(
-      'have.text',
-      'Any orders placed now will not trade until the auction ends'
-    );
-  });
-
-  it('should show warning for not allowed TIF', function () {
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select(
-      TIFlist.filter((item) => item.code === 'FOK')[0].value
-    );
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-tif').should(
-      'have.text',
-      'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'
-    );
-  });
-});
-
-describe('account validation', { tags: '@regression' }, () => {
-  describe('zero balance error', () => {
-    beforeEach(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage();
-      const accounts = accountsQuery();
-      amendGeneralAccountBalance(accounts, 'market-0', '0');
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'Accounts', accounts);
-      });
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    it('should show an error if your balance is zero', () => {
-      cy.getByTestId('place-order').should('be.disabled');
-      // 7002-SORD-003
-      cy.getByTestId('dealticket-error-message-zero-balance').should(
-        'have.text',
-        'You need ' +
-          'tDAI' +
-          ' in your wallet to trade in this market.See all your collateral.Make a deposit'
-      );
-      cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
-    });
-  });
-
-  describe('not enough balance warning', () => {
-    beforeEach(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage();
-      const accounts = accountsQuery();
-      amendGeneralAccountBalance(accounts, 'market-0', '100000000');
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'Accounts', accounts);
-      });
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
-      });
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    it('should display info and button for deposit', () => {
-      // 7002-SORD-003
-
-      // warning should show immediately
-      cy.getByTestId('dealticket-warning-margin').should(
-        'contain.text',
-        'You may not have enough margin available to open this position'
-      );
-      cy.getByTestId('dealticket-warning-margin').should(
-        'contain.text',
-        'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
-      );
-      cy.getByTestId('deal-ticket-deposit-dialog-button').click();
-      cy.getByTestId('dialog-content')
-        .find('h1')
-        .eq(0)
-        .should('have.text', 'Deposit');
-    });
-  });
-
-  describe('must submit order', { tags: '@smoke' }, () => {
-    // 7002-SORD-039
-    beforeEach(() => {
-      cy.setVegaWallet();
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.visit('/#/markets/market-0');
-      cy.wait('@Markets');
-    });
-
-    it('must see a prompt to check connected vega wallet to approve transaction', () => {
-      // 0003-WTXN-002
-      cy.mockVegaWalletTransaction(1000);
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_MARKET,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        size: '100',
-      };
-      createOrder(order);
-      cy.getByTestId('toast-content').should(
-        'contain.text',
-        'Please go to your Vega wallet application and approve or reject the transaction.'
-      );
-    });
-
-    it('must show error returned by wallet ', () => {
-      // 0003-WTXN-009
-      // 0003-WTXN-011
-      // 0002-WCON-016
-      // 0003-WTXN-008
-
-      //trigger error from the wallet
-      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-        req.on('response', (res) => {
-          res.send({
-            jsonrpc: '2.0',
-            id: '1',
-          });
-        });
-      });
-
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_MARKET,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        size: '100',
-      };
-      createOrder(order);
-      cy.getByTestId('toast-content').should(
-        'contain.text',
-        'The connection to your Vega Wallet has been lost.'
-      );
-      cy.getByTestId('connect-vega-wallet').click();
-      cy.getByTestId('dialog-content').should('be.visible');
-    });
-
-    it('must see that the order was rejected by the connected wallet', () => {
-      // 0003-WTXN-007
-
-      //trigger rejection error from the wallet
-      cy.intercept('POST', 'http://localhost:1789/api/v2/requests', (req) => {
-        req.alias = 'client.send_transaction';
-        req.reply({
-          statusCode: 400,
-          body: {
-            jsonrpc: '2.0',
-            error: {
-              code: 3001,
-              data: 'the user rejected the wallet connection',
-              message: 'User error',
-            },
-            id: '0',
-          },
-        });
-      });
-
-      const order: OrderSubmission = {
-        marketId: 'market-0',
-        type: Schema.OrderType.TYPE_MARKET,
-        side: Schema.Side.SIDE_BUY,
-        timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        size: '100',
-      };
-      createOrder(order);
-      cy.getByTestId('toast-content').should(
-        'contain.text',
-        'Error occurredthe user rejected the wallet connection'
-      );
-    });
-  });
-});

apps/trading-e2e/src/integration/trading-deal-ticket-time-in-force.cy.ts

@@ -0,0 +1,157 @@
+import {
+  TIFlist,
+  orderTIFDropDown,
+  toggleLimit,
+  toggleMarket,
+} from '../support/deal-ticket';
+
+describe('time in force validation', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.setVegaWallet();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.clearAllLocalStorage();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  it('must have market order set up to IOC by default', function () {
+    // 7002-SORD-030
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+  });
+
+  it('must have time in force set to GTC for limit order', function () {
+    // 7002-SORD-031
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTC')[0].text
+    );
+  });
+
+  it('selections should be remembered', () => {
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'IOC')[0].text
+    );
+    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
+    cy.getByTestId(toggleLimit).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'GTT')[0].text
+    );
+    cy.getByTestId(toggleMarket).click();
+    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+      'have.text',
+      TIFlist.filter((item) => item.code === 'FOK')[0].text
+    );
+  });
+
+  describe('limit order', () => {
+    before(() => {
+      cy.getByTestId(toggleLimit).click();
+    });
+    const validTIF = TIFlist;
+    validTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-025
+      // 7002-SORD-026
+      // 7002-SORD-027
+      // 7002-SORD-028
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+  });
+
+  describe('market order', () => {
+    before(() => {
+      cy.getByTestId(toggleMarket).click();
+    });
+
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+    const invalidTIF = TIFlist.filter(
+      (tif) => !['FOK', 'IOC'].includes(tif.code)
+    );
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`must be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+      });
+    });
+
+    invalidTIF.forEach((tif) => {
+      // 7002-SORD-023
+      // 7002-SORD-024
+      // 7002-SORD-027
+      // 7002-SORD-028
+      it(`must not be able to select ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
+      });
+    });
+  });
+
+  describe('post and reduce - market order', () => {
+    before(() => {
+      cy.getByTestId(toggleMarket).click();
+    });
+
+    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
+
+    validTIF.forEach((tif) => {
+      // 7002-SORD-025
+      // 7002-SORD-026
+
+      it(`post and reduce order market for ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+        cy.getByTestId('post-only').should('be.disabled');
+        cy.getByTestId('reduce-only').should('be.enabled');
+      });
+    });
+  });
+
+  describe('post and reduce - limit order', () => {
+    before(() => {
+      cy.getByTestId(toggleLimit).click();
+    });
+
+    const validTIFLimit = TIFlist.filter((tif) =>
+      ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
+    );
+
+    validTIFLimit.forEach((tif) => {
+      it(`post and reduce order for limit ${tif.code}`, function () {
+        cy.getByTestId(orderTIFDropDown).select(tif.value);
+        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
+          'have.text',
+          tif.text
+        );
+        cy.getByTestId('post-only').should('be.enabled');
+        cy.getByTestId('reduce-only').should('be.disabled');
+      });
+    });
+  });
+});

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

@@ -1,329 +0,0 @@
-import * as Schema from '@vegaprotocol/types';
-import { mockConnectWallet } from '@vegaprotocol/cypress';
-
-const orderSizeField = 'order-size';
-const orderPriceField = 'order-price';
-const orderTIFDropDown = 'order-tif';
-const placeOrderBtn = 'place-order';
-const toggleShort = 'order-side-SIDE_SELL';
-const toggleLong = 'order-side-SIDE_BUY';
-const toggleLimit = 'order-type-TYPE_LIMIT';
-const toggleMarket = 'order-type-TYPE_MARKET';
-
-const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
-  return {
-    code: Schema.OrderTimeInForceCode[value],
-    value,
-    text: Schema.OrderTimeInForceMapping[value],
-  };
-});
-
-describe('time in force default values', () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must have market order set up to IOC by default', function () {
-    // 7002-SORD-030
-    cy.getByTestId(toggleMarket).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'IOC')[0].text
-    );
-  });
-
-  it('must have time in force set to GTC for limit order', function () {
-    // 7002-SORD-031
-    cy.getByTestId(toggleLimit).click();
-    cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-      'have.text',
-      TIFlist.filter((item) => item.code === 'GTC')[0].text
-    );
-  });
-});
-
-describe('deal ticket validation', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must show place order button and connect wallet if wallet is not connected', () => {
-    // 0003-WTXN-001
-    cy.getByTestId('connect-vega-wallet'); // Not connected
-    cy.getByTestId('order-connect-wallet').should('exist');
-    cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
-  });
-
-  it('must be able to select order direction - long/short', function () {
-    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
-  });
-
-  it('must be able to select order type - limit/market', function () {
-    // 7002-SORD-005
-    // 7002-SORD-006
-    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
-  });
-
-  it('order connect vega wallet button should connect', () => {
-    mockConnectWallet();
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('order-connect-wallet').click();
-    cy.getByTestId('dialog-content').should('be.visible');
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-jsonRpc"]')
-      .click();
-    cy.wait('@walletReq');
-    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).children('input').should('be.checked');
-    cy.getByTestId(orderPriceField).should('have.value', '101');
-  });
-});
-
-describe('deal ticket size validation', { tags: '@smoke' }, function () {
-  beforeEach(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  it('must warn if order size input has too many digits after the decimal place', function () {
-    // 7002-SORD-016
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('1.234');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size must be whole numbers for this market'
-    );
-  });
-
-  it('must warn if order size is set to 0', function () {
-    cy.getByTestId('order-type-TYPE_MARKET').click();
-    cy.getByTestId(orderSizeField).clear().type('0');
-    cy.getByTestId(placeOrderBtn).should('not.be.disabled');
-    cy.getByTestId(placeOrderBtn).click();
-    cy.getByTestId(placeOrderBtn).should('be.disabled');
-    cy.getByTestId('dealticket-error-message-size-market').should(
-      'have.text',
-      'Size cannot be lower than 1'
-    );
-  });
-});
-
-describe('limit order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleLimit).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must see the price unit', function () {
-    // 7002-SORD-018
-    cy.getByTestId(orderPriceField)
-      .siblings('label')
-      .should('have.text', 'Price (DAI)');
-  });
-
-  it('must see warning when placing an order with expiry date in past', () => {
-    const expiresAt = new Date(Date.now() - 24 * 60 * 60 * 1000);
-    const expiresAtInputValue = expiresAt.toISOString().substring(0, 16);
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderPriceField).clear().type('0.1');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-
-    cy.log('choosing yesterday');
-    cy.getByTestId('date-picker-field').type(expiresAtInputValue);
-
-    cy.getByTestId(placeOrderBtn).click();
-
-    cy.getByTestId('dealticket-error-message-expiry').should(
-      'have.text',
-      'The expiry date that you have entered appears to be in the past'
-    );
-  });
-
-  it('must see warning if price has too many digits after decimal place', function () {
-    // 7002-SORD-059
-    cy.getByTestId(toggleLimit).click();
-    cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
-    cy.getByTestId(orderSizeField).clear().type('1');
-    cy.getByTestId(orderPriceField).clear().type('1.123456');
-    cy.getByTestId('dealticket-error-message-price-limit').should(
-      'have.text',
-      'Price accepts up to 5 decimal places'
-    );
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist;
-    validTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-025
-      // 7002-SORD-026
-      // 7002-SORD-027
-      // 7002-SORD-028
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    it('selections should be remembered', () => {
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTT');
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'IOC')[0].text
-      );
-      cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_FOK');
-      cy.getByTestId(toggleLimit).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'GTT')[0].text
-      );
-      cy.getByTestId(toggleMarket).click();
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        TIFlist.filter((item) => item.code === 'FOK')[0].text
-      );
-    });
-  });
-});
-
-describe('market order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  it('must not see the price unit', function () {
-    // 7002-SORD-019
-    cy.getByTestId(orderPriceField).should('not.exist');
-  });
-
-  describe('time in force validations', function () {
-    const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-    const invalidTIF = TIFlist.filter(
-      (tif) => !['FOK', 'IOC'].includes(tif.code)
-    );
-
-    validTIF.forEach((tif) => {
-      // 7002-SORD-025
-      // 7002-SORD-026
-
-      it(`must be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).select(tif.value);
-        cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-          'have.text',
-          tif.text
-        );
-      });
-    });
-
-    invalidTIF.forEach((tif) => {
-      // 7002-SORD-023
-      // 7002-SORD-024
-      // 7002-SORD-027
-      // 7002-SORD-028
-      it(`must not be able to select ${tif.code}`, function () {
-        cy.getByTestId(orderTIFDropDown).should('not.contain', tif.text);
-      });
-    });
-  });
-});
-
-describe('post and reduce order validations', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.setVegaWallet();
-    cy.mockTradingPage();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId(toggleMarket).click();
-  });
-
-  beforeEach(() => {
-    cy.setVegaWallet();
-  });
-
-  const validTIF = TIFlist.filter((tif) => ['FOK', 'IOC'].includes(tif.code));
-
-  validTIF.forEach((tif) => {
-    // 7002-SORD-025
-    // 7002-SORD-026
-
-    it(`post and reduce order market for ${tif.code}`, function () {
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  validTIF.forEach((tif) => {
-    it(`post and reduce order limit for ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.disabled');
-      cy.getByTestId('reduce-only').should('be.enabled');
-    });
-  });
-
-  const validTIFLimit = TIFlist.filter((tif) =>
-    ['GFA', 'GFN', 'GTC', 'GTT'].includes(tif.code)
-  );
-
-  validTIFLimit.forEach((tif) => {
-    it(`post and reduce order for limit ${tif.code}`, function () {
-      cy.getByTestId(toggleLimit).click();
-      cy.getByTestId(orderTIFDropDown).select(tif.value);
-      cy.get(`[data-testid=${orderTIFDropDown}] option:selected`).should(
-        'have.text',
-        tif.text
-      );
-      cy.getByTestId('post-only').should('be.enabled');
-      cy.getByTestId('reduce-only').should('be.disabled');
-    });
-  });
-});

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

@@ -1,7 +1,18 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { fillsQuery } from '@vegaprotocol/mock';
 
+const tabFills = 'tab-fills';
+
 describe('fills', { tags: '@regression' }, () => {
+  // 7005-FILL-001
+  // 7005-FILL-002
+  // 7005-FILL-003
+  // 7005-FILL-004
+  // 7005-FILL-005
+  // 7005-FILL-006
+  // 7005-FILL-007
+  // 7005-FILL-008
+
   beforeEach(() => {
     // Ensure page loads with correct key
     cy.window().then((window) => {
@@ -38,31 +49,37 @@ describe('fills', { tags: '@regression' }, () => {
   });
 
   function validateFillsDisplayed() {
-    cy.getByTestId('tab-fills').should('be.visible');
-
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).should('be.visible');
+    cy.getByTestId(tabFills).contains('Market');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
       )
       .each(($marketSymbol) => {
         cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Size');
+    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
+    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="size"]')
       .each(($amount) => {
         cy.wrap($amount).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Price');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price"]')
       .each(($prices) => {
         cy.wrap($prices).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Notional');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="price_1"]')
       .each(($total) => {
         cy.wrap($total).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Role');
+    cy.getByTestId(tabFills)
       .get('[role="gridcell"][col-id="aggressor"]')
       .each(($role) => {
         cy.wrap($role)
@@ -72,13 +89,15 @@ describe('fills', { tags: '@regression' }, () => {
             expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
           });
       });
-    cy.getByTestId('tab-fills')
+    cy.getByTestId(tabFills).contains('Fee');
+    cy.getByTestId(tabFills)
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
       )
       .each(($fees) => {
         cy.wrap($fees).invoke('text').should('not.be.empty');
       });
+    cy.getByTestId(tabFills).contains('Date');
     const dateTimeRegex =
       /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
     cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {

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

@@ -21,7 +21,7 @@ const cancelOrderBtn = 'cancel';
 const cancelAllOrdersBtn = 'cancelAll';
 const editOrderBtn = 'edit';
 
-describe('orders list', { tags: '@smoke' }, () => {
+describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
   beforeEach(() => {
     const subscriptionMocks = getSubscriptionMocks();
     cy.spy(subscriptionMocks, 'OrdersUpdate');
@@ -89,15 +89,17 @@ describe('orders list', { tags: '@smoke' }, () => {
     cy.contains('Partially Filled').click();
     cy.getByTestId('Orders').click();
 
-    cy.get(`[row-id="${partiallyFilledId}"]`).within(() => {
-      cy.get(`[col-id='${orderStatus}']`).should(
-        'have.text',
-        'Partially Filled'
-      );
-      cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
-      cy.getByTestId(cancelOrderBtn).should('not.exist');
-      cy.getByTestId(editOrderBtn).should('not.exist');
-    });
+    cy.get(`[row-id="${partiallyFilledId}"]`)
+      .eq(1)
+      .within(() => {
+        cy.get(`[col-id='${orderStatus}']`).should(
+          'have.text',
+          'Partially Filled'
+        );
+        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
+        cy.getByTestId(cancelOrderBtn).should('not.exist');
+        cy.getByTestId(editOrderBtn).should('not.exist');
+      });
   });
 
   it('orders are sorted by most recent order', () => {
@@ -424,7 +426,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       .find(`[data-testid="cancel"]`)
       .should('have.text', 'Cancel')
       .then(($btn) => {
-        cy.wrap($btn).click();
+        cy.wrap($btn).click({ force: true });
         const order: OrderCancellation = {
           orderId: orderId,
           marketId: 'market-0',
@@ -445,7 +447,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
     cy.get(`[data-testid="cancelAll"]`)
       .should('have.text', 'Cancel all')
       .then(($btn) => {
-        cy.wrap($btn).click();
+        cy.wrap($btn).click({ force: true });
         const order: OrderCancellation = {
           marketId: 'market-0',
         };
@@ -464,7 +466,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       .find('[data-testid="edit"]')
       .should('have.text', 'Edit')
       .then(($btn) => {
-        cy.wrap($btn).click();
+        cy.wrap($btn).click({ force: true });
         cy.getByTestId('dialog-title').should('have.text', 'Edit order');
         cy.get('#limitPrice').focus().clear().type('0.111111');
         cy.getByTestId('edit-order').find('[type="submit"]').click();

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

@@ -8,7 +8,7 @@ beforeEach(() => {
   cy.setVegaWallet();
 });
 
-describe('positions', { tags: '@smoke' }, () => {
+describe('positions', { tags: '@smoke', testIsolation: true }, () => {
   it('renders positions on trading page', () => {
     cy.visit('/#/markets/market-0');
     cy.getByTestId('Positions').click();
@@ -53,13 +53,17 @@ describe('positions', { tags: '@smoke' }, () => {
         'currentLeverage',
         'averageEntryPrice',
       ];
-      cy.getByTestId('tab-positions').within(() => {
-        cy.get('[row-id="market-2"]').within(() => {
-          emptyCells.forEach((cell) => {
-            cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
-          });
+      cy.getByTestId('tab-positions')
+        .first()
+        .within(() => {
+          cy.get('[row-id="market-2"]')
+            .eq(1)
+            .within(() => {
+              emptyCells.forEach((cell) => {
+                cy.get(`[col-id="${cell}"]`).should('contain.text', '-');
+              });
+            });
         });
-      });
     });
     it('error message should be displayed', () => {
       const errors = [

apps/trading-e2e/src/integration/wallet-eth.cy.ts

@@ -2,7 +2,7 @@ import { connectEthereumWallet } from '../support/ethereum-wallet';
 
 const connectEthWalletBtn = 'connect-eth-wallet-btn';
 
-describe('ethereum wallet', { tags: '@smoke' }, () => {
+describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
   beforeEach(() => {
     cy.mockWeb3Provider();
     // Using portfolio withdrawals tab is it requires Ethereum wallet connection
@@ -27,7 +27,7 @@ describe('ethereum wallet', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-deposits').should('not.be.empty');
   });
 
-  it('should see an option to cancel the attempted connection', () => {
+  it('should see QR code modal for WalletConnect', () => {
     // 0004-EWAL-003
 
     cy.wait('@NetworkParams');
@@ -36,8 +36,8 @@ describe('ethereum wallet', { tags: '@smoke' }, () => {
     cy.getByTestId('connect-eth-wallet-btn').click();
     cy.getByTestId('web3-connector-list').should('exist');
     cy.getByTestId('web3-connector-WalletConnect').click();
-    cy.get('#walletconnect-qrcode-text').should('exist');
-    cy.get('#walletconnect-qrcode-close').click();
+    // testing if exists rather than visible because of the long loading time
+    cy.get('w3m-modal').should('exist');
   });
 
   it('able to disconnect eth wallet', () => {

apps/trading-e2e/src/integration/wallet-vega.cy.ts

@@ -8,103 +8,115 @@ const manageVegaBtn = 'manage-vega-wallet';
 const form = 'rest-connector-form';
 const dialogContent = 'dialog-content';
 
-describe('connect hosted wallet', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    // Using portfolio page as it requires vega wallet connection
-    cy.visit('/#/portfolio');
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.get('main[data-testid="/portfolio"]').should('exist');
-  });
-
-  it('can connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-003
-    // 0002-WCON-039
-    // 0002-WCON-017
-    // 0002-WCON-018
-    // 0002-WCON-019
-
-    // Mock authentication
-    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
-      body: {
-        token: 'test-token',
-      },
+describe(
+  'connect hosted wallet',
+  { tags: '@smoke', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      // Using portfolio page as it requires vega wallet connection
+      cy.visit('/#/portfolio');
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.get('main[data-testid="/portfolio"]').should('exist');
     });
-    // Mock getting keys from wallet
-    cy.intercept('GET', 'https://wallet.testnet.vega.xyz/api/v1/keys', {
-      body: {
-        keys: [
-          {
-            algorithm: {
-              name: 'algo',
-              version: 1,
-            },
-            index: 0,
-            meta: [],
-            pub: 'HOSTED_PUBKEY',
-            tainted: false,
+
+    it('can connect', () => {
+      // 0002-WCON-002
+      // 0002-WCON-003
+      // 0002-WCON-039
+      // 0002-WCON-017
+      // 0002-WCON-018
+      // 0002-WCON-019
+
+      // Mock authentication
+      cy.intercept(
+        'POST',
+        'https://wallet.testnet.vega.xyz/api/v1/auth/token',
+        {
+          body: {
+            token: 'test-token',
           },
-        ],
-      },
+        }
+      );
+      // Mock getting keys from wallet
+      cy.intercept('GET', 'https://wallet.testnet.vega.xyz/api/v1/keys', {
+        body: {
+          keys: [
+            {
+              algorithm: {
+                name: 'algo',
+                version: 1,
+              },
+              index: 0,
+              meta: [],
+              pub: 'HOSTED_PUBKEY',
+              tainted: false,
+            },
+          ],
+        },
+      });
+      cy.getByTestId(connectVegaBtn).click();
+      cy.contains(
+        'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
+      );
+      cy.contains('Connect Vega wallet');
+      cy.contains('Hosted Fairground wallet');
+
+      cy.getByTestId('connectors-list')
+        .find('[data-testid="connector-hosted"]')
+        .click();
+      cy.getByTestId(form).find('#wallet').click().type('user');
+      cy.getByTestId(form).find('#passphrase').click().type('pass');
+      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+      cy.getByTestId(manageVegaBtn).should('exist');
+      cy.getByTestId('manage-vega-wallet').click();
+      cy.getByTestId('keypair-list').should('exist');
     });
-    cy.getByTestId(connectVegaBtn).click();
-    cy.contains(
-      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
-    );
-    cy.contains('Connect Vega wallet');
-    cy.contains('Hosted Fairground wallet');
 
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-hosted"]')
-      .click();
-    cy.getByTestId(form).find('#wallet').click().type('user');
-    cy.getByTestId(form).find('#passphrase').click().type('pass');
-    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-    cy.getByTestId(manageVegaBtn).should('exist');
-    cy.getByTestId('manage-vega-wallet').click();
-    cy.getByTestId('keypair-list').should('exist');
-  });
+    it('doesnt connect with invalid credentials', () => {
+      // 0002-WCON-020
 
-  it('doesnt connect with invalid credentials', () => {
-    // 0002-WCON-020
-
-    // Mock incorrect username/password
-    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
-      body: {
-        error: 'No wallet',
-      },
-      statusCode: 403, // 403 forbidden invalid crednetials
+      // Mock incorrect username/password
+      cy.intercept(
+        'POST',
+        'https://wallet.testnet.vega.xyz/api/v1/auth/token',
+        {
+          body: {
+            error: 'No wallet',
+          },
+          statusCode: 403, // 403 forbidden invalid crednetials
+        }
+      );
+      cy.getByTestId(connectVegaBtn).click();
+      cy.getByTestId('connectors-list')
+        .find('[data-testid="connector-hosted"]')
+        .click();
+      cy.getByTestId(form).find('#wallet').click().type('invalid name');
+      cy.getByTestId(form).find('#passphrase').click().type('invalid password');
+      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+      cy.getByTestId('form-error').should('have.text', 'Invalid credentials');
     });
-    cy.getByTestId(connectVegaBtn).click();
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-hosted"]')
-      .click();
-    cy.getByTestId(form).find('#wallet').click().type('invalid name');
-    cy.getByTestId(form).find('#passphrase').click().type('invalid password');
-    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-    cy.getByTestId('form-error').should('have.text', 'Invalid credentials');
-  });
 
-  it('doesnt connect with empty fields', () => {
-    cy.getByTestId(connectVegaBtn).click();
-    cy.getByTestId('connectors-list')
-      .find('[data-testid="connector-hosted"]')
-      .click();
+    it('doesnt connect with empty fields', () => {
+      cy.getByTestId(connectVegaBtn).click();
+      cy.getByTestId('connectors-list')
+        .find('[data-testid="connector-hosted"]')
+        .click();
 
-    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-    cy.getByTestId(form)
-      .find('#wallet')
-      .next('[data-testid="input-error-text"]')
-      .should('have.text', 'Required');
-    cy.getByTestId(form)
-      .find('#passphrase')
-      .next('[data-testid="input-error-text"]')
-      .should('have.text', 'Required');
-  });
-});
+      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+      cy.getByTestId(form)
+        .find('#wallet')
+        .next('[data-testid="input-error-text"]')
+        .should('have.text', 'Required');
+      cy.getByTestId(form)
+        .find('#passphrase')
+        .next('[data-testid="input-error-text"]')
+        .should('have.text', 'Required');
+    });
+  }
+);
 
-describe('connect vega wallet', { tags: '@smoke' }, () => {
+describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
   beforeEach(() => {
     // Using portfolio page as it requires vega wallet connection
     cy.visit('/#/portfolio');

apps/trading-e2e/src/integration/withdraw-key-to-key.cy.ts

@@ -88,48 +88,54 @@ describe(
   }
 );
 
-describe('withdraw actions', { tags: '@regression' }, () => {
-  beforeEach(() => {
-    cy.mockWeb3Provider();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
+describe(
+  'withdraw actions',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
 
-    cy.visit('/#/portfolio');
-    cy.getByTestId(collateralTab).click();
-    cy.getByTestId(openTransferDialog).click();
+      cy.visit('/#/portfolio');
+      cy.getByTestId(collateralTab).click();
+      cy.getByTestId(openTransferDialog).click();
 
-    cy.wait('@Accounts');
-    cy.wait('@Assets');
-    cy.mockVegaWalletTransaction();
-  });
+      cy.wait('@Accounts');
+      cy.wait('@Assets');
+      cy.mockVegaWalletTransaction();
+    });
 
-  it('key to key transfers by select key', function () {
-    cy.getByTestId(transferForm).should('be.visible');
-    cy.getByTestId(transferForm).find(toAddressField).select(1);
-    selectAsset(ASSET_SEPOLIA_TBTC);
-    cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
-    cy.getByTestId(transferForm).find(submitTransferBtn).click();
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      'Awaiting confirmation'
-    );
-    cy.getByTestId(toastCloseBtn).click();
-  });
+    it('key to key transfers by select key', function () {
+      cy.getByTestId(transferForm).should('be.visible');
+      cy.getByTestId(transferForm).find(toAddressField).select(1);
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(toastContent).should(
+        'contain.text',
+        'Awaiting confirmation'
+      );
+      cy.getByTestId(toastCloseBtn).click();
+    });
 
-  it('key to key transfers by enter manual key', function () {
-    cy.getByTestId(transferForm).should('be.visible');
-    cy.contains('Enter manually').click();
-    cy.getByTestId(transferForm)
-      .find(toAddressField)
-      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
-    selectAsset(ASSET_SEPOLIA_TBTC);
-    cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
-    cy.getByTestId(transferForm).find(submitTransferBtn).click();
-    cy.getByTestId(toastContent).should(
-      'contain.text',
-      'Awaiting confirmation'
-    );
-    cy.getByTestId(toastCloseBtn).click();
-  });
-});
+    it('key to key transfers by enter manual key', function () {
+      cy.getByTestId(transferForm).should('be.visible');
+      cy.contains('Enter manually').click();
+      cy.getByTestId(transferForm)
+        .find(toAddressField)
+        .type(
+          '7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535'
+        );
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId(transferForm).find(amountField).type('1', { delay: 100 });
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(toastContent).should(
+        'contain.text',
+        'Awaiting confirmation'
+      );
+      cy.getByTestId(toastCloseBtn).click();
+    });
+  }
+);

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

@@ -70,54 +70,60 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
   });
 });
 
-describe('withdraw actions', { tags: '@regression' }, () => {
-  // this is extremely ugly hack, but setting it properly in contract is too much effort for such simple validation
+describe(
+  'withdraw actions',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    // this is extremely ugly hack, but setting it properly in contract is too much effort for such simple validation
 
-  // 1002-WITH-018
+    // 1002-WITH-018
 
-  const withdrawalThreshold =
-    Cypress.env('VEGA_ENV') === 'CUSTOM' ? '0.00' : '100.00';
-  before(() => {
-    cy.mockWeb3Provider();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
+    const withdrawalThreshold =
+      Cypress.env('VEGA_ENV') === 'CUSTOM' ? '0.00' : '100.00';
+    before(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
 
-    cy.visit('/#/portfolio');
-    cy.getByTestId('Withdrawals').click();
-    cy.getByTestId('withdraw-dialog-button').click();
+      cy.visit('/#/portfolio');
+      cy.getByTestId('Withdrawals').click();
 
-    connectEthereumWallet('MetaMask');
+      cy.getByTestId('withdraw-dialog-button').click();
 
-    cy.wait('@Accounts');
-    cy.wait('@Assets');
-    cy.mockVegaWalletTransaction();
-  });
+      // It also requires connection Ethereum wallet
+      connectEthereumWallet('MetaMask');
 
-  it('triggers transaction when submitted', () => {
-    // 1002-WITH-002
-    // 1002-WITH-003
-    selectAsset(ASSET_SEPOLIA_TBTC);
-    cy.getByTestId('BALANCE_AVAILABLE_label').should(
-      'contain.text',
-      'Balance available'
-    );
-    cy.getByTestId('BALANCE_AVAILABLE_value').should(
-      'have.text',
-      '1,000.00001'
-    );
-    cy.getByTestId('WITHDRAWAL_THRESHOLD_label').should(
-      'contain.text',
-      'Delayed withdrawal threshold'
-    );
-    cy.getByTestId('WITHDRAWAL_THRESHOLD_value').should(
-      'contain.text',
-      withdrawalThreshold
-    );
-    cy.getByTestId('DELAY_TIME_label').should('contain.text', 'Delay time');
-    cy.getByTestId('DELAY_TIME_value').should('have.text', 'None');
-    cy.get(amountField).clear().type('10');
-    cy.getByTestId(submitWithdrawBtn).click();
-    cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
-  });
-});
+      cy.wait('@Accounts');
+      cy.wait('@Assets');
+      cy.mockVegaWalletTransaction();
+    });
+
+    it('triggers transaction when submitted', () => {
+      // 1002-WITH-002
+      // 1002-WITH-003
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.getByTestId('BALANCE_AVAILABLE_label').should(
+        'contain.text',
+        'Balance available'
+      );
+      cy.getByTestId('BALANCE_AVAILABLE_value').should(
+        'have.text',
+        '1,000.00001'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_label').should(
+        'contain.text',
+        'Delayed withdrawal threshold'
+      );
+      cy.getByTestId('WITHDRAWAL_THRESHOLD_value').should(
+        'contain.text',
+        withdrawalThreshold
+      );
+      cy.getByTestId('DELAY_TIME_label').should('contain.text', 'Delay time');
+      cy.getByTestId('DELAY_TIME_value').should('have.text', 'None');
+      cy.get(amountField).clear().type('10');
+      cy.getByTestId(submitWithdrawBtn).click();
+      cy.getByTestId('toast').should('contain.text', 'Awaiting confirmation');
+    });
+  }
+);

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

@@ -0,0 +1,18 @@
+import * as Schema from '@vegaprotocol/types';
+
+export const orderSizeField = 'order-size';
+export const orderPriceField = 'order-price';
+export const orderTIFDropDown = 'order-tif';
+export const placeOrderBtn = 'place-order';
+export const toggleShort = 'order-side-SIDE_SELL';
+export const toggleLong = 'order-side-SIDE_BUY';
+export const toggleLimit = 'order-type-TYPE_LIMIT';
+export const toggleMarket = 'order-type-TYPE_MARKET';
+
+export const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
+  return {
+    code: Schema.OrderTimeInForceCode[value],
+    value,
+    text: Schema.OrderTimeInForceMapping[value],
+  };
+});

apps/trading-e2e/src/support/index.js

@@ -2,6 +2,7 @@ import '@vegaprotocol/cypress';
 import 'cypress-real-events/support';
 import registerCypressGrep from '@cypress/grep';
 import { addMockTradingPage } from './trading';
+import 'cypress-mochawesome-reporter/register';
 
 registerCypressGrep();
 addMockTradingPage();

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

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

apps/trading/.env

@@ -11,4 +11,5 @@ 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/releases
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

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

@@ -7,7 +7,6 @@ import {
   useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
-
 import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid, TradePanels } from './trade-grid';

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

@@ -1,5 +1,5 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
-import { MarketInfoContainer } from '@vegaprotocol/market-info';
+import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
 import { OrderListContainer } from '@vegaprotocol/orders';
 import { FillsContainer } from '@vegaprotocol/fills';
@@ -12,11 +12,10 @@ import { memo, useState } from 'react';
 import type { ReactNode, ComponentProps } from 'react';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
 import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
+import { OracleBanner } from '../../components/banner';
 import {
   Tab,
   LocalStoragePersistTabs as Tabs,
-  ResizableGrid,
-  ResizableGridPanel,
   Splash,
 } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -33,12 +32,16 @@ import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,
 } from '../../lib/hooks/use-market-click-handler';
+import {
+  ResizableGrid,
+  ResizableGridPanel,
+} from '../../components/resizable-grid';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
   | typeof DepthChartContainer
   | typeof DealTicketContainer
-  | typeof MarketInfoContainer
+  | typeof MarketInfoAccordionContainer
   | typeof OrderbookContainer
   | typeof TradesContainer;
 
@@ -56,7 +59,7 @@ const TradingViews = {
   Depth: requiresMarket(DepthChartContainer),
   Liquidity: requiresMarket(LiquidityContainer),
   Ticket: requiresMarket(DealTicketContainer),
-  Info: requiresMarket(MarketInfoContainer),
+  Info: requiresMarket(MarketInfoAccordionContainer),
   Orderbook: requiresMarket(OrderbookContainer),
   Trades: requiresMarket(TradesContainer),
   Positions: PositionsContainer,
@@ -271,7 +274,10 @@ export const TradeGrid = ({
 }: TradeGridProps) => {
   return (
     <div className="h-full grid grid-rows-[min-content_1fr]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
       <MainGrid
         marketId={market?.id || ''}
         onSelect={onSelect}
@@ -344,7 +350,10 @@ export const TradePanels = ({
 
   return (
     <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
       <div className="h-full">
         <AutoSizer>
           {({ width, height }) => (

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

@@ -13,8 +13,7 @@ import type { OnCellClickHandler } from '../../components/select-market';
 import { Header, HeaderStat } from '../../components/header';
 import { NO_MARKET } from './constants';
 import { MarketMarkPrice } from '../../components/market-mark-price';
-import { Last24hPriceChange } from '../../components/last-24h-price-change';
-import { Last24hVolume } from '../../components/last-24h-volume';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketState } from '../../components/market-state';
 import { HeaderStatMarketTradingMode } from '../../components/market-trading-mode';
 import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';

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

@@ -2,18 +2,13 @@ import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { OrderListContainer } from '@vegaprotocol/orders';
-import {
-  ResizableGridPanel,
-  Tab,
-  LocalStoragePersistTabs as Tabs,
-} from '@vegaprotocol/ui-toolkit';
+import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { WithdrawalsContainer } from './withdrawals-container';
 import { FillsContainer } from '@vegaprotocol/fills';
 import type { ReactNode } from 'react';
 import { useEffect } from 'react';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { DepositsContainer } from './deposits-container';
-import { ResizableGrid } from '@vegaprotocol/ui-toolkit';
 import { LayoutPriority } from 'allotment';
 import { usePageTitleStore } from '../../stores';
 import { LedgerContainer } from '@vegaprotocol/ledger';
@@ -23,6 +18,10 @@ import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,
 } from '../../lib/hooks/use-market-click-handler';
+import {
+  ResizableGrid,
+  ResizableGridPanel,
+} from '../../components/resizable-grid';
 
 export const Portfolio = () => {
   const { updateTitle } = usePageTitleStore((store) => ({

apps/trading/components/app-loader/web3-provider.tsx

@@ -14,10 +14,9 @@ export const Web3Provider = ({ children }: { children: ReactNode }) => {
   const { config, loading, error } = useEthereumConfig();
   const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
     useEnvironment();
-  const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
-    store.connectors,
-    store.initialize,
-  ]);
+
+  const connectors = useWeb3ConnectStore((store) => store.connectors);
+  const initializeConnectors = useWeb3ConnectStore((store) => store.initialize);
 
   useEffect(() => {
     if (config?.chain_id) {

apps/trading/components/banner/announcement-banner.tsx

@@ -1,16 +1,13 @@
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
+import { AnnouncementBanner as Banner } from '@vegaprotocol/announcements';
 import { useEnvironment } from '@vegaprotocol/environment';
 
-export const Banner = () => {
+export const AnnouncementBanner = () => {
   const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
-
   // Return an empty div so that the grid layout in _app.page.ts
   // renders correctly
   if (!ANNOUNCEMENTS_CONFIG_URL) {
     return <div />;
   }
 
-  return (
-    <AnnouncementBanner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />
-  );
+  return <Banner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />;
 };

apps/trading/components/banner/index.tsx

@@ -1 +1,2 @@
-export * from './banner';
+export * from './announcement-banner';
+export * from './oracle-banner';

apps/trading/components/banner/oracle-banner.tsx

@@ -0,0 +1,45 @@
+import { t } from '@vegaprotocol/i18n';
+import { useMarketOracle } from '@vegaprotocol/market-info';
+import ReactMarkdown from 'react-markdown';
+import { Intent, NotificationBanner } from '@vegaprotocol/ui-toolkit';
+
+const oracleStatuses = {
+  UNKNOWN: t(
+    "This public key's proofs have not been verified yet, or no proofs have been provided yet."
+  ),
+  GOOD: t("This public key's proofs have been verified."),
+  SUSPICIOUS: t(
+    'This public key is suspected to be acting in bad faith, pending investigation.'
+  ),
+  MALICIOUS: t('This public key has been observed acting in bad faith.'),
+  RETIRED: t('This public key is no longer in use.'),
+  COMPROMISED: t(
+    'This public key is no longer in the control of its original owners.'
+  ),
+};
+
+export const OracleBanner = ({ marketId }: { marketId: string }) => {
+  const oracle = useMarketOracle(marketId);
+  if (!oracle || oracle.status === 'GOOD') {
+    return null;
+  }
+  return (
+    <NotificationBanner intent={Intent.Danger}>
+      <div>
+        Oracle status for this market is{' '}
+        <span data-testId="oracle-status">{oracle.status}</span>.{' '}
+        {oracleStatuses[oracle.status]}
+      </div>
+      {oracle.status_reason ? (
+        <ReactMarkdown
+          className="react-markdown-container"
+          skipHtml={true}
+          disallowedElements={['img']}
+          linkTarget="_blank"
+        >
+          {oracle.status_reason}
+        </ReactMarkdown>
+      ) : null}
+    </NotificationBanner>
+  );
+};

apps/trading/components/select-market/select-market-columns.tsx

@@ -14,9 +14,8 @@ import type { CandleClose } from '@vegaprotocol/types';
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import { Link } from 'react-router-dom';
 import { MarketMarkPrice } from '../market-mark-price';
-import { Last24hPriceChange } from '../last-24h-price-change';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketTradingMode } from '../market-trading-mode';
-import { Last24hVolume } from '../last-24h-volume';
 import { Links, Routes } from '../../pages/client-router';
 
 const ellipsisClasses = 'whitespace-nowrap overflow-hidden text-ellipsis';

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.spec.tsx

@@ -23,26 +23,44 @@ const generateJsx = (context: VegaWalletContextShape) => {
   );
 };
 
-it('Not connected', () => {
-  render(generateJsx({ pubKey: null } as VegaWalletContextShape));
+describe('VegaWalletConnectButton', () => {
+  it('should fire dialog when not connected', () => {
+    render(generateJsx({ pubKey: null } as VegaWalletContextShape));
 
-  const button = screen.getByTestId('connect-vega-wallet');
-  expect(button).toHaveTextContent('Connect Vega wallet');
-  fireEvent.click(button);
-  expect(mockUpdateDialogOpen).toHaveBeenCalled();
-});
+    const button = screen.getByTestId('connect-vega-wallet');
+    expect(button).toHaveTextContent('Connect Vega wallet');
+    fireEvent.click(button);
+    expect(mockUpdateDialogOpen).toHaveBeenCalled();
+  });
 
-it('Connected', async () => {
-  const pubKey = { publicKey: '123456__123456', name: 'test' };
-  render(
-    generateJsx({
+  it('should retrieve keys when connected', async () => {
+    const pubKey = { publicKey: '123456__123456', name: 'test' };
+    const pubKey2 = { publicKey: '123456__123457', name: 'test2' };
+    render(
+      generateJsx({
+        pubKey: pubKey.publicKey,
+        pubKeys: [pubKey],
+        fetchPubKeys: () => Promise.resolve([pubKey, pubKey2]),
+      } as VegaWalletContextShape)
+    );
+
+    const button = screen.getByTestId('manage-vega-wallet');
+    expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
+    userEvent.click(button);
+    expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
+  });
+
+  it('should fetch keys when connected', async () => {
+    const pubKey = { publicKey: '123456__123456', name: 'test' };
+    const context = {
       pubKey: pubKey.publicKey,
       pubKeys: [pubKey],
-    } as VegaWalletContextShape)
-  );
+    } as VegaWalletContextShape;
+    render(generateJsx(context));
 
-  const button = screen.getByTestId('manage-vega-wallet');
-  expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
-  userEvent.click(button);
-  expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
+    const button = screen.getByTestId('manage-vega-wallet');
+    expect(button).toHaveTextContent(truncateByChars(pubKey.publicKey));
+    userEvent.click(button);
+    expect(mockUpdateDialogOpen).not.toHaveBeenCalled();
+  });
 });

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx

@@ -29,7 +29,7 @@ const MobileWalletButton = ({
   isConnected?: boolean;
   activeKey?: PubKey;
 }) => {
-  const { pubKeys, selectPubKey, disconnect } = useVegaWallet();
+  const { pubKeys, selectPubKey, disconnect, fetchPubKeys } = useVegaWallet();
   const openVegaWalletDialog = useVegaWalletDialogStore(
     (store) => store.openVegaWalletDialog
   );
@@ -46,9 +46,12 @@ const MobileWalletButton = ({
       openVegaWalletDialog();
       setDrawerOpen(false);
     } else {
+      if (fetchPubKeys) {
+        fetchPubKeys();
+      }
       setDrawerOpen(!drawerOpen);
     }
-  }, [drawerOpen, isConnected, openVegaWalletDialog]);
+  }, [drawerOpen, fetchPubKeys, isConnected, openVegaWalletDialog]);
 
   const iconClass = drawerOpen
     ? 'hidden'
@@ -145,8 +148,14 @@ export const VegaWalletConnectButton = () => {
     (store) => store.openVegaWalletDialog
   );
   const openTransferDialog = useTransferDialog((store) => store.open);
-  const { pubKey, pubKeys, selectPubKey, disconnect, isReadOnly } =
-    useVegaWallet();
+  const {
+    pubKey,
+    pubKeys,
+    selectPubKey,
+    disconnect,
+    isReadOnly,
+    fetchPubKeys,
+  } = useVegaWallet();
   const isConnected = pubKey !== null;
 
   const activeKey = useMemo(() => {
@@ -162,7 +171,12 @@ export const VegaWalletConnectButton = () => {
             trigger={
               <DropdownMenuTrigger
                 data-testid="manage-vega-wallet"
-                onClick={() => setDropdownOpen((curr) => !curr)}
+                onClick={() => {
+                  if (fetchPubKeys) {
+                    fetchPubKeys();
+                  }
+                  setDropdownOpen(!dropdownOpen);
+                }}
               >
                 {activeKey && (
                   <span className="uppercase">{activeKey.name}</span>

apps/trading/pages/_app.page.tsx

@@ -30,9 +30,10 @@ import ToastsManager from './toasts-manager';
 import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { ViewingBanner } from '../components/viewing-banner';
-import { Banner } from '../components/banner';
+import { AnnouncementBanner } from '../components/banner';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { Navbar } from '../components/navbar';
+import { ENV } from '../lib/config';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
 
@@ -85,7 +86,7 @@ function AppBody({ Component }: AppProps) {
       </Head>
       <Title />
       <div className={gridClasses}>
-        <Banner />
+        <AnnouncementBanner />
         <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} />
         <ViewingBanner />
         <main data-testid={location.pathname}>
@@ -144,7 +145,7 @@ const PartyData = () => {
 
 const MaybeConnectEagerly = () => {
   useVegaEagerConnect(Connectors);
-  useEthereumEagerConnect();
+  useEthereumEagerConnect(ENV.dsn);
 
   const { pubKey, connect } = useVegaWallet();
   const [searchParams] = useSearchParams();

libs/accounts/src/lib/breakdown-table.tsx

@@ -1,16 +1,16 @@
 import { forwardRef } from 'react';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import {
-  Intent,
-  progressBarCellRendererSelector,
-} from '@vegaprotocol/ui-toolkit';
+import { Intent } from '@vegaprotocol/ui-toolkit';
 import { AgGridColumn } from 'ag-grid-react';
 import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
 import { AccountTypeMapping } from '@vegaprotocol/types';
-import type { ValueProps } from '@vegaprotocol/ui-toolkit';
-import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid';
+import type {
+  ValueProps,
+  VegaValueFormatterParams,
+} from '@vegaprotocol/datagrid';
+import { progressBarCellRendererSelector } from '@vegaprotocol/datagrid';
 import { AgGridDynamic as AgGrid, PriceCell } from '@vegaprotocol/datagrid';
 import type { ValueFormatterParams } from 'ag-grid-community';
 import { accountValuesComparator } from './accounts-table';

libs/cypress/src/lib/commands/add-connect-public-key.ts

@@ -10,14 +10,15 @@ declare global {
 
 export const addConnectPublicKey = () => {
   Cypress.Commands.add('connectPublicKey', (publicKey) => {
-    cy.getByTestId('connect-vega-wallet').then((connectWallet) => {
-      if (connectWallet.length) {
-        cy.get('aside [data-testid="connect-vega-wallet"]').click();
-        cy.getByTestId('connector-view').should('be.visible').click();
-        cy.getByTestId('address').click();
-        cy.getByTestId('address').type(publicKey);
-        cy.getByTestId('connect').click();
-      }
-    });
+    const connectVegaWaletBtn = Cypress.$(
+      `[data-testid="connect-vega-wallet"]`
+    );
+    if (connectVegaWaletBtn.length > 0) {
+      cy.get('aside [data-testid="connect-vega-wallet"]').click();
+      cy.getByTestId('connector-view').should('be.visible').click();
+      cy.getByTestId('address').click();
+      cy.getByTestId('address').type(publicKey);
+      cy.getByTestId('connect').click();
+    }
   });
 };