chore: make log level customisable

.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 "restore-keys" if you need to rebuild yarn from 0
+          # comment out "resotre-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: 35
+    timeout-minutes: 20
     needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
@@ -105,44 +105,19 @@ 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=""
-          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
+          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
           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
@@ -165,9 +140,7 @@ jobs:
 
   dist-check:
     runs-on: ubuntu-latest
-    needs:
-      - publish-dist
-      - lint-test-build
+    needs: publish-dist
     if: ${{ github.event_name == 'pull_request' }}
     name: '(CD) comment preview links'
     steps:
@@ -178,16 +151,22 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Create comment
-        uses: peter-evans/create-or-update-comment@v3
+      - 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
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            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 }}
+            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
 
   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: 40
+    timeout-minutes: 30
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -93,9 +93,3 @@ 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: 25
+    timeout-minutes: 20
     steps:
       - name: Check out code
         uses: actions/checkout@v3

.gitignore

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

Jenkinsfile

@@ -1,2 +1,20 @@
 @Library('vega-shared-library') _
-runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
+
+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'
+      }
+    }
+  }
+}

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.n07.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```
 

apps/explorer-e2e/.env

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

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.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 

apps/explorer-e2e/cypress.config.js

@@ -21,11 +21,10 @@ module.exports = defineConfig({
     chromeWebSecurity: false,
     viewportWidth: 1440,
     viewportHeight: 900,
-    testIsolation: false,
   },
   env: {
     environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3008/graphql',
+    networkQueryUrl: 'http://localhost:3028/query',
     ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
     commitHash: 'dev',
     tsConfig: 'tsconfig.json',

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

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

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

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

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

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

apps/governance-e2e/.env

@@ -5,22 +5,20 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}
 
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
@@ -31,5 +29,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/governance-e2e/.env.testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.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,7 +25,6 @@ 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

@@ -1,38 +0,0 @@
-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

@@ -1,117 +0,0 @@
-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

@@ -1,325 +0,0 @@
-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/proposal-forms.cy.ts

@@ -50,8 +50,6 @@ const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
 const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
-const fUSDCId =
-  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
@@ -266,7 +264,7 @@ context(
     it('Unable to submit update market proposal without minimum amount of tokens', function () {
       vegaWalletTeardown();
       vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
         '1000000',
         vegaWalletPublicKey
       );
@@ -292,7 +290,7 @@ context(
     // 3001-VOTE-092 3004-PMAC-001
     it('Able to submit update market proposal and vote for proposal', function () {
       vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
         '1000000',
         vegaWalletPublicKey
       );

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

@@ -40,15 +40,12 @@ const stakeAddStakeRadioButton = 'add-stake-radio';
 const stakeMaximumTokens = 'token-amount-use-maximum';
 const vegaWalletAssociatedBalance = 'currency-value';
 const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const ethWallet = 'ethereum-wallet';
+const ethWalletContainer = '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' },
@@ -66,7 +63,6 @@ context(
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
-          cy.clearAllLocalStorage();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();
@@ -191,35 +187,31 @@ context(
           .should('contain', 1.0, txTimeout);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        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');
-          });
+        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');
+        });
       });
 
       // 2001-STKE-041
@@ -337,11 +329,11 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens();
-        getEthereumWallet().within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
@@ -365,11 +357,11 @@ context(
         verifyStakedBalance(2.0);
         closeStakingDialog();
         stakingPageDisassociateAllTokens('contract');
-        getEthereumWallet().within(() => {
+        cy.getByTestId(ethWalletContainer).within(() => {
           cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
         });
         verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.00'
@@ -394,7 +386,7 @@ context(
         closeStakingDialog();
         stakingPageDisassociateTokens('1');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).within(() => {
           cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '2.00'
@@ -461,7 +453,7 @@ context(
         verifyUnstakedBalance(0.0);
         closeStakingDialog();
         stakingPageAssociateTokens('6');
-        getVegaWallet().within(() => {
+        cy.getByTestId(vegaWallet).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('should display announcement banner', function () {
+    it.skip('should display announcement banner', function () {
       cy.getByTestId('app-announcement')
         .should('contain.text', 'TEST ANNOUNCEMENT!')
         .within(() => {
@@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
         .within(() => {
           cy.get('span')
             .first()
-            .should('have.text', 'http://localhost:3008/graphql');
+            .should('have.text', 'http://localhost:3028/query');
           cy.getByTestId('link').should('exist');
         });
     });

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

@@ -3,14 +3,11 @@ 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"]';
@@ -24,140 +21,56 @@ context(
       navigateTo(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'
-        );
+    describe('with no network change proposals', function () {
+      it('should have governance tab highlighted', function () {
+        verifyTabHighlighted(navigation.proposals);
       });
-    });
 
-    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 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`
+              );
+            }
           });
       });
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.getByTestId('protocol-upgrade-proposals-list-item').should(
-          'have.length',
-          1
-        );
-      });
-    });
 
-    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', '%');
-          }
-        );
+      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');
+      });
+
+      // 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();
       });
     });
   }

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

@@ -17,15 +17,10 @@ const banner = 'view-banner';
 
 context('View functionality with public key', { tags: '@smoke' }, function () {
   before('send asset to wallet', function () {
-    vegaWalletFaucetAssetsWithoutCheck(
-      '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
-      '1000000',
-      vegaWalletPubKey
-    );
+    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
   });
 
   beforeEach('visit home page', function () {
-    cy.clearLocalStorage();
     cy.visit('/');
     waitForSpinner();
     cy.connectPublicKey(vegaWalletPubKey);
@@ -50,12 +45,10 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     navigateTo(navigation.proposals);
     goToMakeNewProposal('Freeform');
     enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
-    cy.getByTestId('dialog-content')
-      .first()
-      .within(() => {
-        cy.get('h1').should('have.text', 'Transaction failed');
-        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-      });
+    cy.getByTestId('dialog-content').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,7 +3,6 @@ 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"]';
@@ -13,7 +12,6 @@ context(
   { tags: '@regression' },
   function () {
     before('navigate to rewards page', function () {
-      cy.clearLocalStorage();
       cy.visit('/');
       navigateTo(navigation.rewards);
     });
@@ -39,41 +37,6 @@ 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,6 +1,7 @@
 /// <reference types="cypress" />
 
 import {
+  navigateTo,
   navigation,
   verifyPageHeader,
   verifyTabHighlighted,
@@ -33,8 +34,8 @@ const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', function () {
-    cy.clearAllLocalStorage();
-    cy.visit('/validators');
+    cy.visit('/');
+    navigateTo(navigation.validators);
   });
 
   describe('with wallets disconnected', { tags: '@smoke' }, function () {

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

@@ -43,25 +43,23 @@ context(
 
       // 1005-VEST-020 1005-VEST-021
       it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
-        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'
-            );
-          }
-        );
+        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'
+          );
+        });
       });
       // 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"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const dialogCloseBtn = '[data-testid="dialog-close"]';
 
@@ -68,10 +68,8 @@ context(
       it('should have connector list visible', function () {
         const connectList = [
           'Unknown',
-          'MetaMask',
-          'Coinbase',
+          'MetaMask, Brave or other injected web wallet',
           '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"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
 const connectorsList = '[data-testid="connectors-list"]';
@@ -35,7 +35,6 @@ context(
   { tags: '@regression' },
   () => {
     before('visit token home page', () => {
-      cy.clearAllLocalStorage();
       cy.visit('/');
       cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });
@@ -282,30 +281,26 @@ context(
       describe('Vega wallet with assets', function () {
         const assets = [
           {
-            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+            id: 'fUSDC',
             name: 'USDC (fake)',
-            symbol: 'fUSDC',
             amount: '1000000',
             expectedAmount: '10.00',
           },
           {
-            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
+            id: 'fDAI',
             name: 'DAI (fake)',
-            symbol: 'fDAI',
             amount: '200000',
             expectedAmount: '2.00',
           },
           {
-            id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
+            id: 'fBTC',
             name: 'BTC (fake)',
-            symbol: 'fBTC',
             amount: '600000',
             expectedAmount: '6.00',
           },
           {
-            id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
+            id: 'fEURO',
             name: 'EURO (fake)',
-            symbol: 'fEURO',
             amount: '800000',
             expectedAmount: '8.00',
           },
@@ -326,25 +321,28 @@ context(
           });
         });
 
-        for (const { name, symbol, expectedAmount } of assets) {
-          it(`should see ${name} within vega wallet`, () => {
+        for (const { id, name, expectedAmount } of assets) {
+          it(`should see ${id} within vega wallet`, () => {
             cy.get(walletContainer).within(() => {
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name, txTimeout)
+                .contains(id, txTimeout)
                 .should('be.visible');
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name)
+                .contains(id)
                 .parent()
                 .siblings()
                 .invoke('text')
-                .then(parseFloat)
-                .should('be.gte', parseFloat(expectedAmount));
+                .should('have.length.above', 3)
+                .then((el) => {
+                  const value = parseFloat(el);
+                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
+                });
 
               cy.get(vegaWalletCurrencyTitle)
-                .contains(name)
+                .contains(id)
                 .parent()
-                .contains(symbol);
+                .contains(name);
             });
           });
         }

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

@@ -12,7 +12,6 @@ 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,11 +26,9 @@ const topLevelRoutes = [
 export function navigateTo(page: navigation) {
   if (!topLevelRoutes.includes(page)) {
     cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
-    cy.getByTestId('token-dropdown')
-      .first()
-      .within(() => {
-        cy.get(page).eq(0).click();
-      });
+    cy.getByTestId('token-dropdown').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,9 +1,5 @@
 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;
@@ -84,11 +80,3 @@ 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,7 +54,6 @@ 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', txTimeout).should('be.visible');
   closeDialog();
 }
 
@@ -185,18 +184,16 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]`)
-    .eq(1)
-    .within(() => {
-      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
-        'have.text',
-        expectedTotalStake
-      );
-      cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
-        'have.text',
-        expectedTotalShare
-      );
-    });
+  cy.get(`[row-id="${positionOnList}"]`).within(() => {
+    cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
+      'have.text',
+      expectedTotalStake
+    );
+    cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
+      'have.text',
+      expectedTotalShare
+    );
+  });
 }
 
 export function ensureSpecifiedUnstakedTokensAreAssociated(
@@ -225,11 +222,9 @@ export function closeStakingDialog() {
     'contain.text',
     'At the beginning of the next epoch'
   );
-  cy.getByTestId('dialog-content')
-    .last()
-    .within(() => {
-      cy.get('a').should('have.text', 'Back to Staking').click();
-    });
+  cy.getByTestId('dialog-content').within(() => {
+    cy.get('a').should('have.text', 'Back to Staking').click();
+  });
 }
 
 export function validateWalletCurrency(

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

@@ -105,24 +105,25 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
     { timeout: transactionTimeout, log: false }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
-      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
-        () => {
-          cy.get(associatedAmountInWallet)
-            .invoke('text')
-            .then(($walletAmount) => {
-              cy.wrap(
-                stakingBridgeContract.remove_stake(
-                  String(stakeBalance),
-                  vegaWalletPubKey
-                ),
-                { timeout: transactionTimeout, log: false }
-              );
-              cy.get(associatedAmountInWallet, {
+      cy.get(vegaWalletContainer).within(() => {
+        cy.getByTestId('currency-value')
+          .invoke('text')
+          .then(($associatedAmount) => {
+            cy.wrap(
+              stakingBridgeContract.remove_stake(
+                String(stakeBalance),
+                vegaWalletPubKey
+              ),
+              { timeout: transactionTimeout, log: false }
+            );
+            cy.get("[data-testid='currency-value']")
+              .first()
+              .invoke('text', {
                 timeout: transactionTimeout,
-              }).should('not.have.text', $walletAmount);
-            });
-        }
-      );
+              })
+              .should('not.eq', $associatedAmount);
+          });
+      });
     }
   });
 }

apps/governance/.env

@@ -14,7 +14,6 @@ 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

@@ -8,7 +8,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''
 
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -20,4 +20,3 @@ 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.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n08.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, useLocation } from 'react-router-dom';
+import { BrowserRouter as Router } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -17,12 +17,6 @@ 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';
@@ -33,10 +27,10 @@ import {
   NetworkLoader,
   useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { ENV } from './config';
+import { createConnectors } from './lib/web3-connectors';
+import { ENV } from './config/env';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
-import { SplashLoader } from './components/splash-loader';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -76,52 +70,20 @@ 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 />];
   }, []);
-
-  if (connectors.length === 0) {
-    // Prevent loading when the connectors are not initialized
-    return <SplashLoader />;
-  }
-
+  const Connectors = React.useMemo(() => {
+    return createConnectors(providerUrl, Number(chainId));
+  }, [chainId, providerUrl]);
   return (
-    <Web3Provider connectors={connectors}>
-      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
+    <Web3Provider connectors={Connectors}>
+      <Web3Connector connectors={Connectors} chainId={Number(chainId)}>
         <VegaWalletProvider>
           <ContractsProvider>
             <AppLoader>
@@ -135,7 +97,6 @@ const Web3Container = ({
                       <NetworkInfo />
                     </footer>
                   </AppLayout>
-                  <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
                   <WithdrawalDialog />
@@ -149,20 +110,6 @@ 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 } =
@@ -197,7 +144,6 @@ 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,7 +26,6 @@ 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') {
@@ -185,7 +184,6 @@ export const EthWallet = () => {
   const { appDispatch } = useAppState();
   const { account, connector } = useWeb3React();
   const pendingTxs = usePendingTransactions();
-  const disconnect = useWeb3Disconnect(connector);
 
   return (
     <WalletCard>
@@ -241,7 +239,7 @@ export const EthWallet = () => {
             <div className="flex justify-end">
               <button
                 className="underline"
-                onClick={() => disconnect()}
+                onClick={() => connector.deactivate()}
                 data-testid="disconnect-from-eth-wallet-button"
               >
                 {t('disconnect')}

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

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

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

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

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

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

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

@@ -1,17 +1,20 @@
 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 {
-  initializeMetaMaskConnector,
-  initializeWalletConnector,
-  initializeWalletConnectLegacyConnector,
-  initializeCoinbaseConnector,
-  WALLETCONNECT_PROJECT_ID,
-  initializeUrlConnector,
-} from '@vegaprotocol/web3';
+import { UrlConnector } from '@vegaprotocol/web3';
 
-initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic);
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);
+
+const [urlConnector, urlHooks] = initializeConnector<UrlConnector>(
+  (actions) =>
+    new UrlConnector(actions, ENV.localProviderUrl, ENV.ethWalletMnemonic)
+);
 
 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
   return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -21,14 +24,19 @@ 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
-      ? 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][];
+    ENV.urlConnect ? [urlConnector, urlHooks] : null,
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ].filter(Boolean) as [Connector, Web3ReactHooks][];
 };

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

@@ -57,7 +57,10 @@ export const ProtocolUpdateProposalDetailApprovals = ({
                 noBorder={index === consensusApprovals?.length - 1}
                 key={validator.pubkey}
               >
-                <div className="-mb-3 mt-1" data-testid={'validator-name'}>
+                <div
+                  className="-mb-3 mt-1"
+                  data-testid={`validator-${validator.id}`}
+                >
                   <ValidatorDetailsLink
                     id={validator.id}
                     avatarUrl={validator.avatarUrl}
@@ -65,7 +68,7 @@ export const ProtocolUpdateProposalDetailApprovals = ({
                   />
                 </div>
 
-                <span data-testid="validator-voting-power">
+                <span>
                   {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-name/);
+    const validators = screen.getAllByTestId(/validator-/i);
     expect(validators.length).toBe(mockValidators.length);
   });
 

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

@@ -6,7 +6,6 @@ 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
@@ -15,23 +14,11 @@ export const EpochData = () => {
     data: nodesData,
     error: nodesError,
     loading: nodesLoading,
-    refetch: nodesRefetch,
+    refetch,
   } = useNodesQuery();
-
-  const { delegationsPagination } = ENV;
-  const {
-    data: userStakingData,
-    error: userStakingError,
-    loading: userStakingLoading,
-    refetch: userStakingRefetch,
-  } = useStakingQuery({
+  const { data: userStakingData } = useStakingQuery({
     variables: {
       partyId: pubKey || '',
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
     },
   });
   const { data: previousEpochData } = usePreviousEpochQuery({
@@ -41,17 +28,10 @@ export const EpochData = () => {
     skip: !nodesData?.epoch.id,
   });
 
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, () => {
-    nodesRefetch();
-    userStakingRefetch();
-  });
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);
 
   return (
-    <AsyncRenderer
-      loading={nodesLoading || userStakingLoading}
-      error={nodesError || userStakingError}
-      data={nodesData}
-    >
+    <AsyncRenderer loading={nodesLoading} error={nodesError} 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
-              ? formatNumberPercentage(new BigNumber(userStakeShare))
+              ? stakedTotalPercentage(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))
-            .times(100)
+        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
+            new BigNumber(currentUserStakeAvailable)
+          )
         : undefined,
   };
 };

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

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

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

@@ -13,8 +13,6 @@ import { StakingFormTxStatuses } from './staking-form-tx-statuses';
 import {
   ButtonLink,
   FormGroup,
-  Intent,
-  Notification,
   Radio,
   RadioGroup,
 } from '@vegaprotocol/ui-toolkit';
@@ -31,7 +29,6 @@ import type {
   DelegateSubmissionBody,
   UndelegateSubmissionBody,
 } from '@vegaprotocol/wallet';
-import Routes from '../../routes';
 
 export enum FormState {
   Default,
@@ -194,65 +191,51 @@ 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) ? (
-              <Notification
-                intent={Intent.Warning}
-                message={t('stakeNodeWrongVegaKey')}
-              />
+              <span className="text-vega-pink">
+                {t('stakeNodeWrongVegaKey')}
+              </span>
             ) : (
-              <Notification
-                message={t('stakeNodeNone')}
-                intent={Intent.Warning}
-                buttonProps={{
-                  text: t('associateVegaNow'),
-                  action: () => navigate(Routes.ASSOCIATE),
-                  className: 'py-1',
-                  size: 'sm',
-                }}
-              />
+              <span className="text-vega-orange">{t('stakeNodeNone')}</span>
             )}
           </div>
         )}
-
-      <div className="mb-8">
-        <FormGroup
-          label={t('Select if you want to add or remove stake')}
-          labelFor="radio-stake-options"
-          hideLabel={true}
+      <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}
         >
-          <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>
-
+          <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>
       {action !== undefined && (
         // eslint-disable-next-line
         <>
@@ -331,6 +314,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.n07.testnet.vega.xyz/graphql"
+NX_VEGA_URL="https://api.n11.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.capsule

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

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.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.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.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n09.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,7 +9,6 @@ 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';
@@ -35,7 +34,6 @@ 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>
@@ -43,7 +41,7 @@ const ConnectedApp = ({ config }: { config: EthereumConfig | null }) => {
         <p>
           Connected to Eth wallet: <Lozenge>{account}</Lozenge>
         </p>
-        <Button onClick={() => disconnect()}>Disconnect</Button>
+        <Button onClick={() => connector.deactivate()}>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,10 +1,5 @@
 import { useEnvironment } from '@vegaprotocol/environment';
-import {
-  getChainName,
-  useEthereumConfig,
-  useWeb3ConnectStore,
-  useWeb3Disconnect,
-} from '@vegaprotocol/web3';
+import { getChainName, useEthereumConfig } from '@vegaprotocol/web3';
 import { Button, Splash, AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Web3ConnectDialog } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
@@ -60,9 +55,7 @@ export const Web3Content = ({
   appChainId,
   setDialogOpen,
 }: Web3ContentProps) => {
-  const { connector, chainId } = useWeb3React();
-  const error = useWeb3ConnectStore((store) => store.error);
-  const disconnect = useWeb3Disconnect(connector);
+  const { error, connector, chainId } = useWeb3React();
 
   useEffect(() => {
     if (connector?.connectEagerly) {
@@ -78,7 +71,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={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
         </div>
       </Splash>
     );
@@ -91,7 +84,7 @@ export const Web3Content = ({
           <p className="text-white">
             This app only works on {getChainName(appChainId)}
           </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>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';
-import {
-  WALLETCONNECT_PROJECT_ID,
-  initializeCoinbaseConnector,
-  initializeMetaMaskConnector,
-  initializeWalletConnectLegacyConnector,
-  initializeWalletConnector,
-} from '@vegaprotocol/web3';
+
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);
 
 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
   return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -17,11 +17,18 @@ 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 [
-    initializeMetaMaskConnector(),
-    initializeCoinbaseConnector(providerUrl),
-    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
-    initializeWalletConnectLegacyConnector(chainId, providerUrl),
-  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ] as [Connector, Web3ReactHooks][];
 };

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

@@ -1,3 +1,17 @@
 {
-  "hosts": ["https://vega.xprv.io/datanode/query"]
+  "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"
+  ]
 }

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

@@ -1,7 +1,11 @@
 {
   "hosts": [
-    "https://api-n00.testnet.vega.rocks/graphql",
     "https://api-n06.testnet.vega.rocks/graphql",
-    "https://api-n07.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"
   ]
 }

apps/trading-e2e/.env

@@ -8,11 +8,10 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3008/graphql
+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
@@ -27,6 +26,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/.env.capsule

@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3008/graphql
+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"
@@ -24,6 +24,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/cypress.config.js

@@ -1,10 +1,8 @@
 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;
     },
@@ -25,7 +23,6 @@ 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,5 +1,4 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
-import { MarketState } from '@vegaprotocol/types';
 
 const marketInfoBtn = 'Info';
 const row = 'key-value-table-row';
@@ -13,12 +12,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
   });
 
   before(() => {
-    cy.mockTradingPage(
-      MarketState.STATE_ACTIVE,
-      undefined,
-      undefined,
-      'COMPROMISED'
-    );
+    cy.mockTradingPage();
     cy.mockSubscription();
     cy.visit('/#/markets/market-0');
     cy.wait('@Markets');
@@ -26,11 +20,6 @@ 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%');
@@ -119,14 +108,18 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
 
   it('risk model displayed', () => {
     cy.getByTestId(marketTitle).contains('Risk model').click();
-    validateMarketDataRow(0, 'Tau', '0.0001140771161');
-    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
+
+    validateMarketDataRow(0, 'Typename', 'LogNormalRiskModel');
+    validateMarketDataRow(1, 'Tau', '0.0001140771161');
+    validateMarketDataRow(2, 'Risk Aversion Parameter', '0.01');
   });
 
   it('risk parameters displayed', () => {
     cy.getByTestId(marketTitle).contains('Risk parameters').click();
-    validateMarketDataRow(0, 'R', '0.016');
-    validateMarketDataRow(1, 'Sigma', '0.3');
+
+    validateMarketDataRow(0, 'Typename', 'LogNormalModelParams');
+    validateMarketDataRow(1, 'R', '0.016');
+    validateMarketDataRow(2, 'Sigma', '0.3');
   });
 
   it('risk factors displayed', () => {

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

@@ -1,47 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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,3 +1,5 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { proposalListQuery, marketUpdateProposal } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';
 
 const marketSummaryBlock = 'header-summary';
@@ -13,9 +15,50 @@ 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,
@@ -122,7 +165,6 @@ 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.'
@@ -160,7 +202,6 @@ 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')
@@ -175,4 +216,93 @@ 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,38 +1,33 @@
 import { mockConnectWallet } from '@vegaprotocol/cypress';
 
-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();
-  });
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockSubscription();
+  cy.visit('/');
+  cy.wait('@Markets');
+  cy.wait('@MarketsData');
+  cy.wait('@MarketsCandles');
+  cy.getByTestId('dialog-close').click();
+});
 
-  const pages = [
-    { name: 'Markets', link: '#/markets/all' },
-    { name: 'Trading', link: '#/markets' },
-    { name: 'Portfolio', link: '#/portfolio' },
-  ];
+describe('Desktop view', { tags: '@smoke' }, () => {
+  describe('Navbar', () => {
+    const links = ['Markets', 'Trading', 'Portfolio'];
+    const hashes = ['#/markets/all', '#/markets/market-1', '#/portfolio'];
 
-  describe('desktop view', () => {
-    pages.forEach(({ name, link }) => {
-      it(`${name} should be correctly rendered`, () => {
+    links.forEach((link, index) => {
+      it(`${link} should be correctly rendered`, () => {
         cy.get('nav')
-          .find(`a[data-testid=${name}]:visible`)
+          .find(`a[data-testid=${link}]:visible`)
           .then((element) => {
             cy.wrap(element).click();
-            cy.location('hash').should('contain', link);
+            cy.location('hash').should('equal', hashes[index]);
           });
       });
     });
 
     it('Resources dropdown should be correctly rendered', () => {
-      const resourceSelector = 'ul li:contains(Resources)';
+      const resourceSelector = 'ul li:last-child';
       ['Docs', 'Give Feedback'].forEach((text, index) => {
         cy.get('nav').find(resourceSelector).contains('Resources').click();
         cy.get('nav')
@@ -48,61 +43,73 @@ describe('Navbar', { tags: '@smoke' }, () => {
       });
     });
   });
+});
 
-  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);
+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,
     });
+    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('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('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="Settings"]')
-          .should('be.visible');
-        cy.getByTestId('button-menu-drawer').click();
-        cy.getByTestId('menu-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');
     });
-    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/settings.cy.ts

@@ -1,45 +0,0 @@
-import { closeWelcomeDialog } from '../support/helpers';
-
-describe('Settings page', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.clearLocalStorage().then(() => {
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.visit('/');
-      closeWelcomeDialog();
-      cy.get('[aria-label="cog icon"]').click();
-    });
-  });
-  it('telemetry checkbox should work well', () => {
-    cy.location('hash').should('equal', '#/settings');
-    cy.getByTestId('telemetry-approval').should(
-      'have.attr',
-      'data-state',
-      'unchecked'
-    );
-    cy.get('[for="telemetry-approval"]').click();
-    cy.getByTestId('telemetry-approval').should(
-      'have.attr',
-      'data-state',
-      'checked'
-    );
-    cy.reload();
-    cy.getByTestId('telemetry-approval').should(
-      'have.attr',
-      'data-state',
-      'checked'
-    );
-    cy.get('[for="telemetry-approval"]').click();
-    cy.getByTestId('telemetry-approval').should(
-      'have.attr',
-      'data-state',
-      'unchecked'
-    );
-    cy.reload();
-    cy.getByTestId('telemetry-approval').should(
-      'have.attr',
-      'data-state',
-      'unchecked'
-    );
-  });
-});

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

@@ -1,23 +1,15 @@
 import { checkSorting } from '@vegaprotocol/cypress';
 
+beforeEach(() => {
+  cy.mockTradingPage();
+  cy.mockWeb3Provider();
+  cy.mockSubscription();
+  cy.setVegaWallet();
+  cy.visit('/#/markets/market-0');
+});
+
 describe('accounts', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockTradingPage();
-    cy.mockWeb3Provider();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-    cy.visit('/#/markets/market-0');
-  });
-
   it('renders accounts', () => {
-    // 7001-COLL-001
-    // 7001-COLL-002
-    // 7001-COLL-003
-    // 7001-COLL-004
-    // 7001-COLL-005
-    // 7001-COLL-006
-    // 7001-COLL-007
-
     const tradingAccountRowId = '[row-id="t-0"]';
     cy.getByTestId('Collateral').click();
 
@@ -28,98 +20,34 @@ describe('accounts', { tags: '@smoke' }, () => {
       .find('[col-id="asset.symbol"]')
       .should('have.text', 'AST0');
 
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="used"]')
-      .should('have.text', '1.010.00%');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="available"]')
-      .should('have.text', '100,000.00');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="total"]')
-      .should('have.text', '100,001.01');
-
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="accounts-actions"]')
-      .should('have.text', ' ');
+      .should('have.text', 'DepositWithdraw');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[data-testid="deposit"]')
+      .should('have.text', 'Deposit');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"] [data-testid="withdraw"]')
+      .should('have.text', 'Withdraw');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="total"]')
       .should('have.text', '100,001.01');
-
-    cy.getByTestId('tab-accounts')
-      .get('[col-id="accounts-actions"]')
-      .find('[data-testid="dropdown-menu"]')
-      .eq(1)
-      .click();
-    cy.getByTestId('deposit').should('be.visible');
-    cy.getByTestId('withdraw').should('be.visible');
-    cy.getByTestId('breakdown').should('be.visible');
-    cy.getByTestId('Collateral').click({ force: true });
   });
 
-  it('should open asset details dialog when clicked on symbol', () => {
-    // 7001-COLL-008
+  it('asset detail should be properly rendered', () => {
+    cy.getByTestId('Collateral').click();
     cy.getByTestId('asset').contains('tEURO').click();
     cy.get('[data-testid$="_label"]').should('have.length', 16);
-    cy.get('[data-testid="dialog-close"]').click();
-  });
-
-  it('should open asset details dialog when clicked on symbol', () => {
-    // 7001-COLL-008
-    cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid$="_label"]').should('have.length', 16);
-    cy.get('[data-testid="dialog-close"]').click();
-  });
-
-  it('should open usage breakdown dialog when clicked on used', () => {
-    // 7001-COLL-009
-    cy.getByTestId('breakdown').contains('1.01').click();
-    const headers = ['Market', 'Account type', 'Balance'];
-    cy.getByTestId('usage-breakdown').within(($headers) => {
-      cy.wrap($headers)
-        .get('.ag-header-cell-text')
-        .each(($header, i) => {
-          cy.wrap($header).should('have.text', headers[i]);
-        });
-    });
-    cy.get('[data-testid="dialog-close"]').click();
-  });
-
-  it('sorting usage breakdown columns should work well', () => {
-    // 7001-COLL-010
-    cy.getByTestId('breakdown').contains('1.01').click();
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(1)
-      .should('have.text', 'Margin');
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(2)
-      .should('have.text', 'Margin');
-    cy.getByTestId('usage-breakdown')
-      .find('[col-id="type"]')
-      .eq(3)
-      .should('have.text', 'General');
-
-    cy.get('[data-testid="dialog-close"]').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

@@ -1,110 +0,0 @@
-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

@@ -1,96 +0,0 @@
-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

@@ -1,105 +0,0 @@
-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'
-      );
-    });
-    it('must have total margin available', () => {
-      // 7001-COLL-011
-      cy.getByTestId('tab-ticket')
-        .find('.text-xs')
-        .eq(5)
-        .within(() => {
-          cy.get('[data-state="closed"]').should(
-            'have.text',
-            'Total margin available'
-          );
-          cy.get('.text-neutral-500').should('have.text', '~100,000.01 tDAI');
-        });
-    });
-  });
-});

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

@@ -1,173 +0,0 @@
-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

@@ -1,87 +0,0 @@
-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

@@ -1,85 +0,0 @@
-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

@@ -1,85 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -0,0 +1,580 @@
+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

@@ -1,157 +0,0 @@
-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

@@ -0,0 +1,329 @@
+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,18 +1,7 @@
 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) => {
@@ -49,37 +38,31 @@ describe('fills', { tags: '@regression' }, () => {
   });
 
   function validateFillsDisplayed() {
-    cy.getByTestId(tabFills).should('be.visible');
-    cy.getByTestId(tabFills).contains('Market');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills').should('be.visible');
+
+    cy.getByTestId('tab-fills')
       .get(
         '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
       )
       .each(($marketSymbol) => {
         cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
       });
-    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)
+    cy.getByTestId('tab-fills')
       .get('[role="gridcell"][col-id="size"]')
       .each(($amount) => {
         cy.wrap($amount).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId(tabFills).contains('Price');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
       .get('[role="gridcell"][col-id="price"]')
       .each(($prices) => {
         cy.wrap($prices).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId(tabFills).contains('Notional');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
       .get('[role="gridcell"][col-id="price_1"]')
       .each(($total) => {
         cy.wrap($total).invoke('text').should('not.be.empty');
       });
-    cy.getByTestId(tabFills).contains('Role');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
       .get('[role="gridcell"][col-id="aggressor"]')
       .each(($role) => {
         cy.wrap($role)
@@ -89,15 +72,13 @@ describe('fills', { tags: '@regression' }, () => {
             expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
           });
       });
-    cy.getByTestId(tabFills).contains('Fee');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
       .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', testIsolation: true }, () => {
+describe('orders list', { tags: '@smoke' }, () => {
   beforeEach(() => {
     const subscriptionMocks = getSubscriptionMocks();
     cy.spy(subscriptionMocks, 'OrdersUpdate');
@@ -89,17 +89,15 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
     cy.contains('Partially Filled').click();
     cy.getByTestId('Orders').click();
 
-    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');
-      });
+    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');
+    });
   });
 
   it('orders are sorted by most recent order', () => {
@@ -426,7 +424,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       .find(`[data-testid="cancel"]`)
       .should('have.text', 'Cancel')
       .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
         const order: OrderCancellation = {
           orderId: orderId,
           marketId: 'market-0',
@@ -447,7 +445,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
     cy.get(`[data-testid="cancelAll"]`)
       .should('have.text', 'Cancel all')
       .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
         const order: OrderCancellation = {
           marketId: 'market-0',
         };
@@ -455,7 +453,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       });
   });
   it('must be warned (pre-submit) if the input price has too many digits after the decimal place for the market', () => {
-    // 7003-MORD-013
+    // 7003-MORD-016
     updateOrder({
       id: orderId,
       status: Schema.OrderStatus.STATUS_ACTIVE,
@@ -466,7 +464,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
       .find('[data-testid="edit"]')
       .should('have.text', 'Edit')
       .then(($btn) => {
-        cy.wrap($btn).click({ force: true });
+        cy.wrap($btn).click();
         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', testIsolation: true }, () => {
+describe('positions', { tags: '@smoke' }, () => {
   it('renders positions on trading page', () => {
     cy.visit('/#/markets/market-0');
     cy.getByTestId('Positions').click();
@@ -53,17 +53,13 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
         'currentLeverage',
         'averageEntryPrice',
       ];
-      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', '-');
-              });
-            });
+      cy.getByTestId('tab-positions').within(() => {
+        cy.get('[row-id="market-2"]').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', testIsolation: true }, () => {
+describe('ethereum wallet', { tags: '@smoke' }, () => {
   beforeEach(() => {
     cy.mockWeb3Provider();
     // Using portfolio withdrawals tab is it requires Ethereum wallet connection
@@ -27,7 +27,7 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
     cy.getByTestId('tab-deposits').should('not.be.empty');
   });
 
-  it('should see QR code modal for WalletConnect', () => {
+  it('should see an option to cancel the attempted connection', () => {
     // 0004-EWAL-003
 
     cy.wait('@NetworkParams');
@@ -36,8 +36,8 @@ describe('ethereum wallet', { tags: '@smoke', testIsolation: true }, () => {
     cy.getByTestId('connect-eth-wallet-btn').click();
     cy.getByTestId('web3-connector-list').should('exist');
     cy.getByTestId('web3-connector-WalletConnect').click();
-    // testing if exists rather than visible because of the long loading time
-    cy.get('w3m-modal').should('exist');
+    cy.get('#walletconnect-qrcode-text').should('exist');
+    cy.get('#walletconnect-qrcode-close').click();
   });
 
   it('able to disconnect eth wallet', () => {

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

@@ -8,115 +8,103 @@ const manageVegaBtn = 'manage-vega-wallet';
 const form = 'rest-connector-form';
 const dialogContent = 'dialog-content';
 
-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');
+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',
+      },
     });
-
-    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,
+    // Mock getting keys from wallet
+    cy.intercept('GET', 'https://wallet.testnet.vega.xyz/api/v1/keys', {
+      body: {
+        keys: [
+          {
+            algorithm: {
+              name: 'algo',
+              version: 1,
             },
-          ],
-        },
-      });
-      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
-
-      // Mock incorrect username/password
-      cy.intercept(
-        'POST',
-        'https://wallet.testnet.vega.xyz/api/v1/auth/token',
-        {
-          body: {
-            error: 'No wallet',
+            index: 0,
+            meta: [],
+            pub: 'HOSTED_PUBKEY',
+            tainted: false,
           },
-          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.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');
 
-    it('doesnt connect with empty fields', () => {
-      cy.getByTestId(connectVegaBtn).click();
-      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-hosted"]')
-        .click();
+    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('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');
+  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
     });
-  }
-);
+    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');
+  });
 
-describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
+  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');
+  });
+});
+
+describe('connect vega wallet', { tags: '@smoke' }, () => {
   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,54 +88,48 @@ describe(
   }
 );
 
-describe(
-  'withdraw actions',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.mockWeb3Provider();
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.setVegaWallet();
+describe('withdraw actions', { tags: '@regression' }, () => {
+  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,60 +70,54 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
   });
 });
 
-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
+describe('withdraw actions', { tags: '@regression' }, () => {
+  // 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.visit('/#/portfolio');
+    cy.getByTestId('Withdrawals').click();
+    cy.getByTestId('withdraw-dialog-button').click();
 
-      cy.getByTestId('withdraw-dialog-button').click();
+    connectEthereumWallet('MetaMask');
 
-      // It also requires connection Ethereum wallet
-      connectEthereumWallet('MetaMask');
+    cy.wait('@Accounts');
+    cy.wait('@Assets');
+    cy.mockVegaWalletTransaction();
+  });
 
-      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');
-    });
-  }
-);
+  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

@@ -1,18 +0,0 @@
-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/helpers.ts

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

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

@@ -2,7 +2,6 @@ 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,7 +1,6 @@
 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,
@@ -156,6 +155,7 @@ const mockTradingPage = (
   aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
   aliasGQLQuery(req, 'Deposits', depositsQuery());
 };
+
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
   namespace Cypress {
@@ -164,56 +164,50 @@ declare global {
       mockTradingPage(
         state?: Schema.MarketState,
         tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger,
-        oracleStatus?: Status
+        trigger?: Schema.AuctionTrigger
       ): void;
     }
   }
 }
-
 export const addMockTradingPage = () => {
   Cypress.Commands.add(
     'mockTradingPage',
-    (
-      state = Schema.MarketState.STATE_ACTIVE,
-      tradingMode,
-      trigger,
-      oracleStatus
-    ) => {
+    (state = Schema.MarketState.STATE_ACTIVE, tradingMode, trigger) => {
       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: [oracle],
+          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`,
+            },
+          ],
         }
       );
     }

apps/trading/.env

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

apps/trading/.env.capsule

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

apps/trading/.env.testnet

@@ -11,4 +11,4 @@ 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/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

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

@@ -7,6 +7,7 @@ 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 { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
+import { MarketInfoContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
 import { OrderListContainer } from '@vegaprotocol/orders';
 import { FillsContainer } from '@vegaprotocol/fills';
@@ -12,10 +12,11 @@ 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';
@@ -32,16 +33,12 @@ 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 MarketInfoAccordionContainer
+  | typeof MarketInfoContainer
   | typeof OrderbookContainer
   | typeof TradesContainer;
 
@@ -59,7 +56,7 @@ const TradingViews = {
   Depth: requiresMarket(DepthChartContainer),
   Liquidity: requiresMarket(LiquidityContainer),
   Ticket: requiresMarket(DealTicketContainer),
-  Info: requiresMarket(MarketInfoAccordionContainer),
+  Info: requiresMarket(MarketInfoContainer),
   Orderbook: requiresMarket(OrderbookContainer),
   Trades: requiresMarket(TradesContainer),
   Positions: PositionsContainer,
@@ -274,10 +271,7 @@ export const TradeGrid = ({
 }: TradeGridProps) => {
   return (
     <div className="h-full grid grid-rows-[min-content_1fr]">
-      <div>
-        <TradeMarketHeader market={market} onSelect={onSelect} />
-        <OracleBanner marketId={market?.id || ''} />
-      </div>
+      <TradeMarketHeader market={market} onSelect={onSelect} />
       <MainGrid
         marketId={market?.id || ''}
         onSelect={onSelect}
@@ -350,10 +344,7 @@ export const TradePanels = ({
 
   return (
     <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <div>
-        <TradeMarketHeader market={market} onSelect={onSelect} />
-        <OracleBanner marketId={market?.id || ''} />
-      </div>
+      <TradeMarketHeader market={market} onSelect={onSelect} />
       <div className="h-full">
         <AutoSizer>
           {({ width, height }) => (

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

@@ -13,7 +13,8 @@ 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, Last24hVolume } from '@vegaprotocol/market-info';
+import { Last24hPriceChange } from '../../components/last-24h-price-change';
+import { Last24hVolume } from '../../components/last-24h-volume';
 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,13 +2,18 @@ import { titlefy } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PositionsContainer } from '@vegaprotocol/positions';
 import { OrderListContainer } from '@vegaprotocol/orders';
-import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
+import {
+  ResizableGridPanel,
+  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';
@@ -18,10 +23,6 @@ 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/client-pages/settings/index.ts

@@ -1,2 +0,0 @@
-export { Settings as default } from './settings';
-export { SettingsButton } from './settings-button';