chore: remove stag1 dsn as it wasn't in env before

.github/ISSUE_TEMPLATE/chore.md

@@ -14,7 +14,8 @@ What we need to achieve and who for
 
 ## Tasks
 
-- [ ]
-- [ ]
+- [ ] What do we need to do first
+- [ ] and then what?
+- [ ] Etc.
 
 ## Additional details / background info

.github/ISSUE_TEMPLATE/user-story.md

@@ -22,14 +22,11 @@ So that
 
 ## Tasks
 
-- [ ] UX (if needed)
-- [ ] Design (if needed)
+- [ ] Explore and sketch
 - [ ] Team and stakeholder review
-- [ ] Specs reviewed and created or adjusted
-- [ ] Implementation
-- [ ] Testing (unit and/or e2e)
-- [ ] Code review
-- [ ] QA review
+- [ ] Visual Design
+- [ ] Team review
+- [ ] Etc.
 
 ## Sketch
 

.github/workflows/add-ipfs-notes-to-release.yml

@@ -48,8 +48,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           id: ${{ github.event.release.id }}
           body: |
-
-            ___
+            ---
 
             # Deployments
             * https://explorer.vega.xyz
@@ -61,7 +60,7 @@ jobs:
             CIDv0: ${{ env.IPFS_V0 }}
             CIDv1: ${{ env.IPFS_V1 }}
 
-            You can always access the latest IPFS release by visiting [console.vega.xyz](https://console.vega.xyz).
+            You can always access the latest IPFS release by visiting [vega.trading](https://vega.trading).
 
             You can also access Trading directly from an IPFS gateway.
             BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).

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

@@ -5,7 +5,6 @@ on:
     branches:
       - release/*
       - develop
-      - main
     tags:
       - v*
   pull_request:
@@ -99,37 +98,36 @@ jobs:
       # See affected apps
       - name: See affected apps
         run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-
           echo ">>>> debug"
           echo "NX_BASE: ${{ env.NX_BASE }}"
           echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
           echo ">>>> eof debug"
 
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
           projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
-          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
           if [[ -z "$projects_e2e" ]]; then
             projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
             preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
             preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
             preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
           fi
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]
@@ -171,7 +169,6 @@ jobs:
       - publish-dist
       - lint-test-build
     if: ${{ github.event_name == 'pull_request' }}
-    timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
       - name: Find Comment
@@ -181,29 +178,6 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Wait for deployments
-        run: |
-          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
-          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
-          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
-              echo "waiting for governance preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
-              echo "waiting for trading preview"
-              sleep 5
-            done
-          fi
-
       - name: Create comment
         uses: peter-evans/create-or-update-comment@v3
         if: ${{ steps.fc.outputs.comment-id == 0 }}
@@ -215,9 +189,15 @@ jobs:
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
 
-  # Report single result at the end, to avoid mess with required checks in PR
   cypress-check:
     name: '(CI) cypress - check'
+    runs-on: ubuntu-latest
+    needs: cypress
+    steps:
+      - run: echo Done!
+
+  # Report single result at the end, to avoid mess with required checks in PR
+  cypress-result:
     if: ${{ always() }}
     needs: cypress
     runs-on: ubuntu-22.04

.github/workflows/process-tranches.yml

@@ -0,0 +1,32 @@
+name: Generate tranches
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+
+jobs:
+  master:
+    name: Generate Queries
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          fetch-depth: 0
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.15.1
+      - name: Install root dependencies
+        run: yarn install
+      - name: Generate queries
+        run: node ./scripts/get-tranches.js
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'chore: update tranches'
+          commit_options: '--no-verify --signoff'
+          skip_fetch: true
+          skip_checkout: true

.github/workflows/publish-dist.yml

@@ -59,39 +59,26 @@ jobs:
           key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define dist variables
-        if: ${{ github.event_name == 'push' }}
+      - name: Define variables
         run: |
           envName=''
           domain="vega.rocks"
-          bucketName=''
-
-          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            envName="stagnet1"
-          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
-            envName="mainnet"
-          elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
-            envName="mainnet"
-          fi
-
-          if [[ "${envName}" = "mainnet" ]]; then
-            domain="vega.xyz"
-            bucketName="${{ matrix.app }}.${domain}"
-          elif [[ "${envName}" = "testnet" ]]; then
-            domain="fairground.wtf"
-            bucketName="${{ matrix.app }}.${domain}"
-          fi
-
-          if [[ -z "${bucketName}" ]]; then
+          if [[ "${{ github.event_name }}" = "push" ]]; then
+            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
+              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              envName="stagnet1"
+            elif [[ "${{ matrix.app}}" = "trading" ]] && [[ ${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }} = "true" ]]; then
+              envName="mainnet"
+            elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+              envName="mainnet"
+            fi
+            if [[ "${envName}" = "mainnet" ]]; then
+              domain="vega.xyz"
+            fi
             bucketName="${{ matrix.app }}.${envName}.${domain}"
+            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           fi
-
-          echo "bucket name: ${bucketName}"
-          echo "env name: ${envName}"
-
-          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           echo ENV_NAME=${envName} >> $GITHUB_ENV
 
       - name: Build local dist
@@ -168,7 +155,7 @@ jobs:
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -200,19 +187,8 @@ jobs:
             -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
             https://api.fleek.co/graphql
 
-      - name: Check out ipfs-redirect
+      - name: Update vega.trading DNS to redirect to the new console
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        uses: actions/checkout@v3
-        with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      - name: Update console.vega.xyz DNS to redirect to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        env:
-          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
         run: |
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
@@ -221,52 +197,26 @@ jobs:
           new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
           new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
 
-          ls -al ipfs-redirect
+          # Generate console URL
+          new_console_url_type=ipfs
+          # new_console_url_type=ipns
+          new_console_url_domain=cf-ipfs.com
+          # new_console_url_domain=dweb.link
+          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          echo "new_console_url=${new_console_url}"
 
-          echo $new_hash > ipfs-redirect/cidv0.txt
-          echo $new_cid > ipfs-redirect/cidv1.txt
+          # Update record in DNSimple
+          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
+          dnsimple_account_id=84895
+          dnsimple_zone_name=vega.trading
+          dnsimple_record_id=44409591
+          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
 
-          (
-            cd ipfs-redirect
-
-            git status
-            cat .git/config
-            git config --global user.email "vega-ci-bot@vega.xyz"
-            git config --global user.name "vega-ci-bot"
-
-            branch_name="update-hash-${{ github.ref }}"
-            git checkout -b "$branch_name"
-            commit_msg="Automated hash update from ${{ github.ref }}"
-            git add cidv0.txt cidv1.txt
-            git commit -m "$commit_msg"
-            git push -u origin "$branch_name"
-            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
-            echo $pr_url
-            # once auto merge get's enabled on documentation repo let's do follow up
-            sleep 5
-            gh pr merge "${pr_url}" --delete-branch --squash --admin
-          )
-
-          # # Generate console URL
-          # new_console_url_type=ipfs
-          # # new_console_url_type=ipns
-          # new_console_url_domain=cf-ipfs.com
-          # # new_console_url_domain=dweb.link
-          # new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          # echo "new_console_url=${new_console_url}"
-
-          # # Update record in DNSimple
-          # # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          # dnsimple_account_id=84895
-          # dnsimple_zone_name=console.vega.xyz
-          # dnsimple_record_id=44409591
-          # # see: https://dnsimple.com/a/84895/domains/console.vega.xyz/records/44409591/edit
-
-          # curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-          #       -H 'Accept: application/json' \
-          #       -H 'Content-Type: application/json' \
-          #       -X PATCH \
-          #       -d "{
-          #             \"content\": \"${new_console_url}\"
-          #       }" \
-          #       https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
+          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
+                -H 'Accept: application/json' \
+                -H 'Content-Type: application/json' \
+                -X PATCH \
+                -d "{
+                      \"content\": \"${new_console_url}\"
+                }" \
+                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

.github/workflows/rollback-console.yml

@@ -43,17 +43,7 @@ jobs:
             -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
             https://api.fleek.co/graphql
 
-      - name: Check out ipfs-redirect
-        uses: actions/checkout@v3
-        with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      - name: Update console.vega.xyz DNS to redirect to the new console
-        env:
-          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+      - name: Update vega.trading DNS to redirect to the new console
         run: |
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
@@ -61,24 +51,27 @@ jobs:
           which ipfs
           new_hash=$(cat ipfs-hash)
           new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-          git config --global user.email "vega-ci-bot@vega.xyz"
-          git config --global user.name "vega-ci-bot"
-          echo $new_hash > ipfs-redirect/cidv0.txt
-          echo $new_cid > ipfs-redirect/cidv1.txt
 
-          (
-            cd ipfs-redirect
+          # Generate console URL
+          new_console_url_type=ipfs
+          # new_console_url_type=ipns
+          new_console_url_domain=cf-ipfs.com
+          # new_console_url_domain=dweb.link
+          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          echo "new_console_url=${new_console_url}"
 
-            git status
-            branch_name="rollback-to-$new_hash"
-            git checkout -b "$branch_name"
-            commit_msg="hash rollback to $new_hash"
-            git add cidv0.txt cidv1.txt
-            git commit -m "$commit_msg"
-            git push -u origin "$branch_name" --force-with-lease
-            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
-            echo $pr_url
-            # once auto merge get's enabled on documentation repo let's do follow up
-            sleep 5
-            gh pr merge "${pr_url}" --delete-branch --squash --admin
-          )
+          # Update record in DNSimple
+          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
+          dnsimple_account_id=84895
+          dnsimple_zone_name=vega.trading
+          dnsimple_record_id=44409591
+          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
+
+          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
+                -H 'Accept: application/json' \
+                -H 'Content-Type: application/json' \
+                -X PATCH \
+                -d "{
+                      \"content\": \"${new_console_url}\"
+                }" \
+                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

apps/explorer/.env

@@ -3,15 +3,15 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/explorer/.env.mainnet

@@ -10,4 +10,3 @@ NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
-NX_VEGA_CONSOLE_URL=https://console.vega.xyz

apps/explorer/.env.testnet

@@ -10,4 +10,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

apps/explorer/.env.validator-testnet

@@ -7,9 +7,8 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
+NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
-NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
-NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
+NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/

apps/explorer/src/app/app.tsx

@@ -13,7 +13,6 @@ import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
 import { RouterProvider } from 'react-router-dom';
 import { router } from './routes/router-config';
 import { t } from '@vegaprotocol/i18n';
-import { Suspense } from 'react';
 
 const splashLoading = (
   <Splash>
@@ -33,9 +32,7 @@ function App() {
           skeleton={<div>{t('Loading')}</div>}
           failure={<AppFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
         >
-          <Suspense fallback={splashLoading}>
-            <RouterProvider router={router} fallbackElement={splashLoading} />
-          </Suspense>
+          <RouterProvider router={router} fallbackElement={splashLoading} />
         </NodeGuard>
         <NodeSwitcherDialog
           open={nodeSwitcherOpen}

apps/explorer/src/app/components/footer/footer.tsx

@@ -4,11 +4,9 @@ import {
 } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { Link, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
 import { useMemo } from 'react';
 import { ENV } from '../../config/env';
-import { Routes } from '../../routes/route-names';
-import { Link as RouteLink } from 'react-router-dom';
 
 export const Footer = () => {
   const { VEGA_URL, GIT_COMMIT_HASH, GIT_ORIGIN_URL } = useEnvironment();
@@ -23,7 +21,7 @@ export const Footer = () => {
   );
 
   return (
-    <footer className="grid grid-rows-2 lg:grid-cols-[1fr_auto] text-xs md:text-md lg:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
+    <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-xs md:text-md md:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
       <div className="flex justify-between gap-2 align-middle">
         {GIT_COMMIT_HASH && (
           <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">
@@ -58,16 +56,11 @@ export const Footer = () => {
           </div>
         ) : null}
       </div>
-      <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
-        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
-          Disclaimer
-        </RouteLink>
-      </div>
     </footer>
   );
 };
 
-export const NodeUrl = ({ url }: { url: string }) => {
+const NodeUrl = ({ url }: { url: string }) => {
   // get base url from api url, api sub domain
   const urlObj = new URL(url);
   const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');

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

@@ -84,17 +84,15 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
       <AgGridColumn
         colId="asset"
         headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset.symbol"
+        field="tradableInstrument.instrument.product.settlementAsset"
         hide={window.innerWidth <= BREAKPOINT_MD}
         cellRenderer={({
-          data,
+          value,
         }: VegaICellRendererParams<
           MarketFieldsFragment,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value =
-            data?.tradableInstrument.instrument.product.settlementAsset;
-          return value ? (
+          'tradableInstrument.instrument.product.settlementAsset'
+        >) =>
+          value ? (
             <ButtonLink
               onClick={(e) => {
                 openAssetDetailsDialog(value.id, e.target as HTMLElement);
@@ -104,8 +102,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
             </ButtonLink>
           ) : (
             ''
-          );
-        }}
+          )
+        }
       />
       <AgGridColumn
         flex={2}

apps/explorer/src/app/routes/oracles/components/oracle-details-type.spec.tsx

@@ -1,13 +1,12 @@
 import { render } from '@testing-library/react';
-import { OracleDetailsType, isInternalSourceType } from './oracle-details-type';
-import type { SourceType } from './oracle';
-import { PropertyKeyType } from '@vegaprotocol/types';
+import { OracleDetailsType } from './oracle-details-type';
+import type { SourceTypeName } from './oracle-details-type';
 
-function renderComponent(type: SourceType) {
-  return <OracleDetailsType sourceType={type} />;
+function renderComponent(type: SourceTypeName) {
+  return <OracleDetailsType type={type} />;
 }
 
-function renderWrappedComponent(type: SourceType) {
+function renderWrappedComponent(type: SourceTypeName) {
   return (
     <table>
       <tbody>{renderComponent(type)}</tbody>
@@ -15,53 +14,19 @@ function renderWrappedComponent(type: SourceType) {
   );
 }
 
-function mock(name: string): SourceType {
-  return {
-    sourceType: {
-      filters: [
-        {
-          __typename: 'Filter',
-          key: {
-            name,
-            type: PropertyKeyType.TYPE_STRING,
-          },
-        },
-      ],
-    },
-  };
-}
-
 describe('Oracle type view', () => {
   it('Renders nothing when type is null', () => {
-    const res = render(renderComponent(null as unknown as SourceType));
+    const res = render(renderComponent(null as unknown as SourceTypeName));
     expect(res.container).toBeEmptyDOMElement();
   });
 
-  it('Renders Internal time for internal sources - timestamp', () => {
-    const s = mock('vegaprotocol.builtin.timestamp');
-    expect(isInternalSourceType(s)).toEqual(true);
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('Internal data')).toBeInTheDocument();
-  });
-
-  it('Renders Internal time for internal sources - potential future types', () => {
-    const s = mock('vegaprotocol.builtin.boolean');
-    expect(isInternalSourceType(s)).toEqual(true);
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('Internal data')).toBeInTheDocument();
-  });
-
-  it('Renders External data otherwise - prices.external.whatever', () => {
-    const s = mock('prices.external.whatever');
-    expect(isInternalSourceType(s)).toEqual(false);
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('External data')).toBeInTheDocument();
+  it('Renders Internal time for internal sources', () => {
+    const res = render(renderWrappedComponent('DataSourceDefinitionInternal'));
+    expect(res.getByText('Internal time')).toBeInTheDocument();
   });
 
   it('Renders External data otherwise', () => {
-    const s = mock('prices.external.vegaprotocol.builtin.');
-    expect(isInternalSourceType(s)).toEqual(false);
-    const res = render(renderWrappedComponent(s));
+    const res = render(renderWrappedComponent('DataSourceDefinitionExternal'));
     expect(res.getByText('External data')).toBeInTheDocument();
   });
 });

apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx

@@ -1,51 +1,27 @@
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import type { SourceType } from './oracle';
 
-/**
- * Basic function to determine if a source is internal or external.
- *
- * This should be distinguishable using __typename, but the type is incorrectly
- * reported at the moment, so instead we check the filters.
- *
- * @param s SourceType
- * @returns boolean True if the source is internal
- */
-export function isInternalSourceType(s: SourceType) {
-  if ('filters' in s.sourceType) {
-    const filters = s.sourceType.filters;
-
-    if (filters) {
-      return (
-        filters?.filter((f) => {
-          return f.key.name?.indexOf('vegaprotocol.builtin.') === 0;
-        }).length > 0
-      );
-    }
-  }
-
-  return false;
-}
+export type SourceTypeName = SourceType['__typename'] | undefined;
 
 interface OracleDetailsTypeProps {
-  sourceType: SourceType;
+  type: SourceTypeName;
 }
 
 /**
  * Renders a a single table row for the Oracle Details view that shows
  * if the oracle is using the internal time oracle or external data
  */
-export function OracleDetailsType({ sourceType }: OracleDetailsTypeProps) {
-  if (!sourceType) {
+export function OracleDetailsType({ type }: OracleDetailsTypeProps) {
+  if (!type) {
     return null;
   }
-
-  const isInternal = isInternalSourceType(sourceType);
-
   return (
     <TableRow modifier="bordered">
       <TableHeader scope="row">Type</TableHeader>
       <TableCell modifier="bordered">
-        {isInternal ? 'Internal data' : 'External data'}
+        {type === 'DataSourceDefinitionInternal'
+          ? 'Internal time'
+          : 'External data'}
       </TableCell>
     </TableRow>
   );

apps/explorer/src/app/routes/oracles/components/oracle.tsx

@@ -53,7 +53,7 @@ export const OracleDetails = ({
             <OracleLink id={id} />
           </TableCell>
         </TableRow>
-        <OracleDetailsType sourceType={sourceType} />
+        <OracleDetailsType type={sourceType.__typename} />
         <OracleSigners sourceType={sourceType} />
         <OracleMarkets id={id} />
         <TableRow modifier="bordered">

apps/explorer/src/app/routes/pages/disclaimer.tsx

@@ -1,40 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { RouteTitle } from '../../components/route-title';
-
-export const Disclaimer = () => {
-  return (
-    <section>
-      <div className="px-40 max-sm:px-0 max-md:px-10 mb-4 max-w-5xl">
-        <RouteTitle data-testid="disclaimer-header">
-          {t('Disclaimer')}
-        </RouteTitle>
-        <p className="mt-3">
-          The Vega Block Explorer is an application that allows users to, among
-          other things, browse through blocks, view wallet addresses, network
-          hashrate, transaction data and other key information on the Vega
-          blockchain. It is free, public and open source software. Software
-          upgrades may contain bugs or security vulnerabilities that might
-          result in loss of functionality.
-        </p>
-        <p className="mt-3">
-          The Vega Block Explorer uses data from nodes on the Vega Blockchain.
-          The developers of the Vega Block Explorer do not operate or run the
-          Vega Blockchain or any other blockchain.
-        </p>
-        <p className="mt-3 font-semibold">
-          The Vega Block Explorer is provided “as is”. The developers of the
-          Vega Block Explorer make no representations or warranties of any kind,
-          whether express or implied, statutory or otherwise regarding the Vega
-          Block Explorer. They disclaim all warranties of merchantability,
-          quality, fitness for purpose. They disclaim all warranties that the
-          Vega Block Explorer is free of harmful components or errors.
-        </p>
-        <p className="mt-3 font-bold">
-          No developer of the Vega Block Explorer accepts any responsibility
-          for, or liability to users in connection with their use of the Vega
-          Block Explorer.
-        </p>
-      </div>
-    </section>
-  );
-};

apps/explorer/src/app/routes/route-names.tsx

@@ -10,5 +10,4 @@ export const Routes = {
   MARKETS: 'markets',
   ORACLES: 'oracles',
   NETWORK_PARAMETERS: 'network-parameters',
-  DISCLAIMER: 'disclaimer',
 };

apps/explorer/src/app/routes/router-config.tsx

@@ -29,7 +29,6 @@ import { AssetLink, MarketLink } from '../components/links';
 import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
-import { Disclaimer } from './pages/disclaimer';
 
 export type Navigable = {
   path: string;
@@ -336,17 +335,6 @@ export const routerConfig: Route[] = [
           },
         ],
       },
-      {
-        path: Routes.DISCLAIMER,
-        element: <Disclaimer />,
-        handle: {
-          name: t('Disclaimer'),
-          text: t('Disclaimer'),
-          breadcrumb: () => (
-            <Link to={Routes.DISCLAIMER}>{t('Disclaimer')}</Link>
-          ),
-        },
-      },
       ...partiesRoutes,
       ...assetsRoutes,
       ...genesisRoutes,

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

@@ -33,9 +33,8 @@ const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const proposalDetailsDescription = '[data-testid="proposal-description"]';
 const openProposals = '[data-testid="open-proposals"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
-const proposalTermsToggle = 'proposal-json-toggle';
+const proposalTermsToggle = 'proposal-terms-toggle';
 
 describe(
   'Governance flow for proposal details',
@@ -74,8 +73,6 @@ describe(
           'contain.text',
           rawProposal.rationale.title
         );
-        cy.getByTestId(proposalDescriptionToggle).click();
-        cy.getByTestId('proposal-description-toggle');
         cy.get(proposalDetailsDescription)
           .find('p')
           .should('have.text', proposalDescription);
@@ -85,7 +82,7 @@ describe(
       cy.get('code.language-json')
         .should('exist')
         .within(() => {
-          cy.get('.hljs-attr').eq(0).should('have.text', '"id"');
+          cy.get('.hljs-string').eq(0).should('have.text', '"ProposalTerms"');
         });
     });
 
@@ -112,9 +109,16 @@ describe(
           closingDate
         );
       });
-      getProposalInformationFromTable('Proposed on')
-        .invoke('text')
-        .should('not.be.empty');
+      cy.wrap(
+        formatDateWithLocalTimezone(
+          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+        )
+      ).then((proposalDate) => {
+        getProposalInformationFromTable('Proposed on').should(
+          'have.text',
+          proposalDate
+        );
+      });
     });
 
     it('Newly created proposal details - shows default status set to fail', function () {

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

@@ -7,6 +7,7 @@ import {
 import {
   clickOnValidatorFromList,
   closeStakingDialog,
+  stakingPageAssociateTokens,
   stakingValidatorPageAddStake,
   waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
@@ -30,17 +31,19 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.visit('/');
     waitForSpinner();
     depositAsset(vegaAssetAddress, '1000', 18);
+    cy.validatorsSelfDelegate();
     ethereumWalletConnect();
     cy.connectVegaWallet();
-    vegaWalletTeardown();
-    cy.associateTokensToVegaWallet('6000');
     cy.VegaWalletTopUpRewardsPool(30, 200);
     navigateTo(navigation.validators);
+    vegaWalletTeardown();
+    stakingPageAssociateTokens('6000');
     cy.get(vegaWalletUnstakedBalance, txTimeout).should(
       'contain',
       '6,000.0',
       txTimeout
     );
+    cy.get('button').contains('Select a validator to nominate').click();
     clickOnValidatorFromList(0);
     stakingValidatorPageAddStake('3000');
     closeStakingDialog();

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

@@ -24,7 +24,6 @@ const ethWalletContainer = '[data-testid="ethereum-wallet"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletUnstakedBalance =
   '[data-testid="vega-wallet-balance-unstaked"]';
-const currencyTitle = '[data-testid="currency-title"]:visible';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
@@ -80,11 +79,14 @@ context(
         //0005-ETXN-005
         stakingPageAssociateTokens('2', { skipConfirmation: true });
 
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
 
         // 0005-ETXN-002
         verifyEthWalletAssociatedBalance('2.0');
@@ -115,11 +117,14 @@ context(
         verifyEthWalletTotalAssociatedBalance('6,002.00');
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageDisassociateTokens('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         cy.get(
           '[data-testid="eth-wallet-associated-balances"]:visible',
           txTimeout
@@ -220,11 +225,14 @@ context(
           skipConfirmation: true,
         });
 
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet)
@@ -240,11 +248,14 @@ context(
           type: 'contract',
           skipConfirmation: true,
         });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '1.00');
         validateWalletCurrency('Total associated after pending', '1.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('1.0');
         verifyEthWalletTotalAssociatedBalance('1.0');
       });
@@ -328,11 +339,14 @@ context(
       // 1004-ASSO-004
       it('Pending association outside of app is shown', function () {
         vegaWalletAssociate('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '2.00');
       });
 
@@ -341,11 +355,14 @@ context(
         cy.wrap(validateWalletCurrency('Associated', '2.00')).then(() => {
           vegaWalletDisassociate('2');
         });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '0.00');
       });
 

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

@@ -15,7 +15,13 @@ const balanceAvailable = 'BALANCE_AVAILABLE_value';
 const withdrawalThreshold = 'WITHDRAWAL_THRESHOLD_value';
 const delayTime = 'DELAY_TIME_value';
 const submitWithdrawalButton = 'submit-withdrawal';
+const dialogTitle = 'dialog-title';
 const dialogClose = 'dialog-close';
+const txExplorerLink = 'tx-block-explorer';
+const withdrawalAssetSymbol = 'withdrawal-asset-symbol';
+const withdrawalAmount = 'withdrawal-amount';
+const withdrawalRecipient = 'withdrawal-recipient';
+const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
 const tableTxHash = '[col-id="txHash"]';
 const tableAssetSymbol = '[col-id="asset.symbol"]';
@@ -24,16 +30,14 @@ const tableReceiverAddress = '[col-id="details.receiverAddress"]';
 const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
 const tableWithdrawnStatus = '[col-id="status"]';
 const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
-const toast = 'toast';
+const toastContent = 'toast-content';
 const toastPanel = 'toast-panel';
-const toastClose = 'toast-close';
-const withdrawalDialogContent = 'dialog-content';
-const toastCompleteWithdrawal = 'toast-complete-withdrawal';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
 const usdtSelectValue =
   '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede';
+const truncatedWithdrawalEthAddress = '0xEe7D…22d94F';
 const formValidationError = 'input-error-text';
 const txTimeout = Cypress.env('txTimeout');
 
@@ -103,35 +107,29 @@ context(
         cy.getByTestId(amountInput).click().type('120');
         cy.getByTestId(submitWithdrawalButton).click();
       });
+
+      cy.contains('Awaiting network confirmation').should('be.visible');
       // assert withdrawal request
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 120.00 tUSDC'
-          );
-          cy.getByTestId(toastCompleteWithdrawal).click();
-          cy.getByTestId(toastClose).click();
-        });
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Transaction complete'
+      );
+      cy.getByTestId(txExplorerLink)
+        .should('have.attr', 'href')
+        .and('contain', '/txs/');
+      cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
+      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
+      cy.getByTestId(withdrawalRecipient)
+        .should('have.text', truncatedWithdrawalEthAddress)
+        .and('have.attr', 'href')
+        .and('contain', `/address/${Cypress.env('ethWalletPublicKey')}`);
+      cy.getByTestId(withdrawFundsButton).click();
       // withdrawal complete
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'The withdrawal has been approved.')
-        .within(() => {
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 120.00 tUSDC'
-          );
-        });
-      cy.getByTestId(toast)
-        .last(txTimeout)
-        .should('contain.text', 'Transaction confirmed')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-        });
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Withdraw asset complete'
+      );
+      cy.getByTestId(dialogClose).click();
       // withdrawal history for complete withdrawal displayed
       cy.get(tableWithdrawnStatus)
         .eq(1, txTimeout)
@@ -170,17 +168,13 @@ context(
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 110.00 tUSDC'
-          );
-          cy.getByTestId(toastClose).click();
-        });
+      cy.contains('Awaiting network confirmation').should('be.visible');
+      // assert withdrawal request
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Transaction complete'
+      );
+      cy.getByTestId(dialogClose).click();
       cy.get(tableTxHash)
         .eq(1)
         .should('have.text', 'Complete withdrawal')
@@ -195,75 +189,28 @@ context(
           cy.get(tableCreatedTimeStamp).should('not.be.empty');
         });
       ethereumWalletConnect();
-      cy.getByTestId(completeWithdrawalButton).first().click();
-      cy.getByTestId(toast)
-        .last(txTimeout)
+      cy.getByTestId(completeWithdrawalButton).click();
+      cy.getByTestId(toastContent)
+        .last()
         .should('contain.text', 'Awaiting confirmation')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
-      cy.getByTestId(toast)
-        .first(txTimeout)
+      cy.getByTestId(toastContent)
+        .first()
         .should('contain.text', 'The withdrawal has been approved.')
         .within(() => {
           cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
         });
-      cy.getByTestId(toast)
-        .last(txTimeout)
+      cy.getByTestId(toastContent)
+        .last()
         .should('contain.text', 'Transaction confirmed')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
     });
 
-    it('Should be able to see withdrawal details from toast', function () {
-      cy.getByTestId(withdraw).click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-        cy.getByTestId(withdrawalThreshold).should(
-          'have.text',
-          '100,000.00000T'
-        );
-        cy.getByTestId(amountInput).click().type('50');
-        cy.getByTestId(submitWithdrawalButton).click();
-      });
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 50.00 tUSDC'
-          );
-          cy.contains('save your withdrawal details').click();
-        });
-      cy.getByTestId(withdrawalDialogContent)
-        .last()
-        .within(() => {
-          cy.getByTestId('assetSource_value').should(
-            'have.text',
-            '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0'
-          );
-          cy.getByTestId('amount_value').should('have.text', '5000000');
-          cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
-          cy.getByTestId('signatures_value')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('targetAddress_value').should(
-            'have.text',
-            Cypress.env('ethWalletPublicKey')
-          );
-          cy.getByTestId('creation_value')
-            .invoke('text')
-            .should('not.be.empty');
-        });
-      cy.getByTestId(dialogClose).click();
-    });
-
-    // Skipping test due to bug #3882
-    it.skip('Unable to withdraw asset on pub key view', function () {
+    it('Unable to withdraw asset on pub key view', function () {
       const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
       const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
@@ -277,11 +224,10 @@ context(
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
-        cy.pause();
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(withdrawalDialogContent)
+      cy.getByTestId('dialog-content')
         .last()
         .within(() => {
           cy.get('h1').should('have.text', 'Transaction failed');

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

@@ -128,7 +128,6 @@ context(
         .first()
         .find('[data-testid="view-proposal-btn"]')
         .click();
-      cy.url().should('contain', '/protocol-upgrades/v1');
       cy.getByTestId('protocol-upgrade-proposal').within(() => {
         cy.get('h1').should('have.text', 'Vega Release v1');
         cy.getByTestId('protocol-upgrade-block-height').should(

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

@@ -221,7 +221,7 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }
 
 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title', txTimeout).should(
+  cy.getByTestId('dialog-title').should(
     'contain.text',
     'At the beginning of the next epoch'
   );

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

@@ -5,7 +5,7 @@ const capsuleWalletConnectButton = '[data-testid="web3-connector-Unknown"]';
 
 export function ethereumWalletConnect() {
   cy.highlight('Connecting Eth Wallet');
-  cy.get(connectToEthButton, { timeout: 60000 }).within(() => {
+  cy.get(connectToEthButton).within(() => {
     cy.contains('Connect Ethereum wallet to associate $VEGA')
       .should('be.visible')
       .click();

apps/governance/.env

@@ -5,11 +5,10 @@ NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50

apps/governance/.env.stagnet1

@@ -1,9 +1,9 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz

apps/governance/.env.testnet

@@ -13,4 +13,4 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.validator-testnet

@@ -10,4 +10,4 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

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

@@ -115,6 +115,29 @@ describe('Proposals list', () => {
     );
   });
 
+  it('Orders proposals correctly by closingDateTime', () => {
+    render(
+      renderComponent([
+        failedProposalClosedLastMonth,
+        openProposalClosesNextMonth,
+        openProposalClosesNextWeek,
+        enactedProposalClosedLastWeek,
+      ])
+    );
+    const openProposals = within(screen.getByTestId('open-proposals'));
+    const closedProposals = within(screen.getByTestId('closed-proposals'));
+    const openProposalsItems = openProposals.getAllByTestId(
+      'proposals-list-item'
+    );
+    const closedProposalsItems = closedProposals.getAllByTestId(
+      'proposals-list-item'
+    );
+    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal2');
+    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal1');
+    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal3');
+    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal4');
+  });
+
   it('Displays info on no proposals', () => {
     render(renderComponent([]));
     expect(screen.queryByTestId('open-proposals')).not.toBeInTheDocument();

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

@@ -35,11 +35,7 @@ export const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
     arr,
     [
-      (p) =>
-        p?.terms?.enactmentDatetime
-          ? new Date(p?.terms?.enactmentDatetime).getTime()
-          : // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered
-            new Date(p?.terms?.closingDatetime || 0).getTime(),
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
       (p) => new Date(p?.datetime).getTime(),
     ],
     ['asc', 'asc']

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

@@ -5,9 +5,6 @@ import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrad
 import { getNormalisedVotingPower } from '../../staking/shared';
 import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { useVegaRelease } from '@vegaprotocol/environment';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useTranslation } from 'react-i18next';
 
 export interface ProtocolUpgradeProposalProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;
@@ -45,9 +42,6 @@ export const ProtocolUpgradeProposal = ({
   lastBlockHeight,
   consensusValidators,
 }: ProtocolUpgradeProposalProps) => {
-  const { t } = useTranslation();
-  const releaseInfo = useVegaRelease(proposal.vegaReleaseTag);
-
   const consensusApprovals = useMemo(
     () => getConsensusApprovals(consensusValidators || [], proposal),
     [consensusValidators, proposal]
@@ -84,14 +78,6 @@ export const ProtocolUpgradeProposal = ({
           totalConsensusValidators={consensusValidators.length}
         />
       )}
-
-      {releaseInfo && releaseInfo.htmlUrl && (
-        <div className="mb-10">
-          <ExternalLink href={releaseInfo.htmlUrl}>
-            {t('Explore release on GitHub')}
-          </ExternalLink>
-        </div>
-      )}
     </section>
   );
 };

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.spec.tsx

@@ -8,7 +8,6 @@ const mockData = {
     {
       asset: 'tDAI',
       totalAmount: '5',
-      decimals: 6,
       rewardTypes: {
         ACCOUNT_TYPE_GLOBAL_REWARD: {
           amount: '0',

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards-table.tsx

@@ -1,5 +1,6 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
   rowGridItemStyles,
   RewardsTable,
@@ -12,8 +13,7 @@ interface EpochIndividualRewardsGridProps {
 }
 
 interface RewardItemProps {
-  amount: string;
-  decimals: number;
+  value: string;
   percentageOfTotal?: string;
   dataTestId: string;
   last?: boolean;
@@ -21,14 +21,15 @@ interface RewardItemProps {
 
 const DisplayReward = ({
   reward,
-  decimals,
   percentageOfTotal,
 }: {
   reward: string;
-  decimals: number;
   percentageOfTotal?: string;
 }) => {
   const { t } = useTranslation();
+  const {
+    appState: { decimals },
+  } = useAppState();
 
   if (Number(reward) === 0) {
     return <span className="text-vega-dark-300">-</span>;
@@ -63,8 +64,7 @@ const DisplayReward = ({
 };
 
 const RewardItem = ({
-  amount,
-  decimals,
+  value,
   percentageOfTotal,
   dataTestId,
   last,
@@ -72,11 +72,7 @@ const RewardItem = ({
   <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
     <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
     <div className="overflow-auto p-5">
-      <DisplayReward
-        reward={amount}
-        decimals={decimals}
-        percentageOfTotal={percentageOfTotal}
-      />
+      <DisplayReward reward={value} percentageOfTotal={percentageOfTotal} />
     </div>
     <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
   </div>
@@ -90,7 +86,7 @@ export const EpochIndividualRewardsTable = ({
       dataTestId="epoch-individual-rewards-table"
       epoch={Number(data.epoch)}
     >
-      {data.rewards.map(({ asset, rewardTypes, totalAmount, decimals }, i) => (
+      {data.rewards.map(({ asset, rewardTypes, totalAmount }, i) => (
         <div className="contents" key={i}>
           <div
             data-testid="individual-rewards-asset"
@@ -102,19 +98,13 @@ export const EpochIndividualRewardsTable = ({
             ([key, { amount, percentageOfTotal }]) => (
               <RewardItem
                 key={key}
-                amount={amount}
-                decimals={decimals}
+                value={amount}
                 percentageOfTotal={percentageOfTotal}
                 dataTestId={key}
               />
             )
           )}
-          <RewardItem
-            dataTestId="total"
-            amount={totalAmount}
-            decimals={decimals}
-            last={true}
-          />
+          <RewardItem dataTestId="total" value={totalAmount} last={true} />
         </div>
       ))}
     </RewardsTable>

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts

@@ -8,7 +8,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
@@ -18,7 +18,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -28,7 +28,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '200',
     percentageOfTotal: '0.2',
     receivedAt: new Date(),
-    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP', decimals: 7 },
+    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -38,7 +38,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
@@ -48,7 +48,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '150',
     percentageOfTotal: '0.15',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '3' },
   };
@@ -58,7 +58,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -99,7 +99,6 @@ describe('generateEpochIndividualRewardsList', () => {
       rewards: [
         {
           asset: 'USD',
-          decimals: 6,
           totalAmount: '100',
           rewardTypes: {
             [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
@@ -168,7 +167,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'GBP',
             totalAmount: '200',
-            decimals: 7,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
@@ -199,7 +197,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'EUR',
             totalAmount: '50',
-            decimals: 5,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
@@ -235,7 +232,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'USD',
             totalAmount: '200',
-            decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
@@ -283,7 +279,6 @@ describe('generateEpochIndividualRewardsList', () => {
         rewards: [
           {
             asset: 'USD',
-            decimals: 6,
             totalAmount: '150',
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
@@ -320,7 +315,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'GBP',
             totalAmount: '200',
-            decimals: 7,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
@@ -351,7 +345,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'EUR',
             totalAmount: '50',
-            decimals: 5,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
@@ -397,7 +390,6 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'USD',
             totalAmount: '200',
-            decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts

@@ -9,7 +9,6 @@ export interface EpochIndividualReward {
   rewards: {
     asset: string;
     totalAmount: string;
-    decimals: number;
     rewardTypes: {
       [key in AccountType]?: {
         amount: string;
@@ -54,7 +53,6 @@ export const generateEpochIndividualRewardsList = ({
   const epochIndividualRewards = rewards.reduce((acc, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
-    const assetDecimals = reward.asset.decimals;
     const rewardType = reward.rewardType;
     const amount = reward.amount;
     const percentageOfTotal = reward.percentageOfTotal;
@@ -75,7 +73,6 @@ export const generateEpochIndividualRewardsList = ({
     if (!asset) {
       asset = {
         asset: assetName,
-        decimals: assetDecimals,
         totalAmount: '0',
         rewardTypes: Object.fromEntries(emptyRowAccountTypes),
       };

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.spec.tsx

@@ -52,7 +52,6 @@ const assetRewards: Map<
 assetRewards.set(assetId, {
   assetId,
   name: 'tDAI TEST',
-  decimals: 6,
   rewards,
   totalAmount: '295',
 });

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.tsx

@@ -1,5 +1,6 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
   rowGridItemStyles,
   RewardsTable,
@@ -11,19 +12,16 @@ interface EpochTotalRewardsGridProps {
 }
 
 interface RewardItemProps {
-  amount: string;
-  decimals: number;
+  value: string;
   dataTestId: string;
   last?: boolean;
 }
 
-const DisplayReward = ({
-  reward,
-  decimals,
-}: {
-  reward: string;
-  decimals: number;
-}) => {
+const DisplayReward = ({ reward }: { reward: string }) => {
+  const {
+    appState: { decimals },
+  } = useAppState();
+
   if (Number(reward) === 0) {
     return <span className="text-vega-dark-300">-</span>;
   }
@@ -35,16 +33,11 @@ const DisplayReward = ({
   );
 };
 
-const RewardItem = ({
-  amount,
-  decimals,
-  dataTestId,
-  last,
-}: RewardItemProps) => (
+const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
   <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
     <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
     <div className="overflow-auto p-5">
-      <DisplayReward reward={amount} decimals={decimals} />
+      <DisplayReward reward={value} />
     </div>
     <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
   </div>
@@ -56,25 +49,15 @@ export const EpochTotalRewardsTable = ({
   return (
     <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
       {Array.from(data.assetRewards.values()).map(
-        ({ name, rewards, totalAmount, decimals }, i) => (
+        ({ name, rewards, totalAmount }, i) => (
           <div className="contents" key={i}>
             <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
               {name}
             </div>
             {Array.from(rewards.values()).map(({ rewardType, amount }, i) => (
-              <RewardItem
-                key={i}
-                dataTestId={rewardType}
-                amount={amount}
-                decimals={decimals}
-              />
+              <RewardItem key={i} dataTestId={rewardType} value={amount} />
             ))}
-            <RewardItem
-              dataTestId="total"
-              amount={totalAmount}
-              decimals={decimals}
-              last={true}
-            />
+            <RewardItem dataTestId="total" value={totalAmount} last={true} />
           </div>
         )
       )}

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.spec.ts

@@ -56,14 +56,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -103,7 +101,6 @@ describe('generateEpochAssetRewardsList', () => {
           {
             node: {
               epoch: 1,
-              decimals: 18,
               assetId: '1',
               rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
               amount: '123',
@@ -131,7 +128,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 0,
                   name: '',
                   rewards: new Map([
                     [
@@ -200,14 +196,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -218,7 +212,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
               amount: '123',
             },
@@ -227,7 +220,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '100',
             },
@@ -236,7 +228,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
               amount: '5',
             },
@@ -263,7 +254,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -329,7 +319,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -398,14 +387,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -416,7 +403,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
               amount: '123',
             },
@@ -425,7 +411,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '100',
             },
@@ -434,7 +419,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
               amount: '6',
             },
@@ -443,7 +427,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
               amount: '27',
             },
@@ -452,7 +435,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 3,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '15',
             },
@@ -485,7 +467,6 @@ describe('generateEpochAssetRewardsList', () => {
                 {
                   assetId: '1',
                   name: 'Asset 1',
-                  decimals: 18,
                   rewards: new Map([
                     [
                       AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
@@ -550,7 +531,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -628,7 +608,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [

apps/governance/src/routes/rewards/epoch-total-rewards/generate-epoch-total-rewards-list.ts

@@ -22,7 +22,6 @@ export type AggregatedEpochRewardSummary = {
   name: EpochSummaryWithNamedReward['name'];
   rewards: Map<RewardType, RewardItem>;
   totalAmount: string;
-  decimals: number;
 };
 
 export type EpochTotalSummary = {
@@ -92,7 +91,6 @@ export const generateEpochTotalRewardsList = ({
         assetId: reward.assetId,
         name: matchingAsset?.name || '',
         rewards: rewards || new Map(emptyRowAccountTypes),
-        decimals: matchingAsset?.decimals || 0,
         totalAmount: (
           Number(reward.amount) + Number(assetWithRewards?.totalAmount || 0)
         ).toString(),

apps/governance/src/routes/rewards/home/Rewards.graphql

@@ -4,7 +4,6 @@ fragment RewardFields on Reward {
     id
     symbol
     name
-    decimals
   }
   party {
     id
@@ -68,7 +67,6 @@ query EpochAssetsRewards(
       node {
         id
         name
-        decimals
       }
     }
   }

apps/governance/src/routes/rewards/home/__generated__/Rewards.ts

@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
+export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
 
 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };
 
@@ -16,7 +16,7 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;
 
 
-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
 
 export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
 
@@ -26,7 +26,7 @@ export type EpochAssetsRewardsQueryVariables = Types.Exact<{
 }>;
 
 
-export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, decimals: number } } | null> | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
+export type EpochAssetsRewardsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string } } | null> | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
 
 export type EpochFieldsFragment = { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } };
 
@@ -42,7 +42,6 @@ export const RewardFieldsFragmentDoc = gql`
     id
     symbol
     name
-    decimals
   }
   party {
     id
@@ -144,7 +143,6 @@ export const EpochAssetsRewardsDocument = gql`
       node {
         id
         name
-        decimals
       }
     }
   }

apps/governance/src/routes/staking/shared.ts

@@ -71,6 +71,14 @@ export const calculateOverstakedPenalty = (nodeId: string, nodes: Node[]) => {
       new BigNumber(node.rewardScore?.rawValidatorScore || 0).dividedBy(tts)
     )
     .times(100);
+  console.log(
+    nodeId,
+    new BigNumber(node.rewardScore?.rawValidatorScore || 0).toString(),
+    tts.toString(),
+    new BigNumber(node.rewardScore?.rawValidatorScore || 0)
+      .dividedBy(tts)
+      .toString()
+  );
   return penalty.isLessThan(0) ? new BigNumber(0) : penalty;
 };
 

apps/liquidity-provision-dashboard/.env

@@ -23,6 +23,5 @@ NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

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

@@ -2,7 +2,7 @@
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz

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

@@ -2,8 +2,7 @@
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_CONSOLE_URL=https://console.vega.xyz

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

@@ -4,6 +4,5 @@ NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}

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

@@ -2,8 +2,7 @@
 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_ENV=TESTNET
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

apps/multisig-signer/.env.validator-testnet

@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.tom
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
-NX_VEGA_NETWORKS={'{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
+NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=VALIDATOR_TESTNET

apps/trading-e2e/.env

@@ -6,8 +6,7 @@ NX_VEGA_CONFIG_URL=''
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -20,7 +19,6 @@ CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit
 CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
-CYPRESS_CONSOLE_URL=https://console.fairground.wtf
 CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
 CYPRESS_ORACLE_PUBKEY=6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61
 CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65

apps/trading-e2e/.env.capsule

@@ -5,8 +5,7 @@ NX_VEGA_CONFIG_URL=''
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
@@ -18,7 +17,6 @@ CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit
 CYPRESS_ETHEREUM_WALLET_ADDRESS=0xEe7D375bcB50C26d52E1A4a472D8822A2A22d94F
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
-CYPRESS_CONSOLE_URL=https://console.fairground.wtf
 CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
 CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY=02ecea…342f65
 CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535

apps/trading-e2e/cypress.config.js

@@ -24,7 +24,7 @@ module.exports = defineConfig({
     viewportHeight: 900,
     responseTimeout: 50000,
     requestTimeout: 20000,
-    retries: 1,
+    retries: 2,
     testIsolation: false,
   },
   env: {

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

@@ -50,7 +50,10 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
       cy.wrap(markets[0]).as('market');
     });
     cy.visit('/#/portfolio');
-    cy.connectVegaWallet();
+  });
+
+  beforeEach(() => {
+    cy.setVegaWallet();
   });
 
   it('can deposit', function () {
@@ -169,6 +172,7 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
       'contain.text',
       'Error occurredcannot estimate gas'
     );
+    cy.getByTestId(toastCloseBtn).click({ multiple: true });
     cy.getByTestId(completeWithdrawalBtn).should(
       'contain.text',
       'Complete withdrawal'
@@ -372,14 +376,10 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
       'contain.text',
       'Transaction confirmed'
     );
-    cy.getByTestId(toastContent, txTimeout)
-      .should('contain.text', 'Funds unlocked')
-      .and('contain.text', 'Your funds have been unlocked for withdrawal.')
-      .and(
-        'contain.text',
-        'View in block explorerYou can save your withdrawal details for extra security.'
-      )
-      .and('contain.text', 'Withdraw 1.00 tBTCComplete withdrawal');
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Funds unlockedYour funds have been unlocked for withdrawalView in block explorerWithdraw 1.00 tBTCComplete withdrawal'
+    );
 
     cy.get('.ag-center-cols-container')
       .find('[col-id="status"]')
@@ -407,7 +407,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
       });
 
     cy.getByTestId('withdraw-dialog-button').click({ force: true });
-    // cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '6.999');
+    cy.getByTestId('BALANCE_AVAILABLE_value').should('have.text', '7.999');
   });
 
   it('approved amount is less than deposit', function () {

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

@@ -1,16 +1,20 @@
+import { closeWelcomeDialog } from '../support/helpers';
+
 const dialogContent = 'dialog-content';
 const nodeHealth = 'node-health';
 
-describe.skip('home', { tags: '@regression' }, () => {
+describe('home', { tags: '@regression' }, () => {
   before(() => {
     cy.clearAllLocalStorage();
     cy.mockTradingPage();
     cy.mockSubscription();
     cy.visit('/');
+    closeWelcomeDialog();
   });
 
   describe('footer', () => {
-    it('shows current block height', () => {
+    it.skip('shows current block height', () => {
+      closeWelcomeDialog();
       // 0006-NETW-004
       // 0006-NETW-005
       // 0006-NETW-008

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

@@ -1,7 +1,9 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
+import { marketsDataQuery } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';
 
+const selectMarketOverlay = 'select-market-list';
 const dialogContent = 'dialog-content';
 
 const generateProposal = (code: string): ProposalListFieldsFragment => ({
@@ -108,12 +110,77 @@ describe('home', { tags: '@regression' }, () => {
 
       cy.get('main[data-testid^="/markets/"]');
 
+      // Overlay should be shown
+      cy.getByTestId(selectMarketOverlay).should('exist');
+      cy.contains('Select a market to get started').should('be.visible');
+
+      // I expect the market overlay table to contain at least 3 rows (one header row)
+      cy.getByTestId(selectMarketOverlay)
+        .get('table tr')
+        .then((row) => {
+          expect(row.length >= 3).to.be.true;
+        });
+
+      // each market shown in overlay table contains content under the last price and change fields
+      cy.getByTestId(selectMarketOverlay)
+        .get('table tr')
+        .each(($element, index) => {
+          if (index > 0) {
+            // skip header row
+            cy.root().within(() => {
+              cy.getByTestId('price').should('not.be.empty');
+            });
+          }
+        });
+
+      cy.getByTestId('welcome-notice-proposed-markets')
+        .children('div.pt-1.flex.justify-between')
+        .should('have.length', 3)
+        .each((item) => {
+          cy.wrap(item).getByTestId('external-link').should('exist');
+        });
+
+      cy.getByTestId('dialog-close').click();
+      cy.getByTestId(selectMarketOverlay).should('not.exist');
+
       // the choose market overlay is no longer showing
+      cy.contains('Select a market to get started').should('not.exist');
       cy.contains('Loading...').should('not.exist');
       cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-0');
     });
   });
 
+  describe('market table should be properly rendered', () => {
+    it('redirects to a default market with the landing dialog open', () => {
+      const override = {
+        marketsConnection: {
+          edges: [
+            {
+              node: {
+                data: {
+                  markPrice: '46126900581221212121212121212121212121212121212',
+                },
+              },
+            },
+          ],
+        },
+      };
+      // @ts-ignore partial deep check failing
+      const data = marketsDataQuery(override);
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'MarketsData', data);
+      });
+      cy.visit('/');
+      cy.wait('@Markets');
+      cy.getByTestId(selectMarketOverlay)
+        .get('table')
+        .invoke('outerWidth')
+        .then((value) => {
+          expect(value).to.be.closeTo(554, 10);
+        });
+    });
+  });
+
   describe('no markets found', () => {
     beforeEach(() => {
       cy.mockGQL((req) => {
@@ -139,13 +206,40 @@ describe('home', { tags: '@regression' }, () => {
       cy.wait('@Markets');
       cy.wait('@MarketsData');
     });
-
-    it('redirects to market/all and displays welcome notice', () => {
-      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
+    it('redirects to a the empty market page and displays welcome notice', () => {
+      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets`);
       cy.getByTestId('welcome-notice-title').should(
         'contain.text',
         'Welcome to Console'
       );
+      cy.getByTestId('welcome-notice-proposed-markets').should(
+        'contain.text',
+        'AAAZZZ'
+      );
+    });
+  });
+
+  describe('no proposal found', () => {
+    it('there is a link to propose market', () => {
+      cy.mockGQL((req) => {
+        aliasGQLQuery(req, 'ProposalsList', {
+          proposalsConnection: {
+            __typename: 'ProposalsConnection',
+            edges: null,
+          },
+        });
+      });
+      cy.visit('/');
+      cy.wait('@Markets');
+      cy.wait('@MarketsData');
+      cy.getByTestId(selectMarketOverlay)
+        .get('table tr')
+        .then((row) => {
+          expect(row.length >= 3).to.be.true;
+        });
+      cy.getByTestId('external-link')
+        .contains('Propose a market')
+        .should('exist');
     });
   });
 

apps/trading-e2e/src/integration/live-env.cy.ts

@@ -1,3 +1,4 @@
+const selectMarketOverlay = 'select-market-list';
 const marketInfoBtn = 'Info';
 const marketInfoSubtitle = 'accordion-title';
 const marketSummaryBlock = 'header-summary';
@@ -13,6 +14,45 @@ const itemHeader = 'item-header';
 const itemValue = 'item-value';
 const marketListContent = 'popover-content';
 
+describe(
+  'Console - market list - live env',
+  { tags: '@live', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.visit('/');
+    });
+
+    it('shows the market list page', () => {
+      cy.get('main', { timeout: 20000 });
+
+      // Overlay should be shown
+      cy.getByTestId(selectMarketOverlay).should('exist');
+      cy.contains('Select a market to get started').should('be.visible');
+
+      // I expect the market overlay table to contain at least one row
+      cy.getByTestId(selectMarketOverlay)
+        .get('table tr')
+        .should('have.length.greaterThan', 1);
+
+      // each market shown in overlay table contains content under the last price and change fields
+      cy.getByTestId(selectMarketOverlay)
+        .get('table tr')
+        .getByTestId('price')
+        .should('not.be.empty');
+    });
+
+    it('redirects to a default market', () => {
+      cy.getByTestId('dialog-close').click();
+      cy.getByTestId(selectMarketOverlay).should('not.exist');
+
+      // the choose market overlay is no longer showing
+      cy.contains('Select a market to get started').should('not.exist');
+      cy.contains('Loading...').should('not.exist');
+      cy.getByTestId('popover-trigger').should('not.be.empty');
+    });
+  }
+);
+
 describe(
   'Console - market info - live env',
   { tags: '@live', testIsolation: true },

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

@@ -55,10 +55,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
     validateMarketDataRow(3, 'Quote Unit', 'BTC');
   });
 
-  // TODO: fix this test
-  // New volume check logic, added by https://github.com/vegaprotocol/frontend-monorepo/pull/3870 has caused the
-  // 24hr volume assertion to fail as it now reads 'Unknown'
-  it.skip('market volume displayed', () => {
+  it('market volume displayed', () => {
     cy.getByTestId(marketTitle).contains('Market volume').click();
     validateMarketDataRow(0, '24 Hour Volume', '1');
     validateMarketDataRow(1, 'Open Interest', '-');

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

@@ -38,28 +38,28 @@ describe('markets selector', { tags: '@smoke' }, () => {
     // TODO: load data from mocks in. Using alias and wrap intermittently fails
     const data = [
       {
-        code: 'SOLUSD',
-        markPrice: '84.41XYZalpha',
+        code: 'AAPL.MF21',
+        name: 'Apple Monthly (30 Jun 2022)',
+        markPrice: '46,126.90058',
         change: '+200.00%',
-        vol: '324h vol',
-      },
-      {
-        code: 'ETHBTC.QM21',
-        markPrice: '46,126.90058tBTC',
-        change: '+200.00%',
-        vol: '324h vol',
       },
       {
         code: 'BTCUSD.MF21',
-        markPrice: '46,126.90058tDAI',
+        name: 'ACTIVE MARKET',
+        markPrice: '46,126.90058',
         change: '+200.00%',
-        vol: '324h vol',
       },
       {
-        code: 'AAPL.MF21',
-        markPrice: '46,126.90058tUSDC',
+        code: 'ETHBTC.QM21',
+        name: 'ETHBTC Quarterly (30 Jun 2022)',
+        markPrice: '46,126.90058',
+        change: '+200.00%',
+      },
+      {
+        code: 'SOLUSD',
+        name: 'SUSPENDED MARKET',
+        markPrice: '84.41',
         change: '+200.00%',
-        vol: '324h vol',
       },
     ];
     cy.getByTestId(list)
@@ -68,13 +68,12 @@ describe('markets selector', { tags: '@smoke' }, () => {
         const market = data[i];
         // 6001-MARK-021
         expect(item.find('h3').text()).equals(market.code);
-        expect(
-          item.find('[data-testid="market-selector-data-row"]').eq(0).text()
-        ).contains(market.vol);
+        // 6001-MARK-022
+        expect(item.find('h4').text()).equals(market.name);
         // 6001-MARK-024
-        expect(
-          item.find('[data-testid="market-selector-data-row"]').eq(1).text()
-        ).contains(market.markPrice);
+        expect(item.find('[data-testid="market-item-price"]').text()).equals(
+          market.markPrice
+        );
         // 6001-MARK-023
         expect(item.find('[data-testid="market-item-change"]').text()).equals(
           market.change
@@ -97,8 +96,8 @@ describe('markets selector', { tags: '@smoke' }, () => {
     // 6001-MARK-29
     cy.getByTestId(searchInput).clear().type('btc');
     cy.getByTestId(list).find('a').should('have.length', 2);
-    cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
-    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
+    cy.getByTestId(list).find('a').eq(0).contains('BTCUSD.MF21');
+    cy.getByTestId(list).find('a').eq(1).contains('ETHBTC.QM21');
 
     cy.getByTestId(searchInput).clear();
     cy.getByTestId(list).find('a').should('have.length', 4);

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

@@ -3,6 +3,8 @@ import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
 import { marketsQuery } from '@vegaprotocol/mock';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 
+const dialogCloseBtn = 'dialog-close';
+
 describe('markets table', { tags: '@smoke' }, () => {
   beforeEach(() => {
     cy.clearLocalStorage().then(() => {
@@ -12,18 +14,20 @@ describe('markets table', { tags: '@smoke' }, () => {
         Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
       );
       cy.mockSubscription();
-      cy.visit('/#/markets/all');
+      cy.visit('/');
+      cy.wait('@Markets');
+      cy.wait('@MarketsData');
+      cy.wait('@MarketsCandles');
     });
   });
 
   it('renders markets correctly', () => {
-    cy.wait('@Markets');
-    cy.wait('@MarketsData');
     cy.get('[data-testid^="market-link-"]').should('not.be.empty');
     cy.getByTestId('price').invoke('text').should('not.be.empty');
     cy.getByTestId('settlement-asset').should('not.be.empty');
     cy.getByTestId('price-change-percentage').should('not.be.empty');
     cy.getByTestId('price-change').should('not.be.empty');
+    cy.getByTestId('sparkline-svg').should('be.visible');
   });
 
   it('able to open and sort full market list - market page', () => {
@@ -33,6 +37,9 @@ describe('markets table', { tags: '@smoke' }, () => {
       'ETHBTC.QM21',
       'SOLUSD',
     ];
+    cy.getByTestId('view-market-list-link')
+      .should('have.attr', 'href', '#/markets/all')
+      .click();
     cy.url().should('eq', Cypress.config('baseUrl') + '/#/markets/all');
     cy.contains('AAPL.MF21').should('be.visible');
     cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
@@ -44,6 +51,10 @@ describe('markets table', { tags: '@smoke' }, () => {
   });
 
   it('proposed markets tab should be rendered properly', () => {
+    cy.getByTestId('view-market-list-link')
+      .should('have.attr', 'href', '#/markets/all')
+      .click();
+
     cy.get('[data-testid="All markets"]').should(
       'have.attr',
       'data-state',
@@ -76,8 +87,8 @@ describe('markets table', { tags: '@smoke' }, () => {
         `${Cypress.env('VEGA_TOKEN_URL')}/proposals/propose/new-market`
       );
   });
-
   it('proposed markets tab should be sorted properly', () => {
+    cy.getByTestId('view-market-list-link').click();
     cy.get('[data-testid="Proposed markets"]').click();
     const marketColDefault = [
       'ETHUSD',
@@ -156,7 +167,7 @@ describe('markets table', { tags: '@smoke' }, () => {
     checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
   });
 
-  it.skip('opening auction subsets should be properly displayed', () => {
+  it('opening auction subsets should be properly displayed', () => {
     cy.mockTradingPage(
       Schema.MarketState.STATE_ACTIVE,
       Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
@@ -189,6 +200,7 @@ describe('markets table', { tags: '@smoke' }, () => {
     });
     cy.visit('#/markets/market-0');
     cy.url().should('contain', 'market-0');
+    cy.getByTestId(dialogCloseBtn).click();
     cy.getByTestId('item-value').contains('Opening auction').realHover();
     cy.getByTestId('opening-auction-sub-status').should(
       'contain.text',

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

@@ -8,6 +8,9 @@ describe('Navbar', { tags: '@smoke' }, () => {
     cy.visit('/');
     cy.wait('@Markets');
     cy.wait('@MarketsData');
+    cy.wait('@MarketsCandles');
+    // close welcome dialog
+    cy.getByTestId('dialog-close').click();
   });
 
   const pages = [

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

@@ -1,9 +1,12 @@
+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();
     });
   });

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

@@ -1,7 +1,6 @@
 import { checkSorting } from '@vegaprotocol/cypress';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { marketsDataQuery } from '@vegaprotocol/mock';
-import { positionsQuery } from '@vegaprotocol/mock';
 
 beforeEach(() => {
   cy.mockTradingPage();
@@ -17,27 +16,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
   });
 
   it('renders positions on portfolio page', () => {
-    cy.mockGQL((req) => {
-      const positions = positionsQuery();
-      if (positions.positions?.edges) {
-        positions.positions.edges.push(
-          ...positions.positions.edges.map((edge) => ({
-            ...edge,
-            node: {
-              ...edge.node,
-              party: {
-                ...edge.node.party,
-                id: 'vega-1',
-              },
-            },
-          }))
-        );
-      }
-      aliasGQLQuery(req, 'Positions', positions);
-    });
     cy.visit('/#/portfolio');
     cy.getByTestId('Positions').click();
-    validatePositionsDisplayed(true);
+    validatePositionsDisplayed();
   });
   describe('renders position among some graphql errors', () => {
     it('rows should be displayed despite errors', () => {
@@ -75,9 +56,7 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
       cy.getByTestId('tab-positions')
         .first()
         .within(() => {
-          cy.get(
-            '[row-id="02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65-market-2"]'
-          )
+          cy.get('[row-id="market-2"]')
             .eq(1)
             .within(() => {
               emptyCells.forEach((cell) => {
@@ -124,11 +103,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
       const marketsSortedDefault = [
         'ACTIVE MARKET',
         'Apple Monthly (30 Jun 2022)',
-        'SUSPENDED MARKET',
       ];
       const marketsSortedAsc = ['ACTIVE MARKET', 'Apple Monthly (30 Jun 2022)'];
       const marketsSortedDesc = [
-        'SUSPENDED MARKET',
         'Apple Monthly (30 Jun 2022)',
         'ACTIVE MARKET',
       ];
@@ -142,13 +119,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
     });
     it('sorting by notional', () => {
       cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = [
-        '276,761.40348',
-        '46,126.90058',
-        '1,688.20',
-      ];
-      const marketsSortedAsc = ['1,688.20', '46,126.90058', '276,761.40348'];
-      const marketsSortedDesc = ['276,761.40348', '46,126.90058', '1,688.20'];
+      const marketsSortedDefault = ['276,761.40348', '46,126.90058'];
+      const marketsSortedAsc = ['46,126.90058', '276,761.40348'];
+      const marketsSortedDesc = ['276,761.40348', '46,126.90058'];
       cy.getByTestId('Positions').click();
       checkSorting(
         'notional',
@@ -159,9 +132,9 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
     });
     it('sorting by unrealisedPNL', () => {
       cy.visit('/#/markets/market-0');
-      const marketsSortedDefault = ['8.95', '-0.22519', '8.95'];
-      const marketsSortedAsc = ['-0.22519', '8.95', '8.95'];
-      const marketsSortedDesc = ['8.95', '8.95', '-0.22519'];
+      const marketsSortedDefault = ['8.95', '-0.22519'];
+      const marketsSortedAsc = ['-0.22519', '8.95'];
+      const marketsSortedDesc = ['8.95', '-0.22519'];
       cy.getByTestId('Positions').click();
       checkSorting(
         'unrealisedPNL',
@@ -172,7 +145,7 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
     });
   });
 
-  function validatePositionsDisplayed(multiKey = false) {
+  function validatePositionsDisplayed() {
     cy.getByTestId('tab-positions').should('be.visible');
     cy.getByTestId('tab-positions').within(() => {
       cy.get('[col-id="marketName"]')
@@ -192,11 +165,10 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
         cy.wrap($prices).invoke('text').should('not.be.empty');
       });
 
-      if (!multiKey) {
-        cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
-        cy.get('[col-id="marginAccountBalance"]') // margin allocated
-          .should('contain.text', '0.01');
-      }
+      cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
+
+      cy.get('[col-id="marginAccountBalance"]') // margin allocated
+        .should('contain.text', '0.01');
 
       cy.get('[col-id="unrealisedPNL"]').each(($unrealisedPnl) => {
         cy.wrap($unrealisedPnl).invoke('text').should('not.be.empty');
@@ -212,6 +184,6 @@ describe('positions', { tags: '@smoke', testIsolation: true }, () => {
       cy.get('.ag-popup').should('contain.text', 'Mark price x open volume');
     });
 
-    cy.getByTestId('close-position').should('be.visible').and('have.length', 3);
+    cy.getByTestId('close-position').should('be.visible').and('have.length', 2);
   }
 });

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

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

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

@@ -85,7 +85,7 @@ const mockTradingPage = (
   trigger?: Schema.AuctionTrigger
 ) => {
   aliasGQLQuery(req, 'ChainId', chainIdQuery());
-  aliasGQLQuery(req, 'NodeCheck', statisticsQuery());
+  aliasGQLQuery(req, 'Statistics', statisticsQuery());
   aliasGQLQuery(req, 'NodeGuard', nodeGuardQuery());
   aliasGQLQuery(
     req,

apps/trading/.env

@@ -5,8 +5,8 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet

apps/trading/.env.capsule

@@ -4,8 +4,8 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=''
 NX_VEGA_ENV=CUSTOM
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789

apps/trading/.env.devnet

@@ -6,7 +6,7 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet

apps/trading/.env.mainnet

@@ -5,13 +5,10 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-# TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.20.14-core-0.71.4

apps/trading/.env.stagnet1

@@ -5,9 +5,9 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases

apps/trading/.env.testnet

@@ -6,11 +6,10 @@ NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.se
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
+NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://governance.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/fairground/announcements.json
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

apps/trading/.env.validator-testnet

@@ -5,12 +5,11 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
-NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks
-NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\",\"TESTNET\":\"https://console.fairground.wtf\"}
-NX_VEGA_TOKEN_URL=https://governance.validators-testnet.vega.rocks
+NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
+NX_VEGA_TOKEN_URL=https://validator-testnet.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 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_CONSOLE_URL=https://trading.validators-testnet.vega.rocks
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

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

@@ -9,7 +9,7 @@ import { useGlobalStore } from '../../stores';
 export const Home = () => {
   const navigate = useNavigate();
   // The default market selected in the platform behind the overlay
-  // should be the oldest market that is currently trading in continuous mode(i.e. not in auction).
+  // should be the oldest market that is currently trading in     us mode(i.e. not in auction).
   const { data, error, loading } = useDataProvider({
     dataProvider: marketsWithDataProvider,
     variables: undefined,
@@ -30,7 +30,7 @@ export const Home = () => {
           replace: true,
         });
       } else {
-        navigate(Links[Routes.MARKETS]());
+        navigate(Links[Routes.MARKET]());
       }
     }
   }, [marketId, data, navigate, update]);

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

@@ -56,7 +56,13 @@ export const HeaderStats = ({ market }: HeaderStatsProps) => {
               decimalPlaces={market?.decimalPlaces}
             />
           </HeaderStat>
-          <HeaderStat heading={t('Volume (24h)')} testId="market-volume">
+          <HeaderStat
+            heading={t('Volume (24h)')}
+            testId="market-volume"
+            description={t(
+              'The total number of contracts traded in the last 24 hours.'
+            )}
+          >
             <Last24hVolume
               marketId={market?.id}
               positionDecimalPlaces={market?.positionDecimalPlaces}

apps/trading/client-pages/market/market-selector-item.spec.tsx

@@ -22,19 +22,7 @@ describe('MarketSelectorItem', () => {
     id: 'market-0',
     decimalPlaces: 2,
     // @ts-ignore fragment doesn't contain candles
-    candles: [
-      { close: '5', volume: '50' },
-      { close: '10', volume: '50' },
-    ],
-    tradableInstrument: {
-      instrument: {
-        product: {
-          settlementAsset: {
-            symbol: 'SYM',
-          },
-        },
-      },
-    },
+    candles: [{ close: '5' }, { close: '10' }],
   });
   const marketData: MarketDataUpdateFieldsFragment = {
     __typename: 'ObservableMarketData',
@@ -95,9 +83,6 @@ describe('MarketSelectorItem', () => {
   };
 
   it('renders market information', async () => {
-    const symbol =
-      market.tradableInstrument.instrument.product.settlementAsset.symbol;
-
     renderJsx();
 
     const link = screen.getByRole('link');
@@ -106,8 +91,7 @@ describe('MarketSelectorItem', () => {
 
     expect(link).toHaveClass('ring-1');
 
-    expect(screen.getByTitle('24h vol')).toHaveTextContent('100');
-    expect(screen.getByTitle(symbol)).toHaveTextContent('-');
+    expect(screen.getByTestId('market-item-price')).toHaveTextContent('-');
 
     // candles are loaded immediately
     expect(screen.getByTestId('market-item-change')).toHaveTextContent(
@@ -115,7 +99,7 @@ describe('MarketSelectorItem', () => {
     );
 
     await waitFor(() => {
-      expect(screen.getByTitle(symbol)).toHaveTextContent(
+      expect(screen.getByTestId('market-item-price')).toHaveTextContent(
         addDecimalsFormatNumber(marketData.markPrice, market.decimalPlaces)
       );
     });

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

@@ -7,14 +7,8 @@ import {
   priceChangePercentage,
 } from '@vegaprotocol/utils';
 import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
-import { calcCandleVolume } from '@vegaprotocol/markets';
 import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
 import { Sparkline } from '@vegaprotocol/ui-toolkit';
-import {
-  MarketTradingMode,
-  MarketTradingModeMapping,
-} from '@vegaprotocol/types';
-import { t } from '@vegaprotocol/i18n';
 
 export const MarketSelectorItem = ({
   market,
@@ -44,6 +38,13 @@ export const MarketSelectorItem = ({
           onSelect && onSelect(market.id);
         }}
       >
+        <h3>{market.tradableInstrument.instrument.code}</h3>
+        <h4
+          title={market.tradableInstrument.instrument.name}
+          className="text-sm text-vega-light-300 dark:text-vega-dark-300 text-ellipsis whitespace-nowrap overflow-hidden"
+        >
+          {market.tradableInstrument.instrument.name}
+        </h4>
         <MarketData market={market} />
       </Link>
     </div>
@@ -67,84 +68,30 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
     ? addDecimalsFormatNumber(market.data.markPrice, market.decimalPlaces)
     : '-';
 
-  const marketTradingMode = marketData
-    ? marketData.marketTradingMode
-    : market.tradingMode;
-
-  const mode = [
-    MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-    MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-    MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-  ].includes(marketTradingMode)
-    ? MarketTradingModeMapping[marketTradingMode]
-    : '';
-
-  const instrument = market.tradableInstrument.instrument;
-
-  const vol = market.candles ? calcCandleVolume(market.candles) : '0';
-  const volume =
-    vol && vol !== '0'
-      ? addDecimalsFormatNumber(vol, market.positionDecimalPlaces)
-      : '0.00';
-
   return (
-    <>
-      <div className="flex items-end gap-1 mb-1">
-        <h3
-          className={classNames(
-            'overflow-hidden text-ellipsis whitespace-nowrap',
-            {
-              'w-1/2': mode, // make space for showing the trading mode
-            }
-          )}
+    <div className="flex flex-nowrap justify-between items-center mt-1">
+      <div className="w-1/2">
+        <div
+          className="text-ellipsis whitespace-nowrap overflow-hidden"
+          data-testid="market-item-price"
         >
-          {market.tradableInstrument.instrument.code}
-        </h3>
-        {mode && (
-          <p className="w-1/2 text-xs text-right text-vega-orange-500 dark:text-vega-orange-550">
-            {mode}
-          </p>
-        )}
-      </div>
-      <DataRow value={volume} label={t('24h vol')} />
-      <DataRow
-        value={price}
-        label={instrument.product.settlementAsset.symbol}
-      />
-      <div className="relative">
+          {price}
+        </div>
         {market.candles && (
           <PriceChange candles={market.candles.map((c) => c.close)} />
         )}
-
-        <div
-          // absolute so height is not larger than price change value
-          className="absolute right-0 bottom-0 w-[120px]"
-        >
-          {market.candles && (
-            <Sparkline
-              width={120}
-              height={20}
-              data={market.candles.filter(Boolean).map((c) => Number(c.close))}
-            />
-          )}
-        </div>
       </div>
-    </>
-  );
-};
-
-const DataRow = ({ value, label }: { value: string; label: string }) => {
-  return (
-    <div
-      className="text-ellipsis whitespace-nowrap overflow-hidden leading-tight"
-      data-testid="market-selector-data-row"
-    >
-      <span title={label} className="text-sm mr-1">
-        {value}
-      </span>
-      <span className="text-xs text-vega-light-300 dark:text-vega-light-300">
-        {label}
-      </span>
+      <div className="w-1/2 max-w-[120px]">
+        {market.candles ? (
+          <Sparkline
+            width={120}
+            height={20}
+            data={market.candles.filter(Boolean).map((c) => Number(c.close))}
+          />
+        ) : (
+          '-'
+        )}
+      </div>
     </div>
   );
 };

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

@@ -2,8 +2,8 @@ import classNames from 'classnames';
 
 // Make sure these match the available __typename properties on product
 export const Product = {
-  Future: 'Future',
   Spot: 'Spot',
+  Future: 'Future',
   Perpetual: 'Perpetual',
 } as const;
 
@@ -12,8 +12,8 @@ export type ProductType = keyof typeof Product;
 const ProductTypeMapping: {
   [key in ProductType]: string;
 } = {
-  [Product.Future]: 'Futures',
   [Product.Spot]: 'Spot',
+  [Product.Future]: 'Futures',
   [Product.Perpetual]: 'Perpetuals',
 };
 

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

@@ -247,7 +247,7 @@ const MainGrid = memo(
     const navigate = useNavigate();
     const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
-      id: 'middle-1',
+      id: 'middle',
     });
 
     return (
@@ -259,7 +259,27 @@ const MainGrid = memo(
             onChange={handleOnMiddleLayoutChange}
           >
             <ResizableGridPanel
-              preferredSize={sizesMiddle[0] || 330}
+              priority={LayoutPriority.High}
+              minSize={200}
+              preferredSize={sizesMiddle[0] || '50%'}
+            >
+              <TradeGridChild>
+                <Tabs storageKey="console-trade-grid-main-left">
+                  <Tab id="chart" name={t('Chart')}>
+                    <TradingViews.candles.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="depth" name={t('Depth')}>
+                    <TradingViews.depth.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="liquidity" name={t('Liquidity')}>
+                    <TradingViews.liquidity.component marketId={marketId} />
+                  </Tab>
+                </Tabs>
+              </TradeGridChild>
+            </ResizableGridPanel>
+            <ResizableGridPanel
+              priority={LayoutPriority.Low}
+              preferredSize={sizesMiddle[1] || 330}
               minSize={300}
             >
               <TradeGridChild>
@@ -277,25 +297,7 @@ const MainGrid = memo(
               </TradeGridChild>
             </ResizableGridPanel>
             <ResizableGridPanel
-              priority={LayoutPriority.High}
-              minSize={200}
-              preferredSize={sizesMiddle[1] || '50%'}
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-main-left">
-                  <Tab id="chart" name={t('Chart')}>
-                    <TradingViews.candles.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.depth.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.liquidity.component marketId={marketId} />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-            <ResizableGridPanel
+              priority={LayoutPriority.Low}
               preferredSize={sizesMiddle[2] || 430}
               minSize={200}
             >
@@ -339,31 +341,24 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
   return (
     <div className={wrapperClasses}>
       <div className="border-b border-r border-default">
-        <div className="h-full flex gap-2 justify-between items-end px-4 pt-1 pb-3">
+        <div className="flex gap-2 justify-between items-center px-4 py-2">
           <HeaderTitle
             primaryContent={market?.tradableInstrument.instrument.code}
             secondaryContent={market?.tradableInstrument.instrument.name}
           />
           <button
             onClick={() => setSidebarOpen((x) => !x)}
-            className="flex flex-col items-center text-xs w-12"
+            className="p-2"
             data-testid="sidebar-toggle"
           >
-            {sidebarOpen ? (
-              <>
-                <VegaIcon name={VegaIconNames.CHEVRON_UP} />
-                <span className="text-vega-light-300 dark:text-vega-dark-300">
-                  {t('Close')}
-                </span>
-              </>
-            ) : (
-              <>
-                <VegaIcon name={VegaIconNames.CHEVRON_DOWN} />
-                <span className="text-vega-light-300 dark:text-vega-dark-300">
-                  {t('Markets')}
-                </span>
-              </>
-            )}
+            <span
+              className={classNames('block', {
+                'rotate-90 translate-x-1': !sidebarOpen,
+                '-rotate-90 -translate-x-1': sidebarOpen,
+              })}
+            >
+              <VegaIcon name={VegaIconNames.CHEVRON_UP} />
+            </span>
           </button>
         </div>
       </div>

apps/trading/client-pages/market/use-market-selector-list.spec.tsx

@@ -315,47 +315,39 @@ describe('useMarketSelectorList', () => {
     ]);
   });
 
-  it('sorts by state and volume by default', () => {
+  it('sorts albphabetically', () => {
     const markets = [
       createMarketFragment({
         id: 'market-0',
-        state: MarketState.STATE_PENDING,
-        // @ts-ignore candles not on fragment
-        candles: [
-          {
-            volume: '200',
+        tradableInstrument: {
+          instrument: {
+            code: 'd',
           },
-        ],
+        },
       }),
       createMarketFragment({
         id: 'market-1',
-        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore candles not on fragment
-        candles: [
-          {
-            volume: '200',
+        tradableInstrument: {
+          instrument: {
+            code: 'b',
           },
-        ],
+        },
       }),
       createMarketFragment({
         id: 'market-2',
-        state: MarketState.STATE_ACTIVE,
-        // @ts-ignore candles not on fragment
-        candles: [
-          {
-            volume: '100',
+        tradableInstrument: {
+          instrument: {
+            code: 'a',
           },
-        ],
+        },
       }),
       createMarketFragment({
-        state: MarketState.STATE_PENDING,
         id: 'market-3',
-        // @ts-ignore candles not on fragment
-        candles: [
-          {
-            volume: '100',
+        tradableInstrument: {
+          instrument: {
+            code: 'c',
           },
-        ],
+        },
       }),
     ];
 
@@ -372,10 +364,10 @@ describe('useMarketSelectorList', () => {
       assets: [],
     });
     expect(result.current.markets).toEqual([
-      markets[1],
       markets[2],
-      markets[0],
+      markets[1],
       markets[3],
+      markets[0],
     ]);
   });
 

apps/trading/client-pages/market/use-market-selector-list.ts

@@ -1,18 +1,11 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import { calcCandleVolume, useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from './market-selector';
 import { Sort } from './sort-dropdown';
 
-// Used for sort order and filter
-const MARKET_TEMPLATE = [
-  MarketState.STATE_ACTIVE,
-  MarketState.STATE_SUSPENDED,
-  MarketState.STATE_PENDING,
-];
-
 export const useMarketSelectorList = ({
   product,
   assets,
@@ -53,19 +46,7 @@ export const useMarketSelectorList = ({
       });
 
     if (sort === Sort.None) {
-      // Sort by market state primarilly and AtoZ secondarilly
-      return orderBy(
-        markets,
-        [
-          (m) => MARKET_TEMPLATE.indexOf(m.state),
-          (m) => {
-            if (!m.candles?.length) return 0;
-            const vol = calcCandleVolume(m.candles);
-            return Number(vol || 0);
-          },
-        ],
-        ['asc', 'desc']
-      );
+      return orderBy(markets, ['tradableInstrument.instrument.code'], ['asc']);
     }
 
     if (sort === Sort.Gained || sort === Sort.Lost) {
@@ -97,5 +78,9 @@ export const useMarketSelectorList = ({
 };
 
 export const isMarketActive = (state: MarketState) => {
-  return MARKET_TEMPLATE.includes(state);
+  return [
+    MarketState.STATE_ACTIVE,
+    MarketState.STATE_SUSPENDED,
+    MarketState.STATE_PENDING,
+  ].includes(state);
 };

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

@@ -175,10 +175,6 @@ describe('Closed', () => {
         __typename: 'Market',
         id: marketId,
       },
-      party: {
-        __typename: 'Party',
-        id: pubKey,
-      },
     };
   };
   const position = createPosition();
@@ -186,14 +182,18 @@ describe('Closed', () => {
     request: {
       query: PositionsDocument,
       variables: {
-        partyIds: [pubKey],
+        partyId: pubKey,
       },
     },
     result: {
       data: {
-        positions: {
-          __typename: 'PositionConnection',
-          edges: [{ __typename: 'PositionEdge', node: position }],
+        party: {
+          __typename: 'Party',
+          id: pubKey,
+          positionsConnection: {
+            __typename: 'PositionConnection',
+            edges: [{ __typename: 'PositionEdge', node: position }],
+          },
         },
       },
     },

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

@@ -64,7 +64,7 @@ export const Closed = () => {
   });
   const { data: positionData } = usePositionsQuery({
     variables: {
-      partyIds: pubKey ? [pubKey] : [],
+      partyId: pubKey || '',
     },
     skip: !pubKey,
   });
@@ -72,9 +72,11 @@ export const Closed = () => {
   // find a position for each market and add the realised pnl to
   // a normalized object
   const rowData = compact(marketData).map((market) => {
-    const position = positionData?.positions?.edges?.find((edge) => {
-      return edge.node.market.id === market.id;
-    });
+    const position = positionData?.party?.positionsConnection?.edges?.find(
+      (edge) => {
+        return edge.node.market.id === market.id;
+      }
+    );
 
     const instrument = market.tradableInstrument.instrument;
 
@@ -313,7 +315,6 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
       getRowId={({ data }) => data.id}
       defaultColDef={{
         resizable: true,
-        minWidth: 100,
       }}
       overlayNoRowsTemplate="No data"
       storeKey="closedMarkets"

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

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

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

@@ -54,7 +54,6 @@ export const Portfolio = () => {
                     onMarketClick={onMarketClick}
                     noBottomPlaceholder
                     storeKey="portfolioPositions"
-                    allKeys
                   />
                 </VegaWalletContainer>
               </Tab>

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

@@ -89,9 +89,6 @@ const cacheConfig: InMemoryCacheConfig = {
     Party: {
       keyFields: false,
     },
-    Position: {
-      keyFields: ['market', ['id'], 'party', ['id']],
-    },
     Fees: {
       keyFields: false,
     },

apps/trading/components/banner/index.tsx

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

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

@@ -1,84 +0,0 @@
-import { useMemo, useState } from 'react';
-import { gt, prerelease } from 'semver';
-import {
-  ReleasesFeed,
-  useEnvironment,
-  useReleases,
-  Networks,
-} from '@vegaprotocol/environment';
-import { t } from '@vegaprotocol/i18n';
-import {
-  CopyWithTooltip,
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-
-// v0.20.12-core-0.71.4 -> v0.20.12
-// we need to strip the "core" suffix in order to determine whether a release
-// is a pre-release (candidate); example: v.0.21.0-beta.1-core-0.71.4
-const parseTagName = (tagName: string) => tagName.replace(/-core-[\d.]+$/i, '');
-
-type UpgradeBannerProps = {
-  showVersionChange: boolean;
-};
-export const UpgradeBanner = ({ showVersionChange }: UpgradeBannerProps) => {
-  const [visible, setVisible] = useState(true);
-  const { data } = useReleases(ReleasesFeed.FrontEnd);
-  const { APP_VERSION, VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
-
-  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
-
-  const newest = useMemo(() => {
-    if (!APP_VERSION || !data) return undefined;
-    const newer = data.filter((r) => gt(r.tagName, APP_VERSION));
-    const valid =
-      // filter pre-releases on mainnet
-      VEGA_ENV === Networks.MAINNET
-        ? newer?.filter((r) => !prerelease(parseTagName(r.tagName)))
-        : newer;
-    return valid.sort((a, b) => (gt(a.tagName, b.tagName) ? -1 : 1))[0];
-  }, [APP_VERSION, VEGA_ENV, data]);
-
-  if (!visible || !newest) {
-    return null;
-  }
-
-  return (
-    <NotificationBanner
-      intent={Intent.Warning}
-      onClose={() => {
-        setVisible(false);
-      }}
-    >
-      <div className="uppercase mb-1">
-        <ExternalLink href={CANONICAL_URL}>
-          {t('Upgrade to the latest version of Console')}
-        </ExternalLink>
-      </div>
-      <div data-testid="bookmark-message">
-        <a
-          className="underline"
-          href={newest.htmlUrl}
-          rel="noreferrer nofollow noopener"
-          target="_blank"
-        >
-          {t("View what's changed")}
-        </a>{' '}
-        {t(' or bookmark')}{' '}
-        <a className="underline" href={CANONICAL_URL}>
-          {t('console.vega.xyz')}
-        </a>{' '}
-        <CopyWithTooltip text={CANONICAL_URL}>
-          <button title={t('Copy %s', CANONICAL_URL)}>
-            <span className="sr-only">{t('Copy %s', CANONICAL_URL)}</span>
-            <VegaIcon size={14} name={VegaIconNames.COPY} />
-          </button>
-        </CopyWithTooltip>{' '}
-        {'to always see the latest version.'}
-      </div>
-    </NotificationBanner>
-  );
-};

apps/trading/components/constants.ts

@@ -1,5 +1,4 @@
 import { t } from '@vegaprotocol/i18n';
-
 export const THROTTLE_UPDATE_TIME = 500;
 export const RISK_ACCEPTED_KEY = 'vega_risk_accepted';
 export const MAINNET_WELCOME_HEADER = t(

apps/trading/components/footer/footer.spec.tsx

@@ -36,12 +36,11 @@ describe('NodeHealth', () => {
 describe('NodeUrl', () => {
   it('renders correct part of node url', () => {
     const node = 'https://api.n99.somenetwork.vega.xyz';
+    const expectedText = node.split('.').slice(1).join('.');
 
     render(<NodeUrl url={node} />);
 
-    expect(
-      screen.getByText('api.n99.somenetwork.vega.xyz')
-    ).toBeInTheDocument();
+    expect(screen.getByText(expectedText)).toBeInTheDocument();
   });
 });
 

apps/trading/components/footer/footer.tsx

@@ -65,8 +65,9 @@ interface NodeUrlProps {
 }
 
 export const NodeUrl = ({ url }: NodeUrlProps) => {
+  // get base url from api url, api sub domain
   const urlObj = new URL(url);
-  const nodeUrl = urlObj.hostname;
+  const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');
   return <span title={t('Connected node')}>{nodeUrl}</span>;
 };
 

apps/trading/components/header/header.tsx

@@ -73,10 +73,10 @@ export const HeaderTitle = ({
 }) => {
   return (
     <div className="text-left" data-testid="header-title">
-      <div className="text-sm md:text-md lg:text-lg whitespace-nowrap !leading-[1]">
+      <div className="text-sm md:text-md lg:text-lg whitespace-nowrap leading-4">
         {primaryContent}
       </div>
-      <div className="text-xs whitespace-nowrap text-vega-light-300 dark:text-vega-dark-300">
+      <div className="text-xs whitespace-nowrap text-neutral-500 dark:text-neutral-400">
         {secondaryContent}
       </div>
     </div>

apps/trading/components/icons/wallet.tsx

@@ -4,10 +4,15 @@ export const WalletIcon = ({ className }: { className?: string }) => {
       width="26"
       height="18"
       viewBox="0 0 26 18"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
       className={className}
       data-testid="wallet-icon"
     >
-      <path d="M4.77437 17.7499H4.74987C3.6504 17.7368 2.77439 16.8489 2.77439 15.7772V12.8495V12.6343L2.5615 12.6023C1.59672 12.4575 0.849609 11.6116 0.849609 10.6266V7.40064C0.849609 6.39018 1.59509 5.56985 2.56147 5.4249L2.77439 5.39297V5.17767V2.24998C2.77439 1.14102 3.66537 0.25 4.77437 0.25H23.7501C24.8591 0.25 25.7501 1.14098 25.7501 2.24998V15.7499C25.7501 16.8588 24.8591 17.7499 23.7501 17.7499H4.77437ZM4.44917 12.5992H4.19917L4.77441 16.075V16.325H4.77466H23.7502C24.0778 16.325 24.3254 16.0777 24.3254 15.7497V2.24984C24.3254 1.9222 24.0782 1.6746 23.7502 1.6746H4.77441C4.44677 1.6746 4.19917 1.92182 4.19917 2.24984V5.12306V5.37306H4.44917H7.0244C8.51139 5.37306 9.67508 6.56094 9.67508 8.02374V9.94852C9.67508 11.4355 8.4872 12.5992 7.0244 12.5992H4.44917ZM2.84963 6.8253C2.52199 6.8253 2.27439 7.07253 2.27439 7.40054V10.6264C2.27439 10.9541 2.52161 11.2017 2.84962 11.2017L7.02419 11.2019C7.73619 11.2019 8.25009 10.6515 8.25009 9.97598V8.0512C8.25009 7.3392 7.69976 6.8253 7.0242 6.8253H2.84963Z" />
+      <path
+        d="M4.77437 17.7499H4.74987C3.6504 17.7368 2.77439 16.8489 2.77439 15.7772V12.8495V12.6343L2.5615 12.6023C1.59672 12.4575 0.849609 11.6116 0.849609 10.6266V7.40064C0.849609 6.39018 1.59509 5.56985 2.56147 5.4249L2.77439 5.39297V5.17767V2.24998C2.77439 1.14102 3.66537 0.25 4.77437 0.25H23.7501C24.8591 0.25 25.7501 1.14098 25.7501 2.24998V15.7499C25.7501 16.8588 24.8591 17.7499 23.7501 17.7499H4.77437ZM4.44917 12.5992H4.19917L4.77441 16.075V16.325H4.77466H23.7502C24.0778 16.325 24.3254 16.0777 24.3254 15.7497V2.24984C24.3254 1.9222 24.0782 1.6746 23.7502 1.6746H4.77441C4.44677 1.6746 4.19917 1.92182 4.19917 2.24984V5.12306V5.37306H4.44917H7.0244C8.51139 5.37306 9.67508 6.56094 9.67508 8.02374V9.94852C9.67508 11.4355 8.4872 12.5992 7.0244 12.5992H4.44917ZM2.84963 6.8253C2.52199 6.8253 2.27439 7.07253 2.27439 7.40054V10.6264C2.27439 10.9541 2.52161 11.2017 2.84962 11.2017L7.02419 11.2019C7.73619 11.2019 8.25009 10.6515 8.25009 9.97598V8.0512C8.25009 7.3392 7.69976 6.8253 7.0242 6.8253H2.84963Z"
+        stroke="none"
+      />
     </svg>
   );
 };

apps/trading/components/market-mark-price/market-mark-price.tsx

@@ -26,7 +26,7 @@ export const MarketMarkPrice = ({
     {
       dataProvider: marketDataProvider,
       variables: { marketId: marketId || '' },
-      skip: !inView || !marketId,
+      skip: !inView,
     },
     THROTTLE_UPDATE_TIME
   );

apps/trading/components/navbar/navbar.tsx

@@ -16,11 +16,10 @@ import {
   NavigationItem,
   NavigationLink,
   ExternalLink,
+  Icon,
   NavigationBreakpoint,
   NavigationTrigger,
   NavigationContent,
-  VegaIconNames,
-  VegaIcon,
 } from '@vegaprotocol/ui-toolkit';
 
 import { Links, Routes } from '../../pages/client-router';
@@ -147,7 +146,7 @@ const NavExternalLink = ({
     <ExternalLink href={href}>
       <span className="flex items-center gap-2">
         <span>{children}</span>
-        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+        <Icon name="arrow-top-right" size={3} />
       </span>
     </ExternalLink>
   );

apps/trading/components/select-market/index.ts

@@ -0,0 +1,2 @@
+export * from './select-market-columns';
+export * from './select-market-table';

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

@@ -0,0 +1,344 @@
+import type { RefObject, MouseEvent } from 'react';
+import {
+  FeesCell,
+  calcCandleHigh,
+  calcCandleLow,
+  calcCandleVolume,
+  Last24hPriceChange,
+  Last24hVolume,
+} from '@vegaprotocol/markets';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { t } from '@vegaprotocol/i18n';
+import { PriceCell } from '@vegaprotocol/datagrid';
+import { Link as UILink, Sparkline, Tooltip } from '@vegaprotocol/ui-toolkit';
+import isNil from 'lodash/isNil';
+import type { CandleClose } from '@vegaprotocol/types';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import { Link } from 'react-router-dom';
+import { MarketMarkPrice } from '../market-mark-price';
+import { MarketTradingMode } from '../market-trading-mode';
+import { Links, Routes } from '../../pages/client-router';
+
+const ellipsisClasses = 'whitespace-nowrap overflow-hidden text-ellipsis';
+export const cellClassNames = `py-1 first:text-left text-right ${ellipsisClasses}`;
+
+const FeesInfo = () => {
+  return (
+    <Tooltip
+      description={
+        <span>
+          {t(
+            'Fees are paid by market takers on aggressive orders only. The fee displayed is made up of:'
+          )}
+          <ul className="list-disc ml-4">
+            <li>{t('An infrastructure fee')}</li>
+            <li>{t('A liquidity provision fee')}</li>
+            <li>{t('A maker fee')}</li>
+          </ul>
+        </span>
+      }
+    >
+      <span>{t('Taker fee')}</span>
+    </Tooltip>
+  );
+};
+
+export enum ColumnKind {
+  Market,
+  LastPrice,
+  Change24,
+  Asset,
+  ProductType,
+  Sparkline,
+  High24,
+  Low24,
+  TradingMode,
+  Volume,
+  Fee,
+  Position,
+  FullName,
+}
+
+export interface Column {
+  kind: ColumnKind;
+  value: string | React.ReactNode;
+  className: string;
+  onlyOnDetailed: boolean;
+  dataTestId?: string;
+}
+
+const headers: Column[] = [
+  {
+    kind: ColumnKind.Market,
+    value: t('Market'),
+    className: cellClassNames,
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.ProductType,
+    value: t('Type'),
+    className: 'py-2 text-left hidden sm:table-cell',
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.LastPrice,
+    value: t('Last price'),
+    className: cellClassNames,
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.Change24,
+    value: t('Change (24h)'),
+    className: cellClassNames,
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.Sparkline,
+    value: t(''),
+    className: `${cellClassNames} hidden lg:table-cell`,
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.Asset,
+    value: t('Settlement asset'),
+    className: `${cellClassNames} hidden sm:table-cell`,
+    onlyOnDetailed: false,
+  },
+  {
+    kind: ColumnKind.High24,
+    value: t('24h High'),
+    className: `${cellClassNames} hidden xl:table-cell`,
+    onlyOnDetailed: true,
+  },
+  {
+    kind: ColumnKind.Low24,
+    value: t('24h Low'),
+    className: `${cellClassNames} hidden xl:table-cell`,
+    onlyOnDetailed: true,
+  },
+  {
+    kind: ColumnKind.Volume,
+    value: t('24h Volume'),
+    className: `${cellClassNames} hidden lg:table-cell`,
+    onlyOnDetailed: true,
+  },
+  {
+    kind: ColumnKind.TradingMode,
+    value: t('Trading mode'),
+    className: `${cellClassNames} hidden lg:table-cell`,
+    onlyOnDetailed: true,
+  },
+  {
+    kind: ColumnKind.Fee,
+    value: <FeesInfo />,
+    className: `${cellClassNames} hidden xl:table-cell`,
+    onlyOnDetailed: true,
+  },
+];
+
+export const columnHeadersPositionMarkets: Column[] = [
+  ...headers,
+  {
+    kind: ColumnKind.Position,
+    value: t('Position'),
+    className: `${cellClassNames} hidden xxl:table-cell`,
+    onlyOnDetailed: true,
+  },
+];
+
+export const columnHeaders: Column[] = [
+  ...headers,
+  {
+    kind: ColumnKind.FullName,
+    value: t('Full name'),
+    className: `${cellClassNames} hidden xxl:block`,
+    onlyOnDetailed: true,
+  },
+];
+
+export type OnCellClickHandler = (
+  e: MouseEvent,
+  kind: ColumnKind,
+  value: string
+) => void;
+
+export const columns = (
+  market: MarketMaybeWithDataAndCandles,
+  onSelect: (id: string, metaKey?: boolean) => void,
+  onCellClick: OnCellClickHandler,
+  inViewRoot?: RefObject<HTMLElement>
+) => {
+  const candlesClose = market.candles
+    ?.map((candle) => candle?.close)
+    .filter((c: string | undefined): c is CandleClose => !isNil(c));
+  const candleLow = market.candles && calcCandleLow(market.candles);
+  const candleHigh = market.candles && calcCandleHigh(market.candles);
+  const candleVolume = market.candles && calcCandleVolume(market.candles);
+
+  const selectMarketColumns: Column[] = [
+    {
+      kind: ColumnKind.Market,
+      value: (
+        <Link
+          to={Links[Routes.MARKET](market.id)}
+          data-testid={`market-link-${market.id}`}
+          onClick={(e) => {
+            e.preventDefault();
+            e.stopPropagation();
+            onSelect(market.id, e.metaKey || e.ctrlKey);
+          }}
+        >
+          <UILink>{market.tradableInstrument.instrument.code}</UILink>
+        </Link>
+      ),
+      className: `${cellClassNames} max-w-[110px]`,
+      onlyOnDetailed: false,
+    },
+    {
+      kind: ColumnKind.ProductType,
+      value: market.tradableInstrument.instrument.product.__typename,
+      className: `py-2 text-left hidden sm:table-cell max-w-[50px] ${ellipsisClasses}`,
+      onlyOnDetailed: false,
+    },
+    {
+      kind: ColumnKind.LastPrice,
+      value: (
+        <MarketMarkPrice
+          marketId={market.id}
+          decimalPlaces={market?.decimalPlaces}
+          initialValue={market.data?.markPrice}
+          inViewRoot={inViewRoot}
+          asPriceCell
+        />
+      ),
+      className: `${cellClassNames} max-w-[100px]`,
+      onlyOnDetailed: false,
+    },
+    {
+      kind: ColumnKind.Change24,
+      value: (
+        <Last24hPriceChange
+          marketId={market.id}
+          decimalPlaces={market?.decimalPlaces}
+          inViewRoot={inViewRoot}
+          initialValue={candlesClose}
+        />
+      ),
+      className: `${cellClassNames} max-w-[150px]`,
+      onlyOnDetailed: false,
+    },
+    {
+      kind: ColumnKind.Sparkline,
+      value: market.candles && (
+        <Sparkline
+          width={100}
+          height={20}
+          muted={false}
+          data={candlesClose?.map((c: string) => Number(c)) || []}
+        />
+      ),
+      className: `${cellClassNames} hidden lg:table-cell max-w-[80px]`,
+      onlyOnDetailed: false && candlesClose,
+    },
+    {
+      kind: ColumnKind.Asset,
+      value: (
+        <button
+          data-dialog-trigger
+          className="inline underline"
+          onClick={(e) => {
+            e.stopPropagation();
+            onCellClick(
+              e,
+              ColumnKind.Asset,
+              market.tradableInstrument.instrument.product.settlementAsset.id
+            );
+          }}
+        >
+          {market.tradableInstrument.instrument.product.settlementAsset.symbol}
+        </button>
+      ),
+      dataTestId: 'settlement-asset',
+      className: `${cellClassNames} hidden sm:table-cell max-w-[100px]`,
+      onlyOnDetailed: false,
+    },
+    {
+      kind: ColumnKind.High24,
+      value: candleHigh ? (
+        <PriceCell
+          value={Number(candleHigh)}
+          valueFormatted={addDecimalsFormatNumber(
+            candleHigh.toString(),
+            market.decimalPlaces,
+            2
+          )}
+        />
+      ) : (
+        '-'
+      ),
+      className: `${cellClassNames} hidden xl:table-cell font-mono`,
+      onlyOnDetailed: true,
+    },
+    {
+      kind: ColumnKind.Low24,
+      value: candleLow ? (
+        <PriceCell
+          value={Number(candleLow)}
+          valueFormatted={addDecimalsFormatNumber(
+            candleLow.toString(),
+            market.decimalPlaces,
+            2
+          )}
+        />
+      ) : (
+        '-'
+      ),
+      className: `${cellClassNames} hidden xl:table-cell font-mono`,
+      onlyOnDetailed: true,
+    },
+    {
+      kind: ColumnKind.Volume,
+      value: (
+        <Last24hVolume
+          marketId={market.id}
+          positionDecimalPlaces={market.positionDecimalPlaces}
+          initialValue={candleVolume}
+          inViewRoot={inViewRoot}
+          formatDecimals={2}
+        />
+      ),
+      className: `${cellClassNames} hidden lg:table-cell font-mono`,
+      onlyOnDetailed: true,
+      dataTestId: 'market-volume',
+    },
+    {
+      kind: ColumnKind.TradingMode,
+      value: (
+        <MarketTradingMode
+          marketId={market?.id}
+          inViewRoot={inViewRoot}
+          initialTradingMode={market.tradingMode}
+          initialTrigger={market.data?.trigger}
+        />
+      ),
+      className: `${cellClassNames} hidden lg:table-cell`,
+      onlyOnDetailed: true,
+      dataTestId: 'trading-mode-col',
+    },
+    {
+      kind: ColumnKind.Fee,
+      value: <FeesCell feeFactors={market.fees.factors} />,
+      className: `${cellClassNames} hidden xl:table-cell font-mono`,
+      onlyOnDetailed: true,
+      dataTestId: 'taker-fee',
+    },
+    {
+      kind: ColumnKind.FullName,
+      value: market.tradableInstrument.instrument.name,
+      className: `${cellClassNames} hidden xxl:block`,
+      onlyOnDetailed: true,
+      dataTestId: 'market-name',
+    },
+  ];
+  return selectMarketColumns;
+};

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

@@ -0,0 +1,63 @@
+import { columnHeaders } from './select-market-columns';
+import classNames from 'classnames';
+import type { Column } from './select-market-columns';
+
+export const SelectMarketTableHeader = ({
+  detailed = false,
+  headers = columnHeaders,
+}) => {
+  return (
+    <tr className="sticky top-0 z-10 border-b border-default bg-inherit">
+      {headers.map(({ kind, value, className, onlyOnDetailed }) => {
+        const thClass = classNames(
+          'font-normal text-neutral-500 dark:text-neutral-400',
+          className
+        );
+
+        if (!onlyOnDetailed || detailed === onlyOnDetailed) {
+          return (
+            <th key={kind} className={thClass}>
+              {value}
+            </th>
+          );
+        }
+
+        return null;
+      })}
+    </tr>
+  );
+};
+
+export const SelectMarketTableRow = ({
+  detailed = false,
+  columns,
+  onSelect,
+  marketId,
+}: {
+  detailed?: boolean;
+  columns: Column[];
+  onSelect: (id: string, metaKey?: boolean) => void;
+  marketId: string;
+}) => {
+  return (
+    <tr
+      className={`hover:bg-neutral-200 dark:hover:bg-neutral-700 cursor-pointer relative h-[34px]`}
+      onClick={(ev) => {
+        onSelect(marketId, ev.metaKey || ev.ctrlKey);
+      }}
+      data-testid={`market-link-${marketId}`}
+    >
+      {columns.map(({ kind, value, className, dataTestId, onlyOnDetailed }) => {
+        if (!onlyOnDetailed || detailed === onlyOnDetailed) {
+          const tdClass = classNames(className);
+          return (
+            <td key={kind} data-testid={dataTestId} className={tdClass}>
+              {value}
+            </td>
+          );
+        }
+        return null;
+      })}
+    </tr>
+  );
+};

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

@@ -58,7 +58,7 @@ const MobileWalletButton = ({
     ? 'hidden'
     : isYellow
     ? 'fill-black'
-    : 'fill-white';
+    : 'fill-black dark:fill-white';
   const [container, setContainer] = useState<HTMLElement | null>(null);
 
   const walletButton = (