fix: do not show validators with 0 self stake in list

Co-authored-by: Madalina Raicu <madalina@raygroup.uk>

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

@@ -5,6 +5,8 @@ on:
     branches:
       - release/*
       - develop
+    tags:
+      - v*
   pull_request:
     types:
       - opened
@@ -97,15 +99,13 @@ 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"

.github/workflows/publish-dist.yml

@@ -30,13 +30,21 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Log in to the Container registry
+      - 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
+        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:
@@ -54,30 +62,24 @@ jobs:
       - name: Define variables
         run: |
           envName=''
-          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"
             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
@@ -98,62 +100,59 @@ 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: ${{ env.DOCKERFILE }}
+          file: docker/node-outside-docker.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' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
+        if: ${{ github.event_name == 'pull_request' }}
         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"
-          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
-            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          fi
-
+          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 > ${{ matirx.app }}-ipfs-hash
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 
-      - 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
+      - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
         with:
           context: .
-          file: ${{ env.DOCKERFILE }}
+          file: docker/node-outside-docker.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 }}
+
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -169,3 +168,9 @@ jobs:
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
+
+      - name: Add ipfs hash to release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        with:
+          files: ${{ matrix.app }}-ipfs-hash

.gitignore

@@ -2,6 +2,7 @@
 
 # compiled output
 /dist
+/dist-result
 /tmp
 /out-tsc
 /tools/executors/**/*.js

Makefile

@@ -0,0 +1,20 @@
+.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 -rw /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

README.md

@@ -103,25 +103,68 @@ 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.
 
-# Docker & Vegacapsule
+# 🐋 Hosting a console
 
-## Docker
+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).
 
-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:
+In order to run a container on port 3000:
 
 ```bash
 docker run -p 3000:80 [TAG]
 ```
 
-Images ending with `.dist` are to pack locally created transpiled HTML files into nginx container for non-compatible with yarn architectures like M1 Mac
+## 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**
 
 ## Config
 

apps/explorer/.env

@@ -4,14 +4,14 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 
 # App flags

apps/explorer/.env.devnet

@@ -5,8 +5,8 @@ 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.token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://dev.governance.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_VEGA_EXPLORER_URL=/

apps/explorer/.env.mainnet

@@ -5,6 +5,6 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
+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_EXPLORER_URL=https://explorer.vega.xyz/

apps/explorer/.env.testnet

@@ -7,6 +7,6 @@ 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://token.fairground.wtf
+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_EXPLORER_URL=https://explorer.fairground.wtf

apps/governance-e2e/.env

@@ -30,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://token.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

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

@@ -2,6 +2,7 @@ import {
   navigateTo,
   waitForSpinner,
   navigation,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
   createRawProposal,
@@ -50,6 +51,7 @@ describe(
 
     beforeEach('visit proposals tab', function () {
       cy.clearLocalStorage();
+      turnTelemetryOff();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

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

@@ -2,6 +2,7 @@
 import {
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -37,6 +38,7 @@ context(
 
     beforeEach('visit proposals', function () {
       cy.clearLocalStorage();
+      turnTelemetryOff();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

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

@@ -20,6 +20,7 @@ import {
   navigateTo,
   navigation,
   closeDialog,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
   clickOnValidatorFromList,
@@ -85,6 +86,7 @@ context(
 
     beforeEach('visit governance tab', function () {
       cy.clearLocalStorage();
+      turnTelemetryOff();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

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

@@ -2,6 +2,7 @@ import {
   closeDialog,
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -77,6 +78,7 @@ context(
 
     beforeEach('visit governance tab', function () {
       cy.clearLocalStorage();
+      turnTelemetryOff();
       cy.reload();
       waitForSpinner();
       cy.connectVegaWallet();

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

@@ -2,6 +2,7 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import {
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -36,6 +37,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
 
   beforeEach('visit proposals tab', function () {
     cy.clearLocalStorage();
+    turnTelemetryOff();
     cy.reload();
     waitForSpinner();
     cy.connectVegaWallet();

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

@@ -1,6 +1,7 @@
 import {
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -26,6 +27,7 @@ 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);

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

@@ -4,6 +4,7 @@ import {
   waitForSpinner,
   navigateTo,
   navigation,
+  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
   stakingPageAssociateTokens,
@@ -54,6 +55,7 @@ context(
         'teardown wallet & drill into a specific validator',
         function () {
           cy.clearLocalStorage();
+          turnTelemetryOff();
           cy.reload();
           waitForSpinner();
           cy.connectVegaWallet();

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

@@ -1,6 +1,7 @@
 import {
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
@@ -55,6 +56,7 @@ context(
 
     beforeEach('Navigate to withdrawal page', function () {
       cy.clearLocalStorage();
+      turnTelemetryOff();
       cy.reload();
       waitForSpinner();
       navigateTo(navigation.withdraw);

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

@@ -161,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
       cy.getByTestId('menu-drawer').should('be.visible');
     });
 
-    it('should have link for proposal page', function () {
+    it.skip('should have link for proposal page', function () {
       cy.getByTestId('menu-drawer').within(() => {
         cy.get('[href="/proposals"]')
           .should('exist')

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

@@ -54,7 +54,7 @@ context(
         });
     });
 
-    it('should be able to see button for - new proposal', function () {
+    it.skip('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('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
+    it.skip('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')

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

@@ -3,6 +3,7 @@
 import {
   navigateTo,
   navigation,
+  turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -26,6 +27,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
 
   beforeEach('visit home page', function () {
     cy.clearLocalStorage();
+    turnTelemetryOff();
     cy.visit('/');
     waitForSpinner();
     cy.connectPublicKey(vegaWalletPubKey);
@@ -44,7 +46,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
       .and('contain.text', 'USDC (fake)');
   });
 
-  it('Unable to submit proposal with public key', function () {
+  it.skip('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);

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

@@ -13,7 +13,6 @@ context(
   { tags: '@regression' },
   function () {
     before('navigate to rewards page', function () {
-      cy.clearLocalStorage();
       cy.visit('/');
       navigateTo(navigation.rewards);
     });

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

@@ -33,7 +33,6 @@ const stakeNumberRegex = /^\d*\.?\d*$/;
 
 context('Validators Page - verify elements on page', function () {
   before('navigate to validators page', function () {
-    cy.clearAllLocalStorage();
     cy.visit('/validators');
   });
 

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

@@ -35,7 +35,6 @@ context(
   { tags: '@regression' },
   () => {
     before('visit token home page', () => {
-      cy.clearAllLocalStorage();
       cy.visit('/');
       cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
     });

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

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

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

@@ -90,3 +90,10 @@ 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')
+  );
+}

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

@@ -11,6 +11,7 @@ import './proposal.functions.ts';
 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
@@ -24,6 +25,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());

apps/governance/.env

@@ -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.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz

apps/governance/.env.capsule

@@ -3,7 +3,7 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHEREUM_PROVIDER_URL=http://localhost:8545
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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=''

apps/governance/.env.devnet

@@ -2,7 +2,7 @@
 NX_VEGA_ENV=DEVNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_URL=https://api.n00.devnet1.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.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,4 +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_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.mainnet

@@ -2,7 +2,7 @@
 NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/.env.stagnet1

@@ -1,10 +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.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_EXPLORER_URL=https://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_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/governance/.env.testnet

@@ -2,7 +2,7 @@
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/.env.validator-testnet

@@ -3,7 +3,7 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

apps/governance/src/app-loader.tsx

@@ -58,9 +58,15 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
           token.decimals(),
         ]);
 
-        const totalSupply = toBigNum(supply, decimals);
-        const totalWallet = toBigNum(totalAssociatedWallet, decimals);
-        const totalVesting = toBigNum(totalAssociatedVesting, decimals);
+        const totalSupply = toBigNum(supply.toString(), decimals);
+        const totalWallet = toBigNum(
+          totalAssociatedWallet.toString(),
+          decimals
+        );
+        const totalVesting = toBigNum(
+          totalAssociatedVesting.toString(),
+          decimals
+        );
 
         appDispatch({
           type: AppStateActionType.SET_TOKEN,

apps/governance/src/app.tsx

@@ -43,6 +43,11 @@ import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
+import {
+  TelemetryDialog,
+  TELEMETRY_ON,
+} from './components/telemetry-dialog/telemetry-dialog';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -149,6 +154,7 @@ const Web3Container = ({
                   <VegaWalletDialogs />
                   <TransactionModal />
                   <WithdrawalDialog />
+                  <TelemetryDialog />
                 </>
               </BalanceManager>
             </AppLoader>
@@ -177,9 +183,10 @@ const AppContainer = () => {
   const { config, loading, error } = useEthereumConfig();
   const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
     useEnvironment();
+  const [telemetryOn] = useLocalStorage(TELEMETRY_ON);
 
   useEffect(() => {
-    if (ENV.dsn) {
+    if (ENV.dsn && telemetryOn) {
       Sentry.init({
         dsn: ENV.dsn,
         integrations: [new Integrations.BrowserTracing()],
@@ -202,8 +209,10 @@ const AppContainer = () => {
       });
       Sentry.setTag('branch', GIT_BRANCH);
       Sentry.setTag('commit', GIT_COMMIT_HASH);
+    } else {
+      Sentry.close();
     }
-  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV]);
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
 
   return (
     <Router>

apps/governance/src/components/nav/nav.tsx

@@ -11,11 +11,26 @@ import {
   NavigationLink,
   NavigationList,
   NavigationTrigger,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { EthWallet } from '../eth-wallet';
 import { VegaWallet } from '../vega-wallet';
 import { useLocation, useMatch } from 'react-router-dom';
 import { useEffect } from 'react';
+import { useTelemetryDialog } from '../telemetry-dialog/telemetry-dialog';
+
+export const SettingsLink = () => {
+  const { open, isOpen, close } = useTelemetryDialog();
+  return (
+    <button
+      type="button"
+      onClick={() => (isOpen ? close() : open())}
+      aria-label="Open Telemetry Settings"
+    >
+      <Icon name="cog" className="w-5 h-5 mr-2" />
+    </button>
+  );
+};
 
 export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
   const { t } = useTranslation();
@@ -42,7 +57,12 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
   ));
 
   return (
-    <Navigation appName="Governance" theme={theme} breakpoints={[458, 959]}>
+    <Navigation
+      appName="Governance"
+      theme={theme}
+      breakpoints={[458, 959]}
+      actions={<SettingsLink />}
+    >
       <NavigationList
         className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
         hide={[NavigationBreakpoint.Small]}

apps/governance/src/components/telemetry-dialog/telemetry-dialog.spec.tsx

@@ -0,0 +1,53 @@
+import { renderHook, act } from '@testing-library/react';
+import { useTelemetryDialog, TELEMETRY_ON } from './telemetry-dialog';
+
+describe('useTelemetryDialog', () => {
+  beforeEach(() => {
+    localStorage.clear();
+  });
+
+  it('should have the correct initial state based on localStorage', () => {
+    localStorage.setItem(TELEMETRY_ON, 'true');
+
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    expect(result.current.isOpen).toBe(false);
+    expect(result.current.telemetryAccepted).toBe(true);
+  });
+
+  it('should update localStorage and the telemetryAccepted state when setTelemetryAccepted is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.setTelemetryAccepted(true);
+    });
+
+    expect(result.current.telemetryAccepted).toBe(true);
+    expect(localStorage.getItem(TELEMETRY_ON)).toBe('true');
+  });
+
+  it('should update localStorage and the isOpen state when close is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.close();
+    });
+
+    expect(result.current.isOpen).toBe(false);
+  });
+
+  it('should update the isOpen state when open is called', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+
+    act(() => {
+      result.current.open();
+    });
+
+    expect(result.current.isOpen).toBe(true);
+  });
+
+  it('should open the dialog if TELEMETRY_ON is not set', () => {
+    const { result } = renderHook(() => useTelemetryDialog());
+    expect(result.current.isOpen).toBe(true);
+  });
+});

apps/governance/src/components/telemetry-dialog/telemetry-dialog.tsx

@@ -0,0 +1,102 @@
+import { create } from 'zustand';
+import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { Dialog, Icon, Button } from '@vegaprotocol/ui-toolkit';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+
+type TelemetryDialogState = {
+  isOpen: boolean;
+  open: () => void;
+  close: () => void;
+};
+
+const useTelemetryDialogStore = create<TelemetryDialogState>((set) => ({
+  isOpen: false,
+  open: () => set({ isOpen: true }),
+  close: () => set({ isOpen: false }),
+}));
+
+export const TELEMETRY_ON = 'vega_telemetry_on';
+
+export const useTelemetryDialog = () => {
+  const [telemetryOn, setTelemetryOn] = useLocalStorage(TELEMETRY_ON);
+  const { VEGA_ENV } = useEnvironment();
+  const isMainnet = VEGA_ENV === Networks.MAINNET;
+
+  const defaultTelemetryAccepted = isMainnet ? 'false' : 'true';
+
+  const { isOpen, open, close } = useTelemetryDialogStore();
+
+  useEffect(() => {
+    if (telemetryOn === null || telemetryOn === undefined) {
+      open();
+      setTelemetryOn(defaultTelemetryAccepted);
+    }
+  }, [defaultTelemetryAccepted, open, setTelemetryOn, telemetryOn]);
+
+  return {
+    isOpen,
+    open: open,
+    close: close,
+    telemetryAccepted: telemetryOn === 'true',
+    setTelemetryAccepted: (value: boolean) => {
+      setTelemetryOn(value.toString());
+    },
+  };
+};
+
+export const TelemetryDialog = () => {
+  const { t } = useTranslation();
+  const { isOpen, open, close, telemetryAccepted, setTelemetryAccepted } =
+    useTelemetryDialog();
+  return (
+    <Dialog
+      title={t('ImproveVegaGovernance')}
+      open={isOpen}
+      onChange={(isOpen) => (isOpen ? open() : close())}
+      size="small"
+    >
+      <div className="mt-6">{t('TelemetryModalIntro')}</div>
+      <div className="flex items-center mt-6">
+        <Icon name="eye-off" className="mr-6" size={6} />
+        <div className="flex flex-col gap-1">
+          <div className="font-semibold">{t('Anonymous')}</div>
+          <div>{t('YourIdentityAnonymous')}</div>
+        </div>
+      </div>
+
+      <div className="flex items-center mt-6">
+        <Icon name="cog" className="mr-6" size={6} />
+        <div className="flex flex-col gap-1">
+          <div className="font-semibold">{t('Optional')}</div>
+          <div>{t('OptOutOfTelemetry')}</div>
+        </div>
+      </div>
+
+      <div className="flex items-center mt-10 gap-4">
+        <Button
+          onClick={() => {
+            setTelemetryAccepted(false);
+            close();
+          }}
+          variant="default"
+          data-testid="do-not-share-data-button"
+        >
+          {t('NoThanks')}
+        </Button>
+
+        <Button
+          onClick={() => {
+            setTelemetryAccepted(true);
+            close();
+          }}
+          variant="primary"
+          data-testid="share-data-button"
+        >
+          {telemetryAccepted ? t('ContinueSharingData') : t('ShareData')}
+        </Button>
+      </div>
+    </Dialog>
+  );
+};

apps/governance/src/hooks/use-document-title.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 
 export function useDocumentTitle(name?: string) {
-  const base = 'VEGA token';
+  const base = 'VEGA Governance';
 
   React.useEffect(() => {
     if (name) {

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

@@ -66,7 +66,7 @@
   "claim": "This code ({{code}}) entitles <bold>{{user}}</bold> to <bold>{{amount}} $VEGA</bold> tokens from <trancheLink>{{linkText}}</trancheLink> of the vesting contract. {{expiry}}.",
   "claimExpiry": "The code expires on {{date}}",
   "claimNoExpiry": "It has no expiry date",
-  "showRedeem": "You'll be able to redeem your unlocked tokens at token.vega.xyz/vesting",
+  "showRedeem": "You'll be able to redeem your unlocked tokens at governance.vega.xyz/vesting",
   "codeUsed": "Code already used",
   "codeUsedText": "Looks like that code has already been used. Check the Vesting page to see if you can redeem your tokens.",
   "codeExpired": "Code expired",
@@ -86,7 +86,7 @@
   "Awaiting action in Ethereum wallet (e.g. MetaMask)": "Awaiting action in Ethereum wallet (e.g. MetaMask)",
   "Claim {amount} Vega": "Claim {{amount}} $VEGA",
   "Sorry. It is not possible to claim tokens in your country or region.": "It is not possible to claim tokens in your country or region.",
-  "none redeemable": "Tokens in this tranche unlock on {{unlockDate}} and continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked. Come back to token.vega.xyz to redeem your tokens once they begin to unlock.",
+  "none redeemable": "Tokens in this tranche unlock on {{unlockDate}} and continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked. Come back to governance.vega.xyz to redeem your tokens once they begin to unlock.",
   "partially redeemable": "Tokens in this tranche began to unlock on {{unlockDate}} and will continue to unlock gradually until {{trancheEndDate}} when all tokens are unlocked.",
   "fully redeemable": "Tokens in this tranche have fully unlocked and can be redeemed once claimed.",
   "This page can not be found, please check the URL and try again.": "This page can not be found, please check the URL and try again.",
@@ -678,6 +678,8 @@
   "FilterProposalsDescription": "Filter by proposal ID or proposer ID",
   "Freeform proposal": "Freeform proposal",
   "NewProposal": "New proposal",
+  "CreateProposalAndDownloadJSONToShare": "Create proposal and download JSON to share",
+  "SubmitAnAgreedProposalFromTheForum": "Submit an agreed proposal from the forum",
   "ProposalTypeQuestion": "What type of proposal would you like to make?",
   "NetworkParameterProposal": "Update network parameter proposal",
   "parameter": "parameter",
@@ -701,6 +703,7 @@
   "AssetID": "Asset ID",
   "Freeform": "Freeform",
   "RawProposal": "Let me choose (raw proposal)",
+  "SubmitAgreedRawProposal": "Submit agreed raw proposal",
   "UseMin": "Use minimum",
   "UseMax": "Use maximum",
   "Proposal": "Proposal",
@@ -799,5 +802,14 @@
   "associateVegaNow": "Associate $VEGA now",
   "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app.",
   "connectAVegaWalletToVote": "Connect a Vega wallet with $VEGA tokens to vote on a proposal.",
-  "findOutMoreAboutHowToVote": "Find out more about how to vote on Vega"
+  "findOutMoreAboutHowToVote": "Find out more about how to vote on Vega",
+  "ImproveVegaGovernance": "Improve Vega governance",
+  "TelemetryModalIntro": "Help us identify bugs and improve Vega Governance by sharing anonymous usage data.",
+  "Anonymous": "Anonymous",
+  "YourIdentityAnonymous": "Your identity is always anonymous on Vega",
+  "Optional": "Optional",
+  "OptOutOfTelemetry": "You can opt out any time via settings",
+  "NoThanks": "No thanks",
+  "ShareData": "Share data",
+  "ContinueSharingData": "Continue sharing data"
 }

apps/governance/src/index.html

@@ -24,7 +24,7 @@
       type="font/woff2"
       crossorigin="anonymous"
     />
-    <title>Vega Token dApp</title>
+    <title>Vega Governance dApp</title>
     <script src="./assets/env-config.js"></script>
   </head>
   <body class="h-full">

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

@@ -6,13 +6,14 @@ import { ProposalsListItem } from '../proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
-import { ExternalLinks } from '@vegaprotocol/utils';
+import { createDocsLinks, ExternalLinks } from '@vegaprotocol/utils';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
+import { useEnvironment } from '@vegaprotocol/environment';
 
 interface ProposalsListProps {
   proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
@@ -35,6 +36,7 @@ export const ProposalsList = ({
   protocolUpgradeProposals,
   lastBlockHeight,
 }: ProposalsListProps) => {
+  const { VEGA_DOCS_URL } = useEnvironment();
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
   const sortedProposals = proposals.reduce(
@@ -81,15 +83,18 @@ export const ProposalsList = ({
           marginBottom={false}
           title={t('pageTitleProposals')}
         />
-        <Link
-          className="xs:justify-self-end"
-          data-testid="new-proposal-link"
-          to={`${Routes.PROPOSALS}/propose`}
-        >
-          <Button variant="primary" size="sm">
-            {t('NewProposal')}
-          </Button>
-        </Link>
+        {VEGA_DOCS_URL && (
+          <div className="xs:justify-self-end" data-testid="new-proposal-link">
+            <ExternalLink href={createDocsLinks(VEGA_DOCS_URL).PROPOSALS_GUIDE}>
+              <Button variant="primary" size="sm">
+                <div className="flex items-center gap-1">
+                  {t('NewProposal')}
+                  <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={13} />
+                </div>
+              </Button>
+            </ExternalLink>
+          </div>
+        )}
       </div>
       <p className="mb-8">
         {t(

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

@@ -108,7 +108,7 @@ describe('Propose Freeform', () => {
     expect(screen.getByTestId('proposal-title')).toBeTruthy();
     expect(screen.getByTestId('proposal-description')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -9,7 +9,6 @@ import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
   ProposalFormDownloadJson,
@@ -48,7 +47,7 @@ export const ProposeFreeform = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<FreeformProposalFormFields>();
@@ -165,7 +164,6 @@ export const ProposeFreeform = () => {
                 voteMaxClose={params.governance_proposal_freeform_maxClose}
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -111,7 +111,7 @@ describe('Propose Network Parameter', () => {
     expect(screen.getByTestId('proposal-description')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -16,7 +16,6 @@ import { useEnvironment } from '@vegaprotocol/environment';
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
   ProposalFormVoteAndEnactmentDeadline,
@@ -90,7 +89,7 @@ export const ProposeNetworkParameter = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<NetworkParameterProposalFormFields>();
@@ -310,7 +309,6 @@ export const ProposeNetworkParameter = () => {
                 }
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -109,7 +109,7 @@ describe('Propose New Asset', () => {
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-validation-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -16,7 +16,6 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -59,7 +58,7 @@ export const ProposeNewAsset = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<NewAssetProposalFormFields>();
@@ -226,7 +225,6 @@ export const ProposeNewAsset = () => {
                 }
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -103,7 +103,7 @@ describe('Propose New Market', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -15,7 +15,6 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -57,7 +56,7 @@ export const ProposeNewMarket = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<NewMarketProposalFormFields>();
@@ -208,7 +207,6 @@ export const ProposeNewMarket = () => {
                 enactmentMaxClose={params.governance_proposal_market_maxEnact}
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -15,10 +15,10 @@ describe('Propose', () => {
     expect(baseElement).toBeTruthy();
   });
 
-  it('should render the heading, proposal type question and options', () => {
+  it('should render the heading, proposals title and options', () => {
     renderComponent();
     expect(
-      screen.getByText('What type of proposal would you like to make?')
+      screen.getByText('Create proposal and download JSON to share')
     ).toBeTruthy();
     expect(screen.getByText('Network parameter')).toBeTruthy();
     expect(screen.getByText('New market')).toBeTruthy();
@@ -26,6 +26,9 @@ describe('Propose', () => {
     expect(screen.getByText('New asset')).toBeTruthy();
     expect(screen.getByText('Update asset')).toBeTruthy();
     expect(screen.getByText('Freeform')).toBeTruthy();
-    expect(screen.getByText('Let me choose (raw proposal)')).toBeTruthy();
+    expect(
+      screen.getByText('Submit an agreed proposal from the forum')
+    ).toBeTruthy();
+    expect(screen.getByText('Submit agreed raw proposal')).toBeTruthy();
   });
 });

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

@@ -39,8 +39,8 @@ export const Propose = () => {
       </section>
 
       <section>
-        <h2 className="text-h5">{t('ProposalTypeQuestion')}</h2>
-        <ul>
+        <h2 className="text-h5">{t('CreateProposalAndDownloadJSONToShare')}</h2>
+        <ul className="mb-6">
           <li>
             <p>
               <Link
@@ -101,17 +101,14 @@ export const Propose = () => {
               </Link>
             </p>
           </li>
-          <li>
-            <p>
-              <Link
-                className="underline"
-                to={`${Routes.PROPOSALS}/propose/raw`}
-              >
-                {t('RawProposal')}
-              </Link>
-            </p>
-          </li>
         </ul>
+
+        <h2 className="text-h5">{t('SubmitAnAgreedProposalFromTheForum')}</h2>
+        <p>
+          <Link className="underline" to={`${Routes.PROPOSALS}/propose/raw`}>
+            {t('SubmitAgreedRawProposal')}
+          </Link>
+        </p>
       </section>
     </>
   );

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

@@ -18,10 +18,8 @@ import { useProposalSubmit } from '@vegaprotocol/proposals';
 import {
   ProposalFormSubmit,
   ProposalFormTransactionDialog,
-  ProposalFormDownloadJson,
 } from '../../components/propose';
 import { ProposalRawMinRequirements } from './proposal-raw-min-requirements';
-import { downloadJson } from '../../../../lib/download-json';
 
 export interface RawProposalFormFields {
   rawProposalData: string;
@@ -47,7 +45,6 @@ export const ProposeRaw = () => {
     register,
     handleSubmit,
     formState: { isSubmitting, errors },
-    watch,
   } = useForm<RawProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -57,11 +54,6 @@ export const ProposeRaw = () => {
     await submit(JSON.parse(fields.rawProposalData));
   };
 
-  const viewJson = () => {
-    const formData = watch();
-    downloadJson(JSON.stringify(formData), 'vega-raw-proposal');
-  };
-
   return (
     <AsyncRenderer
       loading={networkParamsLoading}
@@ -132,7 +124,6 @@ export const ProposeRaw = () => {
                 )}
               </FormGroup>
               <ProposalFormSubmit isSubmitting={isSubmitting} />
-              <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}
                 TransactionDialog={Dialog}

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

@@ -110,7 +110,7 @@ describe('Propose Update Asset', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -15,7 +15,6 @@ import {
 import {
   ProposalFormDescription,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -57,7 +56,7 @@ export const ProposeUpdateAsset = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<UpdateAssetProposalFormFields>();
@@ -212,7 +211,6 @@ export const ProposeUpdateAsset = () => {
                 }
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -261,7 +261,7 @@ describe('Propose Update Market', () => {
     expect(screen.getByTestId('proposal-terms')).toBeTruthy();
     expect(screen.getByTestId('proposal-vote-deadline')).toBeTruthy();
     expect(screen.getByTestId('proposal-enactment-deadline')).toBeTruthy();
-    expect(screen.getByTestId('proposal-submit')).toBeTruthy();
+
     expect(screen.getByTestId('proposal-download-json')).toBeTruthy();
     expect(screen.getByTestId('proposal-transaction-dialog')).toBeTruthy();
   });

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

@@ -17,7 +17,6 @@ import {
   ProposalFormDescription,
   ProposalFormDownloadJson,
   ProposalFormSubheader,
-  ProposalFormSubmit,
   ProposalFormTerms,
   ProposalFormTitle,
   ProposalFormTransactionDialog,
@@ -104,7 +103,7 @@ export const ProposeUpdateMarket = () => {
   const {
     register,
     handleSubmit,
-    formState: { isSubmitting, errors },
+    formState: { errors },
     setValue,
     watch,
   } = useForm<UpdateMarketProposalFormFields>();
@@ -317,7 +316,6 @@ export const ProposeUpdateMarket = () => {
                 }
               />
 
-              <ProposalFormSubmit isSubmitting={isSubmitting} />
               <ProposalFormDownloadJson downloadJson={viewJson} />
               <ProposalFormTransactionDialog
                 finalizedProposal={finalizedProposal}

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

@@ -34,6 +34,7 @@ import {
   formatNumberPercentage,
   toBigNum,
 } from '@vegaprotocol/utils';
+import { VALIDATOR_LOGO_MAP } from './logo-map';
 
 interface CanonisedConsensusNodeProps {
   id: string;
@@ -131,7 +132,7 @@ export const ConsensusValidatorsTable = ({
   const gridRef = useRef<AgGridReact | null>(null);
 
   const nodes = useMemo(() => {
-    if (!data || !previousEpochData) return [];
+    if (!data) return [];
     let canonisedNodes = data
       .sort((a, b) => {
         const aVotingPower = new BigNumber(a.rankingScore.votingPower);
@@ -161,6 +162,11 @@ export const ConsensusValidatorsTable = ({
           pendingUserStake,
           userStakeShare,
         }) => {
+          const logo = VALIDATOR_LOGO_MAP[id]
+            ? VALIDATOR_LOGO_MAP[id]
+            : avatarUrl
+            ? avatarUrl
+            : null;
           const {
             rawValidatorScore: previousEpochValidatorScore,
             performanceScore: previousEpochPerformanceScore,
@@ -171,7 +177,7 @@ export const ConsensusValidatorsTable = ({
             id,
             [ValidatorFields.RANKING_INDEX]: votingPowerRanking,
             [ValidatorFields.VALIDATOR]: {
-              avatarUrl,
+              avatarUrl: logo,
               name,
             },
             [ValidatorFields.STAKE]: stakedTotal,

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

@@ -0,0 +1,14 @@
+export const VALIDATOR_LOGO_MAP: { [key: string]: string } = {
+  '55504e9bfd914a7bbefa342c82f59a2f4dee344e5b6863a14c02a812f4fbde32':
+    'https://pbs.twimg.com/profile_images/1586047492629712897/ZVMWBE94_400x400.jpg',
+  efbdf943443bd7595e83b0d7e88f37b7932d487d1b94aab3d004997273bb43fc:
+    'https://pbs.twimg.com/profile_images/1026823609979949057/3e-LCHHm_400x400.jpg',
+  '126751c5830b50d39eb85412fb2964f46338cce6946ff455b73f1b1be3f5e8cc':
+    'https://pbs.twimg.com/profile_images/1228627868542029824/9aoaLiIx_400x400.jpg',
+  '43697a3e911d8b70c0ce672adde17a5c38ca8f6a0486bf85ed0546e1b9a82887':
+    'https://pbs.twimg.com/profile_images/1352167987478843392/XzX82gIb_400x400.jpg',
+  ac735acc9ab11cf1d8c59c2df2107e00092b4ac96451cb137a1629af5b66242a:
+    'https://pbs.twimg.com/profile_images/1159254945885016064/vhhp1wL4_400x400.jpg',
+  '74023df02b8afc9eaf3e3e2e8b07eab1d2122ac3e74b1b0222daf4af565ad3dd':
+    'https://cdn4.telegram-cdn.org/file/n_OJ6upnglNG95E7u5FyfLmqqBUhf25LqtyZD0UM27gMM_WWi8rywrp9JaAA83quP7vx-WU9Q86quvIRdk9wuUrC2tdD08cYxah4dXHa4OgphFg7Vm5UYFjuGxuHn916OIlzIuVOjJWK_nricGdlPcZQK_T4kBJ_5v4pp94j76_DQ1eSy8DjUxnchZxqpGFv-lGN8U4SjRMK0RC_6DusNaRYEn9Ni2ZQHig7nMiqud-nkK5RgUrClfXFwyhoMFVfhHpGUzwpSv1pSEVLXVh7E1mVmWYrW9hzdQGGrouWCGRqtf_hRa9enS2fv0P9mAB23BcURWuLOVtMdJTF4wfc-w.jpg',
+};

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

@@ -16,6 +16,7 @@ import type { PreviousEpochQuery } from '../../__generated__/PreviousEpoch';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import type { StakingDelegationFieldsFragment } from '../../__generated__/Staking';
 import type { ValidatorsView } from './validator-tables';
+import { VALIDATOR_LOGO_MAP } from './logo-map';
 
 export enum ValidatorFields {
   RANKING_INDEX = 'rankingIndex',
@@ -102,13 +103,18 @@ interface ValidatorRendererProps {
 export const ValidatorRenderer = ({ data }: ValidatorRendererProps) => {
   const { t } = useTranslation();
   const { avatarUrl, name } = data.validator;
+  const logo = VALIDATOR_LOGO_MAP[data.id]
+    ? VALIDATOR_LOGO_MAP[data.id]
+    : avatarUrl
+    ? avatarUrl
+    : null;
   return (
     <div className="w-[238px] grid grid-cols-[1fr_auto] gap-2 items-center">
       <span className="flex overflow-hidden">
-        {avatarUrl && (
+        {logo && (
           <img
             className="h-6 w-6 rounded-full mr-2"
-            src={avatarUrl}
+            src={logo}
             alt={`Avatar icon for ${name}`}
             onError={(e) => (e.currentTarget.style.display = 'none')}
           />

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

@@ -78,37 +78,38 @@ export const ValidatorTables = ({
           const nextDelegation = delegations?.find(
             (d) => d.node.id === validatorId && d.epoch === Number(epochId) + 1
           );
-
-          switch (validator.rankingScore?.status) {
-            case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT:
-              acc.consensusValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
-              break;
-            case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ:
-              acc.standbyValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
-              break;
-            case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_PENDING:
-              acc.pendingValidators.push(
-                addUserDataToValidator(
-                  validator,
-                  currentDelegation,
-                  nextDelegation,
-                  currentUserStakeAvailable
-                )
-              );
+          if (validator.stakedByOperator !== '0') {
+            switch (validator.rankingScore?.status) {
+              case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT:
+                acc.consensusValidators.push(
+                  addUserDataToValidator(
+                    validator,
+                    currentDelegation,
+                    nextDelegation,
+                    currentUserStakeAvailable
+                  )
+                );
+                break;
+              case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_ERSATZ:
+                acc.standbyValidators.push(
+                  addUserDataToValidator(
+                    validator,
+                    currentDelegation,
+                    nextDelegation,
+                    currentUserStakeAvailable
+                  )
+                );
+                break;
+              case Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_PENDING:
+                acc.pendingValidators.push(
+                  addUserDataToValidator(
+                    validator,
+                    currentDelegation,
+                    nextDelegation,
+                    currentUserStakeAvailable
+                  )
+                );
+            }
           }
           return acc;
         },

apps/trading-e2e/.env

@@ -7,7 +7,7 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
@@ -26,7 +26,7 @@ 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://token.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading-e2e/.env.capsule

@@ -6,7 +6,7 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
@@ -23,7 +23,7 @@ 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://token.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://governance.fairground.wtf
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=

apps/trading/.env

@@ -7,9 +7,9 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

apps/trading/.env.capsule

@@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL=''
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet

apps/trading/.env.devnet

@@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases

apps/trading/.env.mainnet

@@ -5,7 +5,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.vega.xyz
+NX_VEGA_TOKEN_URL=https://governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases

apps/trading/.env.stagnet1

@@ -6,9 +6,9 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

apps/trading/.env.testnet

@@ -6,7 +6,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\"}
-NX_VEGA_TOKEN_URL=https://token.fairground.wtf
+NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases

apps/trading/components/welcome-dialog/risk-notice-dialog.tsx

@@ -7,7 +7,13 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { RISK_ACCEPTED_KEY } from '../constants';
 import { TelemetryApproval } from './telemetry-approval';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import {
+  DOCS_VEGA_WALLET,
+  GET_VEGA_WALLET_URL,
+  Networks,
+  useDocsLink,
+  useEnvironment,
+} from '@vegaprotocol/environment';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 
 interface Props {
@@ -46,8 +52,9 @@ export const RiskNoticeDialog = ({ onClose, network }: Props) => {
 };
 
 const TestnetContent = ({ network }: { network: Networks }) => {
-  const { VEGA_DOCS_URL, GITHUB_FEEDBACK_URL, VEGA_WALLET_URL } =
-    useEnvironment();
+  const { GITHUB_FEEDBACK_URL } = useEnvironment();
+  const docsLink = useDocsLink();
+
   return (
     <>
       <p className="mb-4">
@@ -62,17 +69,17 @@ const TestnetContent = ({ network }: { network: Networks }) => {
           [network]
         )}
       </p>
-      {VEGA_DOCS_URL && GITHUB_FEEDBACK_URL && VEGA_WALLET_URL && (
+      {GITHUB_FEEDBACK_URL && GET_VEGA_WALLET_URL && docsLink && (
         <ul className="list-disc pl-4">
           <li className="mb-1">
-            <Link href={VEGA_WALLET_URL} target="_blank">
-              <span className="underline">{t('Learn about Vega wallet')}</span>{' '}
+            <Link href={GET_VEGA_WALLET_URL} target="_blank">
+              <span className="underline">{t('Get a Vega Wallet')}</span>{' '}
               <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
             </Link>
           </li>
           <li className="mb-1">
-            <Link href={VEGA_DOCS_URL} target="_blank">
-              <span className="underline">{t('View documentation')}</span>{' '}
+            <Link href={docsLink(DOCS_VEGA_WALLET)} target="_blank">
+              <span className="underline">{t('Learn about Vega Wallet')}</span>{' '}
               <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
             </Link>
           </li>

docker/node-inside-docker.Dockerfile

@@ -0,0 +1,31 @@
+# Build container
+ARG NODE_VERSION
+FROM --platform=amd64 node:${NODE_VERSION}-alpine3.16 as build
+WORKDIR /app
+# Argument to allow building of different apps
+ARG APP
+ARG ENV_NAME=""
+RUN apk add --update --no-cache \
+  python3==3.10.11-r0 \
+  make==4.3-r0 \
+  gcc==11.2.1_git20220219-r2 \
+  g++==11.2.1_git20220219-r2
+COPY . ./
+RUN yarn --network-timeout 100000 --pure-lockfile
+# work around for different build process in trading
+RUN sh docker/docker-build.sh
+
+# Server environment
+# if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
+# this is to ensure that we run always same version of alpine to make sure ipfs is indempotent
+FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+# configuration of system
+EXPOSE 80
+# Copy dist
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+RUN rm -rf /usr/share/nginx/html/*
+COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
+RUN apk add --no-cache go-ipfs==0.16.0-r6 \
+      && ipfs init \
+      && echo "$(ipfs add -rwQ /usr/share/nginx/html)" > /ipfs-hash \
+      && echo "ipfs hash of this build: $(cat /ipfs-hash)"

docker/node-outside-docker.Dockerfile

@@ -0,0 +1,10 @@
+FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+EXPOSE 80
+COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
+RUN rm -rf /usr/share/nginx/html/*
+COPY ./dist-result/ /usr/share/nginx/html/
+RUN apk add --no-cache go-ipfs==0.16.0-r6 \
+      && ipfs init \
+      && echo "$(ipfs add -rwQ /usr/share/nginx/html)" > /ipfs-hash \
+      && echo "ipfs hash of this build: $(cat /ipfs-hash)"
+

docker/prepare-dist.sh

@@ -0,0 +1,13 @@
+#!/bin/bash -e
+yarn --pure-lockfile
+app={$1:-trading}
+flags="--env=${$2:-mainnet}"
+yarn install
+if [ "${app}" = "trading" ]; then
+  yarn nx export trading $flags
+  DIST_LOCATION=dist/apps/trading/exported
+else
+  yarn nx build ${app} $flags
+  DIST_LOCATION=dist/apps/${app}
+fi
+cp -r $DIST_LOCATION dist-result

libs/environment/src/hooks/use-links.ts

@@ -38,10 +38,10 @@ const ConsoleLinks = {
 
 const TokenLinks = {
   ...EmptyLinks,
-  [Networks.DEVNET]: 'https://dev.token.vega.xyz',
-  [Networks.TESTNET]: 'https://token.fairground.wtf',
+  [Networks.DEVNET]: 'https://dev.governance.vega.xyz',
+  [Networks.TESTNET]: 'https://governance.fairground.wtf',
   [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.governance.vega.xyz',
-  [Networks.MAINNET]: 'https://token.vega.xyz',
+  [Networks.MAINNET]: 'https://governance.vega.xyz',
 };
 
 const Links: { [k in DApp]: DAppLinks } = {
@@ -84,6 +84,16 @@ export const useEtherscanLink = () => {
   return link;
 };
 
+export const useDocsLink = () => {
+  const { VEGA_DOCS_URL } = useEnvironment();
+  const baseUrl = trim(VEGA_DOCS_URL, '/');
+  const link = useCallback(
+    (url?: string) => `${baseUrl}/${trim(url, '/') || ''}`,
+    [baseUrl]
+  );
+  return link;
+};
+
 // Vega blog
 export const BLOG = 'https://blog.vega.xyz/';
 
@@ -125,3 +135,9 @@ export const CONSOLE_MARKET = '/markets/:marketId';
 export const CONSOLE_MARKETS = '/markets/all';
 export const CONSOLE_PORTFOLIO = '/portfolio';
 export const CONSOLE_LIQUIDITY = 'liquidity/:marketId';
+
+// Vega XYZ
+export const GET_VEGA_WALLET_URL = 'https://vega.xyz/wallet/';
+
+// Docs
+export const DOCS_VEGA_WALLET = '/tools/vega-wallet';

scripts/make-release.js

@@ -68,7 +68,7 @@ inquirer
       })
       .then(() => {
         for (const env of answers.envs) {
-          const branch = env === 'mainnet' ? 'master' : `release/${env}`;
+          const branch = env === 'mainnet' ? 'main' : `release/${env}`;
           release(answers.tag, branch);
         }
         execSync('git checkout develop');