test: fix for key-to-key test

2023-08-02 16:47:48 +02:00
63 changed files with 443 additions and 750 deletions
@@ -1,46 +0,0 @@
-context('Proposal page', { tags: '@smoke' }, function () {
-  describe('Verify elements on page', function () {
-    const proposalHeading = 'proposals-heading';
-    const dateTimeRegex =
-      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
-    const proposalTitle = 'Add Lorem Ipsum market';
-
-    before('Create market proposal', function () {
-      cy.visit('/');
-      cy.createMarket();
-    });
-
-    it('Able to view proposal', function () {
-      cy.navigate_to('governanceProposals');
-      cy.getByTestId(proposalHeading).should('be.visible');
-      // get first proposal in list
-      cy.get('[row-index="0"]').within(() => {
-        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
-        cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
-        cy.get_element_by_col_id('state').should('have.text', 'Enacted');
-        cy.getByTestId('vote-progress').should('be.visible');
-        cy.get('[col-id="cDate"]')
-          .invoke('text')
-          .should('match', dateTimeRegex);
-        cy.get('[col-id="eDate"]')
-          .invoke('text')
-          .should('match', dateTimeRegex);
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and('contains', 'https://governance.fairground.wtf/proposals/');
-        cy.contains('View terms').should('exist').click();
-      });
-      cy.getByTestId('dialog-title').should('have.text', proposalTitle);
-      cy.get('.language-json').should('exist');
-    });
-
-    it('Proposal page displayed on mobile', function () {
-      cy.common_switch_to_mobile_and_click_toggle();
-      cy.navigate_to('governanceProposals', true);
-      cy.getByTestId(proposalHeading).should('be.visible');
-      cy.get('[row-index="0"]').within(() => {
-        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
-      });
-    });
-  });
-});
@@ -200,7 +200,7 @@ export const ProposalMarketData = ({
        title={marketData.tradableInstrument.instrument.code}
        open={isOpen}
        onChange={(isOpen) => (isOpen ? open() : close())}
-        size="large"
+        size="medium"
        dataTestId="market-json-dialog"
      >
        <CopyWithTooltip text={JSON.stringify(marketData)}>
@@ -57,7 +57,7 @@ const ROWS = [

 export const HealthDialog = ({ onChange, isOpen }: HealthDialogProps) => {
  return (
-    <Dialog size="large" open={isOpen} onChange={onChange}>
+    <Dialog size="medium" open={isOpen} onChange={onChange}>
      <h1 className="text-2xl mb-5 pr-2 font-medium font-alpha uppercase">
        {t('Health')}
      </h1>
@@ -2,7 +2,6 @@ describe('charts', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
    cy.getByTestId('Depth').click();
@@ -202,7 +202,6 @@ describe('Closed markets', { tags: '@smoke' }, () => {
  const specDataConnection = createDataConnection();

  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockGQL((req) => {
      aliasGQLQuery(req, 'ChainId', chainIdQuery());
      aliasGQLQuery(req, 'Statistics', statisticsQuery());
@@ -456,7 +455,6 @@ describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
    cy.get('[data-testid="Closed markets"]').click();
  });
@@ -4,7 +4,6 @@ const nodeHealthTrigger = 'node-health-trigger';

 describe('home', { tags: '@regression' }, () => {
  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.visit('/');
@@ -2,7 +2,7 @@ import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import * as Schema from '@vegaprotocol/types';

-const dialogContent = 'welcome-dialog';
+const dialogContent = 'dialog-content';

 const generateProposal = (code: string): ProposalListFieldsFragment => ({
  __typename: 'Proposal',
@@ -140,43 +140,43 @@ describe('home', { tags: '@regression' }, () => {
      cy.wait('@MarketsData');
    });

-    it('close welcome dialog should redirect to market/all', () => {
+    it('redirects to market/all and displays welcome notice', () => {
      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
-      cy.getByTestId('welcome-dialog').should('be.visible');
-      cy.getByTestId('welcome-title').should('contain.text', 'Console CUSTOM');
-      cy.getByTestId('browse-markets-button').should('not.be.disabled');
-      cy.getByTestId('get-started-banner').should('be.visible');
-      cy.getByTestId('get-started-button').should('not.be.disabled');
-      cy.getByTestId('dialog-close').click();
-      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
-      cy.window().then((window) => {
-        expect(window.localStorage.getItem('vega_onboarding_viewed')).to.equal(
-          'true'
-        );
-      });
+      cy.getByTestId('welcome-notice-title').should(
+        'contain.text',
+        'Welcome to Console'
+      );
    });
+  });

-    it('click browse markets button should redirect to market/all', () => {
-      cy.getByTestId('welcome-dialog').should('be.visible');
-      cy.getByTestId('browse-markets-button').click();
-      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
-      cy.window().then((window) => {
-        expect(window.localStorage.getItem('vega_onboarding_viewed')).to.equal(
-          'true'
-        );
+  describe('no proposal nor markets found', () => {
+    it('there are welcome text and a link to propose market', () => {
+      cy.mockGQL((req) => {
+        const data = {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [],
+          },
+        };
+        aliasGQLQuery(req, 'Markets', data);
+        aliasGQLQuery(req, 'MarketsData', data);
+        aliasGQLQuery(req, 'ProposalsList', {
+          proposalsConnection: {
+            __typename: 'ProposalsConnection',
+            edges: null,
+          },
+        });
      });
-    });
-
-    it('click get started button should open connect dialog', () => {
-      cy.getByTestId('welcome-dialog').should('be.visible');
-      cy.getByTestId('get-started-button').click();
-      cy.url().should('eq', Cypress.config().baseUrl + `/#/markets/all`);
-      cy.window().then((window) => {
-        expect(window.localStorage.getItem('vega_onboarding_viewed')).to.equal(
-          'true'
-        );
-      });
-      cy.getByTestId('wallet-dialog-title').should('contain.text', 'Connect');
+      cy.visit('/');
+      cy.wait('@Markets');
+      cy.wait('@MarketsData');
+      cy.getByTestId('welcome-notice-title').should(
+        'contain.text',
+        'Welcome to Console'
+      );
+      cy.getByTestId('external-link')
+        .contains('Propose a market')
+        .should('exist');
    });
  });

@@ -185,7 +185,7 @@ describe('home', { tags: '@regression' }, () => {
      cy.window().then((window) => {
        window.localStorage.setItem('marketId', 'market-1');
        cy.visit('/');
-        cy.getByTestId('dialog-close').click();
+        cy.wait('@Markets');
        cy.location('hash').should('equal', '#/markets/market-1');
        cy.getByTestId(dialogContent).should('not.exist');
      });
@@ -199,7 +199,6 @@ describe('home', { tags: '@regression' }, () => {
        });
        cy.visit('/');
        cy.wait('@Markets');
-        cy.getByTestId('dialog-close').click();
        cy.location('hash').should('equal', '#/markets/market-not-existing');
        cy.getByTestId(dialogContent).should('not.exist');
      });
@@ -9,7 +9,6 @@ const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';
 describe('markets all table', { tags: '@smoke' }, () => {
  beforeEach(() => {
    cy.clearLocalStorage().then(() => {
-      cy.setOnBoardingViewed();
      cy.mockTradingPage(
        Schema.MarketState.STATE_ACTIVE,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -200,7 +199,6 @@ describe('no open markets', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'Markets', markets);
    });
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
  });

@@ -21,7 +21,6 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockTradingPage(MarketState.STATE_ACTIVE);
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
@@ -36,7 +36,6 @@ const headers = [

 describe('liquidity table - trading', { tags: '@smoke' }, () => {
  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockSubscription();
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
@@ -120,7 +119,6 @@ describe('liquidity table - trading', { tags: '@smoke' }, () => {

 describe('liquidity table view', { tags: '@smoke' }, () => {
  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockSubscription();
    cy.mockTradingPage(
      Schema.MarketState.STATE_ACTIVE,
@@ -12,7 +12,6 @@ describe('markets selector', { tags: '@smoke' }, () => {
    cy.window().then((window) => {
      window.localStorage.setItem('marketId', 'market-1');
    });
-    cy.setOnBoardingViewed();
    cy.mockTradingPage(
      MarketState.STATE_ACTIVE,
      MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
@@ -30,7 +30,6 @@ describe('Market trading page', () => {
      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
    );
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/market-0');
    cy.wait('@MarketData');
    cy.getByTestId(marketSummaryBlock).should('be.visible');
@@ -9,7 +9,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
    cy.get('[data-testid="Proposed markets"]').click();
  });
@@ -214,7 +213,6 @@ describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'ProposalsList', proposal);
    });
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
  });

  it('can see no markets message', () => {
@@ -12,7 +12,6 @@ describe('markets table', { tags: '@smoke' }, () => {
        Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
      );
      cy.mockSubscription();
-      cy.setOnBoardingViewed();
      cy.visit('/#/markets/all');
    });
  });
@@ -6,7 +6,6 @@ const oracleFullProfile = 'oracle-full-profile';

 describe('oracle information', { tags: '@smoke' }, () => {
  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockTradingPage(
      MarketState.STATE_ACTIVE,
      undefined,
@@ -14,7 +14,6 @@ const resPrice = 'price-990';

 describe('order book', { tags: '@smoke' }, () => {
  before(() => {
-    cy.setOnBoardingViewed();
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
@@ -4,7 +4,6 @@ describe('Settings page', { tags: '@smoke' }, () => {

    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/');

    // Only click if not already active otherwise sidebar will close
@@ -77,7 +77,6 @@ function getButtonSelectorByText(text: string): string {
 beforeEach(() => {
  cy.mockTradingPage();
  cy.mockSubscription();
-  cy.setOnBoardingViewed();
  cy.visit('/#/markets/market-0');
  cy.wait('@Markets');
 });
@@ -14,7 +14,6 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.clearAllLocalStorage();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
  });
@@ -15,7 +15,6 @@ describe('time in force validation', { tags: '@smoke' }, () => {
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.clearAllLocalStorage();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
  });
@@ -9,7 +9,6 @@ describe('trades', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.intercept('POST', '/graphql', (req) => {
      if (req.body.operationName === 'Trades') {
        req.alias = '@Trades';
@@ -17,7 +17,6 @@ describe(
      cy.visit('/#/portfolio');
      cy.mockTradingPage();
      cy.mockSubscription();
-      cy.setOnBoardingViewed();
      cy.get('[data-testid="pathname-/portfolio"]').should('exist');
    });

@@ -123,7 +122,6 @@ describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
    cy.visit('/#/portfolio');
    cy.mockTradingPage();
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.get('[data-testid="pathname-/portfolio"]').should('exist');
  });

@@ -20,4 +20,4 @@ NX_APP_VERSION=v0.20.21-core-0.71.6
 NX_SUCCESSOR_MARKETS=false
 NX_STOP_ORDERS=false
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
@@ -23,6 +23,7 @@ export const Home = () => {
        replace: true,
      });
    } else if (data) {
+      update({ shouldDisplayWelcomeDialog: true });
      const marketDataId = data[0]?.id;
      if (marketDataId) {
        navigate(Links[Routes.MARKET](marketDataId), {
@@ -10,6 +10,7 @@ import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import {
  ResizableGrid,
  ResizableGridPanel,
@@ -98,48 +99,64 @@ const MainGrid = memo(
          <TradeGridChild>
            <Tabs storageKey="console-trade-grid-bottom">
              <Tab id="positions" name={t('Positions')}>
-                <TradingViews.positions.component
-                  onMarketClick={onMarketClick}
-                />
+                <VegaWalletContainer>
+                  <TradingViews.positions.component
+                    onMarketClick={onMarketClick}
+                  />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="open-orders" name={t('Open')}>
-                <TradingViews.orders.component
-                  marketId={marketId}
-                  filter={Filter.Open}
-                />
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Open}
+                  />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="closed-orders" name={t('Closed')}>
-                <TradingViews.orders.component
-                  marketId={marketId}
-                  filter={Filter.Closed}
-                />
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Closed}
+                  />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="rejected-orders" name={t('Rejected')}>
-                <TradingViews.orders.component
-                  marketId={marketId}
-                  filter={Filter.Rejected}
-                />
+                <VegaWalletContainer>
+                  <TradingViews.orders.component
+                    marketId={marketId}
+                    filter={Filter.Rejected}
+                  />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="orders" name={t('All')}>
-                <TradingViews.orders.component marketId={marketId} />
+                <VegaWalletContainer>
+                  <TradingViews.orders.component marketId={marketId} />
+                </VegaWalletContainer>
              </Tab>
              {FLAGS.STOP_ORDERS ? (
                <Tab id="stop-orders" name={t('Stop orders')}>
-                  <TradingViews.stopOrders.component />
+                  <VegaWalletContainer>
+                    <TradingViews.stopOrders.component />
+                  </VegaWalletContainer>
                </Tab>
              ) : null}
              <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component
-                  marketId={marketId}
-                  onMarketClick={onMarketClick}
-                />
+                <VegaWalletContainer>
+                  <TradingViews.fills.component
+                    marketId={marketId}
+                    onMarketClick={onMarketClick}
+                  />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="accounts" name={t('Collateral')}>
-                <TradingViews.collateral.component
-                  pinnedAsset={pinnedAsset}
-                  onMarketClick={onMarketClick}
-                  hideButtons
-                />
+                <VegaWalletContainer>
+                  <TradingViews.collateral.component
+                    pinnedAsset={pinnedAsset}
+                    onMarketClick={onMarketClick}
+                    hideButtons
+                  />
+                </VegaWalletContainer>
              </Tab>
            </Tabs>
          </TradeGridChild>
@@ -71,7 +71,7 @@ export const AccountHistoryContainer = () => {
  const { data: assets } = useAssetsDataProvider();

  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
+    return <Splash>{t('Connect wallet')}</Splash>;
  }

  return (
@@ -13,6 +13,7 @@ import { FillsContainer } from '../../components/fills-container';
 import { PositionsContainer } from '../../components/positions-container';
 import { WithdrawalsContainer } from './withdrawals-container';
 import { OrdersContainer } from '../../components/orders-container';
+import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { LedgerContainer } from '../../components/ledger-container';
 import { AccountHistoryContainer } from './account-history-container';
 import {
@@ -61,19 +62,29 @@ export const Portfolio = () => {
          <PortfolioGridChild>
            <Tabs storageKey="console-portfolio-top">
              <Tab id="account-history" name={t('Account history')}>
-                <AccountHistoryContainer />
+                <VegaWalletContainer>
+                  <AccountHistoryContainer />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="positions" name={t('Positions')}>
-                <PositionsContainer onMarketClick={onMarketClick} allKeys />
+                <VegaWalletContainer>
+                  <PositionsContainer onMarketClick={onMarketClick} allKeys />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="orders" name={t('Orders')}>
-                <OrdersContainer />
+                <VegaWalletContainer>
+                  <OrdersContainer />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="fills" name={t('Fills')}>
-                <FillsContainer onMarketClick={onMarketClick} />
+                <VegaWalletContainer>
+                  <FillsContainer onMarketClick={onMarketClick} />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="ledger-entries" name={t('Ledger entries')}>
-                <LedgerContainer />
+                <VegaWalletContainer>
+                  <LedgerContainer />
+                </VegaWalletContainer>
              </Tab>
            </Tabs>
          </PortfolioGridChild>
@@ -86,10 +97,14 @@ export const Portfolio = () => {
          <PortfolioGridChild>
            <Tabs storageKey="console-portfolio-bottom">
              <Tab id="collateral" name={t('Collateral')}>
-                <AccountsContainer />
+                <VegaWalletContainer>
+                  <AccountsContainer />
+                </VegaWalletContainer>
              </Tab>
              <Tab id="deposits" name={t('Deposits')}>
-                <DepositsContainer />
+                <VegaWalletContainer>
+                  <DepositsContainer />
+                </VegaWalletContainer>
              </Tab>
              <Tab
                id="withdrawals"
@@ -7,6 +7,7 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
+import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { ViewType, useSidebar } from '../../components/sidebar';

 export const WithdrawalsContainer = () => {
@@ -20,7 +21,7 @@ export const WithdrawalsContainer = () => {
  const { ready, delayed } = useIncompleteWithdrawals();

  return (
-    <>
+    <VegaWalletContainer>
      <div className="h-full relative">
        <WithdrawalsTable
          data-testid="withdrawals-history"
@@ -42,6 +43,6 @@ export const WithdrawalsContainer = () => {
          </Button>
        </div>
      )}
-    </>
+    </VegaWalletContainer>
  );
 };
@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { AccountManager } from '@vegaprotocol/accounts';
@@ -1,7 +1,7 @@
 import { t } from '@vegaprotocol/i18n';

 export const THROTTLE_UPDATE_TIME = 500;
-export const ONBOARDING_VIEWED_KEY = 'vega_onboarding_viewed';
+export const RISK_ACCEPTED_KEY = 'vega_risk_accepted';
 export const MAINNET_WELCOME_HEADER = t(
  'Trade cash settled futures on the fully decentralised Vega network.'
 );
@@ -1,10 +1,10 @@
+import { t } from '@vegaprotocol/i18n';
+import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { FillsManager } from '@vegaprotocol/fills';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
-import { Splash } from '@vegaprotocol/ui-toolkit';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';

@@ -1,6 +1,7 @@
 import { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { Filter, OrderListManager } from '@vegaprotocol/orders';
 import { t } from '@vegaprotocol/i18n';
+import { Filter } from '@vegaprotocol/orders';
+import { OrderListManager } from '@vegaprotocol/orders';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import {
@@ -1,15 +1,7 @@
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import {
-  Sidebar,
-  SidebarButton,
-  SidebarContent,
-  ViewType,
-  useSidebar,
-} from './sidebar';
+import { Sidebar, SidebarContent, ViewType, useSidebar } from './sidebar';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
-import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { VegaWalletProvider } from '@vegaprotocol/wallet';

 jest.mock('../node-health', () => ({
  NodeHealthContainer: () => <span data-testid="node-health" />,
@@ -27,23 +19,16 @@ jest.mock('../settings', () => ({
  Settings: () => <div data-testid="settings" />,
 }));

-jest.mock('../welcome-dialog', () => ({
-  GetStarted: () => <div data-testid="get-started" />,
-}));
-
 describe('Sidebar', () => {
  it.each(['/markets/all', '/portfolio'])(
    'does not render ticket and info',
    (path) => {
      render(
-        <VegaWalletProvider>
-          <MemoryRouter initialEntries={[path]}>
-            <Sidebar />
-          </MemoryRouter>
-        </VegaWalletProvider>
+        <MemoryRouter initialEntries={[path]}>
+          <Sidebar />
+        </MemoryRouter>
      );

-      expect(screen.getByTestId(ViewType.ViewAs)).toBeInTheDocument();
      expect(screen.getByTestId(ViewType.Settings)).toBeInTheDocument();
      expect(screen.getByTestId(ViewType.Transfer)).toBeInTheDocument();
      expect(screen.getByTestId(ViewType.Deposit)).toBeInTheDocument();
@@ -58,14 +43,11 @@ describe('Sidebar', () => {

  it('renders ticket and info on market pages', () => {
    render(
-      <VegaWalletProvider>
-        <MemoryRouter initialEntries={['/markets/ABC']}>
-          <Sidebar />
-        </MemoryRouter>
-      </VegaWalletProvider>
+      <MemoryRouter initialEntries={['/markets/ABC']}>
+        <Sidebar />
+      </MemoryRouter>
    );

-    expect(screen.getByTestId(ViewType.ViewAs)).toBeInTheDocument();
    expect(screen.getByTestId(ViewType.Settings)).toBeInTheDocument();
    expect(screen.getByTestId(ViewType.Transfer)).toBeInTheDocument();
    expect(screen.getByTestId(ViewType.Deposit)).toBeInTheDocument();
@@ -79,11 +61,9 @@ describe('Sidebar', () => {

  it('renders selected state', async () => {
    render(
-      <VegaWalletProvider>
-        <MemoryRouter initialEntries={['/markets/ABC']}>
-          <Sidebar />
-        </MemoryRouter>
-      </VegaWalletProvider>
+      <MemoryRouter initialEntries={['/markets/ABC']}>
+        <Sidebar />
+      </MemoryRouter>
    );

    const settingsButton = screen.getByTestId(ViewType.Settings);
@@ -107,13 +87,11 @@ describe('Sidebar', () => {
 describe('SidebarContent', () => {
  it('renders the correct content', () => {
    const { container } = render(
-      <VegaWalletProvider>
-        <MemoryRouter initialEntries={['/markets/ABC']}>
-          <Routes>
-            <Route path="/markets/:marketId" element={<SidebarContent />} />
-          </Routes>
-        </MemoryRouter>
-      </VegaWalletProvider>
+      <MemoryRouter initialEntries={['/markets/ABC']}>
+        <Routes>
+          <Route path="/markets/:marketId" element={<SidebarContent />} />
+        </Routes>
+      </MemoryRouter>
    );

    expect(container).toBeEmptyDOMElement();
@@ -133,13 +111,11 @@ describe('SidebarContent', () => {

  it('closes sidebar if market id is required but not present', () => {
    const { container } = render(
-      <VegaWalletProvider>
-        <MemoryRouter initialEntries={['/portfolio']}>
-          <Routes>
-            <Route path="/portfolio" element={<SidebarContent />} />
-          </Routes>
-        </MemoryRouter>
-      </VegaWalletProvider>
+      <MemoryRouter initialEntries={['/portfolio']}>
+        <Routes>
+          <Route path="/portfolio" element={<SidebarContent />} />
+        </Routes>
+      </MemoryRouter>
    );

    act(() => {
@@ -161,25 +137,3 @@ describe('SidebarContent', () => {
    expect(container).toBeEmptyDOMElement();
  });
 });
-
-describe('SidebarButton', () => {
-  it.each([ViewType.Info, ViewType.Deposit, ViewType.ViewAs])(
-    'runs given callback regardless of requested view (%s)',
-    async (view) => {
-      const onClick = jest.fn();
-      render(
-        <SidebarButton
-          icon={VegaIconNames.INFO}
-          tooltip="INFO"
-          onClick={onClick}
-          view={view}
-        />
-      );
-
-      const btn = screen.getByTestId(view);
-      await userEvent.click(btn);
-
-      expect(onClick).toBeCalled();
-    }
-  );
-});
@@ -15,8 +15,6 @@ import { Tooltip } from '../../components/tooltip';
 import { WithdrawContainer } from '../withdraw-container';
 import { Routes as AppRoutes } from '../../pages/client-router';
 import { persist } from 'zustand/middleware';
-import { GetStarted } from '../welcome-dialog';
-import { useVegaWallet, useViewAsDialog } from '@vegaprotocol/wallet';

 const STORAGE_KEY = 'vega_sidebar_store';

@@ -27,7 +25,6 @@ export enum ViewType {
  Withdraw = 'Withdraw',
  Transfer = 'Transfer',
  Settings = 'Settings',
-  ViewAs = 'ViewAs',
 }

 type SidebarView =
@@ -55,8 +52,6 @@ type SidebarView =

 export const Sidebar = () => {
  const navClasses = 'flex lg:flex-col items-center gap-2 lg:gap-4 p-1';
-  const setViewAsDialogOpen = useViewAsDialog((state) => state.setOpen);
-  const { pubKeys } = useVegaWallet();
  return (
    <div className="flex lg:flex-col gap-2 h-full p-1" data-testid="sidebar">
      <nav className={navClasses}>
@@ -109,16 +104,6 @@ export const Sidebar = () => {
        </Routes>
      </nav>
      <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>
-        <SidebarButton
-          view={ViewType.ViewAs}
-          onClick={() => {
-            setViewAsDialogOpen(true);
-          }}
-          icon={VegaIconNames.EYE}
-          tooltip={t('View as party')}
-          disabled={Boolean(pubKeys)}
-        />
-
        <SidebarButton
          view={ViewType.Settings}
          icon={VegaIconNames.COG}
@@ -130,41 +115,25 @@ export const Sidebar = () => {
  );
 };

-export const SidebarButton = ({
+const SidebarButton = ({
  view,
  icon,
  tooltip,
-  disabled = false,
-  onClick,
 }: {
-  view?: ViewType;
+  view: ViewType;
  icon: VegaIconNames;
  tooltip: string;
-  disabled?: boolean;
-  onClick?: () => void;
 }) => {
  const { currView, setView } = useSidebar((store) => ({
    currView: store.view,
    setView: store.setView,
  }));
-
-  const onSelect = (view: SidebarView['type']) => {
-    if (view === currView?.type) {
-      setView(null);
-    } else {
-      setView({ type: view });
-    }
-  };
-
  const buttonClasses = classNames('flex items-center p-1 rounded', {
    'text-vega-clight-200 dark:text-vega-cdark-200 hover:bg-vega-clight-500 dark:hover:bg-vega-cdark-500':
-      !view || view !== currView?.type,
+      view !== currView?.type,
    'bg-vega-yellow hover:bg-vega-yellow-550 text-black':
-      view && view === currView?.type,
-    'cursor-not-allowed text-vega-clight-500 hover:bg-inherit dark:text-vega-cdark-500 dark:hover:bg-inherit':
-      disabled,
+      view === currView?.type,
  });
-
  return (
    <Tooltip
      description={tooltip}
@@ -176,8 +145,13 @@ export const SidebarButton = ({
      <button
        className={buttonClasses}
        data-testid={view}
-        onClick={onClick || (() => onSelect(view as SidebarView['type']))}
-        disabled={disabled}
+        onClick={() => {
+          if (view === currView?.type) {
+            setView(null);
+          } else {
+            setView({ type: view });
+          }
+        }}
      >
        <VegaIcon name={icon} size={20} />
      </button>
@@ -210,7 +184,6 @@ export const SidebarContent = () => {
              setView({ type: ViewType.Deposit, assetId })
            }
          />
-          <GetStarted />
        </ContentWrapper>
      );
    } else {
@@ -234,7 +207,6 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Deposit')}>
        <DepositContainer assetId={view.assetId} />
-        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -243,7 +215,6 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Withdraw')}>
        <WithdrawContainer assetId={view.assetId} />
-        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -252,7 +223,6 @@ export const SidebarContent = () => {
    return (
      <ContentWrapper title={t('Transfer')}>
        <TransferContainer assetId={view.assetId} />
-        <GetStarted />
      </ContentWrapper>
    );
  }
@@ -307,7 +277,7 @@ export const useSidebar = create<{
      view: null,
      setView: (x) =>
        set(() => {
-          if (x == null) {
+          if (x === null) {
            return { view: null, init: false };
          }

@@ -27,16 +27,6 @@ describe('VegaWalletConnectButton', () => {
  it('should fire dialog when not connected', () => {
    render(generateJsx({ pubKey: null } as VegaWalletContextShape));

-    const button = screen.getByTestId('connect-vega-wallet');
-    expect(button).toHaveTextContent('Get started');
-    fireEvent.click(button);
-    expect(mockUpdateDialogOpen).toHaveBeenCalled();
-  });
-
-  it('should render "Connect" when browser wallet is detected', () => {
-    window.vega = window.vega || ({} as Vega);
-    render(generateJsx({ pubKey: null } as VegaWalletContextShape));
-
    const button = screen.getByTestId('connect-vega-wallet');
    expect(button).toHaveTextContent('Connect');
    fireEvent.click(button);
@@ -1,6 +1,5 @@
 import { useMemo, useState } from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
-import { isBrowserWalletInstalled } from '@vegaprotocol/wallet';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -38,7 +37,7 @@ export const VegaWalletConnectButton = () => {
    fetchPubKeys,
  } = useVegaWallet();
  const isConnected = pubKey !== null;
-  const walletInstalled = isBrowserWalletInstalled();
+
  const activeKey = useMemo(() => {
    return pubKeys?.find((pk) => pk.publicKey === pubKey);
  }, [pubKey, pubKeys]);
@@ -119,9 +118,7 @@ export const VegaWalletConnectButton = () => {
      intent={Intent.None}
      icon={<VegaIcon name={VegaIconNames.ARROW_RIGHT} size={14} />}
    >
-      <span className="whitespace-nowrap uppercase">
-        {walletInstalled ? t('Connect') : t('Get started')}
-      </span>
+      <span className="whitespace-nowrap uppercase">{t('Connect')}</span>
    </Button>
  );
 };
@@ -1,86 +0,0 @@
-import classNames from 'classnames';
-import { t } from '@vegaprotocol/i18n';
-import { ExternalLink, Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import {
-  useVegaWallet,
-  useVegaWalletDialogStore,
-  isBrowserWalletInstalled,
-} from '@vegaprotocol/wallet';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import * as constants from '../constants';
-
-interface Props {
-  lead?: string;
-}
-
-export const GetStarted = ({ lead }: Props) => {
-  const { pubKey } = useVegaWallet();
-
-  const { VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
-  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
-
-  const [, setOnboardingViewed] = useLocalStorage(
-    constants.ONBOARDING_VIEWED_KEY
-  );
-
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
-
-  const onButtonClick = () => {
-    openVegaWalletDialog();
-    setOnboardingViewed('true');
-  };
-
-  if (!pubKey && !isBrowserWalletInstalled()) {
-    return (
-      <div
-        className={classNames(
-          'flex flex-col bg-vega-blue-300 dark:bg-vega-blue-700 border border-vega-blue-350 dark:border-vega-blue-650 px-6 gap-4',
-          { 'py-4': lead },
-          { 'mt-8 py-6': !lead }
-        )}
-        data-testid="get-started-banner"
-      >
-        {lead && <h2>{lead}</h2>}
-        <h3>{t('Get started')}</h3>
-        <div>
-          <ul className="list-decimal list-inside">
-            <li>{t('Get a Vega wallet')}</li>
-            <li>{t('Connect')}</li>
-            <li>{t('Deposit funds')}</li>
-            <li>{t('Open a position')}</li>
-          </ul>
-        </div>
-        <div>
-          <TradingButton
-            intent={Intent.Info}
-            onClick={onButtonClick}
-            className="block w-full"
-            data-testid="get-started-button"
-          >
-            {t('Get started')}
-          </TradingButton>
-        </div>
-        {VEGA_ENV === Networks.MAINNET && (
-          <p className="text-sm">
-            {t('Experiment for free with virtual assets on')}{' '}
-            <ExternalLink href={CANONICAL_URL}>
-              {t('Fairground Testnet')}
-            </ExternalLink>
-          </p>
-        )}
-        {VEGA_ENV === Networks.TESTNET && (
-          <p className="text-sm">
-            {t('Ready to trade with real funds?')}{' '}
-            <ExternalLink href={CANONICAL_URL}>
-              {t('Switch to Mainnet')}
-            </ExternalLink>
-          </p>
-        )}
-      </div>
-    );
-  }
-  return null;
-};
@@ -1,3 +1,2 @@
 export * from './welcome-dialog';
 export * from './risk-message';
-export * from './get-started';
@@ -0,0 +1,50 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { RiskNoticeDialog } from './risk-notice-dialog';
+
+jest.mock('@vegaprotocol/environment');
+
+const mockEnvDefinitions = {
+  VEGA_CONFIG_URL: 'https://config.url',
+  VEGA_URL: 'https://test.url',
+  VEGA_NETWORKS: JSON.stringify({}),
+};
+
+describe('Risk notice dialog', () => {
+  const mockOnClose = jest.fn();
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it.each`
+    assertion     | network
+    ${'displays'} | ${Networks.CUSTOM}
+    ${'displays'} | ${Networks.DEVNET}
+    ${'displays'} | ${Networks.TESTNET}
+  `(
+    '$assertion a generic message on $network',
+    async ({ assertion, network }) => {
+      // @ts-ignore ignore mock implementation
+      useEnvironment.mockImplementation(() => ({
+        ...mockEnvDefinitions,
+        VEGA_ENV: network,
+      }));
+
+      render(<RiskNoticeDialog onClose={mockOnClose} network={network} />);
+
+      expect(
+        screen.getByText(
+          new RegExp(
+            `This application for trading on Vega is connected to ${network}`
+          )
+        )
+      ).toBeInTheDocument();
+
+      const button = screen.getByRole('button', {
+        name: 'Continue',
+      });
+      fireEvent.click(button);
+      expect(mockOnClose).toHaveBeenCalled();
+    }
+  );
+});
@@ -0,0 +1,89 @@
+import { t } from '@vegaprotocol/i18n';
+import {
+  Button,
+  Link,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { RISK_ACCEPTED_KEY } from '../constants';
+import { TelemetryApproval } from './telemetry-approval';
+import type { Networks } from '@vegaprotocol/environment';
+import {
+  useEnvironment,
+  DocsLinks,
+  ExternalLinks,
+} from '@vegaprotocol/environment';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+
+interface Props {
+  onClose: () => void;
+  network: Networks;
+}
+export const RiskNoticeDialog = ({ onClose, network }: Props) => {
+  const [, setValue] = useLocalStorage(RISK_ACCEPTED_KEY);
+
+  const handleAcceptRisk = () => {
+    onClose();
+    setValue('true');
+  };
+
+  return (
+    <TestnetContent network={network} handleAcceptRisk={handleAcceptRisk} />
+  );
+};
+
+const TestnetContent = ({
+  network,
+  handleAcceptRisk,
+}: {
+  network: Networks;
+  handleAcceptRisk: () => void;
+}) => {
+  const { GITHUB_FEEDBACK_URL } = useEnvironment();
+  return (
+    <>
+      <p className="mb-4">
+        {t(
+          'This application for trading on Vega is connected to %s, meaning you are free to try out trading with virtual assets and no risk.',
+          [network]
+        )}
+      </p>
+      <p className="mb-4">
+        {t(
+          'Your Vega wallet must also be connected to %s, and your Ethereum wallet must be connected to Sepolia.',
+          [network]
+        )}
+      </p>
+      {GITHUB_FEEDBACK_URL && DocsLinks && (
+        <ul className="list-disc pl-4">
+          <li className="mb-1">
+            <Link href={ExternalLinks.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={DocsLinks.VEGA_WALLET_TOOLS_URL} target="_blank">
+              <span className="underline">{t('Learn about Vega Wallet')}</span>{' '}
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            </Link>
+          </li>
+          <li className="mb-1">
+            <Link href={GITHUB_FEEDBACK_URL} target="_blank">
+              <span className="underline">{t('Provide feedback')}</span>{' '}
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            </Link>
+          </li>
+        </ul>
+      )}
+      <div className="my-4">
+        <TelemetryApproval
+          helpText={t(
+            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
+          )}
+        />
+      </div>
+      <Button onClick={handleAcceptRisk}>{t('Continue')}</Button>
+    </>
+  );
+};
@@ -1,230 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { GetStarted } from './get-started';
-import { TradingButton } from '@vegaprotocol/ui-toolkit';
-import { useNavigate } from 'react-router-dom';
-import { Links, Routes } from '../../pages/client-router';
-import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import * as constants from '../constants';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-
-export const WelcomeDialogContent = () => {
-  const { VEGA_ENV } = useEnvironment();
-  const [, setOnboardingViewed] = useLocalStorage(
-    constants.ONBOARDING_VIEWED_KEY
-  );
-  const navigate = useNavigate();
-  const browseMarkets = () => {
-    const link = Links[Routes.MARKETS]();
-    navigate(link);
-    setOnboardingViewed('true');
-  };
-  const lead =
-    VEGA_ENV === Networks.MAINNET
-      ? t('Start trading on the worlds most advanced decentralised exchange.')
-      : t(
-          'Free from the risks of real trading, Fairground is a safe and fun place to try out Vega yourself with virtual assets.'
-        );
-  return (
-    <div className="flex flex-col pb-2">
-      <div className="flex gap-8">
-        <div className="w-1/2 flex flex-col justify-between pt-3">
-          <ul className="ml-0">
-            <li className="my-3 flex gap-3 text-default">
-              <div className="shrink-0 pt-1.5">
-                <svg
-                  width="40"
-                  height="40"
-                  viewBox="0 0 30 30"
-                  fill="currentColor"
-                >
-                  <rect x="14" y="20" width="2" height="2" />
-                  <rect x="12" y="18" width="2" height="2" />
-                  <rect x="10" y="8" width="2" height="10" />
-                  <rect x="16" y="18" width="2" height="2" />
-                  <rect x="20" y="16" width="2" height="2" />
-                  <rect x="18" y="8" width="2" height="8" />
-                  <rect x="28" y="2" width="2" height="26" />
-                  <rect y="2" width="2" height="26" />
-                  <rect
-                    x="28"
-                    width="2"
-                    height="26"
-                    transform="rotate(90 28 0)"
-                  />
-                  <rect
-                    x="28"
-                    y="28"
-                    width="2"
-                    height="26"
-                    transform="rotate(90 28 28)"
-                  />
-                </svg>
-              </div>
-              <div>
-                <h3 className="text-lg">{t('Trade with no KYC')}</h3>
-                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
-                  {t(
-                    'Pseudonomously trade Futures markets. Spot and perps comming soon'
-                  )}
-                </span>
-              </div>
-            </li>
-            <li className="my-3 flex gap-3 text-vega-clight-50 dark:text-vega-cdark-50">
-              <div className="shrink-0 pt-1.5">
-                <svg
-                  width="40"
-                  height="40"
-                  viewBox="0 0 30 30"
-                  fill="currentColor"
-                >
-                  <g clip-path="url(#clip0_5168_49089)">
-                    <path d="M22 7H18V9H22V7Z" />
-                    <path d="M22 13H18V15H22V13Z" />
-                    <path d="M24 17H16V19H24V17Z" />
-                    <path d="M24 9H22V13H24V9Z" />
-                    <path d="M18 9H16V13H18V9Z" />
-                    <path d="M6 19H4V23H6V19Z" />
-                    <path d="M16 19H14V23H16V19Z" />
-                    <path d="M26 19H24V23H26V19Z" />
-                    <path d="M12 7H8V9H12V7Z" />
-                    <path d="M12 13H8V15H12V13Z" />
-                    <path d="M14 17H6V19H14V17Z" />
-                    <path d="M14 9H12V13H14V9Z" />
-                    <path d="M8 9H6V13H8V9Z" />
-                    <path d="M30 2H28V28H30V2Z" />
-                    <path d="M2 2H0V28H2V2Z" />
-                    <path d="M28 0H2V2H28V0Z" />
-                    <path d="M28 28H2V30H28V28Z" />
-                  </g>
-                  <defs>
-                    <clipPath id="clip0_5168_49089">
-                      <rect width="30" height="30" />
-                    </clipPath>
-                  </defs>
-                </svg>
-              </div>
-              <div>
-                <h3 className="text-lg">
-                  {t('Community generated trading pairs')}
-                </h3>
-                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
-                  {t('All markets are proposed and enacted by the community')}
-                </span>
-              </div>
-            </li>
-            <li className="my-3 flex gap-3 text-vega-clight-50 dark:text-vega-cdark-50">
-              <div className="shrink-0 pt-1.5">
-                <svg
-                  width="40"
-                  height="40"
-                  viewBox="0 0 30 30"
-                  fill="currentColor"
-                >
-                  <rect x="6" y="16" width="4" height="2" />
-                  <rect x="10" y="14" width="2" height="2" />
-                  <rect
-                    x="12"
-                    y="24"
-                    width="4"
-                    height="2"
-                    transform="rotate(-90 12 24)"
-                  />
-                  <rect
-                    x="10"
-                    y="20"
-                    width="2"
-                    height="2"
-                    transform="rotate(-90 10 20)"
-                  />
-                  <rect
-                    x="20"
-                    y="18"
-                    width="4"
-                    height="2"
-                    transform="rotate(-180 20 18)"
-                  />
-                  <rect
-                    x="16"
-                    y="20"
-                    width="2"
-                    height="2"
-                    transform="rotate(-180 16 20)"
-                  />
-                  <rect
-                    x="16"
-                    y="14"
-                    width="2"
-                    height="2"
-                    transform="rotate(90 16 14)"
-                  />
-                  <rect
-                    x="22"
-                    y="10"
-                    width="2"
-                    height="2"
-                    transform="rotate(90 22 10)"
-                  />
-                  <rect
-                    x="20"
-                    y="8"
-                    width="2"
-                    height="2"
-                    transform="rotate(90 20 8)"
-                  />
-                  <rect
-                    x="24"
-                    y="8"
-                    width="2"
-                    height="2"
-                    transform="rotate(90 24 8)"
-                  />
-                  <rect
-                    x="22"
-                    y="6"
-                    width="2"
-                    height="2"
-                    transform="rotate(90 22 6)"
-                  />
-                  <rect x="12" y="10" width="2" height="4" />
-                  <rect x="28" y="2" width="2" height="26" />
-                  <rect y="2" width="2" height="26" />
-                  <rect
-                    x="28"
-                    width="2"
-                    height="26"
-                    transform="rotate(90 28 0)"
-                  />
-                  <rect
-                    x="28"
-                    y="28"
-                    width="2"
-                    height="26"
-                    transform="rotate(90 28 28)"
-                  />
-                </svg>
-              </div>
-              <div>
-                <h3 className="text-lg">{t('Rewards')}</h3>
-                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
-                  {t(
-                    'Earn rewards for trading, market making and providing liquidity'
-                  )}
-                </span>
-              </div>
-            </li>
-          </ul>
-          <TradingButton
-            onClick={browseMarkets}
-            className="block w-full"
-            data-testid="browse-markets-button"
-          >
-            {t('Browse the markets')}
-          </TradingButton>
-        </div>
-        <div className="w-1/2 -mr-3 flex flex-grow">
-          <GetStarted lead={lead} />
-        </div>
-      </div>
-    </div>
-  );
-};
@@ -1,52 +1,68 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import { Dialog, Intent } from '@vegaprotocol/ui-toolkit';
+import React, { useCallback } from 'react';
+import { useLocation } from 'react-router-dom';
+import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { isBrowserWalletInstalled } from '@vegaprotocol/wallet';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { activeMarketsProvider } from '@vegaprotocol/markets';
 import * as constants from '../constants';
-import { WelcomeDialogContent } from './welcome-dialog-content';
-import { getConfig } from '@vegaprotocol/wallet';
-import { Links, Routes } from '../../pages/client-router';
+import { RiskNoticeDialog } from './risk-notice-dialog';
+import { WelcomeNoticeDialog } from './welcome-notice-dialog';
 import { useGlobalStore } from '../../stores';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { Networks } from '@vegaprotocol/environment';
+import { isTestEnv } from '@vegaprotocol/utils';

 export const WelcomeDialog = () => {
  const { VEGA_ENV } = useEnvironment();
-  const [onBoardingViewed, setOnboardingViewed] = useLocalStorage(
-    constants.ONBOARDING_VIEWED_KEY
-  );
-  const navigate = useNavigate();
-  const isOnboardingDialogNeeded =
-    onBoardingViewed !== 'true' && !isBrowserWalletInstalled() && !getConfig();
-  const marketId = useGlobalStore((store) => store.marketId);
+  const { pathname } = useLocation();
+  let dialogContent: React.ReactNode;
+  let title = '';
+  let size: 'small' | 'medium' = 'small';
+  let onClose: ((open: boolean) => void) | undefined = undefined;
+  const [riskAccepted] = useLocalStorage(constants.RISK_ACCEPTED_KEY);
+  const { data } = useDataProvider({
+    dataProvider: activeMarketsProvider,
+    variables: undefined,
+  });

-  const onClose = () => {
-    setOnboardingViewed('true');
-    const link = marketId
-      ? Links[Routes.MARKET](marketId)
-      : Links[Routes.HOME]();
-    navigate(link);
-  };
-  const title = (
-    <span className="font-alpha calt" data-testid="welcome-title">
-      {t('Console')}{' '}
-      <span className="text-vega-clight-100 dark:text-vega-cdark-100">
-        {VEGA_ENV}
-      </span>
-    </span>
+  const update = useGlobalStore((store) => store.update);
+  const shouldDisplayWelcomeDialog = useGlobalStore(
+    (store) => store.shouldDisplayWelcomeDialog
  );

-  return isOnboardingDialogNeeded ? (
+  const isRiskDialogNeeded =
+    riskAccepted !== 'true' && VEGA_ENV !== Networks.MAINNET && !isTestEnv();
+
+  const isWelcomeDialogNeeded = pathname === '/' || shouldDisplayWelcomeDialog;
+
+  const onCloseDialog = useCallback(() => {
+    update({
+      shouldDisplayWelcomeDialog: isRiskDialogNeeded,
+    });
+  }, [update, isRiskDialogNeeded]);
+
+  if (isRiskDialogNeeded) {
+    dialogContent = (
+      <RiskNoticeDialog onClose={onCloseDialog} network={VEGA_ENV} />
+    );
+    title = t('Vega Console');
+    size = 'medium';
+  } else if (isWelcomeDialogNeeded && data?.length === 0) {
+    dialogContent = <WelcomeNoticeDialog />;
+    onClose = onCloseDialog;
+  } else {
+    dialogContent = null as React.ReactNode;
+  }
+
+  return (
    <Dialog
-      open
+      open={Boolean(dialogContent)}
      title={title}
-      size="medium"
+      size={size}
      onChange={onClose}
-      intent={Intent.None}
-      dataTestId="welcome-dialog"
    >
-      <WelcomeDialogContent />
+      {dialogContent}
    </Dialog>
-  ) : null;
+  );
 };
@@ -0,0 +1,71 @@
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import {
+  DApp,
+  Networks,
+  TOKEN_NEW_MARKET_PROPOSAL,
+  TOKEN_PROPOSALS,
+  useEnvironment,
+  useLinks,
+  ExternalLinks,
+} from '@vegaprotocol/environment';
+import { ProposedMarkets } from './proposed-markets';
+import { TelemetryApproval } from './telemetry-approval';
+
+export const WelcomeNoticeDialog = () => {
+  const { VEGA_ENV } = useEnvironment();
+  const tokenLink = useLinks(DApp.Token);
+  const consoleFairgroundLink = useLinks(DApp.Console, Networks.TESTNET);
+  const isMainnet = VEGA_ENV === Networks.MAINNET;
+  return (
+    <>
+      <h1
+        data-testid="welcome-notice-title"
+        className="text-2xl uppercase mb-6 text-center font-alpha calt"
+      >
+        {t('Welcome to Console')}
+      </h1>
+      <p className="leading-6 mb-4">
+        {t(
+          'There are no markets to trade on right now. Trading on Vega is now live, but markets need to pass a governance vote before they can be traded on. In the meantime:'
+        )}
+      </p>
+      <ul className="list-[square] pl-4 mb-4">
+        {isMainnet && (
+          <li className="mb-1">
+            <ExternalLink target="_blank" href={consoleFairgroundLink()}>
+              {t('Try out Console')}
+            </ExternalLink>
+            {t(' on Fairground, our Testnet')}
+          </li>
+        )}
+        <li className="mb-1">
+          <ExternalLink target="_blank" href={tokenLink(TOKEN_PROPOSALS)}>
+            {t('View and vote for proposed markets')}
+          </ExternalLink>
+        </li>
+        <li className="mb-1">
+          <ExternalLink
+            target="_blank"
+            href={tokenLink(TOKEN_NEW_MARKET_PROPOSAL)}
+          >
+            {t('Propose a market')}
+          </ExternalLink>
+        </li>
+        <li className="mb-1">
+          <ExternalLink target="_blank" href={ExternalLinks.BLOG}>
+            {t('Read about the mainnet launch')}
+          </ExternalLink>
+        </li>
+      </ul>
+      {isMainnet && (
+        <TelemetryApproval
+          helpText={t(
+            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
+          )}
+        />
+      )}
+      <ProposedMarkets />
+    </>
+  );
+};
@@ -2,7 +2,7 @@ import {
  AssetDetailsDialog,
  useAssetDetailsDialogStore,
 } from '@vegaprotocol/assets';
-import { VegaConnectDialog, ViewAsDialog } from '@vegaprotocol/wallet';
+import { VegaConnectDialog } from '@vegaprotocol/wallet';
 import { Connectors } from '../lib/vega-connectors';
 import {
  Web3ConnectUncontrolledDialog,
@@ -19,7 +19,6 @@ const DialogsContainer = () => {
        connectors={Connectors}
        riskMessage={<RiskMessage />}
      />
-      <ViewAsDialog connector={Connectors.view} />
      <AssetDetailsDialog
        assetId={id}
        trigger={trigger || null}
@@ -5,6 +5,7 @@ import produce from 'immer';
 interface GlobalStore {
  marketId: string | null;
  update: (store: Partial<Omit<GlobalStore, 'update'>>) => void;
+  shouldDisplayWelcomeDialog: boolean;
 }

 interface PageTitleStore {
@@ -14,6 +15,7 @@ interface PageTitleStore {

 export const useGlobalStore = create<GlobalStore>()((set) => ({
  marketId: LocalStorage.getItem('marketId') || null,
+  shouldDisplayWelcomeDialog: false,
  update: (newState) => {
    set(
      produce((state: GlobalStore) => {
@@ -75,7 +75,7 @@ export const AccountBreakdownDialog = memo(
  }) => {
    return (
      <Dialog
-        size="large"
+        size="medium"
        open={Boolean(assetId)}
        onChange={(isOpen) => {
          if (!isOpen) {
@@ -12,7 +12,6 @@ import { addUpdateCapsuleMultiSig } from './lib/commands/add-validators-to-multi
 import {
  addVegaWalletConnect,
  addSetVegaWallet,
-  addSetOnBoardingViewed,
 } from './lib/commands/vega-wallet-connect';
 import { addMockTransactionResponse } from './lib/commands/mock-transaction-response';
 import { addCreateMarket } from './lib/commands/create-market';
@@ -39,7 +38,6 @@ addGetNetworkParameters();
 addUpdateCapsuleMultiSig();
 addVegaWalletConnect();
 addSetVegaWallet();
-addSetOnBoardingViewed();
 addMockTransactionResponse();
 addCreateMarket();
 addConnectPublicKey();
@@ -14,10 +14,6 @@ declare global {
    interface Chainable<Subject> {
      setVegaWallet(): void;
    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      setOnBoardingViewed(): void;
-    }
  }
 }

@@ -64,7 +60,7 @@ export function addVegaWalletConnect() {
 export function addSetVegaWallet() {
  Cypress.Commands.add('setVegaWallet', () => {
    cy.window().then((win) => {
-      win.localStorage.setItem('vega_onboarding_viewed', 'true');
+      win.localStorage.setItem('vega_risk_accepted', 'true');
      win.localStorage.setItem(
        'vega_wallet_config',
        JSON.stringify({
@@ -76,11 +72,3 @@ export function addSetVegaWallet() {
    });
  });
 }
-
-export function addSetOnBoardingViewed() {
-  Cypress.Commands.add('setOnBoardingViewed', () => {
-    cy.window().then((win) => {
-      win.localStorage.setItem('vega_onboarding_viewed', 'true');
-    });
-  });
-}
@@ -17,7 +17,7 @@ export const SideSelector = (props: SideSelectorProps) => {
  return (
    <RadioGroup.Root
      name="order-side"
-      className="mb-4 flex h-10 leading-10"
+      className="mb-2 flex h-10 leading-10"
      {...props}
    >
      {toggles.map(({ label, value }) => (
@@ -45,7 +45,7 @@ export const TypeToggle = ({
  return (
    <RadioGroup.Root
      name="order-type"
-      className={classNames('mb-2 grid h-8 leading-8 font-alpha text-xs', {
+      className={classNames('mb-2 grid h-8 leading-8 font-alpha text-sm', {
        'grid-cols-3': FLAGS.STOP_ORDERS,
        'grid-cols-2': !FLAGS.STOP_ORDERS,
      })}
@@ -9,7 +9,7 @@ export const NodeSwitcherDialog = ({
  setOpen: (x: boolean) => void;
 }) => {
  return (
-    <Dialog open={open} onChange={setOpen} size="large">
+    <Dialog open={open} onChange={setOpen} size="medium">
      <NodeSwitcher closeDialog={() => setOpen(false)} />
    </Dialog>
  );
@@ -16,7 +16,7 @@ interface DialogProps {
  title?: string | ReactNode;
  icon?: ReactNode;
  intent?: Intent;
-  size?: 'small' | 'medium' | 'large';
+  size?: 'small' | 'medium';
  dataTestId?: string;
 }

@@ -46,8 +46,7 @@ export function Dialog({
    getIntentBorder(intent),
    {
      'w-[520px]': size === 'small',
-      'w-[680px]': size === 'medium',
-      'w-[720px] lg:w-[940px]': size === 'large',
+      'w-[720px] lg:w-[940px]': size === 'medium',
    }
  );

@@ -1,8 +0,0 @@
-export const IconEye = ({ size = 16 }: { size: number }) => {
-  return (
-    <svg width={size} height={size} viewBox="0 0 16 16">
-      <path d="M0.678395 7.44128C2.71173 4.52663 5.34817 2.99829 7.9894 2.99829C11.0914 2.99829 13.7635 5.01915 15.34 7.45404L15.3408 7.45519C15.4451 7.61729 15.5006 7.80599 15.5006 7.99876C15.5006 8.19118 15.4453 8.37954 15.3414 8.54144C13.7662 11.0077 11.1114 12.9983 7.9894 12.9983C4.8342 12.9983 2.23054 11.0118 0.659261 8.55277C0.552495 8.38698 0.497119 8.19332 0.500115 7.99613C0.503119 7.79845 0.564651 7.6061 0.676935 7.44338L0.67839 7.44127L0.678395 7.44128ZM1.5 8.01133L1.50139 8.01348L1.50139 8.01349C2.95267 10.2852 5.27875 11.9983 7.9894 11.9983C10.6697 11.9983 13.0459 10.278 14.4989 8.00262L14.4999 8.00113C14.5001 8.00073 14.5003 8.0003 14.5005 7.99985C14.5005 7.9995 14.5006 7.99913 14.5006 7.99876C14.5006 7.99792 14.5003 7.9971 14.4999 7.99639L14.9203 7.72579L14.5006 7.99754C13.0421 5.74493 10.6461 3.99829 7.9894 3.99829C5.75997 3.99829 3.40017 5.28866 1.5 8.01133Z" />
-      <path d="M8 5.99951C6.89543 5.99951 6 6.89494 6 7.99951C6 9.10408 6.89543 9.99951 8 9.99951C9.10457 9.99951 10 9.10408 10 7.99951C10 6.89494 9.10457 5.99951 8 5.99951ZM5 7.99951C5 6.34266 6.34315 4.99951 8 4.99951C9.65685 4.99951 11 6.34266 11 7.99951C11 9.65637 9.65685 10.9995 8 10.9995C6.34315 10.9995 5 9.65637 5 7.99951Z" />
-    </svg>
-  );
-};
@@ -12,7 +12,6 @@ import { IconCross } from './svg-icons/icon-cross';
 import { IconDeposit } from './svg-icons/icon-deposit';
 import { IconEdit } from './svg-icons/icon-edit';
 import { IconExclaimationMark } from './svg-icons/icon-exclaimation-mark';
-import { IconEye } from './svg-icons/icon-eye';
 import { IconForum } from './svg-icons/icon-forum';
 import { IconGlobe } from './svg-icons/icon-globe';
 import { IconInfo } from './svg-icons/icon-info';
@@ -49,7 +48,6 @@ export enum VegaIconNames {
  DEPOSIT = 'deposit',
  EDIT = 'edit',
  EXCLAIMATION_MARK = 'exclaimation-mark',
-  EYE = 'eye',
  FORUM = 'forum',
  GLOBE = 'globe',
  INFO = 'info',
@@ -90,7 +88,6 @@ export const VegaIconNameMap: Record<
  deposit: IconDeposit,
  edit: IconEdit,
  'exclaimation-mark': IconExclaimationMark,
-  eye: IconEye,
  forum: IconForum,
  globe: IconGlobe,
  info: IconInfo,
@@ -21,7 +21,7 @@ export const NotificationBanner = ({
  return (
    <div
      className={classNames(
-        'flex items-center px-1 py-3 border-b min-h-[56px]',
+        'flex items-center p-3 border-b min-h-[56px]',
        'text-[12px] leading-[16px] font-normal',
        {
          'bg-vega-light-100 dark:bg-vega-dark-100 ': intent === Intent.None,
@@ -8,7 +8,7 @@ import type {
 import { Intent } from '../../utils/intent';

 type TradingButtonProps = {
-  size?: 'large' | 'medium' | 'small' | 'extra-small';
+  size?: 'large' | 'medium' | 'small';
  intent?: Intent;
  children?: ReactNode;
  icon?: ReactNode;
@@ -24,31 +24,24 @@ const getClassName = (
  className?: string
 ) =>
  classNames(
-    'flex gap-2 items-center justify-center rounded disabled:opacity-40',
+    'flex gap-2 items-center justify-center rounded',
    // size
    {
      'h-12': !subLabel && size === 'large',
      'h-10': !subLabel && (!size || size === 'medium'),
      'h-8': !subLabel && size === 'small',
      'px-3 text-sm': !subLabel && size === 'small',
-      'h-6 px-2 text-xs': !subLabel && size === 'extra-small',
      'px-4 text-base': !subLabel && size !== 'small',
      'flex-col items-center justify-center px-3 pt-2.5 pb-2': subLabel,
    },
    // colours
    {
-      'bg-vega-yellow hover:bg-vega-yellow-550 dark:bg-vega-yellow dark:hover:bg-vega-yellow-450':
-        intent === Intent.Primary,
-      'bg-vega-clight-500 hover:bg-vega-clight-400 dark:bg-vega-cdark-500 dark:hover:bg-vega-cdark-400':
-        intent === Intent.None,
-      'bg-vega-blue-350 hover:bg-vega-blue-400 dark:bg-vega-blue-650 dark:hover:bg-vega-blue-600':
-        intent === Intent.Info,
-      'bg-vega-orange-350 hover:bg-vega-orange-400 dark:bg-vega-orange-650 dark:hover:bg-vega-orange-600':
-        intent === Intent.Warning,
-      'bg-vega-red-350 hover:bg-vega-red-400 dark:bg-vega-red-650 dark:hover:bg-vega-red-600':
-        intent === Intent.Danger,
-      'bg-vega-green-350 hover:bg-vega-green-400 dark:bg-vega-green-650 dark:hover:bg-vega-green-600':
-        intent === Intent.Success,
+      'bg-vega-yellow dark:bg-vega-yellow': intent === Intent.Primary,
+      'bg-vega-clight-500 dark:bg-vega-cdark-500': intent === Intent.None,
+      'bg-vega-blue-350 dark:bg-vega-blue-650': intent === Intent.Info,
+      'bg-vega-orange-350 dark:bg-vega-orange-650': intent === Intent.Warning,
+      'bg-vega-red-350 dark:bg-vega-red-650': intent === Intent.Danger,
+      'bg-vega-green-350 dark:bg-vega-green-650': intent === Intent.Success,
      'text-vega-clight-50 dark:text-vega-cdark-50': intent !== Intent.Primary,
      'text-vega-clight-900 dark:text-vega-cdark-900':
        intent === Intent.Primary,
@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import { NotificationBanner } from '../notification-banner';
 import { Intent } from '../../utils/intent';
-import { TradingButton } from '../trading-button';

 export function truncateMiddle(address: string, start = 6, end = 4) {
  if (address.length < 11) return address;
@@ -25,20 +24,19 @@ export const ViewingAsBanner = ({
    <NotificationBanner
      data-testid="view-banner"
      intent={Intent.None}
-      className="!px-1 !py-1 min-h-fit"
+      className="py-2 min-h-fit"
    >
      <div className="flex justify-between items-baseline">
        <span>
          {t('Viewing as Vega user:')} {pubKey && truncateMiddle(pubKey)}{' '}
        </span>
-        <TradingButton
-          intent={Intent.None}
-          size="extra-small"
+        <button
+          className="p-2 bg-light-dark-150 dark:bg-vega-dark-150 rounded uppercase"
          data-testid="exit-view"
          onClick={disconnect}
        >
          {t('Exit view as')}
-        </TradingButton>
+        </button>
      </div>
    </NotificationBanner>
  );
@@ -1,2 +1 @@
 export * from './connect-dialog';
-export * from './view-as-dialog';
@@ -1,40 +0,0 @@
-import { Dialog } from '@vegaprotocol/ui-toolkit';
-import { ViewConnectorForm } from './view-connector-form';
-import type { ViewConnector } from '../connectors';
-import { create } from 'zustand';
-
-type ViewAsDialogStore = {
-  open: boolean;
-  setOpen: (open: boolean) => void;
-};
-
-export const useViewAsDialog = create<ViewAsDialogStore>()((set) => ({
-  open: false,
-  setOpen: (open) => set({ open }),
-}));
-
-type ViewAsDialogProps = {
-  connector: ViewConnector;
-};
-
-export const ViewAsDialog = ({ connector }: ViewAsDialogProps) => {
-  const open = useViewAsDialog((state) => state.open);
-  const setOpen = useViewAsDialog((state) => state.setOpen);
-
-  return (
-    <Dialog
-      open={open}
-      size="small"
-      onChange={(open) => {
-        setOpen(open);
-      }}
-    >
-      <ViewConnectorForm
-        connector={connector}
-        onConnect={() => {
-          setOpen(false);
-        }}
-      />
-    </Dialog>
-  );
-};
@@ -2,10 +2,9 @@ import { t } from '@vegaprotocol/i18n';
 import {
  Button,
  FormGroup,
+  Icon,
  Input,
  InputError,
-  VegaIcon,
-  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { useForm } from 'react-hook-form';
 import type { ViewConnector } from '../connectors';
@@ -18,7 +17,7 @@ interface FormFields {
 interface RestConnectorFormProps {
  connector: ViewConnector;
  onConnect: (connector: ViewConnector) => void;
-  reset?: () => void;
+  reset: () => void;
 }

 export function ViewConnectorForm({
@@ -51,19 +50,13 @@ export function ViewConnectorForm({

  return (
    <>
-      {reset && (
-        <button
-          onClick={reset}
-          className="absolute p-2 top-0 left-0 md:top-2 md:left-2"
-          data-testid="back-button"
-        >
-          <VegaIcon
-            name={VegaIconNames.CHEVRON_LEFT}
-            aria-label="back"
-            size={16}
-          />
-        </button>
-      )}
+      <button
+        onClick={reset}
+        className="absolute p-2 top-0 left-0 md:top-2 md:left-2"
+        data-testid="back-button"
+      >
+        <Icon name={'chevron-left'} ariaLabel="back" size={4} />
+      </button>
      <form onSubmit={handleSubmit(onSubmit)} data-testid="view-connector-form">
        <h1 className="text-2xl uppercase mb-6 text-center font-alpha calt">
          {t('VIEW AS VEGA USER')}
@@ -12,7 +12,5 @@ export * from './vega-transaction-dialog';
 export * from './provider';
 export * from './connect-dialog';
 export * from './utils';
-export * from './storage';
-export * from './is-browser-wallet-installed';
 export * from './__generated__/TransactionResult';
 export * from './__generated__/WithdrawalApproval';
@@ -1 +0,0 @@
-export const isBrowserWalletInstalled = () => Boolean(window.vega);
@@ -31,14 +31,7 @@ export function useEagerConnect(Connectors: {
        return;
      }
      try {
-        if (cfg.connector === 'injected') {
-          const injectedInstance = Connectors[cfg.connector];
-          // @ts-ignore only injected wallet has connectWallet method
-          await injectedInstance.connectWallet();
-          await connect(injectedInstance);
-        } else {
-          await connect(Connectors[cfg.connector]);
-        }
+        await connect(Connectors[cfg.connector]);
      } catch {
        console.warn(`Failed to connect with connector: ${cfg.connector}`);
      } finally {
				`@@ -1 +0,0 @@`
				`export const isBrowserWalletInstalled = () => Boolean(window.vega);`