chore: add restrict import rules for utils and react helpers

chore: fix build-spec
chore: fix imports
2023-05-06 09:55:35 -07:00 · 2023-05-05 22:55:23 -07:00 · 2023-05-05 22:41:56 -07:00 · 2023-05-05 17:58:32 -07:00 · 2023-05-05 17:23:34 -07:00 · 2023-05-05 17:00:28 -07:00
673 changed files with 8492 additions and 15828 deletions
@@ -1,74 +0,0 @@
-name: After Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  after-release:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (ghcr)
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: resolve ipfs hashes for release
-        run: |
-          echo "Tag name: ${{ github.event.release.tag_name }}"
-          echo "Name: ${{ github.event.release.name }}"
-          echo "Description: ${{ github.event.release.body }}"
-          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
-            echo "Image not pushed yet, waiting 60 seconds"
-            sleep 60
-          done
-          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
-          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
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          echo IPFS_V0=$(cat ipfs-hash) >> $GITHUB_ENV
-          echo IPFS_V1=$(ipfs cid format -v 1 -b base32 $(cat ipfs-hash)) >> $GITHUB_ENV
-
-      - name: Edit Release
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          body: |
-            ---
-
-            # Deployments
-            * https://explorer.vega.xyz
-            * https://governance.vega.xyz
-
-            # IPFS releases
-            Tye IPFS hash of this release of the Trading app is:
-
-            CIDv0: ${{ env.IPFS_V0 }}
-            CIDv1: ${{ env.IPFS_V1 }}
-
-            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/).
-
-            Your settings are not remembered across different URLs.
-
-            IPFS gateways:
-
-            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
-            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
-            ipfs://${{ env.IPFS_V0 }}/
@@ -5,8 +5,6 @@ on:
    branches:
      - release/*
      - develop
-    tags:
-      - v*
  pull_request:
    types:
      - opened
@@ -99,13 +97,15 @@ jobs:
      - name: See affected apps
        run: |
          echo ">>>> debug"
+          echo "NX Version: $nx_version"
          echo "NX_BASE: ${{ env.NX_BASE }}"
          echo "NX_HEAD: ${{ env.NX_HEAD }}"
          echo ">>>> eof debug"

          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+          echo -n "Affected projects: $affected"

-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+          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"
@@ -33,4 +33,5 @@ jobs:
          config: baseUrl=${{ github.event.inputs.url }}
          env: grepTags=@live
        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 60
+    timeout-minutes: 40
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -66,7 +66,7 @@ jobs:
      ######

      - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --env.grepTags="${{ inputs.tags }}"
        working-directory: frontend-monorepo
        env:
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -98,4 +98,4 @@ jobs:
        if: ${{ failure() }}
        with:
          name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports
@@ -30,21 +30,13 @@ jobs:
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v2

-      - name: Log in to the Container registry (ghcr)
+      - name: Log in to the Container registry
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
-        with:
-          # registry: registry.hub.docker.com
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
      - name: Setup node
        uses: actions/setup-node@v3
        with:
@@ -62,26 +54,30 @@ jobs:
      - name: Define variables
        run: |
          envName=''
-          domain="vega.rocks"
+          dockerfile="dist.Dockerfile"
          if [[ "${{ github.event_name }}" = "push" ]]; then
+            domain="vega.rocks"
            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
+                domain="vega.community"
+                if [[ "${{ matrix.app }}" = "trading" ]]; then
+                  dockerfile="ipfs.Dockerfile"
+                fi
+              fi
            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
+          nodeVersion=$(cat .nvmrc | head -n 1)
          echo ENV_NAME=${envName} >> $GITHUB_ENV
+          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
+          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV

      - name: Build local dist
+        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
        run: |
          flags=""
          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
@@ -102,60 +98,62 @@ jobs:

      - name: Build and export to local Docker
        id: docker_build
+        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        uses: docker/build-push-action@v3
        with:
          context: .
-          file: docker/node-outside-docker.Dockerfile
+          file: ${{ env.DOCKERFILE }}
          load: true
          build-args: |
            APP=${{ matrix.app }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        run: echo ${{ steps.docker_build.outputs.digest }}

      - name: Sanity check docker image
+        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
        run: |
          echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
-          echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
+          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
+            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          fi

-      - name: Publish dist as docker image (ghcr)
+          echo "List html directory"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
+
+      - name: Copy dist to local filesystem
+        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
+        run: |
+          docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
+          docker cp dist:/usr/share/nginx/html dist
+
+          echo "check local dist files"
+          tree dist/html
+          mv dist/html dist-result
+
+      - name: Publish dist as docker image
        uses: docker/build-push-action@v3
-        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
+        if: ${{ github.event_name == 'pull_request' }}
        with:
          context: .
-          file: docker/node-outside-docker.Dockerfile
+          file: ${{ env.DOCKERFILE }}
          push: true
          build-args: |
            APP=${{ matrix.app }}
+            NODE_VERSION=${{ env.NODE_VERSION }}
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}

-      - name: Publish dist as docker image (docker hub)
-        uses: docker/build-push-action@v3
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
-            vegaprotocol/${{ matrix.app }}:mainnet
-
      # 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') }}
+        if: ${{ github.event_name == 'push' }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -171,52 +169,3 @@ jobs:
        with:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}
-
-      - name: Trigger fleek deployment
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        run: |
-          # display info about app
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-            https://api.fleek.co/graphql
-
-          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-            https://api.fleek.co/graphql
-
-      - 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') }}
-        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
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # 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=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}
@@ -1,77 +0,0 @@
-name: 'Rollback console'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version that should be set on rollback'
-        required: true
-        type: string
-
-jobs:
-  rollback:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Retag mainnet
-        run: |
-          docker pull vegaprotocol/trading:${{ inputs.version }}
-          docker tag vegaprotocol/trading:${{ inputs.version }} vegaprotocol/trading:mainnet
-          docker push vegaprotocol/trading:mainnet
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
-
-      - name: Trigger fleek deployment
-        run: |
-          # display info about app
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-            https://api.fleek.co/graphql
-
-          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-            https://api.fleek.co/graphql
-
-      - 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
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # 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=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}
@@ -2,7 +2,6 @@

 # compiled output
 /dist
-/dist-result
 /tmp
 /out-tsc
 /tools/executors/**/*.js
@@ -49,4 +48,4 @@ cypress.env.json
 .next

 #cypress
-/apps/**/cypress/reports/
+/apps/trading-e2e/cypress/reports/
@@ -1,20 +0,0 @@
-.PHONY: latest-release
-latest-release:
-	gh release list | head -n 1 | awk '{print $1}'
-
-.PHONY: show-latest-release
-show-latest-release:
-	gh release view `gh release list | head -n 1 | awk '{print $1}'`
-
-.PHONY: recalculate-ipfs
-recalculate-ipfs:
-	echo "ipfs hash inside the image"
-	docker run --rm ${TAG} cat /ipfs-hash
-	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -r /usr/share/nginx/html
-
-.PHONY: eject-ipfs-hash
-unpack:
-	docker create --name=dist ${TAG}
-	docker cp dist:/usr/share/nginx/html dist
-	docker rm dist
@@ -103,68 +103,25 @@ In CI linting, formatting and also run. These checks can be seen in the [CI work

 Visit the [Nx Documentation](https://nx.dev/getting-started/intro) to learn more.

-# 🐋 Hosting a console
+# Docker & Vegacapsule

-To host a console there are two possible build scenarios for running the frontends: nx performed **outside** or **inside** docker build. For specific build instructions follow [build instructions](#build-instructions).
+## Docker

-In order to run a container on port 3000:
+The [Dockerfile](./dockerfiles) for running the frontends is pretty basic, merely building the application with the APP arg that is passed in and serving the application from [nginx](./nginx/nginx.conf). The only complexity that exists is that there is a script which allows the passing of run time environment variables to the containers. See configuration below for how to do this.
+
+You can build any of the containers locally with the following command:
+
+```bash
+docker build --dockerfile dockerfiles/Dockerfile.cra . --build-arg APP=[YOUR APP] --tag=[TAG]
+```
+
+In order to run a container:

 ```bash
 docker run -p 3000:80 [TAG]
 ```

-## Build instructions
-
-The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of console either for the web, or ready for pinning on IPFS
-
-### nx build outside the docker
-
-Packaging prepared dist into [`nginx`](https://hub.docker.com/_/nginx)([server configuration](./nginx/nginx.conf)) docker image involves building the application on docker host machine from source.
-
-As a prerequisite you need to perform build of `dist` directory and move its content for specific application to `dist-result` directory. Use following script to do it with a single command:
-
-```bash
-./docker/prepare-dist.sh
-```
-
-You can build any of the containers locally with the following command:
-
-```bash
-docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
-```
-
-### nx build inside the docker
-
-Using multistage dockerfile dist is compiled using [node](https://hub.docker.com/_/node) image and later packed to nginx as in [dist build](#dist-build) example.
-
-```bash
-docker build --build-arg APP=[YOUR APP] --build-arg NODE_VERSION=$(cat .nvmrc) --build-arg ENV_NAME=mainnet -t [TAG] -f docker/node-inside-docker.Dockerfile .
-```
-
-### Computing ipfs-hash of the build
-
-At the moment this feature is important only for `trading` (console) releases.
-
-Each docker build finishes with hash calculation for dist directory. Resulting hash is added to file named as `/ipfs-hash`. Once docker image is produced you can run following commad to display ipfs-hash:
-
-```bash
-make recalculate-ipfs TAG=vegaprotocol/trading:{YOUR_VERSION}
-```
-
-**updating hash:** recompiling dist directory (even if there are no changed to source code) results in different hash computed by ipfs command.
-
-### Verifying ipfs-hash of existing current application version
-
-An IPFS CID will be attached to every [release](https://github.com/vegaprotocol/frontend-monorepo/releases). If you are intending to pin an application on IPFS, you can check that your build matches by running the following steps:
-
-1. Show latest release by runnning: `make latest-release`. You need to configure [`gh`](https://cli.github.com/) for this step to work, otherwise please provide release manually from [github](https://github.com/vegaprotocol/frontend-monorepo/releases) or [dockerhub](https://hub.docker.com/r/vegaprotocol/trading)
-2. Set RELEASE environment variable to value that you want to validate: `export RELEASE=$(make latest-release)` or `export RELEASE=vXX.XX.XX`
-3. Set TAG environment variable to image that you want to validate: `export TAG=vegaprotocol/trading:$RELEASE`
-4. Download docker image with the desired release `docker pull $TAG`.
-5. Recalculate hash: `make recalculate-ipfs`
-6. You should see exactly same hash produced by ipfs command as one placed with the release notes: `make show-latest-release`
-7. If you want to extract dist from docker image to your local filesystem you can run following command: `make unpack`
-8. Now `dist` directory contains valid application build. **it is not possible to calculate same ipfs hash on files that are result of copy operation**
+Images ending with `.dist` are to pack locally created transpiled HTML files into nginx container for non-compatible with yarn architectures like M1 Mac

 ## Config

@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
-NX_VEGA_URL=https://api.vega.community/graphql
+NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');

 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',

  e2e: {
    setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
      require('@cypress/grep/src/plugin')(config);
      return config;
    },
@@ -10,8 +10,6 @@
    "governance.proposal.updateMarket.minVoterBalance",
    "governance.proposal.updateNetParam.minProposerBalance",
    "governance.proposal.updateNetParam.minVoterBalance",
-    "governance.proposal.updateAsset.minProposerBalance",
-    "governance.proposal.updateAsset.minVoterBalance",
    "reward.staking.delegation.maxPayoutPerEpoch",
    "reward.staking.delegation.maxPayoutPerParticipant",
    "reward.staking.delegation.minimumValidatorStake",
@@ -21,6 +19,9 @@
    "validators.delegation.minAmount"
  ],
  "fiveDecimal": [
+    "governance.proposal.updateAsset.minProposerBalance",
+    "governance.proposal.updateAsset.minVoterBalance",
+    "governance.proposal.updateAsset.requiredParticipation",
    "market.fee.factors.infrastructureFee",
    "market.fee.factors.makerFee",
    "market.liquidity.bondPenaltyParameter",
@@ -76,7 +77,6 @@
    "governance.proposal.updateNetParam.requiredMajority",
    "governance.proposal.updateNetParam.requiredParticipation",
    "governance.proposal.updateMarket.minProposerEquityLikeShare",
-    "governance.proposal.updateAsset.requiredParticipation",
    "validators.vote.required"
  ],
  "duration": [
@@ -138,7 +138,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
      });
    });

-    it.skip('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
      cy.get_network_parameters().then((network_parameters) => {
        network_parameters = Object.entries(network_parameters);
        network_parameters.forEach((network_parameter) => {
@@ -15,6 +15,5 @@

 import '@vegaprotocol/cypress';
 import './common.functions.js';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();
@@ -4,17 +4,15 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.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

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/

 # App flags
 NX_EXPLORER_TXS_LIST=0
@@ -5,8 +5,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_EXPLORER_URL=/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,11 +1,9 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_TENDERMINT_URL=https://be.explorer.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz/websocket
 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_BLOCK_EXPLORER=https://be.vega.community/rest/
+NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 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_GOVERNANCE_URL=https://token.vega.xyz
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -1,2 +1 @@
-# .env is stagnet1, so there are no overrides required
-NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET3":"https://stagnet3.explorer.vega.xyz"}'
+# .env is stagnet1, so there are no overrides required
@@ -7,6 +7,5 @@ NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 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_GOVERNANCE_URL=https://token.fairground.wtf
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -11,4 +11,3 @@ 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_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
@@ -5,4 +5,3 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
@@ -1,18 +1,9 @@
-import {
-  AppFailure,
-  NetworkLoader,
-  NodeGuard,
-  NodeSwitcherDialog,
-  useEnvironment,
-  useInitializeEnv,
-  useNodeSwitcherStore,
-} from '@vegaprotocol/environment';
+import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 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';

 const splashLoading = (
  <Splash>
@@ -21,23 +12,10 @@ const splashLoading = (
 );

 function App() {
-  const { VEGA_URL } = useEnvironment();
-  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useNodeSwitcherStore(
-    (store) => [store.dialogOpen, store.setDialogOpen]
-  );
  return (
    <TendermintWebsocketProvider>
      <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <NodeGuard
-          skeleton={<div>{t('Loading')}</div>}
-          failure={<AppFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
-        >
-          <RouterProvider router={router} fallbackElement={splashLoading} />
-        </NodeGuard>
-        <NodeSwitcherDialog
-          open={nodeSwitcherOpen}
-          setOpen={setNodeSwitcherOpen}
-        />
+        <RouterProvider router={router} fallbackElement={splashLoading} />
      </NetworkLoader>
    </TendermintWebsocketProvider>
  );
@@ -6,7 +6,6 @@ export type AssetBalanceProps = {
  assetId: string;
  price: string;
  showAssetLink?: boolean;
-  showAssetSymbol?: boolean;
 };

 /**
@@ -17,21 +16,18 @@ const AssetBalance = ({
  assetId,
  price,
  showAssetLink = true,
-  showAssetSymbol = false,
 }: AssetBalanceProps) => {
-  const { data: asset, loading } = useAssetDataProvider(assetId);
+  const { data: asset } = useAssetDataProvider(assetId);

  const label =
-    !loading && asset && asset.decimals
+    asset && asset.decimals
      ? addDecimalsFormatNumber(price, asset.decimals)
      : price;

  return (
    <div className="inline-block">
      <span>{label}</span>{' '}
-      {showAssetLink && asset?.id ? (
-        <AssetLink showAssetSymbol={showAssetSymbol} assetId={assetId} />
-      ) : null}
+      {showAssetLink && asset?.id ? <AssetLink assetId={assetId} /> : null}
    </div>
  );
 };
@@ -13,17 +13,11 @@ const DEFAULT_DECIMALS = 18;
 * the governance asset first, which is set by a network parameter
 */
 const GovernanceAssetBalance = ({ price }: GovernanceAssetBalanceProps) => {
-  const { data, loading } = useExplorerGovernanceAssetQuery();
+  const { data } = useExplorerGovernanceAssetQuery();

-  if (!loading && data && data.networkParameter?.value) {
+  if (data && data.networkParameter?.value) {
    const governanceAssetId = data.networkParameter.value;
-    return (
-      <AssetBalance
-        price={price}
-        showAssetSymbol={true}
-        assetId={governanceAssetId}
-      />
-    );
+    return <AssetBalance price={price} assetId={governanceAssetId} />;
  } else {
    return (
      <div className="inline-block">
@@ -1,19 +1,13 @@
-import {
-  useEnvironment,
-  useNodeSwitcherStore,
-} from '@vegaprotocol/environment';
+import { NodeSwitcherDialog, useEnvironment } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { ENV } from '../../config/env';

 export const Footer = () => {
  const { VEGA_URL, GIT_COMMIT_HASH, GIT_ORIGIN_URL } = useEnvironment();
-  const setNodeSwitcherOpen = useNodeSwitcherStore(
-    (store) => store.setDialogOpen
-  );
-
+  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
@@ -21,42 +15,46 @@ export const Footer = () => {
  );

  return (
-    <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">
-            <p data-testid="git-commit-hash">
-              {t('Version')}:{' '}
-              <Link
-                href={
-                  GIT_ORIGIN_URL
-                    ? `${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`
-                    : undefined
-                }
-                target={GIT_ORIGIN_URL ? '_blank' : undefined}
-              >
-                {GIT_COMMIT_HASH}
-              </Link>
-            </p>
+    <>
+      <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">
+              <p data-testid="git-commit-hash">
+                {t('Version')}:{' '}
+                <Link
+                  href={
+                    GIT_ORIGIN_URL
+                      ? `${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`
+                      : undefined
+                  }
+                  target={GIT_ORIGIN_URL ? '_blank' : undefined}
+                >
+                  {GIT_COMMIT_HASH}
+                </Link>
+              </p>
+            </div>
+          )}
+
+          <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
+            {VEGA_URL && <NodeUrl url={VEGA_URL} />}
+            <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
+              {t('Change')}
+            </Link>
          </div>
-        )}

-        <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
-          {VEGA_URL && <NodeUrl url={VEGA_URL} />}
-          <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
-            {t('Change')}
-          </Link>
-        </div>
-
-        {ENV.addresses.feedback ? (
          <div className="flex pl-2 content-center">
            <ExternalLink href={ENV.addresses.feedback}>
              {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
            </ExternalLink>
          </div>
-        ) : null}
-      </div>
-    </footer>
+        </div>
+      </footer>
+      <NodeSwitcherDialog
+        open={nodeSwitcherOpen}
+        setOpen={setNodeSwitcherOpen}
+      />
+    </>
  );
 };

@@ -64,5 +62,9 @@ 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, '');
-  return <span className="cursor-default">{nodeUrl}</span>;
+  return (
+    <Link href={'https://' + nodeUrl} target="_blank">
+      {nodeUrl}
+    </Link>
+  );
 };
@@ -3,7 +3,6 @@ import { Header } from './header';
 import { MemoryRouter } from 'react-router-dom';

 jest.mock('@vegaprotocol/environment', () => ({
-  ...jest.requireActual('@vegaprotocol/environment'),
  NetworkSwitcher: () => (
    <div data-testid="network-switcher">NetworkSwitcher</div>
  ),
@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  LiquidityInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
  InstrumentInfoPanel,
  KeyDetailsInfoPanel,
  LiquidityPriceRangeInfoPanel,
@@ -12,18 +12,20 @@ import {
  RiskModelInfoPanel,
  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import { MarketInfoTable } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;

-  const settlementData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
-  const terminationData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  const terminationData =
+    market.tradableInstrument.instrument.product
+      .dataSourceSpecForTradingTermination.data;

  const getSigners = (data: DataSourceDefinition) => {
    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
@@ -20,7 +20,7 @@ export const PageHeader = ({
  copy = false,
  className,
 }: PageHeaderProps) => {
-  const titleClasses = 'text-xl uppercase font-alpha calt';
+  const titleClasses = 'text-4xl xl:text-5xl uppercase font-alpha calt';
  return (
    <header className={className}>
      <span className={`${titleClasses} block`}>{prefix}</span>
@@ -1,5 +1,3 @@
-import { Icon } from '@vegaprotocol/ui-toolkit';
-
 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
  [51, 'Transaction failed validation'],
@@ -30,11 +28,7 @@ export const ChainResponseCode = ({
 }: ChainResponseCodeProps) => {
  const isSuccess = successCodes.has(code);

-  const icon = isSuccess ? (
-    <Icon name="tick-circle" className="fill-vega-green-550" />
-  ) : (
-    <Icon name="cross" className="fill-vega-pink-550" />
-  );
+  const icon = isSuccess ? '✅' : '❌';
  const label = ErrorCodes.get(code) || 'Unknown response code';

  // Hack for batches with many errors - see https://github.com/vegaprotocol/vega/issues/7245
@@ -42,7 +36,7 @@ export const ChainResponseCode = ({
    error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;

  return (
-    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
+    <div title={`Response code: ${code} - ${label}`} className="inline-block">
      <span
        className="mr-2"
        aria-label={isSuccess ? 'Success' : 'Warning'}
@@ -30,7 +30,7 @@ export const BundleExists = ({
  // Note if this is wrong, the wrong decoder will be used which will give incorrect data

  return (
-    <div className="w-auto h-10 max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
+    <div className="w-auto max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
      <IconForBundleStatus status={status} />
      <h1 className="text-xl pb-1">
        {status === 'STATUS_ENABLED'
@@ -4,7 +4,6 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import ProposalLink from '../../links/proposal-link/proposal-link';
-import { VoteIcon } from '../../vote-icon/vote-icon';

 interface TxProposalVoteProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -31,22 +30,27 @@ export const TxProposalVote = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

-  const vote = txData.command.voteSubmission.value === 'VALUE_YES';
-
+  const vote = txData.command.voteSubmission.value ? '👍' : '👎';
  return (
    <TableWithTbody className="mb-8" allowWrap={true}>
      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
+      <TableRow modifier="bordered">
+        <TableCell>{t('Proposal ID')}</TableCell>
+        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
+      </TableRow>
      <TableRow modifier="bordered">
        <TableCell>{t('Proposal details')}</TableCell>
        <TableCell>
          <ProposalLink id={txData.command.voteSubmission.proposalId} />
        </TableCell>
      </TableRow>
+      <TableRow modifier="bordered">
+        <TableCell>{t('Proposal')}</TableCell>
+        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
+      </TableRow>
      <TableRow modifier="bordered">
        <TableCell>{t('Vote')}</TableCell>
-        <TableCell>
-          <VoteIcon vote={vote} />
-        </TableCell>
+        <TableCell>{vote}</TableCell>
      </TableRow>
    </TableWithTbody>
  );
@@ -1,56 +0,0 @@
-import type { Proposal } from './tx-proposal';
-import { proposalRequiresSignatureBundle } from './tx-proposal';
-
-describe('proposalRequiresSignatureBundle', () => {
-  it('should return false for freeform proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newFreeform: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return false for newMarket proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newMarket: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return true for newAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return true for updateAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        updateAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return false when bad data is supplied', () => {
-    expect(
-      proposalRequiresSignatureBundle(false as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle(undefined as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle({ test: false } as unknown as Proposal)
-    ).toEqual(false);
-  });
-});
@@ -28,16 +28,11 @@ interface TxProposalProps {
 * @returns boolean True if a signature bundle is required. Used to fetch a signature bundle
 */
 export function proposalRequiresSignatureBundle(proposal?: Proposal): boolean {
-  const proposalsThatRequireBundles = ['newAsset', 'updateAsset'];
-
  if (!proposal?.terms) {
    return false;
  }
-
-  return (
-    proposalsThatRequireBundles.filter((requiredIfExists) =>
-      has(proposal.terms, requiredIfExists)
-    ).length > 0
+  return !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
+    has(proposal.terms, requiredIfExists)
  );
 }

@@ -86,7 +81,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {

  const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;

-  // This component is not rendered if no bundle is required
  const SignatureBundleComponent = proposal.terms?.newAsset
    ? ProposalSignatureBundleNewAsset
    : ProposalSignatureBundleUpdateAsset;
@@ -1,3 +1,4 @@
+export { TxList } from './tx-list';
 export { TxOrderType } from './tx-order-type';
 export { TxsInfiniteList } from './txs-infinite-list';
 export { TxsInfiniteListItem } from './txs-infinite-list-item';
@@ -0,0 +1,14 @@
+import { t } from '@vegaprotocol/i18n';
+import type { TendermintUnconfirmedTransactionsResponse } from '../../routes/txs/tendermint-unconfirmed-transactions-response.d';
+
+interface TxsProps {
+  data: TendermintUnconfirmedTransactionsResponse | undefined;
+}
+
+export const TxList = ({ data }: TxsProps) => {
+  if (!data) {
+    return <div>{t('Awaiting transactions')}</div>;
+  }
+
+  return <div>{JSON.stringify(data, null, '  ')}</div>;
+};
@@ -1,6 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
-import { VoteIcon } from '../vote-icon/vote-icon';

 interface TxOrderTypeProps {
  orderType: string;
@@ -138,15 +137,12 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
  let type = displayString[orderType] || orderType;

  let colours =
-    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250';
+    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-150';

  // This will get unwieldy and should probably produce a different colour of tag
  if (type === 'Chain Event' && !!command?.chainEvent) {
    type = getLabelForChainEvent(command.chainEvent);
    colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
-  } else if (type === 'Validator Heartbeat') {
-    colours =
-      'text-white dark-text-white bg-vega-light-200 dark:bg-vega-dark-100';
  } else if (type === 'Proposal' || type === 'Governance Proposal') {
    if (command && !!command.proposalSubmission) {
      type = getLabelForProposal(command.proposalSubmission);
@@ -154,16 +150,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
    colours = 'text-black bg-vega-yellow';
  }

-  if (type === 'Vote on Proposal') {
-    return (
-      <VoteIcon
-        vote={command?.voteSubmission?.value === 'VALUE_YES'}
-        yesText="Proposal vote"
-        noText="Proposal vote"
-      />
-    );
-  }
-
  if (type === 'Vote on Proposal' || type === 'Vote Submission') {
    colours = 'text-black bg-vega-yellow';
  }
@@ -98,6 +98,6 @@ describe('Txs infinite list item', () => {
    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
    expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success');
+    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success: ✅');
  });
 });
@@ -7,7 +7,7 @@ import { toHex } from '../search/detect-search';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import isNumber from 'lodash/isNumber';

-const TRUNCATE_LENGTH = 10;
+const TRUNCATE_LENGTH = 5;

 export const TxsInfiniteListItem = ({
  hash,
@@ -31,13 +31,13 @@ export const TxsInfiniteListItem = ({
  return (
    <div
      data-testid="transaction-row"
-      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10"
+      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10 py-2"
    >
      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
+        className="text-sm col-span-10 xl:col-span-3 leading-none"
        data-testid="tx-hash"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          ID:&nbsp;
        </span>
        <TruncatedLink
@@ -48,10 +48,10 @@ export const TxsInfiniteListItem = ({
        />
      </div>
      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
+        className="text-sm col-span-10 xl:col-span-3 leading-none"
        data-testid="pub-key"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          By:&nbsp;
        </span>
        <TruncatedLink
@@ -61,14 +61,14 @@ export const TxsInfiniteListItem = ({
          endChars={TRUNCATE_LENGTH}
        />
      </div>
-      <div className="text-sm col-span-5 md:col-span-2 leading-none	flex items-center">
+      <div className="text-sm col-span-5 xl:col-span-2 leading-none	flex items-center">
        <TxOrderType orderType={type} command={command} />
      </div>
      <div
-        className="text-sm col-span-3 md:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-3 xl:col-span-1 leading-none flex items-center"
        data-testid="tx-block"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
+        <span className="xl:hidden uppercase text-vega-dark-300">
          Block:&nbsp;
        </span>
        <TruncatedLink
@@ -79,11 +79,11 @@ export const TxsInfiniteListItem = ({
        />
      </div>
      <div
-        className="text-sm col-span-2 md:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-2 xl:col-span-1 leading-none flex items-center"
        data-testid="tx-success"
      >
-        <span className="md:hidden uppercase text-vega-dark-300">
-          Success&nbsp;
+        <span className="xl:hidden uppercase text-vega-dark-300">
+          Success:&nbsp;
        </span>
        {isNumber(code) ? (
          <ChainResponseCode code={code} hideLabel={true} />
@@ -64,7 +64,9 @@ describe('Txs infinite list', () => {
        error={Error('test error!')}
      />
    );
-    expect(screen.getByText('Cannot fetch transaction')).toBeInTheDocument();
+    expect(
+      screen.getByText('Cannot fetch transaction: Error: test error!')
+    ).toBeInTheDocument();
  });

  it('item renders data of n length into list of n length', () => {
@@ -30,7 +30,7 @@ const NOOP = () => {};
 const Item = ({ index, style, isLoading, error }: ItemProps) => {
  let content;
  if (error) {
-    content = t(`Cannot fetch transaction`);
+    content = t(`Cannot fetch transaction: ${error}`);
  } else if (isLoading) {
    content = <Loader />;
  } else {
@@ -68,7 +68,7 @@ export const TxsInfiniteList = ({
  className,
 }: TxsInfiniteListProps) => {
  const { screenSize } = useScreenDimensions();
-  const isStacked = ['xs', 'sm'].includes(screenSize);
+  const isStacked = ['xs', 'sm', 'md', 'lg'].includes(screenSize);

  if (!txs) {
    if (!areTxsLoading) {
@@ -95,15 +95,15 @@ export const TxsInfiniteList = ({

  return (
    <div className={className} data-testid="transactions-list">
-      <div className="lg:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
+      <div className="xl:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
        <div className="col-span-3">
-          <span className="hidden xl:inline">{t('Transaction')} &nbsp;</span>
+          <span className="hidden xl:inline">Transaction &nbsp;</span>
          <span>ID</span>
        </div>
-        <div className="col-span-3">{t('Submitted By')}</div>
-        <div className="col-span-2">{t('Type')}</div>
-        <div className="col-span-1">{t('Block')}</div>
-        <div className="col-span-1">{t('Success')}</div>
+        <div className="col-span-3">Submitted By</div>
+        <div className="col-span-2">Type</div>
+        <div className="col-span-1">Block</div>
+        <div className="col-span-1">Success</div>
      </div>
      <div data-testid="infinite-scroll-wrapper">
        <InfiniteLoader
@@ -1,4 +1,5 @@
 import { Routes } from '../../routes/route-names';
+import { RenderFetched } from '../render-fetched';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { TxOrderType } from './tx-order-type';
 import { Table, TableRow, TableCell } from '../table';
@@ -8,7 +9,7 @@ import type { BlockExplorerTransactions } from '../../routes/types/block-explore
 import isNumber from 'lodash/isNumber';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import { getTxsDataUrl } from '../../hooks/use-txs-data';
-import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
+import { Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';

 interface TxsPerBlockProps {
@@ -26,7 +27,7 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  } = useFetch<BlockExplorerTransactions>(url);

  return (
-    <AsyncRenderer data={data} error={error} loading={!!loading}>
+    <RenderFetched error={error} loading={loading} className="text-body-large">
      {data && data.transactions.length > 0 ? (
        <div className="overflow-x-auto whitespace-nowrap mb-28">
          <Table>
@@ -94,6 +95,6 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
          label={t('0 transactions')}
        />
      )}
-    </AsyncRenderer>
+    </RenderFetched>
  );
 };
@@ -1,37 +0,0 @@
-import { render } from '@testing-library/react';
-import { VoteIcon } from './vote-icon';
-
-describe('Vote TX icon', () => {
-  it('should use the text For by default for yes votes', () => {
-    const yes = render(<VoteIcon vote={true} />);
-    expect(yes.getByTestId('label')).toHaveTextContent('For');
-  });
-
-  it('should use the yesText for yes votes if specified', () => {
-    const yes = render(<VoteIcon vote={true} yesText="Test" />);
-    expect(yes.getByTestId('label')).toHaveTextContent('Test');
-  });
-
-  it('should display the tick icon for yes votes', () => {
-    const no = render(<VoteIcon vote={true} />);
-    expect(no.getByRole('img')).toHaveAttribute(
-      'aria-label',
-      'tick-circle icon'
-    );
-  });
-
-  it('should use the text Against by default for no votes', () => {
-    const no = render(<VoteIcon vote={false} />);
-    expect(no.getByTestId('label')).toHaveTextContent('Against');
-  });
-
-  it('should use the noText for no votes if specified', () => {
-    const no = render(<VoteIcon vote={false} noText="Test" />);
-    expect(no.getByTestId('label')).toHaveTextContent('Test');
-  });
-
-  it('should display the delete icon for no votes', () => {
-    const no = render(<VoteIcon vote={false} />);
-    expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
-  });
-});
@@ -1,40 +0,0 @@
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@vegaprotocol/ui-toolkit';
-
-export interface VoteIconProps {
-  // True is a yes vote, false is undefined or no vorte
-  vote: boolean;
-  // Defaults to 'For', but can be any text
-  yesText?: string;
-  // Defaults to 'Against', but can be any text
-  noText?: string;
-}
-
-/**
- * Displays a lozenge with an icon representing the way a user voted for a proposal.
- * The yes and no text can be overridden
- *
- * @returns
- */
-export function VoteIcon({
-  vote,
-  yesText = 'For',
-  noText = 'Against',
-}: VoteIconProps) {
-  const label = vote ? yesText : noText;
-  const bg = vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
-  const icon: IconName = vote ? 'tick-circle' : 'delete';
-  const fill = vote ? 'vega-green-300' : 'vega-pink-300';
-  const text = vote ? 'vega-green-200' : 'vega-pink-200';
-
-  return (
-    <div
-      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
-    >
-      <Icon name={icon} size={3} className={`mr-2 p-0 fill-${fill}`} />
-      <span className={`text-base text-${text}`} data-testid="label">
-        {label}
-      </span>
-    </div>
-  );
-}
@@ -144,12 +144,12 @@ afterEach(() => {
 describe('Block', () => {
  it('renders error state if error is present', async () => {
    (useFetch as jest.Mock).mockReturnValue({
-      state: { data: null, loading: false, error: new Error('asd') },
+      state: { data: null, loading: false, error: 'asd' },
    });
    render(renderComponent());

    expect(screen.getByText(`BLOCK ${blockId}`)).toBeInTheDocument();
-    expect(screen.getByText('Something went wrong: asd')).toBeInTheDocument();
+    expect(screen.getByText('Error retrieving data')).toBeInTheDocument();
  });

  it('renders loading state if present', async () => {
@@ -1,3 +1,4 @@
+import React from 'react';
 import { Link, useParams } from 'react-router-dom';
 import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
@@ -11,8 +12,9 @@ import {
  TableCell,
 } from '../../../components/table';
 import { TxsPerBlock } from '../../../components/txs/txs-per-block';
-import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
+import { RenderFetched } from '../../../components/render-fetched';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { NodeLink } from '../../../components/links';
@@ -32,7 +34,7 @@ const Block = () => {
  return (
    <section>
      <RouteTitle data-testid="block-header">{t(`BLOCK ${block}`)}</RouteTitle>
-      <AsyncRenderer data={blockData} error={error} loading={!!loading}>
+      <RenderFetched error={error} loading={loading}>
        <>
          <div className="grid grid-cols-2 gap-2 mb-8">
            <Link
@@ -121,7 +123,7 @@ const Block = () => {
            </>
          )}
        </>
-      </AsyncRenderer>
+      </RenderFetched>
    </section>
  );
 };
@@ -1,7 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { RouteTitle } from '../../components/route-title';
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { DATA_SOURCES } from '../../config';
 import type { TendermintGenesisResponse } from './tendermint-genesis-response';
 import { useDocumentTitle } from '../../hooks/use-document-title';
@@ -10,26 +10,21 @@ const Genesis = () => {
  useDocumentTitle(['Genesis']);

  const {
-    state: { data, loading, error },
+    state: { data: genesis, loading },
  } = useFetch<TendermintGenesisResponse>(
    `${DATA_SOURCES.tendermintUrl}/genesis`
  );
-
+  if (!genesis?.result.genesis) {
+    if (loading) {
+      return <Loader />;
+    }
+    return null;
+  }
  return (
-    <>
+    <section>
      <RouteTitle data-testid="genesis-header">{t('Genesis')}</RouteTitle>
-      <AsyncRenderer
-        data={data}
-        error={error}
-        loading={!!loading}
-        loadingMessage={t('Loading genesis information...')}
-        errorMessage={t('Could not fetch genesis data')}
-      >
-        <section>
-          <SyntaxHighlighter data={data?.result.genesis} />
-        </section>
-      </AsyncRenderer>
-    </>
+      <SyntaxHighlighter data={genesis?.result.genesis} />
+    </section>
  );
 };

@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -49,7 +49,6 @@ export const MarketPage = () => {
        />
        <AsyncRenderer
          noDataMessage={t('This chain has no markets')}
-          errorMessage={t('Could not fetch market') + ' ' + marketId}
          data={data}
          loading={loading}
          error={error}
@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
@@ -21,7 +21,6 @@ import { useDocumentTitle } from '../../hooks/use-document-title';
 const PERCENTAGE_PARAMS = [
  'governance.proposal.asset.requiredMajority',
  'governance.proposal.asset.requiredParticipation',
-  'governance.proposal.updateAsset.requiredParticipation',
  'governance.proposal.freeform.requiredMajority',
  'governance.proposal.freeform.requiredParticipation',
  'governance.proposal.market.requiredMajority',
@@ -54,8 +53,6 @@ const BIG_NUMBER_PARAMS = [
  'governance.proposal.asset.minProposerBalance',
  'governance.proposal.market.minProposerBalance',
  'governance.proposal.market.minVoterBalance',
-  'governance.proposal.updateAsset.minProposerBalance',
-  'governance.proposal.updateAsset.minVoterBalance',
 ];

 export const NetworkParameterRow = ({
@@ -1,4 +1,4 @@
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { RouteTitle } from '../../../components/route-title';
 import { t } from '@vegaprotocol/i18n';
 import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles';
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';

 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery();
+  const { data, loading } = useExplorerOracleSpecsQuery();

  useDocumentTitle(['Oracles']);
  useScrollToLocation();
@@ -16,40 +16,28 @@ const Oracles = () => {
  return (
    <section>
      <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
-      <AsyncRenderer
-        data={data}
-        loading={loading}
-        error={error}
-        loadingMessage={t('Loading oracle data...')}
-        errorMessage={t('Oracle data could not be loaded')}
-        noDataMessage={t('No oracles found')}
-        noDataCondition={(data) =>
-          !data?.oracleSpecsConnection?.edges ||
-          data.oracleSpecsConnection.edges?.length === 0
-        }
-      >
-        {data?.oracleSpecsConnection?.edges
-          ? data.oracleSpecsConnection.edges.map((o) => {
-              const id = o?.node.dataSourceSpec.spec.id;
-              if (!id) {
-                return null;
-              }
-              return (
-                <div id={id} key={id} className="mb-10">
-                  <OracleDetails
-                    id={id}
-                    dataSource={o?.node}
-                    showBroadcasts={false}
-                  />
-                  <details>
-                    <summary className="pointer">JSON</summary>
-                    <SyntaxHighlighter data={filter(o, ['__typename'])} />
-                  </details>
-                </div>
-              );
-            })
-          : null}
-      </AsyncRenderer>
+      {loading ? <Loader /> : null}
+      {data?.oracleSpecsConnection?.edges
+        ? data.oracleSpecsConnection.edges.map((o) => {
+            const id = o?.node.dataSourceSpec.spec.id;
+            if (!id) {
+              return null;
+            }
+            return (
+              <div id={id} key={id} className="mb-10">
+                <OracleDetails
+                  id={id}
+                  dataSource={o?.node}
+                  showBroadcasts={false}
+                />
+                <details>
+                  <summary className="pointer">JSON</summary>
+                  <SyntaxHighlighter data={filter(o, ['__typename'])} />
+                </details>
+              </div>
+            );
+          })
+        : null}
    </section>
  );
 };
@@ -1,11 +1,12 @@
 import { RouteTitle } from '../../../components/route-title';
+import { RenderFetched } from '../../../components/render-fetched';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import { useParams } from 'react-router-dom';
 import { useExplorerOracleSpecByIdQuery } from '../__generated__/Oracles';
 import { OracleDetails } from '../components/oracle';
-import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import filter from 'recursive-key-filter';
 import { TruncateInline } from '../../../components/truncate/truncate';

@@ -26,14 +27,7 @@ export const Oracle = () => {
        {t(`Oracle `)}
        <TruncateInline startChars={5} endChars={5} text={id || '1'} />
      </RouteTitle>
-      <AsyncRenderer
-        data={data}
-        error={error}
-        loading={loading}
-        noDataCondition={(data) => !data?.oracleSpec}
-        errorMessage={t('Could not load oracle data')}
-        loadingMessage={t('Loading oracle data...')}
-      >
+      <RenderFetched error={error} loading={loading}>
        {data?.oracleSpec ? (
          <div id={id} key={id} className="mb-10">
            <OracleDetails
@@ -50,7 +44,7 @@ export const Oracle = () => {
        ) : (
          <span></span>
        )}
-      </AsyncRenderer>
+      </RenderFetched>
    </section>
  );
 };
@@ -48,13 +48,6 @@ query ExplorerPartyAssets($partyId: ID!) {
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: { first: 100 }) {
-            edges {
-              node {
-                amount
-              }
-            }
-          }
        }
        accountsConnection {
          edges {
@@ -10,7 +10,7 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 }>;


-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };

 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
    fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,13 +64,6 @@ export const ExplorerPartyAssetsDocument = gql`
        }
        stakingSummary {
          currentStakeAvailable
-          linkings(pagination: {first: 100}) {
-            edges {
-              node {
-                amount
-              }
-            }
-          }
        }
        accountsConnection {
          edges {
@@ -1,24 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useParams } from 'react-router-dom';
-import { toNonHex } from '../../../../components/search/detect-search';
-import { PageHeader } from '../../../../components/page-header';
-import { useDocumentTitle } from '../../../../hooks/use-document-title';
-
-import { PartyAccounts } from '../components/party-accounts';
-
-const PartyAccountsByAsset = () => {
-  const { party } = useParams<{ party: string }>();
-
-  useDocumentTitle(['Public keys', party || '-']);
-  const partyId = toNonHex(party ? party : '');
-
-  return (
-    <section>
-      <PageHeader title={t('Balances by asset')} />
-
-      <PartyAccounts partyId={partyId} />
-    </section>
-  );
-};
-
-export { PartyAccountsByAsset };
@@ -1,9 +1,32 @@
-import { AccountManager } from '@vegaprotocol/accounts';
-import { useCallback } from 'react';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import { t } from '@vegaprotocol/i18n';
+import get from 'lodash/get';
+import AssetBalance from '../../../../components/asset-balance/asset-balance';
+import { AssetLink, MarketLink } from '../../../../components/links';
+import { Table, TableRow } from '../../../../components/table';
+import type * as Schema from '@vegaprotocol/types';
+import type { ExplorerPartyAssetsAccountsFragment } from '../__generated__/Party-assets';
+
+const accountTypeString: Record<Schema.AccountType, string> = {
+  ACCOUNT_TYPE_BOND: t('Bond'),
+  ACCOUNT_TYPE_EXTERNAL: t('External'),
+  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: t('Fees (Infrastructure)'),
+  ACCOUNT_TYPE_FEES_LIQUIDITY: t('Fees (Liquidity)'),
+  ACCOUNT_TYPE_FEES_MAKER: t('Fees (Maker)'),
+  ACCOUNT_TYPE_GENERAL: t('General'),
+  ACCOUNT_TYPE_GLOBAL_INSURANCE: t('Global Insurance Pool'),
+  ACCOUNT_TYPE_GLOBAL_REWARD: t('Global Reward Pool'),
+  ACCOUNT_TYPE_INSURANCE: t('Insurance'),
+  ACCOUNT_TYPE_MARGIN: t('Margin'),
+  ACCOUNT_TYPE_PENDING_TRANSFERS: t('Pending Transfers'),
+  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: t('Reward - LP Fees received'),
+  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: t('Reward - Maker fees paid'),
+  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: t('Reward - Maker fees received'),
+  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: t('Reward - Market proposers'),
+  ACCOUNT_TYPE_SETTLEMENT: t('Settlement'),
+};

 interface PartyAccountsProps {
-  partyId: string;
+  accounts: ExplorerPartyAssetsAccountsFragment[];
 }

 /**
@@ -11,22 +34,49 @@ interface PartyAccountsProps {
 * probably do with sorting by asset, and then within asset, by type with general
 * appearing first and... tbd
 */
-export const PartyAccounts = ({ partyId }: PartyAccountsProps) => {
-  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  const onClickAsset = useCallback(
-    (assetId?: string) => {
-      assetId && openAssetDetailsDialog(assetId);
-    },
-    [openAssetDetailsDialog]
-  );
-
+export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
  return (
-    <div className="block min-h-44 h-60 4 w-full border-red-800 relative">
-      <AccountManager
-        partyId={partyId}
-        onClickAsset={onClickAsset}
-        isReadOnly={true}
-      />
-    </div>
+    <Table className="max-w-5xl min-w-fit">
+      <thead>
+        <TableRow modifier="bordered" className="font-mono">
+          <td>{t('Type')}</td>
+          <td>{t('Market')}</td>
+          <td className="text-right pr-2">{t('Balance')}</td>
+          <td>{t('Asset')}</td>
+        </TableRow>
+      </thead>
+      <tbody>
+        {accounts.map((account) => {
+          const m = get(account, 'market.tradableInstrument.instrument.name');
+
+          return (
+            <TableRow
+              key={`pa-${account.asset.id}-${account.type}`}
+              title={account.asset.name}
+              id={`${accountTypeString[account.type]} ${m ? ` - ${m}` : ''}`}
+            >
+              <td className="text-md">{accountTypeString[account.type]}</td>
+              <td className="text-md">
+                {account.market?.id ? (
+                  <MarketLink id={account.market?.id} />
+                ) : (
+                  <p>-</p>
+                )}
+              </td>
+              <td className="text-md text-right pr-2">
+                <AssetBalance
+                  assetId={account.asset.id}
+                  price={account.balance}
+                  showAssetLink={false}
+                />
+              </td>
+              <td className="text-md">
+                <AssetLink assetId={account.asset.id} asDialog={true} />
+              </td>
+            </TableRow>
+          );
+        })}
+      </tbody>
+    </Table>
  );
 };
@@ -1,63 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useNavigate } from 'react-router-dom';
-import { Routes } from '../../../../routes/route-names';
-import { Button, Icon, Loader } from '@vegaprotocol/ui-toolkit';
-import { PartyBlock } from './party-block';
-import type { AccountFields } from '@vegaprotocol/accounts';
-
-export interface PartyBlockAccountProps {
-  partyId: string;
-  accountData: AccountFields[] | null;
-  accountLoading: boolean;
-  accountError?: Error;
-}
-
-/**
- * Displays an overview of a party's assets. This uses existing data
- * providers to structure the details by asset, rather than looking at
- * it by account. The assumption is that this is a more natural way to
- * get an idea of the assets and activity of a party.
- */
-export const PartyBlockAccounts = ({
-  partyId,
-  accountData,
-  accountLoading,
-  accountError,
-}: PartyBlockAccountProps) => {
-  const navigate = useNavigate();
-
-  const shouldShowActionButton =
-    accountData && accountData.length > 0 && !accountLoading && !accountError;
-
-  const action = shouldShowActionButton ? (
-    <Button
-      size="sm"
-      onClick={() => navigate(`/${Routes.PARTIES}/${partyId}/assets`)}
-    >
-      {t('Show all')}
-    </Button>
-  ) : null;
-
-  return (
-    <PartyBlock title={t('Assets')} action={action}>
-      {accountData && accountData.length > 0 ? (
-        <p>
-          {accountData.length} {t('assets, including')}{' '}
-          {accountData
-            .map((a) => a.asset.symbol)
-            .slice(0, 3)
-            .join(', ')}
-        </p>
-      ) : accountLoading && !accountError ? (
-        <Loader size="small" />
-      ) : accountData && accountData.length === 0 ? (
-        <p>{t('No accounts found')}</p>
-      ) : (
-        <p>
-          <Icon className="mr-1" name="error" />
-          <span className="text-sm">{t('Could not load assets')}</span>
-        </p>
-      )}
-    </PartyBlock>
-  );
-};
@@ -1,83 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useExplorerPartyAssetsQuery } from '../__generated__/Party-assets';
-import GovernanceAssetBalance from '../../../../components/asset-balance/governance-asset-balance';
-import {
-  Icon,
-  KeyValueTable,
-  KeyValueTableRow,
-  Loader,
-} from '@vegaprotocol/ui-toolkit';
-import { PartyBlock } from './party-block';
-import BigNumber from 'bignumber.js';
-
-export interface PartyBlockStakeProps {
-  partyId: string;
-  accountLoading: boolean;
-  accountError?: Error;
-}
-
-/**
- * Displays an overview of a single party's staking balance, importantly maintaining'
- * the same height before and after the details are loaded in.
- *
- * Unlike PartyBlockAccounts there is not action button in the title of this block as
- * there is no page for it to link to currently. That's a future task.
- */
-export const PartyBlockStake = ({
-  partyId,
-  accountLoading,
-  accountError,
-}: PartyBlockStakeProps) => {
-  const partyRes = useExplorerPartyAssetsQuery({
-    // Don't cache data for this query, party information can move quite quickly
-    fetchPolicy: 'network-only',
-    variables: { partyId: partyId },
-    skip: !partyId,
-  });
-
-  const p = partyRes.data?.partiesConnection?.edges[0].node;
-
-  const linkedLength = p?.stakingSummary?.linkings?.edges?.length;
-  const linkedStake =
-    linkedLength && linkedLength > 0
-      ? p?.stakingSummary?.linkings?.edges
-          ?.reduce((total, e) => {
-            return new BigNumber(total).plus(
-              new BigNumber(e?.node.amount || 0)
-            );
-          }, new BigNumber(0))
-          .toString()
-      : '0';
-
-  return (
-    <PartyBlock title={t('Staking')}>
-      {p?.stakingSummary.currentStakeAvailable ? (
-        <KeyValueTable>
-          <KeyValueTableRow noBorder={true}>
-            <div>{t('Available stake')}</div>
-            <div>
-              <GovernanceAssetBalance
-                price={p.stakingSummary.currentStakeAvailable}
-              />
-            </div>
-          </KeyValueTableRow>
-          <KeyValueTableRow noBorder={true}>
-            <div>{t('Active stake')}</div>
-            <div>
-              <GovernanceAssetBalance price={linkedStake || '0'} />
-            </div>
-          </KeyValueTableRow>
-        </KeyValueTable>
-      ) : accountLoading && !accountError ? (
-        <Loader size="small" />
-      ) : !accountError ? (
-        <p>{t('No staking balance')}</p>
-      ) : (
-        <p>
-          <Icon className="mr-1" name="error" />
-          <span className="text-sm">{t('Could not load stake details')}</span>
-        </p>
-      )}
-    </PartyBlock>
-  );
-};
@@ -1,24 +0,0 @@
-import type { ReactNode } from 'react';
-
-export interface PartyBlockProps {
-  children: ReactNode;
-  title: string;
-  action?: ReactNode;
-}
-
-export function PartyBlock({ children, title, action }: PartyBlockProps) {
-  return (
-    <div className="border-2 min-h-[138px] border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
-      <div
-        className="flex flex-col md:flex-row gap-1 justify-between content-start mb-2"
-        data-testid="page-title"
-      >
-        <h3 className="font-semibold text-lg">{title}</h3>
-
-        {action ? action : null}
-      </div>
-
-      {children}
-    </div>
-  );
-}
@@ -1,26 +1,24 @@
+import { getNodes } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
-import { useNavigate, useParams } from 'react-router-dom';
+import { useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
+import { Panel } from '../../../components/panel';
 import { toNonHex } from '../../../components/search/detect-search';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { TxsInfiniteList } from '../../../components/txs';
 import { PageHeader } from '../../../components/page-header';
+import { useExplorerPartyAssetsQuery } from './__generated__/Party-assets';
+import type { ExplorerPartyAssetsAccountsFragment } from './__generated__/Party-assets';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
-import { Icon, Intent, Notification, Splash } from '@vegaprotocol/ui-toolkit';
-import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
-import { PartyBlockStake } from './components/party-block-stake';
-import { PartyBlockAccounts } from './components/party-block-accounts';
-import { isValidPartyId } from './components/party-id-error';
-import { useDataProvider } from '@vegaprotocol/data-provider';
+import GovernanceAssetBalance from '../../../components/asset-balance/governance-asset-balance';
+import { PartyAccounts } from './components/party-accounts';

 const Party = () => {
  const { party } = useParams<{ party: string }>();

  useDocumentTitle(['Public keys', party || '-']);
-  const navigate = useNavigate();
-
  const partyId = toNonHex(party ? party : '');
  const { isMobile } = useScreenDimensions();
  const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
@@ -30,72 +28,71 @@ const Party = () => {
    filters,
  });

-  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const {
-    data: AccountData,
-    loading: AccountLoading,
-    error: AccountError,
-  } = useDataProvider({
-    dataProvider: aggregatedAccountsDataProvider,
-    variables,
+  const partyRes = useExplorerPartyAssetsQuery({
+    // Don't cache data for this query, party information can move quite quickly
+    fetchPolicy: 'network-only',
+    variables: { partyId: partyId },
+    skip: !party,
  });

-  if (!isValidPartyId(partyId)) {
-    return (
-      <div className="max-w-sm mx-auto">
-        <Notification
-          message={t('Invalid party ID')}
-          intent={Intent.Danger}
-          buttonProps={{
-            text: t('Go back'),
-            action: () => navigate(-1),
-            className: 'py-1',
-            size: 'sm',
-          }}
-        />
-      </div>
-    );
-  }
+  const p = partyRes.data?.partiesConnection?.edges[0].node;
+
+  const header = p?.id ? (
+    <PageHeader
+      title={p.id}
+      copy
+      truncateStart={visibleChars}
+      truncateEnd={visibleChars}
+    />
+  ) : (
+    <Panel>
+      <p>No data found for public key {party}</p>
+    </Panel>
+  );
+
+  const staking = (
+    <section>
+      {p?.stakingSummary?.currentStakeAvailable ? (
+        <div className="mt-4 leading-3">
+          <strong className="font-semibold">{t('Staking Balance: ')}</strong>
+          <GovernanceAssetBalance
+            price={p.stakingSummary.currentStakeAvailable}
+          />
+        </div>
+      ) : null}
+    </section>
+  );
+
+  const accounts = getNodes<ExplorerPartyAssetsAccountsFragment>(
+    p?.accountsConnection
+  );

  return (
    <section>
-      <PageHeader
-        title={partyId}
-        copy
-        truncateStart={visibleChars}
-        truncateEnd={visibleChars}
-      />
+      <h1
+        className="font-alpha calt uppercase font-xl mb-4 text-vega-dark-100 dark:text-vega-light-100"
+        data-testid="parties-header"
+      >
+        {t('Public key')}
+      </h1>
+      {partyRes.data ? (
+        <>
+          {header}
+          <SubHeading>{t('Asset data')}</SubHeading>
+          {accounts ? <PartyAccounts accounts={accounts} /> : null}
+          {staking}

-      <div className="grid md:grid-flow-col grid-flow-row md:space-x-4 grid-cols-1 md:grid-cols-2 w-full">
-        <PartyBlockAccounts
-          accountError={AccountError}
-          accountLoading={AccountLoading}
-          accountData={AccountData}
-          partyId={partyId}
-        />
-        <PartyBlockStake
-          accountError={AccountError}
-          accountLoading={AccountLoading}
-          partyId={partyId}
-        />
-      </div>
-
-      <SubHeading>{t('Transactions')}</SubHeading>
-      {!error && txsData ? (
-        <TxsInfiniteList
-          hasMoreTxs={hasMoreTxs}
-          areTxsLoading={loading}
-          txs={txsData}
-          loadMoreTxs={loadTxs}
-          error={error}
-          className="mb-28"
-        />
-      ) : (
-        <Splash>
-          <Icon name="error" className="mr-1" />
-          &nbsp;{t('Could not load transaction list for party')}
-        </Splash>
-      )}
+          <SubHeading>{t('Transactions')}</SubHeading>
+          <TxsInfiniteList
+            hasMoreTxs={hasMoreTxs}
+            areTxsLoading={loading}
+            txs={txsData}
+            loadMoreTxs={loadTxs}
+            error={error}
+            className="mb-28"
+          />
+        </>
+      ) : null}
    </section>
  );
 };
@@ -1,7 +0,0 @@
-import { Outlet } from 'react-router-dom';
-
-const PartiesSubPage = () => {
-  return <Outlet />;
-};
-
-export default PartiesSubPage;
@@ -0,0 +1,35 @@
+import React from 'react';
+import { DATA_SOURCES } from '../../config';
+import type { TendermintUnconfirmedTransactionsResponse } from '../txs/tendermint-unconfirmed-transactions-response.d';
+import { TxList } from '../../components/txs';
+import { RouteTitle } from '../../components/route-title';
+import { t } from '@vegaprotocol/i18n';
+import { useFetch } from '@vegaprotocol/react-helpers';
+import { useDocumentTitle } from '../../hooks/use-document-title';
+
+const PendingTxs = () => {
+  const {
+    state: { data: unconfirmedTransactions },
+  } = useFetch<TendermintUnconfirmedTransactionsResponse>(
+    `${DATA_SOURCES.tendermintUrl}/unconfirmed_txs`
+  );
+
+  useDocumentTitle(['Pending transactions']);
+
+  return (
+    <section>
+      <RouteTitle data-testid="unconfirmed-transactions-header">
+        {t('Unconfirmed transactions')}
+      </RouteTitle>
+      <br />
+      <div>{t(`Number: ${unconfirmedTransactions?.result?.n_txs || 0}`)}</div>
+      <br />
+      <div>
+        <br />
+        <TxList data={unconfirmedTransactions} />
+      </div>
+    </section>
+  );
+};
+
+export { PendingTxs };
@@ -14,6 +14,7 @@ import { Block } from './blocks/id';
 import { Blocks } from './blocks/home';
 import { Tx } from './txs/id';
 import { TxsList } from './txs/home';
+import { PendingTxs } from './pending';
 import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
@@ -28,7 +29,6 @@ import compact from 'lodash/compact';
 import { AssetLink, MarketLink } from '../components/links';
 import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
-import { PartyAccountsByAsset } from './parties/id/accounts';

 export type Navigable = {
  path: string;
@@ -75,43 +75,14 @@ const partiesRoutes: Route[] = flags.parties
          },
          {
            path: ':party',
-            element: <Party />,
-
-            children: [
-              {
-                index: true,
-                element: <PartySingle />,
-                handle: {
-                  breadcrumb: (params: Params<string>) => (
-                    <Link to={linkTo(Routes.PARTIES, params.party)}>
-                      {truncateMiddle(params.party as string)}
-                    </Link>
-                  ),
-                },
-              },
-              {
-                path: 'assets',
-                element: <Party />,
-                handle: {
-                  breadcrumb: (params: Params<string>) => (
-                    <Link to={linkTo(Routes.PARTIES, params.party)}>
-                      {truncateMiddle(params.party as string)}
-                    </Link>
-                  ),
-                },
-                children: [
-                  {
-                    index: true,
-                    element: <PartyAccountsByAsset />,
-                    handle: {
-                      breadcrumb: () => {
-                        return t('Assets');
-                      },
-                    },
-                  },
-                ],
-              },
-            ],
+            element: <PartySingle />,
+            handle: {
+              breadcrumb: (params: Params<string>) => (
+                <Link to={linkTo(Routes.PARTIES, params.party)}>
+                  {truncateMiddle(params.party as string)}
+                </Link>
+              ),
+            },
          },
        ],
      },
@@ -266,6 +237,17 @@ export const routerConfig: Route[] = [
          breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
        },
        children: [
+          {
+            path: 'pending',
+            element: <PendingTxs />,
+            handle: {
+              breadcrumb: () => (
+                <Link to={linkTo(Routes.TX, 'pending')}>
+                  {t('Pending transactions')}
+                </Link>
+              ),
+            },
+          },
          {
            path: ':txHash',
            element: <Tx />,
@@ -10,7 +10,7 @@ interface TxDetailsProps {

 export const txDetailsTruncateLength = 30;

-export const TxDetails = ({ txData, pubKey }: TxDetailsProps) => {
+export const TxDetails = ({ txData, pubKey, className }: TxDetailsProps) => {
  if (!txData) {
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }
@@ -28,7 +28,6 @@ import {
 } from '@vegaprotocol/environment';
 import classNames from 'classnames';
 import { NodeStatus, NodeStatusMapping } from '@vegaprotocol/types';
-import { PartyLink } from '../../components/links';

 type RateProps = {
  value: BigNumber | number | undefined;
@@ -192,9 +191,7 @@ export const ValidatorsPage = () => {
                      <KeyValueTable>
                        <KeyValueTableRow>
                          <div>{t('ID')}</div>
-                          <div className="break-all text-xs font-mono">
-                            {v.id}
-                          </div>
+                          <div className="break-all text-xs">{v.id}</div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Status')}</div>
@@ -221,14 +218,12 @@ export const ValidatorsPage = () => {
                          </div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
-                          <div>{t('Key')}</div>
-                          <div className="break-all text-xs">
-                            <PartyLink id={v.pubkey} />
-                          </div>
+                          <div>{t('Public key')}</div>
+                          <div className="break-all text-xs">{v.pubkey}</div>
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Ethereum address')}</div>
-                          <div className="break-all text-xs font-mono">
+                          <div className="break-all text-xs">
                            <EtherscanLink address={v.ethereumAddress} />{' '}
                            <CopyWithTooltip text={v.ethereumAddress}>
                              <button title={t('Copy address to clipboard')}>
@@ -239,9 +234,7 @@ export const ValidatorsPage = () => {
                        </KeyValueTableRow>
                        <KeyValueTableRow>
                          <div>{t('Tendermint public key')}</div>
-                          <div className="break-all text-xs font-mono">
-                            {v.tmPubkey}
-                          </div>
+                          <div className="break-all text-xs">{v.tmPubkey}</div>
                        </KeyValueTableRow>

                        <KeyValueTableRow>
@@ -32,11 +32,6 @@
  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }

-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
-}
-
 /* Light variables */
 .ag-theme-balham {
  --ag-background-color: theme(colors.white);
@@ -46,6 +41,7 @@
  --ag-header-column-separator-color: theme(colors.neutral[300]);
  --ag-row-border-color: theme(colors.white);
  --ag-row-hover-color: theme(colors.neutral[100]);
+  --ag-font-size: 12px;
 }

 /* Dark variables */
@@ -57,8 +53,5 @@
  --ag-header-column-separator-color: theme(colors.neutral[600]);
  --ag-row-border-color: theme(colors.black);
  --ag-row-hover-color: theme(colors.neutral[800]);
-}
-
-.voteicon svg {
-  vertical-align: baseline;
+  --ag-font-size: 12px;
 }
@@ -17,7 +17,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -31,6 +30,6 @@ CYPRESS_TRUNCATED_VEGA_PUBLIC_KEY2=7f9cf0…c25535
 CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
-CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
-NX_VEGA_URL=https://api.vega.community/graphql
+NX_VEGA_URL=https://api.vega.xyz/query
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');

 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',

  e2e: {
    setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
      require('@cypress/grep/src/plugin')(config);
      return config;
    },
@@ -1,113 +0,0 @@
-{
-  "rationale": {
-    "title": "New Market Proposal E2E submission",
-    "description": "E2E new market proposal"
-  },
-  "terms": {
-    "newMarket": {
-      "changes": {
-        "decimalPlaces": "5",
-        "positionDecimalPlaces": "5",
-        "linearSlippageFactor": "0.001",
-        "quadraticSlippageFactor": "0",
-        "lpPriceRange": "10",
-        "instrument": {
-          "name": "Token test market",
-          "code": "TEST.24h",
-          "future": {
-            "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
-            "quoteName": "fBTC",
-            "dataSourceSpecForSettlementData": {
-              "external": {
-                "oracle": {
-                  "signers": [
-                    {
-                      "pubKey": {
-                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                      }
-                    }
-                  ],
-                  "filters": [
-                    {
-                      "key": {
-                        "name": "prices.ETH.value",
-                        "type": "TYPE_INTEGER",
-                        "numberDecimalPlaces": "0"
-                      },
-                      "conditions": [
-                        {
-                          "operator": "OPERATOR_GREATER_THAN",
-                          "value": "0"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecForTradingTermination": {
-              "external": {
-                "oracle": {
-                  "signers": [
-                    {
-                      "pubKey": {
-                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                      }
-                    }
-                  ],
-                  "filters": [
-                    {
-                      "key": {
-                        "name": "trading.terminated.ETH5",
-                        "type": "TYPE_BOOLEAN"
-                      },
-                      "conditions": [
-                        {
-                          "operator": "OPERATOR_EQUALS",
-                          "value": "true"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecBinding": {
-              "settlementDataProperty": "prices.ETH.value",
-              "tradingTerminationProperty": "trading.terminated.ETH5"
-            }
-          }
-        },
-        "metadata": ["sector:energy", "sector:tech", "source:docs.vega.xyz"],
-        "priceMonitoringParameters": {
-          "triggers": [
-            {
-              "horizon": "43200",
-              "probability": "0.9999999",
-              "auctionExtension": "600"
-            }
-          ]
-        },
-        "liquidityMonitoringParameters": {
-          "targetStakeParameters": {
-            "timeWindow": "3600",
-            "scalingFactor": 10
-          },
-          "triggeringRatio": "0.7",
-          "auctionExtension": "1"
-        },
-        "logNormal": {
-          "tau": 0.0001140771161,
-          "riskAversionParameter": 0.01,
-          "params": {
-            "mu": 0,
-            "r": 0.016,
-            "sigma": 0.5
-          }
-        }
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}
@@ -2,23 +2,27 @@ import {
  navigateTo,
  waitForSpinner,
  navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
+  convertUnixTimestampToDateformat,
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
+  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
-  getDateFormatForSpecifiedDays,
-  getProposalFromTitle,
+  getGovernanceProposalDateFormatForSpecifiedDays,
+  getProposalIdFromList,
  getProposalInformationFromTable,
-  submitUniqueRawProposal,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
+  governanceProposalType,
  voteForProposal,
+  waitForProposalSubmitted,
+  waitForProposalSync,
 } from '../../../../governance-e2e/src/support/governance.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
-import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';

 const proposalVoteProgressForPercentage =
  '[data-testid="vote-progress-indicator-percentage-for"]';
@@ -33,8 +37,6 @@ 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 voteBreakdownToggle = 'vote-breakdown-toggle';
-const proposalTermsToggle = 'proposal-terms-toggle';

 describe(
  'Governance flow for proposal details',
@@ -48,7 +50,6 @@ describe(

    beforeEach('visit proposals tab', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -59,25 +60,23 @@ describe(

    // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
    it('Newly created raw proposal details - shows proposal title and full description', function () {
-      const proposalDescription =
-        'I propose that everyone evaluate the following IPFS document and vote Yes if they agree. bafybeigwwctpv37xdcwacqxvekr6e4kaemqsrv34em6glkbiceo3fcy4si';
-
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        cy.get(openProposals).within(() => {
-          getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.get(viewProposalButton).should('be.visible').click();
+        getProposalIdFromList(rawProposal.rationale.title);
+        cy.get('@proposalIdText').then((proposalId) => {
+          cy.get(openProposals).within(() => {
+            cy.get(`#${proposalId}`).within(() => {
+              cy.get(viewProposalButton).should('be.visible').click();
+            });
          });
        });
-        cy.get(proposalDetailsTitle).should(
-          'contain.text',
-          rawProposal.rationale.title
-        );
+        cy.get(proposalDetailsTitle)
+          .should('contain', rawProposal.rationale.title)
+          .and('be.visible');
        cy.get(proposalDetailsDescription)
-          .find('p')
-          .should('have.text', proposalDescription);
+          .should('contain', rawProposal.rationale.description)
+          .and('be.visible');
      });
-      cy.getByTestId(proposalTermsToggle).click();
      // 3001-VOTE-052
      cy.get('code.language-json')
        .should('exist')
@@ -88,37 +87,32 @@ describe(

    // 3001-VOTE-043
    it('Newly created freeform proposal details - shows proposed and closing dates', function () {
+      const closingVoteHrs = '72';
      const proposalTitle = generateFreeFormProposalTitle();
      const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      // const currentDate = new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
-      // const proposedDate = new Date(currentDate.getTime() + 60000)

-      submitUniqueRawProposal({
-        proposalTitle: proposalTitle,
-        closingTimestamp: proposalTimeStamp,
-      });
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody(closingVoteHrs, proposalTitle);
+      waitForProposalSubmitted();
+      waitForProposalSync();
      navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
-      cy.wrap(
-        formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
-      ).then((closingDate) => {
-        getProposalInformationFromTable('Closes on').should(
-          'have.text',
-          closingDate
-        );
-      });
-      cy.wrap(
-        formatDateWithLocalTimezone(
-          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
-        )
-      ).then((proposalDate) => {
-        getProposalInformationFromTable('Proposed on').should(
-          'have.text',
-          proposalDate
-        );
-      });
+      convertUnixTimestampToDateformat(proposalTimeStamp).then(
+        (closingDate) => {
+          getProposalInformationFromTable('Closes on')
+            .contains(closingDate)
+            .should('be.visible');
+        }
+      );
+      getGovernanceProposalDateFormatForSpecifiedDays(0).then(
+        (proposalDate) => {
+          getProposalInformationFromTable('Proposed on')
+            .contains(proposalDate)
+            .should('be.visible');
+        }
+      );
    });

    it('Newly created proposal details - shows default status set to fail', function () {
@@ -127,14 +121,13 @@ describe(
      // 3001-VOTE-067
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
      });
      cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
        'be.visible'
      );
-      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Expected to pass')
        .contains('👎')
        .should('be.visible');
@@ -154,24 +147,26 @@ describe(
    it('Newly created proposal details - ability to vote for and against proposal - with minimum required tokens associated', function () {
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
      });
      // 3001-VOTE-080
      cy.getByTestId('vote-buttons').contains('against').should('be.visible');
      cy.getByTestId('vote-buttons').contains('for').should('be.visible');
      voteForProposal('for');
-      getDateFormatForSpecifiedDays(0).then((votedDate) => {
-        // 3001-VOTE-051
-        // 3001-VOTE-093
-        cy.contains('You voted:')
-          .siblings()
-          .contains('For')
-          .siblings()
-          .contains(votedDate)
-          .should('be.visible');
-      });
+      getGovernanceProposalDateFormatForSpecifiedDays(0, 'shortMonth').then(
+        (votedDate) => {
+          // 3001-VOTE-051
+          // 3001-VOTE-093
+          cy.contains('You voted:')
+            .siblings()
+            .contains('For')
+            .siblings()
+            .contains(votedDate)
+            .should('be.visible');
+        }
+      );
      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
        .contains('100.00%')
        .and('be.visible');
@@ -182,7 +177,6 @@ describe(
      cy.get(proposalVoteProgressAgainstTokens)
        .contains('0.00')
        .and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
@@ -224,15 +218,14 @@ describe(
      vegaWalletSetSpecifiedApprovalAmount('1000');
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
      });
      voteForProposal('for');
      // 3001-VOTE-079
      cy.contains('You voted: For').should('be.visible');
      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Total Supply')
        .invoke('text')
        .then((totalSupply) => {
@@ -240,15 +233,14 @@ describe(
            (Number(totalSupply.replace(/,/g, '')) * 0.001) /
            100
          ).toFixed(2);
-          ethereumWalletConnect();
          ensureSpecifiedUnstakedTokensAreAssociated(
            tokensRequiredToAchieveResult
          );
          navigateTo(navigation.proposals);
          cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.get(viewProposalButton).click()
-            );
+            getSubmittedProposalFromProposalList(
+              rawProposal.rationale.title
+            ).within(() => cy.get(viewProposalButton).click());
          });
          cy.get(proposalVoteProgressForPercentage)
            .contains('100.00%')
@@ -265,7 +257,6 @@ describe(
          cy.get(proposalVoteProgressAgainstTokens)
            .contains('0.00')
            .and('be.visible');
-          cy.getByTestId(voteBreakdownToggle).click();
          getProposalInformationFromTable('Total tokens voted percentage')
            .should('have.text', '0.00%')
            .and('be.visible');
@@ -2,7 +2,6 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -38,7 +37,6 @@ context(

    beforeEach('visit proposals', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -58,12 +56,14 @@ context(
          .parentsUntil(proposalListItem)
          .last()
          .within(() => {
-            cy.get(proposalStatus).should('have.text', 'Enacted');
+            cy.get(proposalStatus).should('have.text', 'Enacted ');
            cy.get(viewProposalButton).click();
          });
      });
      cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.get(proposalStatus).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted')
+        .and('be.visible');
      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
@@ -85,10 +85,16 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
      voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Passed', proposalTimeout)
+        .and('be.visible');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
      cy.get(votesTable).within(() => {
        cy.contains('Vote passed.').should('be.visible');
        cy.contains('Voting has ended.').should('be.visible');
@@ -113,9 +119,13 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
      voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
    });

    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -132,8 +142,12 @@ context(
          .last()
          .within(() => cy.get(viewProposalButton).click());
      });
-      cy.get(proposalStatus).should('have.text', 'Open');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Declined', proposalTimeout)
+        .and('be.visible');
      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
        .and('be.visible');
@@ -5,11 +5,10 @@ import {
  enterRawProposalBody,
  enterUniqueFreeFormProposalBody,
  generateFreeFormProposalTitle,
-  getProposalFromTitle,
  getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
-  submitUniqueRawProposal,
  voteForProposal,
  waitForProposalSubmitted,
  waitForProposalSync,
@@ -21,7 +20,6 @@ import {
  navigateTo,
  navigation,
  closeDialog,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -82,11 +80,11 @@ context(
      });

      vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.associateTokensToVegaWallet('1');
    });

    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -95,8 +93,7 @@ context(
      navigateTo(navigation.proposals);
    });

-    // Test can only pass if run before other proposal tests.
-    it.skip('Should be able to see that no proposals exist', function () {
+    it('Should be able to see that no proposals exist', function () {
      // 3001-VOTE-003
      cy.get(noOpenProposals)
        .should('be.visible')
@@ -108,7 +105,7 @@ context(

    // 3002-PROP-002
    // 3002-PROP-003
-    it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
+    it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
      // 3002-PROP-005
      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.contains(
@@ -116,9 +113,8 @@ context(
      ).should('be.visible');
    });

-    // Skipping as currently unable to propose using forms other than raw
    // 3002-PROP-011
-    it.skip('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      cy.get(minVoteButton).should('be.visible'); // 3002-PROP-008
      cy.get(maxVoteButton).should('be.visible');
@@ -142,13 +138,16 @@ context(
      closeStakingDialog();

      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
-      createRawProposal();
+
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
+      waitForProposalSubmitted();
    });

-    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
-
      cy.contains('Awaiting network confirmation', epochTimeout).should(
        'not.exist'
      );
@@ -157,7 +156,7 @@ context(
        .should('equal', 'Value must be greater than or equal to 1.');
    });

-    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
      goToMakeNewProposal(governanceProposalType.FREEFORM);
      enterUniqueFreeFormProposalBody(
        '100000',
@@ -184,13 +183,17 @@ context(
      navigateTo(navigation.proposals);
      cy.get(rejectProposalsLink).click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => {
          cy.contains('Rejected').should('be.visible');
          cy.contains('Close time too late').should('be.visible');
          cy.get(viewProposalButton).click();
        });
      });
-      cy.getByTestId('proposal-status').should('have.text', 'Rejected');
+      getProposalInformationFromTable('State')
+        .contains('Rejected')
+        .and('be.visible');
      getProposalInformationFromTable('Rejection reason')
        .contains('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
        .and('be.visible');
@@ -285,19 +288,18 @@ context(
      const proposalTitle = generateFreeFormProposalTitle();

      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      submitUniqueRawProposal({ proposalTitle: proposalTitle });
-      ethereumWalletConnect();
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', proposalTitle);
+      waitForProposalSubmitted();
      stakingPageDisassociateTokens('0.0001');
-      cy.get(vegaWallet)
-        .first()
-        .within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.9999'
-          );
-        });
+      cy.get(vegaWallet).within(() => {
+        cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          'contain',
+          '0.9999'
+        );
+      });
      navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
        cy.get(viewProposalButton).click()
      );
      cy.contains('Vote breakdown').should('be.visible', {
@@ -315,9 +317,9 @@ context(
      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
      cy.get('[data-testid="disconnect"]').click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
      });
      // 3001-VOTE-075
      // 3001-VOTE-076
@@ -2,13 +2,11 @@ import {
  closeDialog,
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
  getProposalInformationFromTable,
  goToMakeNewProposal,
-  governanceProposalType,
  voteForProposal,
  waitForProposalSubmitted,
 } from '../../support/governance.functions';
@@ -57,8 +55,18 @@ const fUSDCId =
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

+const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  UPDATE_ASSET: 'Update asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};
+
 // 3001-VOTE-007
-context.skip(
+context(
  'Governance flow - form validations for different governance proposals',
  { tags: '@slow' },
  function () {
@@ -69,7 +77,6 @@ context.skip(

    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -2,19 +2,19 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
+  createFreeformProposal,
  createRawProposal,
  createTenDigitUnixTimeStampForSpecifiedDays,
  enterRawProposalBody,
  generateFreeFormProposalTitle,
-  getProposalFromTitle,
+  getProposalIdFromList,
  getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
-  submitUniqueRawProposal,
  voteForProposal,
  waitForProposalSubmitted,
  waitForProposalSync,
@@ -23,14 +23,10 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/stakin
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

-const proposalListItem = 'proposals-list-item';
 const openProposals = '[data-testid="open-proposals"]';
-const voteStatus = 'vote-status';
-const proposalType = 'proposal-type';
-const proposalStatus = 'proposal-status';
+const voteStatus = '[data-testid="vote-status"]';
 const proposalClosingDate = '[data-testid="vote-details"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const voteBreakDownToggle = 'vote-breakdown-toggle';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  before('connect wallets and set approval limit', function () {
@@ -40,7 +36,6 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

  beforeEach('visit proposals tab', function () {
    cy.clearLocalStorage();
-    turnTelemetryOff();
    cy.reload();
    waitForSpinner();
    cy.connectVegaWallet();
@@ -63,12 +58,12 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {

    navigateTo(navigation.proposals);
    cy.get(openProposals).within(() => {
+      cy.get(proposalClosingDate).first().should('contain.text', 'year');
+      cy.get(proposalClosingDate).should('contain.text', 'months');
      cy.get(proposalClosingDate)
-        .first()
+        .last()
        .invoke('text')
        .should('match', /days|minutes/);
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'year');
    });
  });

@@ -76,27 +71,36 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    const proposerId = Cypress.env('vegaWalletPublicKey');
    const proposalTitle = generateFreeFormProposalTitle();

-    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    cy.get('[data-testid="set-proposals-filter-visible"]').click();
-    cy.get('[data-testid="filter-input"]').type(proposerId);
-    // cy.get(`#${proposalId}`).should('contain', proposalId);
-    cy.contains(proposalTitle).should('be.visible');
-    cy.get('[data-testid="filter-input"]').type('123');
-    cy.getByTestId(proposalListItem).should('not.exist');
+    createFreeformProposal(proposalTitle);
+    getProposalIdFromList(proposalTitle);
+    cy.get('@proposalIdText').then((proposalId) => {
+      cy.get('[data-testid="set-proposals-filter-visible"]').click();
+      cy.get('[data-testid="filter-input"]').type(proposerId);
+      cy.get(`#${proposalId}`).should('contain', proposalId);
+    });
  });

  it('Newly created proposals list - shows title and portion of summary', function () {
-    const proposalPath = '/proposals/new-market-raw.json';
-    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-    submitUniqueRawProposal({
-      proposalBody: proposalPath,
-      enactmentTimestamp: enactmentTimestamp,
-    }); // 3001-VOTE-052
-    // 3001-VOTE-008
-    // 3001-VOTE-034
-    // 3001-VOTE-097
-    cy.contains('New Market Proposal E2E submission');
-    cy.contains('Code: TEST.24h. fBTC settled future.').should('be.visible');
+    createRawProposal(this.minProposerBalance); // 3001-VOTE-052
+    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+      getProposalIdFromList(rawProposal.rationale.title);
+      cy.get('@proposalIdText').then((proposalId) => {
+        cy.get(openProposals).within(() => {
+          // 3001-VOTE-008
+          // 3001-VOTE-034
+          cy.get(`#${proposalId}`)
+            // 3001-VOTE-097
+            .should('contain', rawProposal.rationale.title)
+            .and('be.visible');
+          cy.get(`#${proposalId}`)
+            .should(
+              'contain',
+              rawProposal.rationale.description.substring(0, 59)
+            )
+            .and('be.visible');
+        });
+      });
+    });
  });

  it('Newly created proposals list - shows open proposals in an open state', function () {
@@ -104,11 +108,23 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    // 3001-VOTE-035
    createRawProposal(this.minProposerBalance);
    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-      getProposalFromTitle(rawProposal.rationale.title).within(() => {
-        cy.get(viewProposalButton).should('be.visible');
-        cy.getByTestId(proposalType).should('have.text', 'Freeform');
-        cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      getSubmittedProposalFromProposalList(rawProposal.rationale.title).within(
+        () => {
+          cy.get(viewProposalButton).should('be.visible').click();
+        }
+      );
+
+      cy.get('@proposalIdText').then((proposalId) => {
+        getProposalInformationFromTable('ID')
+          .contains(String(proposalId))
+          .and('be.visible');
      });
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('Type')
+        .contains('Freeform')
+        .and('be.visible');
    });
  });

@@ -116,22 +132,18 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  it('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
    const proposalTitle = generateFreeFormProposalTitle();

-    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    getProposalFromTitle(proposalTitle).within(() => {
+    createFreeformProposal(proposalTitle);
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
      // 3001-VOTE-039
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Participation not reached'
-      );
+      cy.get(voteStatus).should('have.text', 'Participation not reached');
      cy.get(viewProposalButton).click();
    });
    voteForProposal('for');
    navigateTo(navigation.proposals);
-    getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+      cy.get(voteStatus).should('have.text', 'Set to pass');
      cy.get(viewProposalButton).click();
    });
-    cy.getByTestId(voteBreakDownToggle).click();
    getProposalInformationFromTable('Token participation met')
      .contains('👍')
      .should('be.visible');
@@ -1,7 +1,6 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -27,7 +26,6 @@ const rewardsTimeOut = { timeout: 60000 };
 context('rewards - flow', { tags: '@slow' }, function () {
  before('set up environment to allow rewards', function () {
    cy.clearLocalStorage();
-    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
    depositAsset(vegaAssetAddress, '1000', 18);
@@ -7,7 +7,6 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -68,7 +67,6 @@ context(
        'teardown wallet & drill into a specific validator',
        function () {
          cy.clearLocalStorage();
-          turnTelemetryOff();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -96,7 +94,7 @@ context(
        navigateTo(navigation.validators);

        // 2002-SINC-007
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
      });

      it('Able to view validators staked by me', function () {
@@ -146,7 +144,7 @@ context(
        verifyThisEpochValue(2.0);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
      });

      it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
@@ -166,11 +164,10 @@ context(
        verifyThisEpochValue(6.0);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,006.00', '50.05%');
+        validateValidatorListTotalStakeAndShare('0', '6.00', '100.00%');
      });

      it('Able to stake against multiple validators', function () {
-        vegaWalletTeardown();
        stakingPageAssociateTokens('5');
        verifyUnstakedBalance(5.0);
        cy.get('button').contains('Select a validator to nominate').click();
@@ -198,10 +195,14 @@ context(
          .eq(1)
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '3,002.00')
+              .should('have.text', '2.00')
              .and('be.visible');
            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '50.01%')
+              .should('have.text', '66.67%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '2.00')
              .and('be.visible');
          });
        cy.get(`[row-id="${1}"]`)
@@ -209,10 +210,14 @@ context(
          .within(() => {
            cy.getByTestId(stakeValidatorListTotalStake)
              .scrollIntoView()
-              .should('have.text', '3,001.00')
+              .should('have.text', '1.00')
              .and('be.visible');
            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '49.99%')
+              .should('have.text', '33.33%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '1.00')
              .and('be.visible');
          });
      });
@@ -247,10 +252,10 @@ context(
          waitForBeginningOfEpoch();
          cy.getByTestId(stakeValidatorListStakePercentage).should(
            'have.text',
-            '50.02%'
+            '100%'
          );
          navigateTo(navigation.validators);
-          validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
        }
      );

@@ -275,7 +280,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');

        cy.getByTestId(userStakeBtn).should('not.exist');
        cy.getByTestId(userStake).should('not.exist');
@@ -347,7 +352,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
      });

      it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
@@ -375,7 +380,7 @@ context(
          txTimeout
        );
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
      });

      it('Disassociating some tokens - prioritizes unstaked tokens', function () {
@@ -397,7 +402,7 @@ context(
        });
        verifyStakedBalance(2.0);
        navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
      });

      it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
@@ -4,7 +4,6 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  stakingPageAssociateTokens,
@@ -55,7 +54,6 @@ context(
        'teardown wallet & drill into a specific validator',
        function () {
          cy.clearLocalStorage();
-          turnTelemetryOff();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -111,10 +109,10 @@ context(
        // 1004-ASSO-028
        // 1004-ASSO-029
        // 1004-ASSO-031
-        vegaWalletTeardown();
+
        stakingPageAssociateTokens('2');
        verifyEthWalletAssociatedBalance('2.0');
-        verifyEthWalletTotalAssociatedBalance('6,002.00');
+        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get('button').contains('Select a validator to nominate').click();
        stakingPageDisassociateTokens('2');
        cy.getByTestId('currency-title', txTimeout).should(
@@ -125,18 +123,17 @@ context(
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
-        cy.get(
-          '[data-testid="eth-wallet-associated-balances"]:visible',
-          txTimeout
-        ).should('have.length', 2);
-        verifyEthWalletTotalAssociatedBalance('6,000.00');
+        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
+          'not.exist'
+        );
+        verifyEthWalletTotalAssociatedBalance('0.00');
      });

      it('Able to associate more tokens than the approved amount of 1000 - requires re-approval', function () {
        //1004-ASSO-011
        stakingPageAssociateTokens('1001', { approve: true });
        verifyEthWalletAssociatedBalance('1,001.00');
-        verifyEthWalletTotalAssociatedBalance('7,001.00');
+        verifyEthWalletTotalAssociatedBalance('1,001.00');
        cy.get(vegaWallet)
          .last()
          .within(() => {
@@ -1,7 +1,6 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
@@ -30,8 +29,6 @@ const tableReceiverAddress = '[col-id="details.receiverAddress"]';
 const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
 const tableWithdrawnStatus = '[col-id="status"]';
 const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
-const toastContent = 'toast-content';
-const toastPanel = 'toast-panel';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
@@ -47,13 +44,15 @@ context(
  function () {
    before('visit withdrawals and connect vega wallet', function () {
      cy.visit('/');
-      ethereumWalletConnect();
-      depositAsset(usdcEthAddress, '1000', 5);
+      // When running tests locally, will fail if run without restarting capsule
+      cy.updateCapsuleMultiSig().then(() => {
+        ethereumWalletConnect();
+        depositAsset(usdcEthAddress, '1000', 5);
+      });
    });

    beforeEach('Navigate to withdrawal page', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
@@ -150,6 +149,7 @@ context(
        });
    });

+    // Skipping because of bug #1857
    it('Able to withdraw asset: -eth wallet not connected', function () {
      const ethWalletAddress = Cypress.env('ethWalletPublicKey');
      cy.reload();
@@ -187,26 +187,8 @@ context(
            .should('have.attr', 'href')
            .and('contain', 'https://sepolia.etherscan.io/address/');
          cy.get(tableCreatedTimeStamp).should('not.be.empty');
-        });
-      ethereumWalletConnect();
-      cy.getByTestId(completeWithdrawalButton).click();
-      cy.getByTestId(toastContent)
-        .last()
-        .should('contain.text', 'Awaiting confirmation')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-        });
-      cy.getByTestId(toastContent)
-        .first()
-        .should('contain.text', 'The withdrawal has been approved.')
-        .within(() => {
-          cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
-        });
-      cy.getByTestId(toastContent)
-        .last()
-        .should('contain.text', 'Transaction confirmed')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
+          cy.getByTestId(completeWithdrawalButton).click();
+          // Unable to complete withdrawal in Capsule
        });
    });

@@ -236,10 +218,7 @@ context(
    });

    function waitForAssetsDisplayed(expectedAsset: string) {
-      cy.getByTestId('currency-title', txTimeout).should(
-        'contain.text',
-        expectedAsset
-      );
+      cy.getByTestId('currency-title').should('contain.text', expectedAsset);
    }
  }
 );
@@ -27,7 +27,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('app-announcement').should('not.exist');
    });

-    it('should show open or enacted proposals without proposal summary', function () {
+    it('should show open or enacted proposals with proposal summary', function () {
      cy.get('body').then(($body) => {
        if (!$body.find('[data-testid="proposals-list-item"]').length) {
          cy.createMarket();
@@ -43,6 +43,12 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
            .invoke('text')
            .should('not.be.empty');
          cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
+          cy.getByTestId('proposal-description')
+            .invoke('text')
+            .should('not.be.empty');
+          cy.getByTestId('proposal-details')
+            .invoke('text')
+            .should('not.be.empty');
          cy.getByTestId('proposal-status')
            .invoke('text')
            .should('not.be.empty');
@@ -161,7 +167,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('menu-drawer').should('be.visible');
    });

-    it.skip('should have link for proposal page', function () {
+    it('should have link for proposal page', function () {
      cy.getByTestId('menu-drawer').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -54,7 +54,7 @@ context(
        });
    });

-    it.skip('should be able to see button for - new proposal', function () {
+    it('should be able to see button for - new proposal', function () {
      // 3001-VOTE-002
      cy.get(newProposalLink)
        .should('be.visible')
@@ -63,7 +63,7 @@ context(
        .and('equal', '/proposals/propose');
    });

-    it.skip('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
+    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
      cy.get(connectToVegaWalletButton)
        .should('be.visible')
@@ -101,15 +101,15 @@ context(
            );
            cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
              'have.text',
-              'Vega release tag: v1'
+              'Vega release tagv1'
            );
            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
              'have.text',
-              'Upgrade block height: 2015942'
+              'Upgrade block height2015942'
            );
            cy.getByTestId('protocol-upgrade-proposal-status').should(
              'have.text',
-              'Approved by validators '
+              'Approved'
            );
          });
      });
@@ -136,7 +136,7 @@ context(
        );
        cy.getByTestId('protocol-upgrade-state').should(
          'have.text',
-          'Approved by validators'
+          'Approved'
        );
        cy.getByTestId('protocol-upgrade-release-tag').should(
          'have.text',
@@ -3,13 +3,11 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
  enterUniqueFreeFormProposalBody,
  goToMakeNewProposal,
-  governanceProposalType,
 } from '../../support/governance.functions';
 import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';

@@ -28,7 +26,6 @@ context('View functionality with public key', { tags: '@smoke' }, function () {

  beforeEach('visit home page', function () {
    cy.clearLocalStorage();
-    turnTelemetryOff();
    cy.visit('/');
    waitForSpinner();
    cy.connectPublicKey(vegaWalletPubKey);
@@ -47,11 +44,11 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
      .and('contain.text', 'USDC (fake)');
  });

-  it.skip('Unable to submit proposal with public key', function () {
+  it('Unable to submit proposal with public key', function () {
    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.`;

    navigateTo(navigation.proposals);
-    goToMakeNewProposal(governanceProposalType.FREEFORM);
+    goToMakeNewProposal('Freeform');
    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content')
      .first()
@@ -13,6 +13,7 @@ context(
  { tags: '@regression' },
  function () {
    before('navigate to rewards page', function () {
+      cy.clearLocalStorage();
      cy.visit('/');
      navigateTo(navigation.rewards);
    });
@@ -63,6 +64,7 @@ context(
      });

      it('should have option to go to last and newest page', function () {
+        waitForBeginningOfEpoch();
        cy.getByTestId('goto-last-page').click();
        cy.getByTestId('epoch-total-rewards-table')
          .last()
@@ -29,10 +29,11 @@ const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
 const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
 const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
 const epochCountDown = '[data-testid="epoch-countdown"]';
-const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
+const stakeNumberRegex = /^\d*\.?\d*$/;

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
+    cy.clearAllLocalStorage();
    cy.visit('/validators');
  });

@@ -84,13 +85,13 @@ context('Validators Page - verify elements on page', function () {

          cy.get(stakedByOperatorToolTip)
            .invoke('text')
-            .should('contain', 'Staked by operator: 3,000.00');
+            .should('contain', 'Staked by operator: 0.00');
          cy.get(stakedByDelegatesToolTip)
            .invoke('text')
            .should('contain', 'Staked by delegates: 0.00');
          cy.get(totalStakedToolTip)
            .invoke('text')
-            .should('contain', 'Total stake: 3,000.00');
+            .should('contain', 'Total stake: 0.00');
        });

        it('Should be able to see validator normalised voting power', function () {
@@ -106,10 +107,10 @@ context('Validators Page - verify elements on page', function () {

          cy.get(unnormalisedVotingPowerToolTip)
            .invoke('text')
-            .should('contain', 'Unnormalised voting power: 20.00%');
+            .should('contain', 'Unnormalised voting power: 0.00%');
          cy.get(normalisedVotingPowerToolTip)
            .invoke('text')
-            .should('contain', 'Normalised voting power: 50.00%');
+            .should('contain', 'Normalised voting power: 0.10%');
        });

        // 2002-SINC-018
@@ -126,13 +127,13 @@ context('Validators Page - verify elements on page', function () {

          cy.get(performancePenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Performance penalty: 0.00%');
+            .should('contain', 'Performance penalty: 100.00%');
          cy.get(overstakedPenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+            .should('contain', 'Overstaked penalty:'); // value not asserted due to #2886
          cy.get(totalPenaltyToolTip)
            .invoke('text')
-            .should('contain', 'Total penalties: 60.00%');
+            .should('contain', 'Total penalties: 0.00%');
        });

        it('Should be able to see validator pending stake', function () {
@@ -35,6 +35,7 @@ context(
  { tags: '@regression' },
  () => {
    before('visit token home page', () => {
+      cy.clearAllLocalStorage();
      cy.visit('/');
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });
@@ -12,6 +12,7 @@ context(
  { tags: '@smoke' },
  function () {
    before('navigate to withdrawals page', function () {
+      cy.clearAllLocalStorage();
      cy.visit('/');
      navigateTo(navigation.withdraw);
    });
@@ -90,10 +90,3 @@ export function verifyEthWalletAssociatedBalance(amount: string) {
 export function closeDialog() {
  cy.getByTestId('dialog-close').click();
 }
-
-export function turnTelemetryOff() {
-  // Ensuring the telemetry modal doesn't disrupt the tests
-  cy.window().then((win) =>
-    win.localStorage.setItem('vega_telemetry_on', 'false')
-  );
-}
@@ -1,12 +1,7 @@
-import { format } from 'date-fns';
-import {
-  closeDialog,
-  navigateTo,
-  navigation,
-  waitForSpinner,
-} from './common.functions';
+import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

+const newProposalButton = '[data-testid="new-proposal-link"]';
 const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
 const proposalListItem = '[data-testid="proposals-list-item"]';
 const newProposalTitle = '[data-testid="proposal-title"]';
@@ -20,6 +15,35 @@ const newProposalSubmitButton = '[data-testid="proposal-submit"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

+export function convertUnixTimestampToDateformat(
+  unixTimestamp: number,
+  monthTextLength = 'longMonth'
+) {
+  const dateSupplied = new Date(unixTimestamp * 1000);
+  const year = dateSupplied.getFullYear();
+  const months = [
+    'January',
+    'February',
+    'March',
+    'April',
+    'May',
+    'June',
+    'July',
+    'August',
+    'September',
+    'October',
+    'November',
+    'December',
+  ];
+  const month = months[dateSupplied.getMonth()];
+  const shortMonth = months[dateSupplied.getMonth()].substring(0, 3),
+    date = dateSupplied.getDate();
+
+  if (monthTextLength === 'longMonth') {
+    return cy.wrap(`${date} ${month} ${year}`);
+  } else return cy.wrap(`${date} ${shortMonth} ${year}`);
+}
+
 export function createTenDigitUnixTimeStampForSpecifiedDays(
  durationDays: number
 ) {
@@ -28,13 +52,6 @@ export function createTenDigitUnixTimeStampForSpecifiedDays(
  return (timestamp = Math.floor(timestamp / 1000));
 }

-export function getDateFormatForSpecifiedDays(days: number) {
-  const date = new Date(
-    createTenDigitUnixTimeStampForSpecifiedDays(days) * 1000
-  );
-  return cy.wrap(format(date, 'dd MMM yyyy'));
-}
-
 export function enterRawProposalBody(timestamp: number) {
  cy.fixture('/proposals/raw.json').then((rawProposal) => {
    rawProposal.terms.closingTimestamp = timestamp;
@@ -50,53 +67,6 @@ export function enterRawProposalBody(timestamp: number) {
  });
 }

-export function submitUniqueRawProposal(proposalFields: {
-  proposalBody?: string;
-  proposalTitle?: string;
-  proposalDescription?: string;
-  closingTimestamp?: number;
-  enactmentTimestamp?: number;
-  submit?: boolean;
-}) {
-  goToMakeNewProposal(governanceProposalType.RAW);
-  let proposalBodyPath = '/proposals/raw.json';
-  if (proposalFields.proposalBody) {
-    proposalBodyPath = proposalFields.proposalBody;
-  }
-  cy.fixture(proposalBodyPath).then((rawProposal) => {
-    if (proposalFields.proposalTitle) {
-      rawProposal.rationale.title = proposalFields.proposalTitle;
-      cy.wrap(proposalFields.proposalTitle).as('proposalTitle');
-    }
-    if (proposalFields.proposalDescription) {
-      rawProposal.rationale.description = proposalFields.proposalDescription;
-    }
-    if (proposalFields.closingTimestamp) {
-      rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
-    } else {
-      const minTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      rawProposal.terms.closingTimestamp = minTimeStamp;
-    }
-    if (proposalFields.enactmentTimestamp) {
-      rawProposal.terms.enactmentTimestamp = proposalFields.enactmentTimestamp;
-    }
-
-    const proposalPayload = JSON.stringify(rawProposal);
-    cy.get(rawProposalData).type(proposalPayload, {
-      parseSpecialCharSequences: false,
-      delay: 2,
-    });
-
-    if (proposalFields.submit !== false) {
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wrap(rawProposal).as('rawProposal');
-      waitForProposalSubmitted();
-      waitForProposalSync();
-      navigateTo(navigation.proposals);
-    }
-  });
-}
-
 export function enterUniqueFreeFormProposalBody(
  timestamp: string,
  proposalTitle: string
@@ -109,10 +79,6 @@ export function enterUniqueFreeFormProposalBody(
  cy.getByTestId('proposal-submit').should('be.visible').click();
 }

-export function getProposalFromTitle(proposalTitle: string) {
-  return cy.contains(proposalTitle).parentsUntil(proposalListItem).last();
-}
-
 export function getSubmittedProposalFromProposalList(proposalTitle: string) {
  getProposalIdFromList(proposalTitle);
  cy.get('@proposalIdText').then((proposalId) => {
@@ -138,6 +104,16 @@ export function getProposalIdFromList(proposalTitle: string) {
    });
 }

+export function getGovernanceProposalDateFormatForSpecifiedDays(
+  days: number,
+  shortOrLong?: string
+) {
+  return convertUnixTimestampToDateformat(
+    createTenDigitUnixTimeStampForSpecifiedDays(days),
+    shortOrLong
+  );
+}
+
 export function getProposalInformationFromTable(heading: string) {
  return cy.get(proposalInformationTableRows).contains(heading).siblings();
 }
@@ -175,17 +151,13 @@ export function waitForProposalSync() {
  });
 }

-export function goToMakeNewProposal(proposalType: governanceProposalType) {
-  cy.visit('/proposals/propose');
-  waitForSpinner();
+export function goToMakeNewProposal(proposalType: string) {
+  navigateTo(navigation.proposals);
+  cy.get(newProposalButton).should('be.visible').click();
  cy.url().should('include', '/proposals/propose');
  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
-  if (proposalType == governanceProposalType.RAW) {
-    cy.get('[href="/proposals/propose/raw"]').click();
-  } else {
-    cy.get('li').should('contain.text', proposalType).and('be.visible');
-    cy.get('li').contains(proposalType).click();
-  }
+  cy.get('li').should('contain.text', proposalType).and('be.visible');
+  cy.get('li').contains(proposalType).click();
 }

 export function waitForProposalSubmitted() {
@@ -222,12 +194,11 @@ export function createFreeformProposal(proposalTitle: string) {
  navigateTo(navigation.proposals);
 }

-export enum governanceProposalType {
-  NETWORK_PARAMETER = 'Network parameter',
-  NEW_MARKET = 'New market',
-  UPDATE_MARKET = 'Update market',
-  NEW_ASSET = 'New asset',
-  UPDATE_ASSET = 'Update asset',
-  FREEFORM = 'Freeform',
-  RAW = 'raw proposal',
-}
+export const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};
@@ -8,11 +8,9 @@ import './wallet-eth.functions.ts';
 import './wallet-teardown.functions.ts';
 import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';
-import { turnTelemetryOff } from './common.functions.ts';
 registerCypressGrep();

 // Hide fetch/XHR requests - They create a lot of noise in command log
@@ -26,14 +24,9 @@ if (!app.document.head.querySelector('[data-hide-command-log-request]')) {
 }

 before(() => {
-  cy.clearLocalStorage();
-  // // Ensuring the telemetry modal doesn't disrupt the tests
-  turnTelemetryOff();
  // Mock chainId fetch which happens on every page for wallet connection
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'ChainId', chainIdQuery());
    aliasGQLQuery(req, 'Statistics', statisticsQuery());
  });
-  // Self stake validators so they are displayed
-  cy.validatorsSelfDelegate();
 });
@@ -85,132 +85,6 @@ export function createFreeFormProposalTxBody(): ProposalSubmissionBody {
  };
 }

-export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
-  const MIN_CLOSE_SEC = 5;
-  const MIN_ENACT_SEC = 7;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'New Market Proposal E2E submission',
-        description: 'E2E new market proposal',
-      },
-      terms: {
-        newMarket: {
-          changes: {
-            decimalPlaces: '5',
-            positionDecimalPlaces: '5',
-            linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
-            lpPriceRange: '10',
-            instrument: {
-              name: 'Token test market',
-              code: 'TEST.24h',
-              future: {
-                settlementAsset:
-                  '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
-                quoteName: 'fBTC',
-                dataSourceSpecForSettlementData: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'prices.ETH.value',
-                            type: 'TYPE_INTEGER' as const,
-                            numberDecimalPlaces: '0',
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_GREATER_THAN' as const,
-                              value: '0',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'trading.terminated.ETH5',
-                            type: 'TYPE_BOOLEAN' as const,
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_EQUALS' as const,
-                              value: 'true',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  settlementDataProperty: 'prices.ETH.value',
-                  tradingTerminationProperty: 'trading.terminated.ETH5',
-                },
-              },
-            },
-            metadata: ['sector:energy', 'sector:tech', 'source:docs.vega.xyz'],
-            priceMonitoringParameters: {
-              triggers: [
-                {
-                  horizon: '43200',
-                  probability: '0.9999999',
-                  auctionExtension: '600',
-                },
-              ],
-            },
-            liquidityMonitoringParameters: {
-              targetStakeParameters: {
-                timeWindow: '3600',
-                scalingFactor: 10,
-              },
-              triggeringRatio: '0.7',
-              auctionExtension: '1',
-            },
-            logNormal: {
-              tau: 0.0001140771161,
-              riskAversionParameter: 0.01,
-              params: {
-                mu: 0,
-                r: 0.016,
-                sigma: 0.5,
-              },
-            },
-          },
-        },
-        closingTimestamp,
-        enactmentTimestamp,
-      },
-    },
-  };
-}
-
 export function mockNetworkUpgradeProposal() {
  cy.mockGQL((req) => {
    aliasGQLQuery(req, 'Nodes', nodeData);
@@ -3,6 +3,7 @@ import {
  StakingBridge,
  Token,
  TokenVesting,
+  TokenFaucetable,
  CollateralBridge,
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';
@@ -40,7 +41,7 @@ export async function depositAsset(
  decimalPlaces: number
 ) {
  // Approve asset
-  const faucet = new Token(assetEthAddress, signer);
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
  cy.wrap(
    faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
    {
@@ -61,12 +62,13 @@ export async function depositAsset(
 }

 export async function faucetAsset(assetEthAddress: string) {
-  const faucet = new Token(assetEthAddress, signer);
+  const faucet = new TokenFaucetable(assetEthAddress, signer);
  await promiseWithTimeout(faucet.faucet(), 10 * 60 * 1000, 'faucet asset');
 }

 export async function vegaWalletTeardown() {
  cy.get(associatedAmountInWallet)
+    .should('be.visible')
    .invoke('text')
    .then((associatedAmount) => {
      cy.get('body').then(($body) => {
@@ -81,11 +83,9 @@ export async function vegaWalletTeardown() {
      cy.get(vegaWalletContainer).within(() => {
        cy.get(associatedAmountInWallet, {
          timeout: transactionTimeout,
-        })
-          .should('have.length', 1, { timeout: transactionTimeout })
-          .contains('0.00', {
-            timeout: transactionTimeout,
-          });
+        }).contains('0.00', {
+          timeout: transactionTimeout,
+        });
      });
    });
 }
@@ -5,7 +5,7 @@ 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://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
@@ -15,7 +15,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -3,7 +3,7 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''
@@ -17,7 +17,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=DEVNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -10,5 +10,4 @@ NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -1,8 +1,8 @@
 # App configuration variables
 NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
-NX_VEGA_URL=https://api.vega.community/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -12,4 +12,3 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-NX_VEGA_REST_URL=https://api.vega.community/api/v2/
@@ -1,11 +1,10 @@
 # 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://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -2,7 +2,7 @@
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -12,4 +12,3 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 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/
@@ -3,10 +3,9 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 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/
@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	eb953bf62e	chore: add restrict import rules for utils and react helpers	2023-05-06 09:55:35 -07:00
Matthew Russell	a7d6c68515	chore: fix build-spec	2023-05-05 22:55:23 -07:00
Matthew Russell	660552c565	chore: fix imports	2023-05-05 22:41:56 -07:00
Matthew Russell	ccfcdd4d52	chore: create lib for network params move chain id query	2023-05-05 17:58:32 -07:00
Matthew Russell	3ab0c77866	fix: tests	2023-05-05 17:23:34 -07:00
Matthew Russell	a673811d20	chore: move all data provider code to data-provider lib	2023-05-05 17:00:28 -07:00