chore(explorer,trading,governance): change explorer api nodes

chore(explorer,trading,governance): change data node URLs to new ones
2023-05-09 13:07:15 +01:00 · 2023-05-09 12:59:58 +01:00
64 changed files with 113 additions and 324 deletions
@@ -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.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

 # App flags
@@ -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.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_VEGA_EXPLORER_URL=/
@@ -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://governance.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://token.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/
@@ -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://governance.fairground.wtf
+NX_VEGA_GOVERNANCE_URL=https://token.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
@@ -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://governance.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -2,7 +2,6 @@ import {
  navigateTo,
  waitForSpinner,
  navigation,
-  turnTelemetryOff,
 } from '../../support/common.functions';
 import {
  createRawProposal,
@@ -51,7 +50,6 @@ describe(

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

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

    beforeEach('visit governance tab', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      cy.connectVegaWallet();
@@ -2,7 +2,6 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -37,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();
@@ -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);
@@ -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();
@@ -1,7 +1,6 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
@@ -56,7 +55,6 @@ context(

    beforeEach('Navigate to withdrawal page', function () {
      cy.clearLocalStorage();
-      turnTelemetryOff();
      cy.reload();
      waitForSpinner();
      navigateTo(navigation.withdraw);
@@ -161,7 +161,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')
@@ -3,7 +3,6 @@
 import {
  navigateTo,
  navigation,
-  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
@@ -27,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);
@@ -46,7 +44,7 @@ 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);
@@ -13,6 +13,7 @@ context(
  { tags: '@regression' },
  function () {
    before('navigate to rewards page', function () {
+      cy.clearLocalStorage();
      cy.visit('/');
      navigateTo(navigation.rewards);
    });
@@ -33,6 +33,7 @@ const stakeNumberRegex = /^\d*\.?\d*$/;

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

@@ -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')
-  );
-}
@@ -11,7 +11,6 @@ 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
@@ -25,9 +24,6 @@ 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());
@@ -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
@@ -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=''
@@ -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,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
@@ -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.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://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
@@ -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.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_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
@@ -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.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
@@ -58,15 +58,9 @@ export const AppLoader = ({ children }: { children: React.ReactElement }) => {
          token.decimals(),
        ]);

-        const totalSupply = toBigNum(supply.toString(), decimals);
-        const totalWallet = toBigNum(
-          totalAssociatedWallet.toString(),
-          decimals
-        );
-        const totalVesting = toBigNum(
-          totalAssociatedVesting.toString(),
-          decimals
-        );
+        const totalSupply = toBigNum(supply, decimals);
+        const totalWallet = toBigNum(totalAssociatedWallet, decimals);
+        const totalVesting = toBigNum(totalAssociatedVesting, decimals);

        appDispatch({
          type: AppStateActionType.SET_TOKEN,
@@ -43,11 +43,6 @@ 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: {
@@ -154,7 +149,6 @@ const Web3Container = ({
                  <VegaWalletDialogs />
                  <TransactionModal />
                  <WithdrawalDialog />
-                  <TelemetryDialog />
                </>
              </BalanceManager>
            </AppLoader>
@@ -183,10 +177,9 @@ 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 && telemetryOn) {
+    if (ENV.dsn) {
      Sentry.init({
        dsn: ENV.dsn,
        integrations: [new Integrations.BrowserTracing()],
@@ -209,10 +202,8 @@ const AppContainer = () => {
      });
      Sentry.setTag('branch', GIT_BRANCH);
      Sentry.setTag('commit', GIT_COMMIT_HASH);
-    } else {
-      Sentry.close();
    }
-  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV, telemetryOn]);
+  }, [GIT_COMMIT_HASH, GIT_BRANCH, VEGA_ENV]);

  return (
    <Router>
@@ -11,26 +11,11 @@ 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();
@@ -57,12 +42,7 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
  ));

  return (
-    <Navigation
-      appName="Governance"
-      theme={theme}
-      breakpoints={[458, 959]}
-      actions={<SettingsLink />}
-    >
+    <Navigation appName="Governance" theme={theme} breakpoints={[458, 959]}>
      <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]}
@@ -1,53 +0,0 @@
-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);
-  });
-});
@@ -1,102 +0,0 @@
-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>
-  );
-};
@@ -1,7 +1,7 @@
 import React from 'react';

 export function useDocumentTitle(name?: string) {
-  const base = 'VEGA Governance';
+  const base = 'VEGA token';

  React.useEffect(() => {
    if (name) {
@@ -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 governance.vega.xyz/vesting",
+  "showRedeem": "You'll be able to redeem your unlocked tokens at token.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 governance.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 token.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,8 +678,6 @@
  "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",
@@ -703,7 +701,6 @@
  "AssetID": "Asset ID",
  "Freeform": "Freeform",
  "RawProposal": "Let me choose (raw proposal)",
-  "SubmitAgreedRawProposal": "Submit agreed raw proposal",
  "UseMin": "Use minimum",
  "UseMax": "Use maximum",
  "Proposal": "Proposal",
@@ -802,14 +799,5 @@
  "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",
-  "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"
+  "findOutMoreAboutHowToVote": "Find out more about how to vote on Vega"
 }
@@ -24,7 +24,7 @@
      type="font/woff2"
      crossorigin="anonymous"
    />
-    <title>Vega Governance dApp</title>
+    <title>Vega Token dApp</title>
    <script src="./assets/env-config.js"></script>
  </head>
  <body class="h-full">
@@ -6,14 +6,13 @@ 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, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
-import { createDocsLinks, ExternalLinks } from '@vegaprotocol/utils';
+import { 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']>;
@@ -36,7 +35,6 @@ export const ProposalsList = ({
  protocolUpgradeProposals,
  lastBlockHeight,
 }: ProposalsListProps) => {
-  const { VEGA_DOCS_URL } = useEnvironment();
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');
  const sortedProposals = proposals.reduce(
@@ -83,18 +81,15 @@ export const ProposalsList = ({
          marginBottom={false}
          title={t('pageTitleProposals')}
        />
-        {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>
-        )}
+        <Link
+          className="xs:justify-self-end"
+          data-testid="new-proposal-link"
+          to={`${Routes.PROPOSALS}/propose`}
+        >
+          <Button variant="primary" size="sm">
+            {t('NewProposal')}
+          </Button>
+        </Link>
      </div>
      <p className="mb-8">
        {t(
@@ -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();
  });
@@ -9,6 +9,7 @@ import { useEnvironment } from '@vegaprotocol/environment';
 import {
  ProposalFormDescription,
  ProposalFormSubheader,
+  ProposalFormSubmit,
  ProposalFormTitle,
  ProposalFormTransactionDialog,
  ProposalFormDownloadJson,
@@ -47,7 +48,7 @@ export const ProposeFreeform = () => {
  const {
    register,
    handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
    setValue,
    watch,
  } = useForm<FreeformProposalFormFields>();
@@ -164,6 +165,7 @@ export const ProposeFreeform = () => {
                voteMaxClose={params.governance_proposal_freeform_maxClose}
              />

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

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

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

+              <ProposalFormSubmit isSubmitting={isSubmitting} />
              <ProposalFormDownloadJson downloadJson={viewJson} />
              <ProposalFormTransactionDialog
                finalizedProposal={finalizedProposal}
@@ -15,10 +15,10 @@ describe('Propose', () => {
    expect(baseElement).toBeTruthy();
  });

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

      <section>
-        <h2 className="text-h5">{t('CreateProposalAndDownloadJSONToShare')}</h2>
-        <ul className="mb-6">
+        <h2 className="text-h5">{t('ProposalTypeQuestion')}</h2>
+        <ul>
          <li>
            <p>
              <Link
@@ -101,14 +101,17 @@ 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>
    </>
  );
@@ -18,8 +18,10 @@ 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;
@@ -45,6 +47,7 @@ export const ProposeRaw = () => {
    register,
    handleSubmit,
    formState: { isSubmitting, errors },
+    watch,
  } = useForm<RawProposalFormFields>();
  const { finalizedProposal, submit, Dialog } = useProposalSubmit();

@@ -54,6 +57,11 @@ 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}
@@ -124,6 +132,7 @@ export const ProposeRaw = () => {
                )}
              </FormGroup>
              <ProposalFormSubmit isSubmitting={isSubmitting} />
+              <ProposalFormDownloadJson downloadJson={viewJson} />
              <ProposalFormTransactionDialog
                finalizedProposal={finalizedProposal}
                TransactionDialog={Dialog}
@@ -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();
  });
@@ -15,6 +15,7 @@ import {
 import {
  ProposalFormDescription,
  ProposalFormSubheader,
+  ProposalFormSubmit,
  ProposalFormTerms,
  ProposalFormTitle,
  ProposalFormTransactionDialog,
@@ -56,7 +57,7 @@ export const ProposeUpdateAsset = () => {
  const {
    register,
    handleSubmit,
-    formState: { errors },
+    formState: { isSubmitting, errors },
    setValue,
    watch,
  } = useForm<UpdateAssetProposalFormFields>();
@@ -211,6 +212,7 @@ export const ProposeUpdateAsset = () => {
                }
              />

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

+              <ProposalFormSubmit isSubmitting={isSubmitting} />
              <ProposalFormDownloadJson downloadJson={viewJson} />
              <ProposalFormTransactionDialog
                finalizedProposal={finalizedProposal}
@@ -131,7 +131,7 @@ export const ConsensusValidatorsTable = ({
  const gridRef = useRef<AgGridReact | null>(null);

  const nodes = useMemo(() => {
-    if (!data) return [];
+    if (!data || !previousEpochData) return [];
    let canonisedNodes = data
      .sort((a, b) => {
        const aVotingPower = new BigNumber(a.rankingScore.votingPower);
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.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://governance.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.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://governance.fairground.wtf
+CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.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
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases
@@ -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://governance.vega.xyz
+NX_VEGA_TOKEN_URL=https://token.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
@@ -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.governance.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.token.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
@@ -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://governance.fairground.wtf
+NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
@@ -38,10 +38,10 @@ const ConsoleLinks = {

 const TokenLinks = {
  ...EmptyLinks,
-  [Networks.DEVNET]: 'https://dev.governance.vega.xyz',
-  [Networks.TESTNET]: 'https://governance.fairground.wtf',
+  [Networks.DEVNET]: 'https://dev.token.vega.xyz',
+  [Networks.TESTNET]: 'https://token.fairground.wtf',
  [Networks.VALIDATOR_TESTNET]: 'https://validator-testnet.governance.vega.xyz',
-  [Networks.MAINNET]: 'https://governance.vega.xyz',
+  [Networks.MAINNET]: 'https://token.vega.xyz',
 };

 const Links: { [k in DApp]: DAppLinks } = {
@@ -68,7 +68,7 @@ inquirer
      })
      .then(() => {
        for (const env of answers.envs) {
-          const branch = env === 'mainnet' ? 'main' : `release/${env}`;
+          const branch = env === 'mainnet' ? 'master' : `release/${env}`;
          release(answers.tag, branch);
        }
        execSync('git checkout develop');
Author	SHA1	Message	Date
Dexter	cde6577356	chore(explorer,trading,governance): change explorer api nodes	2023-05-09 13:07:15 +01:00
Dexter	b41de05cfc	chore(explorer,trading,governance): change data node URLs to new ones	2023-05-09 12:59:58 +01:00