Update feature-epic.md

chore: add default title
2023-08-02 12:02:21 +01:00 · 2023-08-02 11:47:59 +01:00 · 2023-08-01 23:24:24 +01:00 · 2023-08-01 23:11:15 +01:00
160 changed files with 1772 additions and 5279 deletions
@@ -29,12 +29,6 @@ jobs:
          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
-          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-
-      - name: Is dev image
-        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
@@ -81,7 +75,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -179,7 +173,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -189,7 +183,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -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);
-      });
-    });
-  });
-});
@@ -1,107 +0,0 @@
-{
-  "changes": {
-    "decimalPlaces": "5",
-    "positionDecimalPlaces": "5",
-    "linearSlippageFactor": "0.001",
-    "quadraticSlippageFactor": "0",
-    "lpPriceRange": "10",
-    "instrument": {
-      "name": "Token test market",
-      "code": "Token.24h",
-      "future": {
-        "settlementAsset": "816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc",
-        "quoteName": "fUSDC",
-        "dataSourceSpecForSettlementData": {
-          "external": {
-            "oracle": {
-              "signers": [
-                {
-                  "pubKey": {
-                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                  }
-                }
-              ],
-              "filters": [
-                {
-                  "key": {
-                    "name": "prices.BTC.value",
-                    "type": "TYPE_INTEGER",
-                    "numberDecimalPlaces": "0"
-                  },
-                  "conditions": [
-                    {
-                      "operator": "OPERATOR_GREATER_THAN",
-                      "value": "0"
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        },
-        "dataSourceSpecForTradingTermination": {
-          "external": {
-            "oracle": {
-              "signers": [
-                {
-                  "pubKey": {
-                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                  }
-                }
-              ],
-              "filters": [
-                {
-                  "key": {
-                    "name": "trading.terminated.ETH5",
-                    "type": "TYPE_BOOLEAN"
-                  },
-                  "conditions": [
-                    {
-                      "operator": "OPERATOR_EQUALS",
-                      "value": "true"
-                    }
-                  ]
-                }
-              ]
-            }
-          }
-        },
-        "dataSourceSpecBinding": {
-          "settlementDataProperty": "prices.BTC.value",
-          "tradingTerminationProperty": "trading.terminated.ETH5"
-        }
-      }
-    },
-    "metadata": ["sector:food", "sector:materials", "source:docs.vega.xyz"],
-    "priceMonitoringParameters": {
-      "triggers": [
-        {
-          "horizon": "43200",
-          "probability": "0.9999999",
-          "auctionExtension": "600"
-        }
-      ]
-    },
-    "liquidityMonitoringParameters": {
-      "targetStakeParameters": {
-        "timeWindow": "3600",
-        "scalingFactor": 10
-      },
-      "triggeringRatio": "0.7",
-      "auctionExtension": "1"
-    },
-    "logNormal": {
-      "tau": 0.0001140771161,
-      "riskAversionParameter": 0.001,
-      "params": {
-        "mu": 0,
-        "r": 0.016,
-        "sigma": 0.8
-      }
-    },
-    "successor": {
-      "parentMarketId": "",
-      "insurancePoolFraction": "0.75"
-    }
-  }
-}
@@ -220,7 +220,7 @@ context(
      function () {
        const proposalTitle = 'Test new market proposal';
        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.getByTestId(newProposalTitle).type(proposalTitle);
+        cy.getByTestId(newProposalTitle).type('Test new market proposal');
        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
          const newMarketPayload = JSON.stringify(newMarketProposal);
@@ -606,94 +606,6 @@ context(
        });
    });

-    it('able to submit successor market proposal', function () {
-      const proposalTitle = 'Test successor market proposal';
-
-      cy.createMarket();
-      cy.reload();
-      waitForSpinner();
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.contains('Add Lorem Ipsum market')
-          .parentsUntil(proposalListItem)
-          .last()
-          .within(() => {
-            cy.getByTestId(viewProposalBtn).click();
-          });
-      });
-      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
-      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(newProposalTitle).type(proposalTitle);
-      cy.getByTestId(newProposalDescription).type(
-        'E2E test for successor market'
-      );
-      cy.fixture('/proposals/successor-market').then((newMarketProposal) => {
-        newMarketProposal.changes.successor.parentMarketId =
-          this.parentMarketId;
-        const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
-          parseSpecialCharSequences: false,
-          delay: 2,
-        });
-      });
-      cy.getByTestId(proposalDownloadBtn)
-        .should('be.visible')
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-new-market-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath });
-          });
-        });
-      navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() => {
-        // 3003-PMAN-008
-        cy.getByTestId('proposal-successor-info')
-          .should('have.text', 'Successor market to: TEST.24h')
-          .find('a')
-          .should('have.attr', 'href')
-          .and('contain', this.parentMarketId);
-        cy.getByTestId('view-proposal-btn').click();
-      });
-      // #3003-PMAN-010
-      cy.getByTestId(proposalJsonToggle).click();
-      cy.get('.language-json').within(() => {
-        cy.get('.hljs-attr').should('contain.text', 'parentMarketId');
-        cy.get('.hljs-string').should('contain.text', this.parentMarketId);
-        cy.get('.hljs-attr').should('contain.text', 'insurancePoolFraction');
-        cy.get('.hljs-string').should('contain.text', '0.75');
-      });
-      cy.getByTestId('proposal-market-data').within(() => {
-        cy.getByTestId('proposal-market-data-toggle').click();
-        cy.contains('Key details').click();
-        // 3003-PMAN-009
-        getMarketProposalDetailsFromTable('Parent Market ID').should(
-          'have.text',
-          this.parentMarketId
-        );
-        getMarketProposalDetailsFromTable('Insurance Pool Fraction').should(
-          'have.text',
-          '0.75'
-        );
-        getMarketProposalDetailsFromTable('Trading Mode').should(
-          'have.text',
-          'No trading'
-        );
-      });
-      // 3003-PMAN-011
-      cy.contains('Parent Market ID').realHover();
-      cy.getByTestId('tooltip-content').should(
-        'contain.text',
-        'The ID of the market this market succeeds.'
-      );
-      cy.contains('Insurance Pool Fraction').realHover();
-      cy.getByTestId('tooltip-content').should(
-        'contain.text',
-        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
-      );
-    });
-
    after('Disassociate from second wallet key if present', function () {
      cy.reload();
      waitForSpinner();
@@ -96,14 +96,12 @@ context('rewards - flow', { tags: '@slow' }, function () {
      .within(() => {
        cy.get('h2').first().should('contain.text', 'EPOCH');
        cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut).should(
-          'contain.text',
-          '0.4415'
-        );
-        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
-          'contain.text',
-          '0.0004'
-        );
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
+          .should('contain.text', '0.4415')
+          .and('contain.text', '(44.15%)');
+        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
+          .should('contain.text', '0.0004')
+          .and('contain.text', '(44.15%)');
        cy.getByTestId('total').should('have.text', '0.4419');
      });
  });
@@ -339,7 +339,7 @@ context(
              cy.getByTestId(vegaWalletCurrencyTitle)
                .contains(name)
                .parent()
-                .siblings(txTimeout)
+                .siblings()
                .should((elementAmount) => {
                  const displayedAmount = parseFloat(elementAmount.text());
                  expect(displayedAmount).be.gte(expectedAmount);
@@ -107,7 +107,7 @@ export function dissociateFromSecondWalletKey() {
  cy.getByTestId('vega-in-wallet')
    .first()
    .within(() => {
-      cy.getByTestId('eth-wallet-associated-balances', txTimeout)
+      cy.getByTestId('eth-wallet-associated-balances')
        .last()
        .within(() => {
          cy.getByTestId('associated-key')
@@ -78,21 +78,13 @@ export function stakingPageAssociateTokens(
  }
  cy.get(tokenAmountInputBox, epochTimeout).type(amount);
  if (approve) {
-    cy.getByTestId('wallet-associate').then((walletAssociateField) => {
-      if (
-        walletAssociateField.find('[data-testid="token-input-approve-button"]')
-          .length
-      ) {
-        cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
-        cy.contains('Approve $VEGA Tokens for staking on Vega').should(
-          'be.visible'
-        );
-        cy.contains(
-          'Approve $VEGA Tokens for staking on Vega',
-          txTimeout
-        ).should('not.exist');
-      }
-    });
+    cy.get(tokenInputApprove, txTimeout).should('be.enabled').click();
+    cy.contains('Approve $VEGA Tokens for staking on Vega').should(
+      'be.visible'
+    );
+    cy.contains('Approve $VEGA Tokens for staking on Vega', txTimeout).should(
+      'not.exist'
+    );
  }
  cy.get(tokenSubmitButton, txTimeout).should('be.enabled').click();

@@ -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');
      });
@@ -3,13 +3,12 @@ import type { MarketsQuery } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';

 const rowSelector =
-  '[data-testid="tab-open-markets"] .ag-center-cols-container .ag-row';
+  '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
 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,
@@ -35,7 +34,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
      'Settlement asset',
      '',
    ];
-    cy.getByTestId('tab-open-markets').within(($headers) => {
+    cy.getByTestId('tab-all-markets').within(($headers) => {
      cy.wrap($headers)
        .get('.ag-header-cell-text')
        .each(($header, i) => {
@@ -45,7 +44,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
  });

  it('markets tab should be rendered properly', () => {
-    cy.get('[data-testid="Open markets"]').should(
+    cy.get('[data-testid="All markets"]').should(
      'have.attr',
      'data-state',
      'active'
@@ -167,7 +166,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
      'ETHBTC.QM21',
      'SOLUSD',
    ];
-    cy.get('[data-testid="Open markets"]').click({ force: true });
+    cy.get('[data-testid="All markets"]').click({ force: true });
    cy.url().should('eq', Cypress.config('baseUrl') + '/#/markets/all');
    cy.contains('AAPL.MF21').should('be.visible');
    cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
@@ -192,7 +191,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
  });
 });

-describe('no open markets', { tags: '@smoke', testIsolation: true }, () => {
+describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
  before(() => {
    cy.mockTradingPage();
    const markets: MarketsQuery = {};
@@ -200,12 +199,11 @@ describe('no open markets', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'Markets', markets);
    });
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
    cy.visit('/#/markets/all');
  });

  it.skip('can see no markets message', () => {
    // 6001-MARK-048
-    cy.getByTestId('tab-open-markets').should('contain.text', 'No markets');
+    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
  });
 });
@@ -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();
  });
@@ -101,6 +100,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
          'VEGA_TOKEN_URL'
        )}/proposals/e9ec6d5c46a7e7bcabf9ba7a893fa5a5eeeec08b731f06f7a6eb7bf0e605b829`
      );
+    cy.getByTestId('proposal-actions-content').click();
  });

  // 6001-MARK-060
@@ -214,13 +214,11 @@ describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
      aliasGQLQuery(req, 'ProposalsList', proposal);
    });
    cy.mockSubscription();
-    cy.setOnBoardingViewed();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Proposed markets"]').click();
  });

  it('can see no markets message', () => {
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Proposed markets"]').click();
-
    // 6001-MARK-061
    cy.getByTestId('tab-proposed-markets').should('contain.text', 'No markets');
  });
@@ -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');
  });
@@ -29,16 +28,16 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {

  it('must be able to select order direction - long/short', function () {
    // 7002-SORD-004
-    cy.getByTestId(toggleShort).click().next('input').should('be.checked');
-    cy.getByTestId(toggleLong).click().next('input').should('be.checked');
+    cy.getByTestId(toggleShort).click().children('input').should('be.checked');
+    cy.getByTestId(toggleLong).click().children('input').should('be.checked');
  });

  it('must be able to select order type - limit/market', function () {
    // 7002-SORD-005
    // 7002-SORD-006
    // 7002-SORD-007
-    cy.getByTestId(toggleLimit).click().next('input').should('be.checked');
-    cy.getByTestId(toggleMarket).click().next('input').should('be.checked');
+    cy.getByTestId(toggleLimit).click().children('input').should('be.checked');
+    cy.getByTestId(toggleMarket).click().children('input').should('be.checked');
  });

  it('order connect vega wallet button should connect', () => {
@@ -52,7 +51,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
      .click();
    cy.wait('@walletReq');
    cy.getByTestId(placeOrderBtn).should('be.visible');
-    cy.getByTestId(toggleLimit).next('input').should('be.checked');
+    cy.getByTestId(toggleLimit).children('input').should('be.checked');
    cy.getByTestId(orderPriceField).should('have.value', '101');
  });
 });
@@ -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');
  });

@@ -1,191 +0,0 @@
-import { selectAsset } from '../support/helpers';
-
-const amountField = 'input[name="amount"]';
-const transferText = 'transfer-intro-text';
-const errorText = 'input-error-text';
-const formFieldError = 'input-error-text';
-const includeTransferFeeRadioBtn = 'include-transfer-fee';
-const keyID = `[data-testid="${transferText}"] > .rounded-md`;
-const manageVegaWallet = 'manage-vega-wallet';
-const submitTransferBtn = '[type="submit"]';
-const toAddressField = '[name="toAddress"]';
-const totalTransferfee = 'total-transfer-fee';
-const transferAmount = 'transfer-amount';
-const transferForm = 'transfer-form';
-const transferFee = 'transfer-fee';
-const walletTransfer = 'wallet-transfer';
-
-const ASSET_EURO = 1;
-const ASSET_SEPOLIA_TBTC = 2;
-
-describe('transfer fees', { tags: '@regression', testIsolation: true }, () => {
-  beforeEach(() => {
-    cy.mockWeb3Provider();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.setVegaWallet();
-
-    cy.visit('/');
-    cy.getByTestId(manageVegaWallet).click();
-    cy.getByTestId(walletTransfer).click();
-
-    cy.wait('@Assets');
-    cy.wait('@Accounts');
-
-    cy.mockVegaWalletTransaction();
-  });
-
-  it('transfer fees tooltips', () => {
-    // 1003-TRAN-015
-    // 1003-TRAN-016
-    // 1003-TRAN-017
-    // 1003-TRAN-018
-    // 1003-TRAN-019
-    cy.getByTestId(transferForm);
-    cy.contains('Enter manually').click();
-    cy.getByTestId(transferForm)
-      .find(toAddressField)
-      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
-    selectAsset(ASSET_SEPOLIA_TBTC);
-    cy.getByTestId(transferForm)
-      .find(amountField)
-      .type('1', { delay: 100, force: true });
-
-    /// Check Include Transfer Fee tooltip
-    cy.get('label[for="include-transfer-fee"] div').realHover();
-    cy.get('[data-side="bottom"] div')
-      .should('be.visible')
-      .should('not.be.empty');
-
-    //Check Transfer Fee tooltip
-    cy.contains('div', 'Transfer fee').realHover();
-    cy.get('[data-side="bottom"] div')
-      .should('be.visible')
-      .should('not.be.empty');
-
-    //Check Amount to be transferred tooltip
-    cy.contains('div', 'Amount to be transferred').realHover();
-    cy.get('[data-side="bottom"] div')
-      .should('be.visible')
-      .should('not.be.empty');
-
-    //Check Total amount (with fee) tooltip
-    cy.contains('div', 'Total amount (with fee)').realHover();
-    cy.get('[data-side="bottom"] div')
-      .should('be.visible')
-      .should('not.be.empty');
-  });
-
-  it('transfer fees', () => {
-    // 1003-TRAN-020
-    // 1003-TRAN-021
-    // 1003-TRAN-022
-    // 1003-TRAN-023
-    cy.getByTestId(transferForm);
-    cy.contains('Enter manually').click();
-
-    cy.getByTestId(transferForm)
-      .find(toAddressField)
-      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
-    selectAsset(ASSET_SEPOLIA_TBTC);
-    cy.getByTestId(includeTransferFeeRadioBtn).should('be.disabled');
-
-    cy.getByTestId(transferForm)
-      .find(amountField)
-      .type('1', { delay: 100, force: true });
-
-    cy.getByTestId(transferFee)
-      .should('be.visible')
-      .should('contain.text', '0.01');
-    cy.getByTestId(transferAmount)
-      .should('be.visible')
-      .should('contain.text', '1.00');
-    cy.getByTestId(totalTransferfee)
-      .should('be.visible')
-      .should('contain.text', '1.01');
-    cy.getByTestId(includeTransferFeeRadioBtn).click();
-    cy.getByTestId(transferFee)
-      .should('be.visible')
-      .should('contain.text', '0.01');
-    cy.getByTestId(transferAmount)
-      .should('be.visible')
-      .should('contain.text', '0.99');
-    cy.getByTestId(totalTransferfee)
-      .should('be.visible')
-      .should('contain.text', '1.00');
-  });
-});
-
-describe(
-  'transfer form validation',
-  { tags: '@regression', testIsolation: true },
-  () => {
-    beforeEach(() => {
-      cy.mockWeb3Provider();
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.setVegaWallet();
-
-      cy.visit('/#/portfolio');
-      cy.getByTestId(manageVegaWallet).click();
-      cy.getByTestId(walletTransfer).click();
-
-      cy.wait('@Accounts');
-      cy.wait('@Assets');
-    });
-
-    it('transfer Text', () => {
-      // 1003-TRAN-003
-      cy.getByTestId(transferText)
-        .should('exist')
-        .get(keyID)
-        .invoke('text')
-        .should('match', /[\w.]{6}…[\w.]{6}/);
-    });
-
-    it('invalid vega key validation', () => {
-      //1003-TRAN-013
-      //1003-TRAN-004
-      cy.getByTestId(transferForm).should('be.visible');
-      cy.contains('Enter manually').click();
-      cy.getByTestId(transferForm).find(toAddressField).type('asd');
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(formFieldError).should('contain.text', 'Invalid Vega key');
-      cy.contains('label', 'Vega key').should('be.visible');
-      cy.contains('label', 'Asset').should('be.visible');
-      cy.contains('label', 'Amount').should('be.visible');
-    });
-
-    it('empty fields', () => {
-      // 1003-TRAN-012
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(formFieldError).should('contain.text', 'Required');
-      cy.getByTestId(formFieldError).should('have.length', 3);
-    });
-
-    it('min amount', () => {
-      // 1002-WITH-010
-      // 1003-TRAN-014
-      selectAsset(ASSET_SEPOLIA_TBTC);
-      cy.get(amountField).clear().type('0');
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(errorText).should(
-        'contain.text',
-        'Value is below minimum'
-      );
-    });
-
-    it('max amount', () => {
-      // 1003-TRAN-002
-      // 1003-TRAN-011
-      // 1003-TRAN-002
-      selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
-      cy.get(amountField).clear().type('1001', { delay: 100 });
-      cy.getByTestId(transferForm).find(submitTransferBtn).click();
-      cy.getByTestId(errorText).should(
-        'contain.text',
-        'You cannot transfer more than your available collateral'
-      );
-    });
-  }
-);
@@ -5,15 +5,205 @@ const amountShortName = 'input[name="amount"] + div + span.text-xs';
 const assetSelection = 'select-asset';
 const assetBalance = 'asset-balance';
 const assetOption = 'rich-select-option';
+const transferText = 'transfer-intro-text';
+const errorText = 'input-error-text';
+const formFieldError = 'input-error-text';
+const includeTransferFeeRadioBtn = 'include-transfer-fee';
+const keyID = `[data-testid="${transferText}"] > .rounded-md`;
+const manageVegaWallet = 'manage-vega-wallet';
 const openTransferButton = 'open-transfer';
 const submitTransferBtn = '[type="submit"]';
 const toAddressField = '[name="toAddress"]';
+const totalTransferfee = 'total-transfer-fee';
+const transferAmount = 'transfer-amount';
 const transferForm = 'transfer-form';
+const transferFee = 'transfer-fee';
+const walletTransfer = 'wallet-transfer';
+
+const ASSET_EURO = 1;
 const ASSET_SEPOLIA_TBTC = 2;
+
 const collateralTab = 'Collateral';
 const toastCloseBtn = 'toast-close';
 const toastContent = 'toast-content';

+describe('transfer fees', { tags: '@regression', testIsolation: true }, () => {
+  beforeEach(() => {
+    cy.mockWeb3Provider();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.setVegaWallet();
+
+    cy.visit('/');
+
+    cy.wait('@Assets');
+    cy.wait('@Accounts');
+
+    cy.mockVegaWalletTransaction();
+
+    // Only click if not already active otherwise sidebar will close
+    cy.get('[data-testid="sidebar-content"]').then(($sidebarContent) => {
+      if ($sidebarContent.find('h2').text() !== 'Transfer') {
+        cy.get('[data-testid="sidebar"] [data-testid="Transfer"]').click();
+      }
+    });
+  });
+
+  it('transfer fees tooltips', () => {
+    // 1003-TRAN-015
+    // 1003-TRAN-016
+    // 1003-TRAN-017
+    // 1003-TRAN-018
+    // 1003-TRAN-019
+    cy.getByTestId(transferForm);
+    cy.contains('Enter manually').click();
+
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+
+    /// Check Include Transfer Fee tooltip
+    cy.get('label[for="include-transfer-fee"] div').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+
+    //Check Transfer Fee tooltip
+    cy.contains('div', 'Transfer fee').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+
+    //Check Amount to be transferred tooltip
+    cy.contains('div', 'Amount to be transferred').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+
+    //Check Total amount (with fee) tooltip
+    cy.contains('div', 'Total amount (with fee)').realHover();
+    cy.get('[data-side="bottom"] div')
+      .should('be.visible')
+      .should('not.be.empty');
+  });
+
+  it('transfer fees', () => {
+    // 1003-TRAN-020
+    // 1003-TRAN-021
+    // 1003-TRAN-022
+    // 1003-TRAN-023
+    cy.getByTestId(transferForm);
+    cy.contains('Enter manually').click();
+
+    cy.getByTestId(transferForm)
+      .find(toAddressField)
+      .type('7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535');
+    selectAsset(ASSET_SEPOLIA_TBTC);
+    cy.getByTestId(includeTransferFeeRadioBtn).should('be.disabled');
+
+    cy.getByTestId(transferForm)
+      .find(amountField)
+      .type('1', { delay: 100, force: true });
+
+    cy.getByTestId(transferFee)
+      .should('be.visible')
+      .should('contain.text', '0.01');
+    cy.getByTestId(transferAmount)
+      .should('be.visible')
+      .should('contain.text', '1.00');
+    cy.getByTestId(totalTransferfee)
+      .should('be.visible')
+      .should('contain.text', '1.01');
+    cy.getByTestId(includeTransferFeeRadioBtn).click();
+    cy.getByTestId(transferFee)
+      .should('be.visible')
+      .should('contain.text', '0.01');
+    cy.getByTestId(transferAmount)
+      .should('be.visible')
+      .should('contain.text', '0.99');
+    cy.getByTestId(totalTransferfee)
+      .should('be.visible')
+      .should('contain.text', '1.00');
+  });
+});
+
+describe(
+  'transfer form validation',
+  { tags: '@regression', testIsolation: true },
+  () => {
+    beforeEach(() => {
+      cy.mockWeb3Provider();
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.setVegaWallet();
+
+      cy.visit('/#/portfolio');
+      cy.getByTestId(manageVegaWallet).click();
+      cy.getByTestId(walletTransfer).click();
+
+      cy.wait('@Accounts');
+      cy.wait('@Assets');
+    });
+
+    it('transfer Text', () => {
+      // 1003-TRAN-003
+      cy.getByTestId(transferText)
+        .should('exist')
+        .get(keyID)
+        .invoke('text')
+        .should('match', /[\w.]{6}…[\w.]{6}/);
+    });
+
+    it('invalid vega key validation', () => {
+      //1003-TRAN-013
+      //1003-TRAN-004
+      cy.getByTestId(transferForm).should('be.visible');
+      cy.contains('Enter manually').click();
+      cy.getByTestId(transferForm).find(toAddressField).type('asd');
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(formFieldError).should('contain.text', 'Invalid Vega key');
+      cy.contains('label', 'Vega key').should('be.visible');
+      cy.contains('label', 'Asset').should('be.visible');
+      cy.contains('label', 'Amount').should('be.visible');
+    });
+
+    it('empty fields', () => {
+      // 1003-TRAN-012
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(formFieldError).should('contain.text', 'Required');
+      cy.getByTestId(formFieldError).should('have.length', 3);
+    });
+
+    it('min amount', () => {
+      // 1002-WITH-010
+      // 1003-TRAN-014
+      selectAsset(ASSET_SEPOLIA_TBTC);
+      cy.get(amountField).clear().type('0');
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(errorText).should(
+        'contain.text',
+        'Value is below minimum'
+      );
+    });
+
+    it('max amount', () => {
+      // 1003-TRAN-002
+      // 1003-TRAN-011
+      // 1003-TRAN-002
+      selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
+      cy.get(amountField).clear().type('1001', { delay: 100 });
+      cy.getByTestId(transferForm).find(submitTransferBtn).click();
+      cy.getByTestId(errorText).should(
+        'contain.text',
+        'You cannot transfer more than your available collateral'
+      );
+    });
+  }
+);
 describe('withdraw actions', { tags: '@smoke', testIsolation: true }, () => {
  beforeEach(() => {
    cy.mockWeb3Provider();
@@ -1,4 +1,3 @@
-import { OrderType } from '@vegaprotocol/types';
 import type { OrderSubmission } from '@vegaprotocol/wallet';

 const orderSizeField = 'order-size';
@@ -10,9 +9,7 @@ export const createOrder = (order: OrderSubmission): void => {
  cy.log('Placing order', order);
  const { type, side, size, price, timeInForce, expiresAt } = order;

-  cy.getByTestId(
-    `order-type-${type === OrderType.TYPE_LIMIT ? 'Limit' : 'Market'}`
-  ).click();
+  cy.getByTestId(`order-type-${type}`).click();
  cy.getByTestId(`order-side-${side}`).click();
  cy.getByTestId(orderSizeField).clear().type(size);
  if (price) {
@@ -6,8 +6,8 @@ export const orderTIFDropDown = 'order-tif';
 export const placeOrderBtn = 'place-order';
 export const toggleShort = 'order-side-SIDE_SELL';
 export const toggleLong = 'order-side-SIDE_BUY';
-export const toggleLimit = 'order-type-Limit';
-export const toggleMarket = 'order-type-Market';
+export const toggleLimit = 'order-type-TYPE_LIMIT';
+export const toggleMarket = 'order-type-TYPE_MARKET';

 export const TIFlist = Object.values(Schema.OrderTimeInForce).map((value) => {
  return {
@@ -16,6 +16,6 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -18,6 +18,6 @@ NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supp

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
-NX_STOP_ORDERS=false
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -16,6 +16,6 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -18,6 +18,6 @@ NX_APP_VERSION=v0.20.21-core-0.71.6

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
-NX_STOP_ORDERS=false
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
-# NX_PRODUCT_PERPETUALS
+# NX_PRODUCT_PERPETUALS
@@ -18,6 +18,6 @@ NX_APP_VERSION=v0.20.19-core-0.71.6

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
-NX_STOP_ORDERS=false
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -16,6 +16,6 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -17,6 +17,6 @@ NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
-NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+# NX_STOP_ORDERS
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -17,6 +17,6 @@ NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks

 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=false
-NX_STOP_ORDERS=false
+# NX_STOP_ORDERS
 # NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
@@ -1,19 +0,0 @@
-import { DepositContainer } from '@vegaprotocol/deposits';
-import { GetStarted } from '../../components/welcome-dialog';
-import { t } from '@vegaprotocol/i18n';
-
-export const Deposit = () => {
-  return (
-    <div className="py-16 px-8 flex w-full justify-center">
-      <div className="lg:min-w-[700px] min-w-[300px] max-w-[700px]">
-        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
-          {t('Deposit')}
-        </h1>
-        <div className="mt-10">
-          <DepositContainer />
-          <GetStarted />
-        </div>
-      </div>
-    </div>
-  );
-};
@@ -1,3 +0,0 @@
-import { Deposit } from './deposit';
-
-export default Deposit;
@@ -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,
@@ -57,11 +58,7 @@ const MainGrid = memo(
            >
              <TradeGridChild>
                <Tabs storageKey="console-trade-grid-main-left">
-                  <Tab
-                    id="chart"
-                    name={t('Chart')}
-                    menu={<TradingViews.candles.menu />}
-                  >
+                  <Tab id="chart" name={t('Chart')}>
                    <TradingViews.candles.component marketId={marketId} />
                  </Tab>
                  <Tab id="depth" name={t('Depth')}>
@@ -98,48 +95,57 @@ 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 />
-                </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>
@@ -37,7 +37,6 @@ export const TradePanels = ({
  const onOrderTypeClick = useMarketLiquidityClickHandler();

  const [view, setView] = useState<TradingView>('candles');
-
  const renderView = () => {
    const Component = memo<{
      marketId: string;
@@ -66,23 +65,8 @@ export const TradePanels = ({
    );
  };

-  const renderMenu = () => {
-    const viewCfg = TradingViews[view];
-
-    if ('menu' in viewCfg) {
-      const Menu = viewCfg.menu;
-      return (
-        <div className="flex gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
-          <Menu />
-        </div>
-      );
-    }
-
-    return null;
-  };
-
  return (
-    <div className="h-full grid grid-rows-[min-content_min-content_1fr_min-content]">
+    <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
      <div>
        {FLAGS.SUCCESSOR_MARKETS && (
          <>
@@ -92,7 +76,6 @@ export const TradePanels = ({
        )}
        <OracleBanner marketId={market?.id || ''} />
      </div>
-      <div>{renderMenu()}</div>
      <div className="h-full">
        <AutoSizer>
          {({ width, height }) => (
@@ -2,10 +2,7 @@ import type { ComponentProps } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { TradesContainer } from '@vegaprotocol/trades';
 import { DepthChartContainer } from '@vegaprotocol/market-depth';
-import {
-  CandlesChartContainer,
-  CandlesMenu,
-} from '@vegaprotocol/candles-chart';
+import { CandlesChartContainer } from '@vegaprotocol/candles-chart';
 import { Filter } from '@vegaprotocol/orders';
 import { NO_MARKET } from './constants';
 import { OrderbookContainer } from '../../components/orderbook-container';
@@ -15,7 +12,6 @@ import { AccountsContainer } from '../../components/accounts-container';
 import { LiquidityContainer } from '../../components/liquidity-container';
 import type { OrderContainerProps } from '../../components/orders-container';
 import { OrdersContainer } from '../../components/orders-container';
-import { StopOrdersContainer } from '../../components/stop-orders-container';

 type MarketDependantView =
  | typeof CandlesChartContainer
@@ -38,7 +34,6 @@ export const TradingViews = {
  candles: {
    label: 'Candles',
    component: requiresMarket(CandlesChartContainer),
-    menu: CandlesMenu,
  },
  depth: {
    label: 'Depth',
@@ -79,10 +74,6 @@ export const TradingViews = {
    label: 'All',
    component: OrdersContainer,
  },
-  stopOrders: {
-    label: 'Stop',
-    component: StopOrdersContainer,
-  },
  collateral: { label: 'Collateral', component: AccountsContainer },
  fills: { label: 'Fills', component: FillsContainer },
 };
@@ -18,7 +18,7 @@ export const MarketsPage = () => {
    <div className="h-full pt-0.5 pb-3 px-1.5">
      <div className="h-full my-1 border border-default rounded-sm">
        <Tabs storageKey="console-markets">
-          <Tab id="open-markets" name={t('Open markets')}>
+          <Tab id="all-markets" name={t('All markets')}>
            <Markets />
          </Tab>
          <Tab id="proposed-markets" name={t('Proposed markets')}>
@@ -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 (
@@ -1,4 +1,4 @@
-import { Button, Splash } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import { DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
@@ -17,9 +17,6 @@ export const DepositsContainer = () => {
    skip: !pubKey,
  });
  const setView = useSidebar((store) => store.setView);
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
  return (
    <div className="h-full">
      <DepositsTable
@@ -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"
@@ -1,4 +1,4 @@
-import { Button, Splash } from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import {
  withdrawalProvider,
  WithdrawalsTable,
@@ -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 = () => {
@@ -18,11 +19,9 @@ export const WithdrawalsContainer = () => {
  });
  const setView = useSidebar((store) => store.setView);
  const { ready, delayed } = useIncompleteWithdrawals();
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
+
  return (
-    <>
+    <VegaWalletContainer>
      <div className="h-full relative">
        <WithdrawalsTable
          data-testid="withdrawals-history"
@@ -44,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';

@@ -12,9 +12,10 @@ import {
  NetworkParams,
  useNetworkParams,
 } from '@vegaprotocol/network-parameters';
+import type { AgGridReact } from 'ag-grid-react';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';

@@ -25,6 +26,8 @@ export const LiquidityContainer = ({
  marketId: string | undefined;
  filter?: Filter;
 }) => {
+  const gridRef = useRef<AgGridReact | null>(null);
+
  const gridStore = useLiquidityStore((store) => store.gridStore);
  const updateGridStore = useLiquidityStore((store) => store.updateGridStore);

@@ -57,6 +60,7 @@ export const LiquidityContainer = ({
  return (
    <div className="h-full relative">
      <LiquidityTable
+        ref={gridRef}
        rowData={data}
        symbol={symbol}
        assetDecimalPlaces={assetDecimalPlaces}
@@ -52,9 +52,6 @@ export const Navbar = ({
          'bg-vega-yellow text-vega-clight-50': theme === 'yellow',
          'text-default': theme === 'system',
        })}
-        style={{
-          background: theme === 'yellow' ? 'url(/testnet-logo-bg.png' : 'none',
-        }}
      >
        <VLogo className="w-4" />
      </NavLink>
@@ -1,14 +1,10 @@
 import { OrderbookManager } from '@vegaprotocol/market-depth';
 import { useCreateOrderStore } from '@vegaprotocol/orders';
 import { ViewType, useSidebar } from '../sidebar';
-import { useStopOrderFormValues } from '@vegaprotocol/deal-ticket';

 export const OrderbookContainer = ({ marketId }: { marketId: string }) => {
  const useOrderStoreRef = useCreateOrderStore();
  const updateOrder = useOrderStoreRef((store) => store.update);
-  const updateStoredFormValues = useStopOrderFormValues(
-    (state) => state.update
-  );
  const setView = useSidebar((store) => store.setView);
  return (
    <OrderbookManager
@@ -16,11 +12,9 @@ export const OrderbookContainer = ({ marketId }: { marketId: string }) => {
      onClick={({ price, size }) => {
        if (price) {
          updateOrder(marketId, { price });
-          updateStoredFormValues(marketId, { price });
        }
        if (size) {
          updateOrder(marketId, { size });
-          updateStoredFormValues(marketId, { size });
        }
        setView({ type: ViewType.Order });
      }}
@@ -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 };
          }

@@ -1 +0,0 @@
-export * from './stop-orders-container';
@@ -1,41 +0,0 @@
-import { useDataGridEvents } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
-import { StopOrdersManager } from '@vegaprotocol/orders';
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import type { DataGridSlice } from '../../stores/datagrid-store-slice';
-import { createDataGridSlice } from '../../stores/datagrid-store-slice';
-
-export const StopOrdersContainer = () => {
-  const { pubKey, isReadOnly } = useVegaWallet();
-  const onMarketClick = useMarketClickHandler(true);
-
-  const gridStore = useStopOrdersStore((store) => store.gridStore);
-  const updateGridStore = useStopOrdersStore((store) => store.updateGridStore);
-
-  const gridStoreCallbacks = useDataGridEvents(gridStore, (colState) => {
-    updateGridStore(colState);
-  });
-
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
-
-  return (
-    <StopOrdersManager
-      partyId={pubKey}
-      onMarketClick={onMarketClick}
-      isReadOnly={isReadOnly}
-      gridProps={gridStoreCallbacks}
-    />
-  );
-};
-
-const useStopOrdersStore = create<DataGridSlice>()(
-  persist(createDataGridSlice, {
-    name: 'vega_fills_store',
-  })
-);
@@ -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,159 +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';
-import type { ReactNode } from 'react';
-
-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 sm:flex-row gap-8">
-      <div className="sm:w-1/2 flex flex-col justify-between pt-3">
-        <ul className="ml-0">
-          <ListItemContent
-            icon={<NonCustodialIcon />}
-            title={t('Non-cutodial and pseudonymous')}
-            text={t('No third party has access to your funds.')}
-          />
-          <ListItemContent
-            icon={<PurposeBuiltIcon />}
-            title={t('Purpose built proof of stake blockhain')}
-            text={t(
-              'Fully decentralised high performance peer-to-network trading.'
-            )}
-          />
-          <ListItemContent
-            icon={<RewardIcon />}
-            title={t('Low fees and no cost to place orders')}
-            text={t(
-              'Fees work like a CEX with no per-transaction gas for orders'
-            )}
-          />
-        </ul>
-        <TradingButton
-          onClick={browseMarkets}
-          className="block w-full"
-          data-testid="browse-markets-button"
-        >
-          {t('Browse the markets')}
-        </TradingButton>
-      </div>
-      <div className="sm:w-1/2">
-        <GetStarted lead={lead} />
-      </div>
-    </div>
-  );
-};
-
-const ListItemContent = ({
-  icon,
-  title,
-  text,
-}: {
-  icon: ReactNode;
-  title: string;
-  text: string;
-}) => {
-  return (
-    <li className="my-4 flex gap-3">
-      <div className="shrink-0 pt-1">{icon}</div>
-      <div>
-        <h3 className="text-lg leading-snug mb-2">{title}</h3>
-        <p className="text-sm text-secondary">{text}</p>
-      </div>
-    </li>
-  );
-};
-
-const PurposeBuiltIcon = () => {
-  return (
-    <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>
-  );
-};
-
-const NonCustodialIcon = () => {
-  return (
-    <svg width="40" height="40" viewBox="0 0 30 30" className="fill-current">
-      <rect x="8" y="22" width="14" height="2" />
-      <rect x="8" y="12" width="14" height="2" />
-      <rect
-        x="22"
-        y="24"
-        width="2"
-        height="12"
-        transform="rotate(-180 22 24)"
-      />
-      <rect
-        x="10"
-        y="24"
-        width="2"
-        height="12"
-        transform="rotate(-180 10 24)"
-      />
-      <rect x="12" y="12" width="2" height="2" transform="rotate(-180 12 12)" />
-      <rect x="20" y="12" width="2" height="2" transform="rotate(-180 20 12)" />
-      <rect x="12" y="10" width="2" height="2" transform="rotate(-180 12 10)" />
-      <rect x="20" y="10" width="2" height="2" transform="rotate(-180 20 10)" />
-      <rect x="18" y="8" width="2" height="2" transform="rotate(-180 18 8)" />
-      <rect x="14" y="8" width="2" height="2" transform="rotate(-180 14 8)" />
-      <rect x="16" y="8" width="2" height="2" transform="rotate(-180 16 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>
-  );
-};
-
-const RewardIcon = () => {
-  return (
-    <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>
-  );
-};
@@ -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 />
+    </>
+  );
+};
@@ -31,10 +31,6 @@ const LazyDisclaimer = dynamic(() => import('../client-pages/disclaimer'), {
  ssr: false,
 });

-const LazyDeposit = dynamic(() => import('../client-pages/deposit'), {
-  ssr: false,
-});
-
 export enum Routes {
  HOME = '/',
  MARKET = '/markets/:marketId',
@@ -42,7 +38,6 @@ export enum Routes {
  PORTFOLIO = '/portfolio',
  LIQUIDITY = '/liquidity/:marketId',
  DISCLAIMER = '/disclaimer',
-  DEPOSIT = '/deposit',
 }

 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -56,7 +51,6 @@ export const Links: ConsoleLinks = {
  [Routes.LIQUIDITY]: (marketId: string) =>
    trimEnd(Routes.LIQUIDITY.replace(':marketId', marketId)),
  [Routes.DISCLAIMER]: () => Routes.DISCLAIMER,
-  [Routes.DEPOSIT]: () => Routes.DEPOSIT,
 };

 const routerConfig: RouteObject[] = [
@@ -103,7 +97,6 @@ const routerConfig: RouteObject[] = [
    path: Routes.DISCLAIMER,
    element: <LazyDisclaimer />,
  },
-  { path: Routes.DEPOSIT, element: <LazyDeposit /> },
  {
    path: '*',
    element: (
@@ -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) {
@@ -23,7 +23,7 @@ export const useAccountBalance = (assetId?: string) => {
    },
    [assetId]
  );
-  const { loading, error } = useDataProvider({
+  useDataProvider({
    dataProvider: accountsDataProvider,
    variables,
    skip: !pubKey || !assetId,
@@ -34,9 +34,7 @@ export const useAccountBalance = (assetId?: string) => {
    () => ({
      accountBalance: pubKey ? accountBalance : '',
      accountDecimals: pubKey ? accountDecimals : null,
-      loading,
-      error,
    }),
-    [accountBalance, accountDecimals, pubKey, loading, error]
+    [accountBalance, accountDecimals, pubKey]
  );
 };
@@ -22,7 +22,7 @@ export const useMarketAccountBalance = (marketId: string) => {
    },
    [marketId]
  );
-  const { loading, error } = useDataProvider({
+  useDataProvider({
    dataProvider: accountsDataProvider,
    variables: { partyId: pubKey || '' },
    skip: !pubKey || !marketId,
@@ -33,9 +33,7 @@ export const useMarketAccountBalance = (marketId: string) => {
    () => ({
      accountBalance: pubKey ? accountBalance : '',
      accountDecimals: pubKey ? accountDecimals : null,
-      loading,
-      error,
    }),
-    [accountBalance, accountDecimals, pubKey, loading, error]
+    [accountBalance, accountDecimals, pubKey]
  );
 };
@@ -0,0 +1,71 @@
+import { CandlesChartContainer } from './candles-chart';
+import { render, screen, waitFor, act } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { MockedProvider } from '@apollo/client/testing';
+import { VegaWalletContext } from '@vegaprotocol/wallet';
+import { CandlesEventsDocument } from './__generated__/Candles';
+import type { CandlesEventsSubscription } from './__generated__/Candles';
+
+const candles: CandlesEventsSubscription = {
+  candles: {
+    lastUpdateInPeriod: 0,
+    periodStart: 0,
+    open: '0',
+    high: '0',
+    low: '0',
+    close: '0',
+    volume: '0',
+  },
+};
+const mocks = [
+  {
+    request: {
+      query: CandlesEventsDocument,
+      variables: { marketId: 'market-id', interval: 'INTERVAL_I15M' },
+    },
+    result: { data: candles },
+  },
+];
+
+describe('TradingChart', () => {
+  it('should render successfully', () => {
+    const { baseElement } = render(
+      <MockedProvider>
+        <VegaWalletContext.Provider value={{} as never}>
+          <CandlesChartContainer marketId={'market-id'} />
+        </VegaWalletContext.Provider>
+      </MockedProvider>
+    );
+    expect(baseElement).toBeTruthy();
+  });
+
+  it('volume study should be preselected', async () => {
+    act(() => {
+      render(
+        <MockedProvider mocks={mocks}>
+          <VegaWalletContext.Provider value={{} as never}>
+            <CandlesChartContainer marketId={'market-id'} />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      );
+    });
+    await waitFor(() => {
+      expect(
+        screen.getByText('Studies', {
+          selector: '[type="button"]',
+        })
+      ).toBeInTheDocument();
+    });
+    act(() => {
+      userEvent.click(
+        screen.getByText('Studies', {
+          selector: '[type="button"]',
+        })
+      );
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    });
+    expect(screen.getByText('Volume')).toHaveAttribute('data-state', 'checked');
+  });
+});
@@ -1,12 +1,92 @@
 import 'pennant/dist/style.css';
-import { CandlestickChart } from 'pennant';
+import {
+  CandlestickChart,
+  ChartType,
+  Interval,
+  Overlay,
+  Study,
+  chartTypeLabels,
+  intervalLabels,
+  overlayLabels,
+  studyLabels,
+} from 'pennant';
 import { VegaDataSource } from './data-source';
 import { useApolloClient } from '@apollo/client';
 import { useMemo } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+import {
+  useThemeSwitcher,
+  getValidItem,
+  getValidSubset,
+} from '@vegaprotocol/react-helpers';
+import {
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuItemIndicator,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+  Icon,
+} from '@vegaprotocol/ui-toolkit';
+import type { IconName } from '@blueprintjs/icons';
+import { IconNames } from '@blueprintjs/icons';
 import { t } from '@vegaprotocol/i18n';
-import { useCandlesChartSettings } from './use-candles-chart-settings';
+import { create } from 'zustand';
+import { persist } from 'zustand/middleware';
+import { immer } from 'zustand/middleware/immer';
+
+interface StoredSettings {
+  interval?: Interval;
+  type?: ChartType;
+  overlays?: Overlay[];
+  studies?: Study[];
+}
+
+export const useCandlesChartSettings = create<
+  StoredSettings & {
+    merge: (settings: StoredSettings) => void;
+    setType: (type: ChartType) => void;
+    setInterval: (interval: Interval) => void;
+    setOverlays: (overlays: Overlay[]) => void;
+    setStudies: (studies: Study[]) => void;
+  }
+>()(
+  persist(
+    immer((set) => ({
+      merge: (settings: StoredSettings) =>
+        set((state) => {
+          Object.assign(state, settings);
+        }),
+      setType: (type: ChartType) =>
+        set((state) => {
+          state.type = type;
+        }),
+      setInterval: (interval: Interval) =>
+        set((state) => {
+          state.interval = interval;
+        }),
+      setOverlays: (overlays: Overlay[]) =>
+        set((state) => {
+          state.overlays = overlays;
+        }),
+      setStudies: (studies: Study[]) =>
+        set((state) => {
+          state.studies = studies;
+        }),
+    })),
+    {
+      name: 'console-candles',
+    }
+  )
+);
+
+const chartTypeIcon = new Map<ChartType, IconName>([
+  [ChartType.AREA, IconNames.TIMELINE_AREA_CHART],
+  [ChartType.CANDLE, IconNames.WATERFALL_CHART],
+  [ChartType.LINE, IconNames.TIMELINE_LINE_CHART],
+  [ChartType.OHLC, IconNames.WATERFALL_CHART],
+]);

 export type CandlesChartContainerProps = {
  marketId: string;
@@ -19,32 +99,161 @@ export const CandlesChartContainer = ({
  const { pubKey } = useVegaWallet();
  const { theme } = useThemeSwitcher();

-  const { interval, chartType, overlays, studies, merge } =
-    useCandlesChartSettings();
+  const settings = useCandlesChartSettings();
+
+  const interval: Interval = getValidItem(
+    settings.interval,
+    Object.values(Interval),
+    Interval.I15M
+  );
+
+  const chartType: ChartType = getValidItem(
+    settings.type,
+    Object.values(ChartType),
+    ChartType.CANDLE
+  );
+
+  const overlays: Overlay[] = getValidSubset(
+    settings.overlays,
+    Object.values(Overlay),
+    []
+  );
+
+  const studies: Study[] = getValidSubset(
+    settings.studies,
+    Object.values(Study),
+    [Study.VOLUME]
+  );

  const dataSource = useMemo(() => {
    return new VegaDataSource(client, marketId, pubKey);
  }, [client, marketId, pubKey]);

  return (
-    <CandlestickChart
-      dataSource={dataSource}
-      options={{
-        chartType,
-        overlays,
-        studies,
-        notEnoughDataText: (
-          <span className="text-xs text-center">{t('No data')}</span>
-        ),
-      }}
-      interval={interval}
-      theme={theme}
-      onOptionsChanged={(options) => {
-        merge({
-          overlays: options.overlays,
-          studies: options.studies,
-        });
-      }}
-    />
+    <div className="h-full flex flex-col">
+      <div className="px-3 lg:px-4 py-2 flex flex-row flex-wrap gap-2 bg-vega-clight-700 dark:bg-vega-cdark-700">
+        <DropdownMenu
+          trigger={
+            <DropdownMenuTrigger>
+              {t(`Interval: ${intervalLabels[interval]}`)}
+            </DropdownMenuTrigger>
+          }
+        >
+          <DropdownMenuContent>
+            <DropdownMenuRadioGroup
+              value={interval}
+              onValueChange={(value) => {
+                settings.setInterval(value as Interval);
+              }}
+            >
+              {Object.values(Interval).map((timeInterval) => (
+                <DropdownMenuRadioItem
+                  key={timeInterval}
+                  inset
+                  value={timeInterval}
+                >
+                  {intervalLabels[timeInterval]}
+                  <DropdownMenuItemIndicator />
+                </DropdownMenuRadioItem>
+              ))}
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+        <DropdownMenu
+          trigger={
+            <DropdownMenuTrigger>
+              <Icon name={chartTypeIcon.get(chartType) as IconName} />
+            </DropdownMenuTrigger>
+          }
+        >
+          <DropdownMenuContent>
+            <DropdownMenuRadioGroup
+              value={chartType}
+              onValueChange={(value) => {
+                settings.setType(value as ChartType);
+              }}
+            >
+              {Object.values(ChartType).map((type) => (
+                <DropdownMenuRadioItem key={type} inset value={type}>
+                  {chartTypeLabels[type]}
+                  <DropdownMenuItemIndicator />
+                </DropdownMenuRadioItem>
+              ))}
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+        <DropdownMenu
+          trigger={<DropdownMenuTrigger>{t('Overlays')}</DropdownMenuTrigger>}
+        >
+          <DropdownMenuContent>
+            {Object.values(Overlay).map((overlay) => (
+              <DropdownMenuCheckboxItem
+                key={overlay}
+                checked={overlays.includes(overlay)}
+                onCheckedChange={() => {
+                  const newOverlays = [...overlays];
+                  const index = overlays.findIndex((item) => item === overlay);
+
+                  index !== -1
+                    ? newOverlays.splice(index, 1)
+                    : newOverlays.push(overlay);
+
+                  settings.setOverlays(newOverlays);
+                }}
+              >
+                {overlayLabels[overlay]}
+                <DropdownMenuItemIndicator />
+              </DropdownMenuCheckboxItem>
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+        <DropdownMenu
+          trigger={<DropdownMenuTrigger>{t('Studies')}</DropdownMenuTrigger>}
+        >
+          <DropdownMenuContent>
+            {Object.values(Study).map((study) => (
+              <DropdownMenuCheckboxItem
+                key={study}
+                checked={studies.includes(study)}
+                onCheckedChange={() => {
+                  const newStudies = [...studies];
+                  const index = studies.findIndex((item) => item === study);
+
+                  index !== -1
+                    ? newStudies.splice(index, 1)
+                    : newStudies.push(study);
+
+                  settings.setStudies(newStudies);
+                }}
+              >
+                {studyLabels[study]}
+                <DropdownMenuItemIndicator />
+              </DropdownMenuCheckboxItem>
+            ))}
+          </DropdownMenuContent>
+        </DropdownMenu>
+      </div>
+      <div className="flex-1">
+        <CandlestickChart
+          dataSource={dataSource}
+          options={{
+            chartType: chartType,
+            overlays: overlays,
+            studies: studies,
+            notEnoughDataText: (
+              <span className="text-xs text-center">{t('No data')}</span>
+            ),
+          }}
+          interval={interval}
+          theme={theme}
+          onOptionsChanged={(options) => {
+            settings.merge({
+              overlays: options.overlays,
+              studies: options.studies,
+            });
+          }}
+        />
+      </div>
+    </div>
  );
 };
@@ -1,17 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { CandlesMenu } from './candles-menu';
-
-describe('CandlesMenu', () => {
-  it('should render with volume study showing by default', async () => {
-    render(<CandlesMenu />);
-
-    await userEvent.click(
-      screen.getByText('Studies', {
-        selector: '[type="button"]',
-      })
-    );
-    expect(await screen.findByRole('menu')).toBeInTheDocument();
-    expect(screen.getByText('Volume')).toHaveAttribute('data-state', 'checked');
-  });
-});
@@ -1,160 +0,0 @@
-import 'pennant/dist/style.css';
-import {
-  ChartType,
-  Interval,
-  Overlay,
-  Study,
-  chartTypeLabels,
-  intervalLabels,
-  overlayLabels,
-  studyLabels,
-} from 'pennant';
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuItemIndicator,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuTrigger,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@blueprintjs/icons';
-import { IconNames } from '@blueprintjs/icons';
-import { t } from '@vegaprotocol/i18n';
-import { useCandlesChartSettings } from './use-candles-chart-settings';
-
-const chartTypeIcon = new Map<ChartType, IconName>([
-  [ChartType.AREA, IconNames.TIMELINE_AREA_CHART],
-  [ChartType.CANDLE, IconNames.WATERFALL_CHART],
-  [ChartType.LINE, IconNames.TIMELINE_LINE_CHART],
-  [ChartType.OHLC, IconNames.WATERFALL_CHART],
-]);
-
-export const CandlesMenu = () => {
-  const {
-    interval,
-    chartType,
-    studies,
-    overlays,
-    setInterval,
-    setType,
-    setStudies,
-    setOverlays,
-  } = useCandlesChartSettings();
-  const triggerClasses = 'text-xs';
-  const contentAlign = 'end';
-
-  return (
-    <>
-      <DropdownMenu
-        trigger={
-          <DropdownMenuTrigger className={triggerClasses}>
-            {t(`Interval: ${intervalLabels[interval]}`)}
-          </DropdownMenuTrigger>
-        }
-      >
-        <DropdownMenuContent align={contentAlign}>
-          <DropdownMenuRadioGroup
-            value={interval}
-            onValueChange={(value) => {
-              setInterval(value as Interval);
-            }}
-          >
-            {Object.values(Interval).map((timeInterval) => (
-              <DropdownMenuRadioItem
-                key={timeInterval}
-                inset
-                value={timeInterval}
-              >
-                {intervalLabels[timeInterval]}
-                <DropdownMenuItemIndicator />
-              </DropdownMenuRadioItem>
-            ))}
-          </DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
-      <DropdownMenu
-        trigger={
-          <DropdownMenuTrigger className={triggerClasses}>
-            <Icon name={chartTypeIcon.get(chartType) as IconName} />
-          </DropdownMenuTrigger>
-        }
-      >
-        <DropdownMenuContent align={contentAlign}>
-          <DropdownMenuRadioGroup
-            value={chartType}
-            onValueChange={(value) => {
-              setType(value as ChartType);
-            }}
-          >
-            {Object.values(ChartType).map((type) => (
-              <DropdownMenuRadioItem key={type} inset value={type}>
-                {chartTypeLabels[type]}
-                <DropdownMenuItemIndicator />
-              </DropdownMenuRadioItem>
-            ))}
-          </DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
-      <DropdownMenu
-        trigger={
-          <DropdownMenuTrigger className={triggerClasses}>
-            {t('Overlays')}
-          </DropdownMenuTrigger>
-        }
-      >
-        <DropdownMenuContent align={contentAlign}>
-          {Object.values(Overlay).map((overlay) => (
-            <DropdownMenuCheckboxItem
-              key={overlay}
-              checked={overlays.includes(overlay)}
-              onCheckedChange={() => {
-                const newOverlays = [...overlays];
-                const index = overlays.findIndex((item) => item === overlay);
-
-                index !== -1
-                  ? newOverlays.splice(index, 1)
-                  : newOverlays.push(overlay);
-
-                setOverlays(newOverlays);
-              }}
-            >
-              {overlayLabels[overlay]}
-              <DropdownMenuItemIndicator />
-            </DropdownMenuCheckboxItem>
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-      <DropdownMenu
-        trigger={
-          <DropdownMenuTrigger className={triggerClasses}>
-            {t('Studies')}
-          </DropdownMenuTrigger>
-        }
-      >
-        <DropdownMenuContent align={contentAlign}>
-          {Object.values(Study).map((study) => (
-            <DropdownMenuCheckboxItem
-              key={study}
-              checked={studies.includes(study)}
-              onCheckedChange={() => {
-                const newStudies = [...studies];
-                const index = studies.findIndex((item) => item === study);
-
-                index !== -1
-                  ? newStudies.splice(index, 1)
-                  : newStudies.push(study);
-
-                setStudies(newStudies);
-              }}
-            >
-              {studyLabels[study]}
-              <DropdownMenuItemIndicator />
-            </DropdownMenuCheckboxItem>
-          ))}
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </>
-  );
-};
@@ -1,5 +1,4 @@
 export * from './__generated__/Candles';
 export * from './__generated__/Chart';
 export * from './candles-chart';
-export * from './candles-menu';
 export * from './data-source';
@@ -1,99 +0,0 @@
-import { getValidItem, getValidSubset } from '@vegaprotocol/react-helpers';
-import { ChartType, Interval, Study } from 'pennant';
-import { Overlay } from 'pennant';
-import { create } from 'zustand';
-import { persist } from 'zustand/middleware';
-import { immer } from 'zustand/middleware/immer';
-
-interface StoredSettings {
-  interval: Interval;
-  type: ChartType;
-  overlays: Overlay[];
-  studies: Study[];
-}
-
-const DEFAULT_CHART_SETTINGS = {
-  interval: Interval.I15M,
-  type: ChartType.CANDLE,
-  overlays: [],
-  studies: [Study.VOLUME],
-};
-
-export const useCandlesChartSettingsStore = create<
-  StoredSettings & {
-    merge: (settings: Partial<StoredSettings>) => void;
-    setType: (type: ChartType) => void;
-    setInterval: (interval: Interval) => void;
-    setOverlays: (overlays: Overlay[]) => void;
-    setStudies: (studies: Study[]) => void;
-  }
->()(
-  persist(
-    immer((set) => ({
-      ...DEFAULT_CHART_SETTINGS,
-      merge: (settings: Partial<StoredSettings>) =>
-        set((state) => {
-          Object.assign(state, settings);
-        }),
-      setType: (type) =>
-        set((state) => {
-          state.type = type;
-        }),
-      setInterval: (interval) =>
-        set((state) => {
-          state.interval = interval;
-        }),
-      setOverlays: (overlays) =>
-        set((state) => {
-          state.overlays = overlays;
-        }),
-      setStudies: (studies) =>
-        set((state) => {
-          state.studies = studies;
-        }),
-    })),
-    {
-      name: 'vega_candles_chart_store',
-    }
-  )
-);
-
-export const useCandlesChartSettings = () => {
-  const settings = useCandlesChartSettingsStore();
-
-  const interval: Interval = getValidItem(
-    settings.interval,
-    Object.values(Interval),
-    Interval.I15M
-  );
-
-  const chartType: ChartType = getValidItem(
-    settings.type,
-    Object.values(ChartType),
-    ChartType.CANDLE
-  );
-
-  const overlays: Overlay[] = getValidSubset(
-    settings.overlays,
-    Object.values(Overlay),
-    []
-  );
-
-  const studies: Study[] = getValidSubset(
-    settings.studies,
-    Object.values(Study),
-    [Study.VOLUME]
-  );
-
-  return {
-    interval,
-    chartType,
-    overlays,
-    studies,
-    setInterval: settings.setInterval,
-    setType: settings.setType,
-    setStudies: settings.setStudies,
-    setOverlays: settings.setOverlays,
-    merge: settings.merge,
-  };
-};
@@ -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');
-    });
-  });
-}
@@ -3,7 +3,7 @@ import { useCallback } from 'react';
 import get from 'lodash/get';

 interface MarketNameCellProps {
-  value?: string | null;
+  value?: string;
  data?: { id?: string; marketId?: string; market?: { id: string } };
  idPath?: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
@@ -1,5 +1,5 @@
 import type { Control } from 'react-hook-form';
-import type { Market, StaticMarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';
@@ -9,8 +9,7 @@ import type { OrderFormFields } from '../../hooks/use-order-form';
 export interface DealTicketAmountProps {
  control: Control<OrderFormFields>;
  orderType: Schema.OrderType;
-  marketData: StaticMarketData;
-  marketPrice?: string;
+  marketData: MarketData;
  market: Market;
  sizeError?: string;
  priceError?: string;
@@ -22,18 +21,11 @@ export interface DealTicketAmountProps {
 export const DealTicketAmount = ({
  orderType,
  marketData,
-  marketPrice,
  ...props
 }: DealTicketAmountProps) => {
  switch (orderType) {
    case Schema.OrderType.TYPE_MARKET:
-      return (
-        <DealTicketMarketAmount
-          {...props}
-          marketData={marketData}
-          marketPrice={marketPrice}
-        />
-      );
+      return <DealTicketMarketAmount {...props} marketData={marketData} />;
    case Schema.OrderType.TYPE_LIMIT:
      return <DealTicketLimitAmount {...props} />;
    default: {
@@ -4,10 +4,9 @@ import classNames from 'classnames';

 interface Props {
  side: Side;
-  label?: string;
 }

-export const DealTicketButton = ({ side, label }: Props) => {
+export const DealTicketButton = ({ side }: Props) => {
  const buttonClasses = classNames(
    'px-10 py-2 uppercase rounded-md text-white w-full',
    {
@@ -18,7 +17,7 @@ export const DealTicketButton = ({ side, label }: Props) => {
  return (
    <div className="mb-2">
      <button type="submit" data-testid="place-order" className={buttonClasses}>
-        {label || t('Place order')}
+        {t('Place order')}
      </button>
    </div>
  );
@@ -1,20 +1,11 @@
-import { useVegaTransactionStore } from '@vegaprotocol/wallet';
-import {
-  DealTicketType,
-  useDealTicketTypeStore,
-} from '../../hooks/use-type-store';
-import { StopOrder } from './deal-ticket-stop-order';
-import {
-  useStaticMarketData,
-  useMarket,
-  useMarketPrice,
-} from '@vegaprotocol/markets';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
+import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
+import { useVegaTransactionStore } from '@vegaprotocol/wallet';
+import { useMarket, marketDataProvider } from '@vegaprotocol/markets';
 import { DealTicket } from './deal-ticket';
-import { FLAGS } from '@vegaprotocol/environment';

-interface DealTicketContainerProps {
+export interface DealTicketContainerProps {
  marketId: string;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  onClickCollateral?: () => void;
@@ -23,9 +14,10 @@ interface DealTicketContainerProps {

 export const DealTicketContainer = ({
  marketId,
-  ...props
+  onMarketClick,
+  onClickCollateral,
+  onDeposit,
 }: DealTicketContainerProps) => {
-  const type = useDealTicketTypeStore((state) => state.type[marketId]);
  const {
    data: market,
    error: marketError,
@@ -37,9 +29,15 @@ export const DealTicketContainer = ({
    error: marketDataError,
    loading: marketDataLoading,
    reload,
-  } = useStaticMarketData(marketId);
-  const { data: marketPrice } = useMarketPrice(market?.id);
+  } = useThrottledDataProvider(
+    {
+      dataProvider: marketDataProvider,
+      variables: { marketId },
+    },
+    1000
+  );
  const create = useVegaTransactionStore((state) => state.create);
+
  return (
    <AsyncRenderer
      data={market && marketData}
@@ -48,23 +46,14 @@ export const DealTicketContainer = ({
      reload={reload}
    >
      {market && marketData ? (
-        FLAGS.STOP_ORDERS &&
-        (type === DealTicketType.StopLimit ||
-          type === DealTicketType.StopMarket) ? (
-          <StopOrder
-            market={market}
-            marketPrice={marketPrice}
-            submit={(stopOrdersSubmission) => create({ stopOrdersSubmission })}
-          />
-        ) : (
-          <DealTicket
-            {...props}
-            market={market}
-            marketPrice={marketPrice}
-            marketData={marketData}
-            submit={(orderSubmission) => create({ orderSubmission })}
-          />
-        )
+        <DealTicket
+          market={market}
+          marketData={marketData}
+          submit={(orderSubmission) => create({ orderSubmission })}
+          onClickCollateral={onClickCollateral}
+          onMarketClick={onMarketClick}
+          onDeposit={onDeposit}
+        />
      ) : (
        <Splash>
          <p>{t('Could not load market')}</p>
@@ -4,11 +4,11 @@ import classnames from 'classnames';
 import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { FeesBreakdown } from '@vegaprotocol/markets';
-import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { useVegaWallet } from '@vegaprotocol/wallet';

 import type { Market } from '@vegaprotocol/markets';
 import type { EstimatePositionQuery } from '@vegaprotocol/positions';
+import type { EstimateFeesQuery } from '../../hooks/__generated__/EstimateOrder';
 import { AccountBreakdownDialog } from '@vegaprotocol/accounts';

 import { formatRange, formatValue } from '@vegaprotocol/utils';
@@ -24,7 +24,6 @@ import {
  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
  MARGIN_ACCOUNT_TOOLTIP_TEXT,
 } from '../../constants';
-import { useEstimateFees } from '../../hooks';

 const emptyValue = '-';

@@ -77,82 +76,26 @@ export const DealTicketFeeDetail = ({
 };

 export interface DealTicketFeeDetailsProps {
-  assetSymbol: string;
-  order: OrderSubmissionBody['orderSubmission'];
-  market: Market;
-  notionalSize: string | null;
-}
-
-export const DealTicketFeeDetails = ({
-  assetSymbol,
-  order,
-  market,
-  notionalSize,
-}: DealTicketFeeDetailsProps) => {
-  const feeEstimate = useEstimateFees(order);
-  const { settlementAsset: asset } =
-    market.tradableInstrument.instrument.product;
-  const { decimals: assetDecimals, quantum } = asset;
-  const marketDecimals = market.decimalPlaces;
-  const quoteName = market.tradableInstrument.instrument.product.quoteName;
-
-  return (
-    <>
-      <DealTicketFeeDetail
-        label={t('Notional')}
-        value={formatValue(notionalSize, marketDecimals)}
-        formattedValue={formatValue(notionalSize, marketDecimals)}
-        symbol={quoteName}
-        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
-      />
-      <DealTicketFeeDetail
-        label={t('Fees')}
-        value={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
-        }
-        formattedValue={
-          feeEstimate?.totalFeeAmount &&
-          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
-        }
-        labelDescription={
-          <>
-            <span>
-              {t(
-                `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
-              )}
-            </span>
-            <FeesBreakdown
-              fees={feeEstimate?.fees}
-              feeFactors={market.fees.factors}
-              symbol={assetSymbol}
-              decimals={assetDecimals}
-            />
-          </>
-        }
-        symbol={assetSymbol}
-      />
-    </>
-  );
-};
-
-export interface DealTicketMarginDetailsProps {
  generalAccountBalance?: string;
  marginAccountBalance?: string;
  market: Market;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  assetSymbol: string;
+  notionalSize: string | null;
+  feeEstimate: EstimateFeesQuery['estimateFees'] | undefined;
  positionEstimate: EstimatePositionQuery['estimatePosition'];
 }

-export const DealTicketMarginDetails = ({
+export const DealTicketFeeDetails = ({
  marginAccountBalance,
  generalAccountBalance,
  assetSymbol,
+  feeEstimate,
  market,
  onMarketClick,
+  notionalSize,
  positionEstimate,
-}: DealTicketMarginDetailsProps) => {
+}: DealTicketFeeDetailsProps) => {
  const [breakdownDialog, setBreakdownDialog] = useState(false);
  const { pubKey: partyId } = useVegaWallet();
  const { data: currentMargins } = useDataProvider({
@@ -167,6 +110,7 @@ export const DealTicketMarginDetails = ({
  const { settlementAsset: asset } =
    market.tradableInstrument.instrument.product;
  const { decimals: assetDecimals, quantum } = asset;
+  const marketDecimals = market.decimalPlaces;
  let marginRequiredBestCase: string | undefined = undefined;
  let marginRequiredWorstCase: string | undefined = undefined;
  if (marginEstimate) {
@@ -307,7 +251,41 @@ export const DealTicketMarginDetails = ({
  const quoteName = market.tradableInstrument.instrument.product.quoteName;

  return (
-    <>
+    <div>
+      <DealTicketFeeDetail
+        label={t('Notional')}
+        value={formatValue(notionalSize, marketDecimals)}
+        formattedValue={formatValue(notionalSize, marketDecimals)}
+        symbol={quoteName}
+        labelDescription={NOTIONAL_SIZE_TOOLTIP_TEXT(quoteName)}
+      />
+      <DealTicketFeeDetail
+        label={t('Fees')}
+        value={
+          feeEstimate?.totalFeeAmount &&
+          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals)}`
+        }
+        formattedValue={
+          feeEstimate?.totalFeeAmount &&
+          `~${formatValue(feeEstimate?.totalFeeAmount, assetDecimals, quantum)}`
+        }
+        labelDescription={
+          <>
+            <span>
+              {t(
+                `An estimate of the most you would be expected to pay in fees, in the market's settlement asset ${assetSymbol}.`
+              )}
+            </span>
+            <FeesBreakdown
+              fees={feeEstimate?.fees}
+              feeFactors={market.fees.factors}
+              symbol={assetSymbol}
+              decimals={assetDecimals}
+            />
+          </>
+        }
+        symbol={assetSymbol}
+      />
      <DealTicketFeeDetail
        label={t('Margin required')}
        value={formatRange(
@@ -373,6 +351,6 @@ export const DealTicketMarginDetails = ({
          onClose={onAccountBreakdownDialogClose}
        />
      )}
-    </>
+    </div>
  );
 };
@@ -44,12 +44,12 @@ export const DealTicketLimitAmount = ({

  return (
    <div className="mb-2">
-      <div className="flex items-start gap-4">
+      <div className="flex items-center gap-4">
        <div className="flex-1">
          <FormGroup
            label={t('Size')}
            labelFor="input-order-size-limit"
-            className="!mb-0"
+            className="!mb-1"
          >
            <Controller
              name="size"
@@ -78,13 +78,16 @@ export const DealTicketLimitAmount = ({
            />
          </FormGroup>
        </div>
-        <div className="pt-7 leading-10">@</div>
+        <div className="flex-0 items-center">
+          <div className="flex">&nbsp;</div>
+          <div className="flex">@</div>
+        </div>
        <div className="flex-1">
          <FormGroup
            labelFor="input-price-quote"
            label={t(`Price (${quoteName})`)}
            labelAlign="right"
-            className="!mb-0"
+            className="!mb-1"
          >
            <Controller
              name="price"
@@ -5,10 +5,10 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { Input, InputError, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { isMarketInAuction } from '@vegaprotocol/markets';
+import { isMarketInAuction } from '../../utils';
 import type { DealTicketAmountProps } from './deal-ticket-amount';
+import { getMarketPrice } from '../../utils/get-price';
 import { Controller } from 'react-hook-form';
-import classNames from 'classnames';

 export type DealTicketMarketAmountProps = Omit<
  DealTicketAmountProps,
@@ -19,26 +19,37 @@ export const DealTicketMarketAmount = ({
  control,
  market,
  marketData,
-  marketPrice,
  sizeError,
  update,
  size,
 }: DealTicketMarketAmountProps) => {
  const quoteName = market.tradableInstrument.instrument.product.quoteName;
  const sizeStep = toDecimal(market?.positionDecimalPlaces);
-  const price = marketPrice;
+  const price = getMarketPrice(marketData);

  const priceFormatted = price
    ? addDecimalsFormatNumber(price, market.decimalPlaces)
    : undefined;

-  const inAuction = isMarketInAuction(marketData.marketTradingMode);
-
  return (
    <div className="mb-2">
-      <div className="flex items-start gap-4">
+      <div className="flex items-end gap-4 mb-2">
+        <div className="flex-1 text-sm">{t('Size')}</div>
+        <div />
+        <div className="flex-2 text-sm text-right">
+          {isMarketInAuction(marketData.marketTradingMode) && (
+            <Tooltip
+              description={t(
+                'This market is in auction. The uncrossing price is an indication of what the price is expected to be when the auction ends.'
+              )}
+            >
+              <div>{t(`Indicative price`)}</div>
+            </Tooltip>
+          )}
+        </div>
+      </div>
+      <div className="flex items-center gap-4">
        <div className="flex-1">
-          <div className="mb-2 text-sm">{t('Size')}</div>
          <Controller
            name="size"
            control={control}
@@ -65,29 +76,15 @@ export const DealTicketMarketAmount = ({
            )}
          />
        </div>
-        <div className="pt-7 leading-10">@</div>
-        <div className="flex-1 text-sm text-right">
-          {inAuction && (
-            <Tooltip
-              description={t(
-                'This market is in auction. The uncrossing price is an indication of what the price is expected to be when the auction ends.'
-              )}
-            >
-              <div className="mb-2">{t(`Indicative price`)}</div>
-            </Tooltip>
+        <div>@</div>
+        <div className="flex-1 text-sm text-right" data-testid="last-price">
+          {priceFormatted && quoteName ? (
+            <>
+              ~{priceFormatted} {quoteName}
+            </>
+          ) : (
+            '-'
          )}
-          <div
-            data-testid="last-price"
-            className={classNames('leading-10', { 'pt-7': !inAuction })}
-          >
-            {priceFormatted && quoteName ? (
-              <>
-                ~{priceFormatted} {quoteName}
-              </>
-            ) : (
-              '-'
-            )}
-          </div>
        </div>
      </div>
      {sizeError && (
@@ -1,314 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { generateMarket } from '../../test-helpers';
-import { StopOrder } from './deal-ticket-stop-order';
-import * as Schema from '@vegaprotocol/types';
-import { MockedProvider } from '@apollo/client/testing';
-import type { StopOrderFormValues } from '../../hooks/use-stop-order-form-values';
-import { useStopOrderFormValues } from '../../hooks/use-stop-order-form-values';
-import type { FeatureFlags } from '@vegaprotocol/environment';
-
-jest.mock('zustand');
-jest.mock('./deal-ticket-fee-details', () => ({
-  DealTicketFeeDetails: () => <div data-testid="deal-ticket-fee-details" />,
-}));
-
-jest.mock('@vegaprotocol/environment', () => {
-  const actual = jest.requireActual('@vegaprotocol/environment');
-  return {
-    ...actual,
-    FLAGS: {
-      ...actual.FLAGS,
-      STOP_ORDERS: true,
-    } as FeatureFlags,
-  };
-});
-
-const marketPrice = '200';
-const market = generateMarket();
-const submit = jest.fn();
-
-function generateJsx(pubKey: string | null = 'pubKey', isReadOnly = false) {
-  return (
-    <MockedProvider>
-      <VegaWalletContext.Provider value={{ pubKey, isReadOnly } as any}>
-        <StopOrder market={market} marketPrice={marketPrice} submit={submit} />
-      </VegaWalletContext.Provider>
-    </MockedProvider>
-  );
-}
-
-const submitButton = 'place-order';
-const sizeInput = 'order-size';
-const priceInput = 'order-price';
-const triggerPriceInput = 'triggerPrice';
-const triggerTrailingPercentOffsetInput = 'triggerTrailingPercentOffset';
-
-const orderTypeTrigger = 'order-type-Stop';
-const orderTypeLimit = 'order-type-StopLimit';
-const orderTypeMarket = 'order-type-StopMarket';
-
-const orderSideBuy = 'order-side-SIDE_BUY';
-const orderSideSell = 'order-side-SIDE_SELL';
-
-const triggerDirectionRisesAbove = 'triggerDirection-risesAbove';
-// const triggerDirectionFallsBelow = 'triggerDirection-fallsBelow';
-
-const expiryStrategySubmit = 'expiryStrategy-submit';
-const expiryStrategyCancel = 'expiryStrategy-cancel';
-
-const triggerTypePrice = 'triggerType-price';
-const triggerTypeTrailingPercentOffset = 'triggerType-trailingPercentOffset';
-
-const expire = 'expire';
-const datePicker = 'date-picker-field';
-const timeInForce = 'order-tif';
-
-const sizeErrorMessage = 'stop-order-error-message-size';
-const priceErrorMessage = 'stop-order-error-message-price';
-const triggerPriceErrorMessage = 'stop-order-error-message-trigger-price';
-const triggerTrailingPercentOffsetErrorMessage =
-  'stop-order-error-message-trigger-trailing-percent-offset';
-
-describe('StopOrder', () => {
-  beforeEach(() => {
-    localStorage.clear();
-  });
-
-  afterEach(() => {
-    localStorage.clear();
-    jest.clearAllMocks();
-  });
-
-  it('should display ticket defaults', async () => {
-    render(generateJsx());
-    // place order button should always be enabled
-    expect(screen.getByTestId(submitButton)).toBeEnabled();
-
-    // Assert defaults are used
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    expect(screen.getByTestId(orderTypeLimit).dataset.state).toEqual('checked');
-    await userEvent.click(screen.getByTestId(orderTypeLimit));
-    expect(screen.getByTestId(orderSideBuy).dataset.state).toEqual('checked');
-    expect(screen.getByTestId(sizeInput)).toHaveDisplayValue('0');
-    expect(screen.getByTestId(timeInForce)).toHaveValue(
-      Schema.OrderTimeInForce.TIME_IN_FORCE_FOK
-    );
-    expect(
-      screen.getByTestId(triggerDirectionRisesAbove).dataset.state
-    ).toEqual('checked');
-    expect(screen.getByTestId(triggerTypePrice).dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId(expire).dataset.state).toEqual('unchecked');
-    await userEvent.click(screen.getByTestId(expire));
-    await waitFor(() => {
-      expect(screen.getByTestId(expiryStrategySubmit).dataset.state).toEqual(
-        'checked'
-      );
-    });
-  });
-
-  it('should display trigger price as price for market type order', async () => {
-    render(generateJsx());
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    await userEvent.click(screen.getByTestId(orderTypeMarket));
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '10');
-    expect(screen.getByTestId('price')).toHaveTextContent('10.0');
-  });
-
-  it('should use local storage state for initial values', async () => {
-    const values: Partial<StopOrderFormValues> = {
-      type: Schema.OrderType.TYPE_LIMIT,
-      side: Schema.Side.SIDE_SELL,
-      size: '0.1',
-      price: '300.22',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-      expire: true,
-      expiryStrategy: Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_CANCELS,
-      expiresAt: '2023-07-27T16:43:27.000',
-    };
-
-    useStopOrderFormValues.setState({
-      formValues: {
-        [market.id]: values,
-      },
-    });
-
-    render(generateJsx());
-    // Assert correct defaults are used from store
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    expect(screen.queryByTestId(orderTypeLimit)).toBeChecked();
-    expect(screen.getByTestId(orderSideSell).dataset.state).toEqual('checked');
-    expect(screen.getByTestId(sizeInput)).toHaveDisplayValue(
-      values.size as string
-    );
-    expect(screen.getByTestId('order-tif')).toHaveValue(values.timeInForce);
-    expect(screen.getByTestId(priceInput)).toHaveDisplayValue(
-      values.price as string
-    );
-    expect(screen.getByTestId(expire).dataset.state).toEqual('checked');
-    expect(screen.getByTestId(expiryStrategyCancel).dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId(datePicker)).toHaveDisplayValue(
-      values.expiresAt as string
-    );
-  });
-
-  it('shows no wallet warning and do not submit if no wallet connected', async () => {
-    render(generateJsx(null));
-    await userEvent.type(screen.getByTestId(sizeInput), '1');
-    await userEvent.type(screen.getByTestId(priceInput), '1');
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '1');
-    await userEvent.click(screen.getByTestId(submitButton));
-    expect(submit).not.toBeCalled();
-    expect(
-      screen.getByTestId('deal-ticket-connect-wallet')
-    ).toBeInTheDocument();
-  });
-
-  it('calls submit if form is valid', async () => {
-    render(generateJsx());
-    await userEvent.type(screen.getByTestId(sizeInput), '1');
-    await userEvent.type(screen.getByTestId(priceInput), '1');
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '1');
-    await userEvent.click(screen.getByTestId(submitButton));
-    expect(submit).toBeCalled();
-  });
-
-  it('validates size field', async () => {
-    render(generateJsx());
-
-    await userEvent.click(screen.getByTestId(submitButton));
-
-    // default value should be invalid
-    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
-    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(sizeInput), '0.01');
-    expect(screen.getByTestId(sizeErrorMessage)).toBeInTheDocument();
-
-    // clear and fill using valid value
-    await userEvent.clear(screen.getByTestId(sizeInput));
-    await userEvent.type(screen.getByTestId(sizeInput), '0.1');
-    expect(screen.queryByTestId(sizeErrorMessage)).toBeNull();
-  });
-
-  it('validates price field', async () => {
-    render(generateJsx());
-
-    await userEvent.click(screen.getByTestId(submitButton));
-    // price error message should not show if size has error
-    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
-    await userEvent.type(screen.getByTestId(sizeInput), '0.1');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
-    await userEvent.type(screen.getByTestId(priceInput), '0.001');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
-
-    // switch to market order type error should disappear
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    await userEvent.click(screen.getByTestId(orderTypeMarket));
-    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
-
-    // switch back to limit type
-    await userEvent.click(screen.getByTestId(orderTypeTrigger));
-    await userEvent.click(screen.getByTestId(orderTypeLimit));
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
-
-    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(priceInput), '0.001');
-    expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
-
-    // clear and fill using valid value
-    await userEvent.clear(screen.getByTestId(priceInput));
-    await userEvent.type(screen.getByTestId(priceInput), '0.01');
-    expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
-  });
-
-  it('validates trigger price field', async () => {
-    render(generateJsx());
-
-    await userEvent.click(screen.getByTestId(submitButton));
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-    // switch to trailing percentage offset trigger type
-    await userEvent.click(screen.getByTestId(triggerTypeTrailingPercentOffset));
-    expect(screen.queryByTestId(triggerPriceErrorMessage)).toBeNull();
-
-    // switch back to price trigger type
-    await userEvent.click(screen.getByTestId(triggerTypePrice));
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-    // to small value should be invalid
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '0.001');
-    expect(screen.getByTestId(triggerPriceErrorMessage)).toBeInTheDocument();
-
-    // clear and fill using valid value
-    await userEvent.clear(screen.getByTestId(triggerPriceInput));
-    await userEvent.type(screen.getByTestId(triggerPriceInput), '0.01');
-    expect(screen.queryByTestId(triggerPriceErrorMessage)).toBeNull();
-  });
-
-  it('validates trigger trailing percentage offset field', async () => {
-    render(generateJsx());
-
-    // should not show error with default form values
-    await userEvent.click(screen.getByTestId(submitButton));
-    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
-
-    // switch to trailing percentage offset trigger type
-    await userEvent.click(screen.getByTestId(triggerTypeTrailingPercentOffset));
-    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeInTheDocument();
-
-    // to small value should be invalid
-    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
-      '0.09'
-    );
-    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeInTheDocument();
-
-    // clear and fill using valid value
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
-    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
-      '0.1'
-    );
-    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
-
-    // to big value should be invalid
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
-    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
-      '99.91'
-    );
-    expect(
-      screen.getByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeInTheDocument();
-
-    // clear and fill using valid value
-    await userEvent.clear(
-      screen.getByTestId(triggerTrailingPercentOffsetInput)
-    );
-    await userEvent.type(
-      screen.getByTestId(triggerTrailingPercentOffsetInput),
-      '99.9'
-    );
-    expect(
-      screen.queryByTestId(triggerTrailingPercentOffsetErrorMessage)
-    ).toBeNull();
-  });
-});
@@ -1,588 +0,0 @@
-import type { FormEventHandler } from 'react';
-import { useRef, useCallback, useEffect } from 'react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { StopOrdersSubmission } from '@vegaprotocol/wallet';
-import {
-  formatNumber,
-  removeDecimal,
-  toDecimal,
-  validateAmount,
-} from '@vegaprotocol/utils';
-import { useForm, Controller } from 'react-hook-form';
-import * as Schema from '@vegaprotocol/types';
-import {
-  Radio,
-  RadioGroup,
-  Input,
-  Checkbox,
-  FormGroup,
-  InputError,
-  Select,
-  Tooltip,
-} from '@vegaprotocol/ui-toolkit';
-import { getDerivedPrice, type Market } from '@vegaprotocol/markets';
-import { t } from '@vegaprotocol/i18n';
-import { ExpirySelector } from './expiry-selector';
-import { SideSelector } from './side-selector';
-import { timeInForceLabel, useOrder } from '@vegaprotocol/orders';
-import {
-  NoWalletWarning,
-  REDUCE_ONLY_TOOLTIP,
-  useNotionalSize,
-} from './deal-ticket';
-import { TypeToggle } from './type-selector';
-import {
-  useStopOrderFormValues,
-  type StopOrderFormValues,
-} from '../../hooks/use-stop-order-form-values';
-import {
-  DealTicketType,
-  useDealTicketTypeStore,
-} from '../../hooks/use-type-store';
-import { mapFormValuesToStopOrdersSubmission } from '../../utils/map-form-values-to-stop-order-submission';
-import { DealTicketButton } from './deal-ticket-button';
-import { DealTicketFeeDetails } from './deal-ticket-fee-details';
-import { validateExpiration } from '../../utils';
-
-export interface StopOrderProps {
-  market: Market;
-  marketPrice?: string | null;
-  submit: (order: StopOrdersSubmission) => void;
-}
-
-const defaultValues: Partial<StopOrderFormValues> = {
-  type: Schema.OrderType.TYPE_LIMIT,
-  side: Schema.Side.SIDE_BUY,
-  timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-  triggerType: 'price',
-  triggerDirection:
-    Schema.StopOrderTriggerDirection.TRIGGER_DIRECTION_RISES_ABOVE,
-  expiryStrategy: Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_SUBMIT,
-  size: '0',
-};
-
-const stopSubmit: FormEventHandler = (e) => e.preventDefault();
-
-export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
-  const { pubKey, isReadOnly } = useVegaWallet();
-  const setDealTicketType = useDealTicketTypeStore((state) => state.set);
-  const [, updateOrder] = useOrder(market.id);
-  const updateStoredFormValues = useStopOrderFormValues(
-    (state) => state.update
-  );
-  const storedFormValues = useStopOrderFormValues(
-    (state) => state.formValues[market.id]
-  );
-  const { handleSubmit, setValue, watch, control, formState } =
-    useForm<StopOrderFormValues>({
-      defaultValues: { ...defaultValues, ...storedFormValues },
-    });
-  const { errors } = formState;
-  const lastSubmitTime = useRef(0);
-  const onSubmit = useCallback(
-    (data: StopOrderFormValues) => {
-      const now = new Date().getTime();
-      if (lastSubmitTime.current && now - lastSubmitTime.current < 1000) {
-        return;
-      }
-      submit(
-        mapFormValuesToStopOrdersSubmission(
-          data,
-          market.id,
-          market.decimalPlaces,
-          market.positionDecimalPlaces
-        )
-      );
-      lastSubmitTime.current = now;
-    },
-    [market.id, market.decimalPlaces, market.positionDecimalPlaces, submit]
-  );
-  const side = watch('side');
-  const expire = watch('expire');
-  const triggerType = watch('triggerType');
-  const triggerPrice = watch('triggerPrice');
-  const timeInForce = watch('timeInForce');
-  const type = watch('type');
-  const rawPrice = watch('price');
-  const rawSize = watch('size');
-
-  if (storedFormValues?.size && rawSize !== storedFormValues?.size) {
-    setValue('size', storedFormValues.size);
-  }
-  if (storedFormValues?.price && rawPrice !== storedFormValues?.price) {
-    setValue('price', storedFormValues.price);
-  }
-
-  const isPriceTrigger = triggerType === 'price';
-  const size = removeDecimal(rawSize, market.positionDecimalPlaces);
-  const price =
-    marketPrice &&
-    getDerivedPrice(
-      {
-        type,
-        price: rawPrice && removeDecimal(rawPrice, market.decimalPlaces),
-      },
-      type === Schema.OrderType.TYPE_MARKET && isPriceTrigger && triggerPrice
-        ? removeDecimal(triggerPrice, market.decimalPlaces)
-        : marketPrice
-    );
-
-  const notionalSize = useNotionalSize(
-    price,
-    size,
-    market.decimalPlaces,
-    market.positionDecimalPlaces
-  );
-
-  useEffect(() => {
-    const subscription = watch((value, { name, type }) => {
-      updateStoredFormValues(market.id, value);
-    });
-    return () => subscription.unsubscribe();
-  }, [watch, market.id, updateStoredFormValues]);
-
-  const { quoteName, settlementAsset: asset } =
-    market.tradableInstrument.instrument.product;
-
-  const sizeStep = toDecimal(market?.positionDecimalPlaces);
-  const priceStep = toDecimal(market?.decimalPlaces);
-  const trailingPercentOffsetStep = '0.1';
-
-  const priceFormatted =
-    isPriceTrigger && triggerPrice
-      ? formatNumber(triggerPrice, market.decimalPlaces)
-      : undefined;
-
-  return (
-    <form
-      onSubmit={isReadOnly || !pubKey ? stopSubmit : handleSubmit(onSubmit)}
-      noValidate
-    >
-      <Controller
-        name="type"
-        control={control}
-        render={({ field }) => {
-          const { value } = field;
-          return (
-            <TypeToggle
-              value={
-                value === Schema.OrderType.TYPE_LIMIT
-                  ? DealTicketType.StopLimit
-                  : DealTicketType.StopMarket
-              }
-              onValueChange={(value) => {
-                const type = value as DealTicketType;
-                setDealTicketType(market.id, type);
-                if (
-                  type === DealTicketType.Limit ||
-                  type === DealTicketType.Market
-                ) {
-                  updateOrder({
-                    type:
-                      type === DealTicketType.Limit
-                        ? Schema.OrderType.TYPE_LIMIT
-                        : Schema.OrderType.TYPE_MARKET,
-                  });
-                  return;
-                }
-                setValue(
-                  'type',
-                  type === DealTicketType.StopLimit
-                    ? Schema.OrderType.TYPE_LIMIT
-                    : Schema.OrderType.TYPE_MARKET
-                );
-              }}
-            />
-          );
-        }}
-      />
-      {errors.type && (
-        <InputError testId="stop-order-error-message-type">
-          {errors.type.message}
-        </InputError>
-      )}
-
-      <Controller
-        name="side"
-        control={control}
-        render={({ field }) => (
-          <SideSelector value={field.value} onValueChange={field.onChange} />
-        )}
-      />
-      <FormGroup label={t('Trigger')} compact={true} labelFor="">
-        <Controller
-          name="triggerDirection"
-          control={control}
-          render={({ field }) => {
-            const { onChange, value } = field;
-            return (
-              <RadioGroup
-                name="triggerDirection"
-                onChange={onChange}
-                value={value}
-                orientation="horizontal"
-                className="mb-2"
-              >
-                <Radio
-                  value={
-                    Schema.StopOrderTriggerDirection
-                      .TRIGGER_DIRECTION_RISES_ABOVE
-                  }
-                  id="triggerDirection-risesAbove"
-                  label={'Rises above'}
-                />
-                <Radio
-                  value={
-                    Schema.StopOrderTriggerDirection
-                      .TRIGGER_DIRECTION_FALLS_BELOW
-                  }
-                  id="triggerDirection-fallsBelow"
-                  label={'Falls below'}
-                />
-              </RadioGroup>
-            );
-          }}
-        />
-        {isPriceTrigger && (
-          <div className="mb-2">
-            <Controller
-              name="triggerPrice"
-              rules={{
-                required: t('You need provide a price'),
-                min: {
-                  value: priceStep,
-                  message: t('Price cannot be lower than ' + priceStep),
-                },
-                validate: validateAmount(priceStep, 'Price'),
-              }}
-              control={control}
-              render={({ field }) => {
-                const { value, ...props } = field;
-                return (
-                  <div className="mb-2">
-                    <Input
-                      data-testid="triggerPrice"
-                      type="number"
-                      step={priceStep}
-                      appendElement={asset.symbol}
-                      value={value || ''}
-                      {...props}
-                    />
-                  </div>
-                );
-              }}
-            />
-            {errors.triggerPrice && (
-              <InputError testId="stop-order-error-message-trigger-price">
-                {errors.triggerPrice.message}
-              </InputError>
-            )}
-          </div>
-        )}
-        {!isPriceTrigger && (
-          <div className="mb-2">
-            <Controller
-              name="triggerTrailingPercentOffset"
-              control={control}
-              rules={{
-                required: t('You need provide a trailing percent offset'),
-                min: {
-                  value: trailingPercentOffsetStep,
-                  message: t(
-                    'Trailing percent offset cannot be lower than ' +
-                      trailingPercentOffsetStep
-                  ),
-                },
-                max: {
-                  value: '99.9',
-                  message: t(
-                    'Trailing percent offset cannot be higher than 99.9'
-                  ),
-                },
-                validate: validateAmount(
-                  trailingPercentOffsetStep,
-                  'Trailing percentage offset'
-                ),
-              }}
-              render={({ field }) => {
-                const { value, ...props } = field;
-                return (
-                  <div className="mb-2">
-                    <Input
-                      type="number"
-                      step={trailingPercentOffsetStep}
-                      appendElement="%"
-                      data-testid="triggerTrailingPercentOffset"
-                      value={value || ''}
-                      {...props}
-                    />
-                  </div>
-                );
-              }}
-            />
-            {errors.triggerTrailingPercentOffset && (
-              <InputError testId="stop-order-error-message-trigger-trailing-percent-offset">
-                {errors.triggerTrailingPercentOffset.message}
-              </InputError>
-            )}
-          </div>
-        )}
-        <Controller
-          name="triggerType"
-          control={control}
-          rules={{ deps: ['triggerTrailingPercentOffset', 'triggerPrice'] }}
-          render={({ field }) => {
-            const { onChange, value } = field;
-            return (
-              <RadioGroup
-                onChange={onChange}
-                value={value}
-                orientation="horizontal"
-              >
-                <Radio value="price" id="triggerType-price" label={'Price'} />
-                <Radio
-                  value="trailingPercentOffset"
-                  id="triggerType-trailingPercentOffset"
-                  label={'Trailing Percent Offset'}
-                />
-              </RadioGroup>
-            );
-          }}
-        />
-      </FormGroup>
-      <div className="mb-2">
-        <div className="flex items-start gap-4">
-          <FormGroup
-            labelFor="input-price-quote"
-            label={t(`Size`)}
-            className="!mb-0 flex-1"
-          >
-            <Controller
-              name="size"
-              control={control}
-              rules={{
-                required: t('You need to provide a size'),
-                min: {
-                  value: sizeStep,
-                  message: t('Size cannot be lower than ' + sizeStep),
-                },
-                validate: validateAmount(sizeStep, 'Size'),
-              }}
-              render={({ field }) => {
-                const { value, ...props } = field;
-                return (
-                  <Input
-                    id="order-size"
-                    className="w-full"
-                    type="number"
-                    step={sizeStep}
-                    min={sizeStep}
-                    onWheel={(e) => e.currentTarget.blur()}
-                    data-testid="order-size"
-                    value={value || ''}
-                    {...props}
-                  />
-                );
-              }}
-            />
-          </FormGroup>
-          <div className="pt-7 leading-10">@</div>
-          <div className="flex-1">
-            {type === Schema.OrderType.TYPE_LIMIT ? (
-              <FormGroup
-                labelFor="input-price-quote"
-                label={t(`Price (${quoteName})`)}
-                labelAlign="right"
-                className="!mb-0"
-              >
-                <Controller
-                  name="price"
-                  control={control}
-                  rules={{
-                    deps: 'type',
-                    required: t('You need provide a price'),
-                    min: {
-                      value: priceStep,
-                      message: t('Price cannot be lower than ' + priceStep),
-                    },
-                    validate: validateAmount(priceStep, 'Price'),
-                  }}
-                  render={({ field }) => {
-                    const { value, ...props } = field;
-                    return (
-                      <Input
-                        id="input-price-quote"
-                        className="w-full"
-                        type="number"
-                        step={priceStep}
-                        data-testid="order-price"
-                        onWheel={(e) => e.currentTarget.blur()}
-                        value={value || ''}
-                        {...props}
-                      />
-                    );
-                  }}
-                />
-              </FormGroup>
-            ) : (
-              <div
-                className="text-sm text-right pt-7 leading-10"
-                data-testid="price"
-              >
-                {priceFormatted && quoteName
-                  ? `~${priceFormatted} ${quoteName}`
-                  : '-'}
-              </div>
-            )}
-          </div>
-        </div>
-        {errors.size && (
-          <InputError testId="stop-order-error-message-size">
-            {errors.size.message}
-          </InputError>
-        )}
-
-        {!errors.size &&
-          errors.price &&
-          type === Schema.OrderType.TYPE_LIMIT && (
-            <InputError testId="stop-order-error-message-price">
-              {errors.price.message}
-            </InputError>
-          )}
-      </div>
-      <div className="mb-2">
-        <FormGroup
-          label={t('Time in force')}
-          labelFor="select-time-in-force"
-          compact={true}
-        >
-          <Controller
-            name="timeInForce"
-            control={control}
-            render={({ field }) => (
-              <Select
-                id="select-time-in-force"
-                className="w-full"
-                data-testid="order-tif"
-                {...field}
-              >
-                <option
-                  key={Schema.OrderTimeInForce.TIME_IN_FORCE_IOC}
-                  value={Schema.OrderTimeInForce.TIME_IN_FORCE_IOC}
-                >
-                  {timeInForceLabel(Schema.OrderTimeInForce.TIME_IN_FORCE_IOC)}
-                </option>
-                <option
-                  key={Schema.OrderTimeInForce.TIME_IN_FORCE_FOK}
-                  value={Schema.OrderTimeInForce.TIME_IN_FORCE_FOK}
-                >
-                  {timeInForceLabel(Schema.OrderTimeInForce.TIME_IN_FORCE_FOK)}
-                </option>
-              </Select>
-            )}
-          />
-        </FormGroup>
-        {errors.timeInForce && (
-          <InputError testId="stop-error-message-tif">
-            {errors.timeInForce.message}
-          </InputError>
-        )}
-      </div>
-      <div className="flex gap-2 pb-2 justify-between">
-        <Controller
-          name="expire"
-          control={control}
-          render={({ field }) => {
-            const { onChange: onCheckedChange, value } = field;
-            return (
-              <Checkbox
-                onCheckedChange={onCheckedChange}
-                checked={value}
-                name="expire"
-                label={<span className="text-xs">{t('Expire')}</span>}
-              />
-            );
-          }}
-        />
-        <Checkbox
-          name="reduce-only"
-          checked={true}
-          disabled={true}
-          label={
-            <Tooltip description={<span>{t(REDUCE_ONLY_TOOLTIP)}</span>}>
-              <span className="text-xs">{t('Reduce only')}</span>
-            </Tooltip>
-          }
-        />
-      </div>
-      {expire && (
-        <>
-          <FormGroup
-            label={t('Strategy')}
-            labelFor="expiryStrategy"
-            compact={true}
-          >
-            <Controller
-              name="expiryStrategy"
-              control={control}
-              render={({ field }) => {
-                return (
-                  <RadioGroup orientation="horizontal" {...field}>
-                    <Radio
-                      value={
-                        Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_SUBMIT
-                      }
-                      id="expiryStrategy-submit"
-                      label={'Submit'}
-                    />
-                    <Radio
-                      value={
-                        Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_CANCELS
-                      }
-                      id="expiryStrategy-cancel"
-                      label={'Cancel'}
-                    />
-                  </RadioGroup>
-                );
-              }}
-            />
-          </FormGroup>
-          <div className="mb-2">
-            <Controller
-              name="expiresAt"
-              control={control}
-              rules={{
-                validate: validateExpiration,
-              }}
-              render={({ field }) => {
-                const { value, onChange: onSelect } = field;
-                return (
-                  <ExpirySelector
-                    value={value}
-                    onSelect={onSelect}
-                    errorMessage={errors.expiresAt?.message}
-                  />
-                );
-              }}
-            />
-          </div>
-        </>
-      )}
-      <NoWalletWarning pubKey={pubKey} isReadOnly={isReadOnly} asset={asset} />
-      <DealTicketButton side={side} label={t('Submit Stop Order')} />
-      <DealTicketFeeDetails
-        order={{
-          marketId: market.id,
-          price: price || undefined,
-          side,
-          size,
-          timeInForce,
-          type,
-        }}
-        notionalSize={notionalSize}
-        assetSymbol={asset.symbol}
-        market={market}
-      />
-    </form>
-  );
-};
@@ -22,12 +22,8 @@ import { OrdersDocument } from '@vegaprotocol/orders';
 jest.mock('zustand');
 jest.mock('./deal-ticket-fee-details', () => ({
  DealTicketFeeDetails: () => <div data-testid="deal-ticket-fee-details" />,
-  DealTicketMarginDetails: () => (
-    <div data-testid="deal-ticket-margin-details" />
-  ),
 }));

-const marketPrice = '200';
 const pubKey = 'pubKey';
 const market = generateMarket();
 const marketData = generateMarketData();
@@ -40,7 +36,6 @@ function generateJsx(mocks: MockedResponse[] = []) {
        <DealTicket
          market={market}
          marketData={marketData}
-          marketPrice={marketPrice}
          submit={submit}
          onDeposit={jest.fn()}
        />
@@ -119,22 +114,30 @@ describe('DealTicket', () => {
  });

  it('should display ticket defaults', () => {
-    render(generateJsx());
+    const { container } = render(generateJsx());

    // place order button should always be enabled
    expect(screen.getByTestId('place-order')).toBeEnabled();

    // Assert defaults are used
-    expect(screen.getByTestId('order-type-Market')).toBeInTheDocument();
-    expect(screen.getByTestId('order-type-Limit')).toBeInTheDocument();
+    expect(
+      screen.getByTestId(`order-type-${Schema.OrderType.TYPE_MARKET}`)
+    ).toBeInTheDocument();
+    expect(
+      screen.getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+    ).toBeInTheDocument();

-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
+    const oderTypeLimitToggle = container.querySelector(
+      `[data-testid="order-type-${Schema.OrderType.TYPE_LIMIT}"] input[type="radio"]`
    );
+    expect(oderTypeLimitToggle).toBeChecked();

-    expect(screen.getByTestId('order-side-SIDE_BUY').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue('0');
    expect(screen.getByTestId('order-tif')).toHaveValue(
      Schema.OrderTimeInForce.TIME_IN_FORCE_GTC
@@ -144,12 +147,12 @@ describe('DealTicket', () => {
  it('should display last price for market type order', () => {
    render(generateJsx());
    act(() => {
-      screen.getByTestId('order-type-Market').click();
+      screen.getByTestId(`order-type-${Schema.OrderType.TYPE_MARKET}`).click();
    });
    // Assert last price is shown
    expect(screen.getByTestId('last-price')).toHaveTextContent(
      // eslint-disable-next-line
-      `~${addDecimal(marketPrice, market.decimalPlaces)} ${
+      `~${addDecimal(marketData.markPrice, market.decimalPlaces)} ${
        market.tradableInstrument.instrument.product.quoteName
      }`
    );
@@ -175,12 +178,17 @@ describe('DealTicket', () => {
    render(generateJsx());

    // Assert correct defaults are used from store
-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
      expectedOrder.size
    );
@@ -213,12 +221,17 @@ describe('DealTicket', () => {
    render(generateJsx());

    // Assert correct defaults are used from store
-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
      expectedOrder.size
    );
@@ -256,12 +269,17 @@ describe('DealTicket', () => {
    render(generateJsx());

    // Assert correct defaults are used from store
-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
      expectedOrder.size
    );
@@ -304,12 +322,17 @@ describe('DealTicket', () => {
    render(generateJsx());

    // Assert correct defaults are used from store
-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
      expectedOrder.size
    );
@@ -348,12 +371,17 @@ describe('DealTicket', () => {
    render(generateJsx());

    // Assert correct defaults are used from store
-    expect(screen.getByTestId('order-type-Limit').dataset.state).toEqual(
-      'checked'
-    );
-    expect(screen.getByTestId('order-side-SIDE_SELL').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen
+        .getByTestId(`order-type-${Schema.OrderType.TYPE_LIMIT}`)
+        .querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_SELL')?.querySelector('input')
+    ).toBeChecked();
+    expect(
+      screen.queryByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).not.toBeChecked();
    expect(screen.getByTestId('order-size')).toHaveDisplayValue(
      expectedOrder.size
    );
@@ -374,7 +402,7 @@ describe('DealTicket', () => {
    render(generateJsx());

    act(() => {
-      screen.getByTestId('order-type-Market').click();
+      screen.getByTestId(`order-type-${Schema.OrderType.TYPE_MARKET}`).click();
    });

    // Only FOK and IOC should be present for type market order
@@ -399,7 +427,7 @@ describe('DealTicket', () => {
    );

    // Switch to type limit order -> all TIF options should be shown
-    await userEvent.click(screen.getByTestId('order-type-Limit'));
+    await userEvent.click(screen.getByTestId('order-type-TYPE_LIMIT'));
    expect(screen.getByTestId('order-tif').children).toHaveLength(
      Object.keys(Schema.OrderTimeInForce).length
    );
@@ -419,7 +447,7 @@ describe('DealTicket', () => {
    );

    // Switch back to type market order -> FOK should be preserved from previous selection
-    await userEvent.click(screen.getByTestId('order-type-Market'));
+    await userEvent.click(screen.getByTestId('order-type-TYPE_MARKET'));
    expect(screen.getByTestId('order-tif')).toHaveValue(
      Schema.OrderTimeInForce.TIME_IN_FORCE_FOK
    );
@@ -434,7 +462,7 @@ describe('DealTicket', () => {
    );

    // Switch back type limit order -> GTT should be preserved
-    await userEvent.click(screen.getByTestId('order-type-Limit'));
+    await userEvent.click(screen.getByTestId('order-type-TYPE_LIMIT'));
    expect(screen.getByTestId('order-tif')).toHaveValue(
      Schema.OrderTimeInForce.TIME_IN_FORCE_GTT
    );
@@ -449,7 +477,7 @@ describe('DealTicket', () => {
    );

    // Switch to type market order -> IOC should be preserved
-    await userEvent.click(screen.getByTestId('order-type-Market'));
+    await userEvent.click(screen.getByTestId('order-type-TYPE_MARKET'));
    expect(screen.getByTestId('order-tif')).toHaveValue(
      Schema.OrderTimeInForce.TIME_IN_FORCE_IOC
    );
@@ -459,9 +487,9 @@ describe('DealTicket', () => {
    render(generateJsx());

    // BUY is selected by default
-    expect(screen.getByTestId('order-side-SIDE_BUY').dataset.state).toEqual(
-      'checked'
-    );
+    expect(
+      screen.getByTestId('order-side-SIDE_BUY')?.querySelector('input')
+    ).toBeChecked();

    await userEvent.type(screen.getByTestId('order-size'), '200');

@@ -476,7 +504,7 @@ describe('DealTicket', () => {
    );

    // Switch to limit order
-    await userEvent.click(screen.getByTestId('order-type-Limit'));
+    await userEvent.click(screen.getByTestId('order-type-TYPE_LIMIT'));

    // Check all TIF options shown
    expect(screen.getByTestId('order-tif').children).toHaveLength(
@@ -4,10 +4,7 @@ import { memo, useCallback, useEffect, useState, useRef, useMemo } from 'react';
 import { Controller } from 'react-hook-form';
 import { DealTicketAmount } from './deal-ticket-amount';
 import { DealTicketButton } from './deal-ticket-button';
-import {
-  DealTicketFeeDetails,
-  DealTicketMarginDetails,
-} from './deal-ticket-fee-details';
+import { DealTicketFeeDetails } from './deal-ticket-fee-details';
 import { ExpirySelector } from './expiry-selector';
 import { SideSelector } from './side-selector';
 import { TimeInForceSelector } from './time-in-force-selector';
@@ -33,7 +30,8 @@ import {
 } from '@vegaprotocol/positions';
 import { toBigNum, removeDecimal } from '@vegaprotocol/utils';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
-import { getDerivedPrice } from '@vegaprotocol/markets';
+import { useEstimateFees } from '../../hooks/use-estimate-fees';
+import { getDerivedPrice } from '../../utils/get-price';
 import type { OrderInfo } from '@vegaprotocol/types';

 import {
@@ -45,11 +43,7 @@ import {
 } from '../../utils';
 import { ZeroBalanceError } from '../deal-ticket-validation/zero-balance-error';
 import { SummaryValidationType } from '../../constants';
-import type {
-  Market,
-  MarketData,
-  StaticMarketData,
-} from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import { MarginWarning } from '../deal-ticket-validation/margin-warning';
 import {
  useMarketAccountBalance,
@@ -59,59 +53,26 @@ import {
 import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
 import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import {
-  DealTicketType,
-  useDealTicketTypeStore,
-} from '../../hooks/use-type-store';
-import { useStopOrderFormValues } from '../../hooks/use-stop-order-form-values';
 import { DealTicketSizeIceberg } from './deal-ticket-size-iceberg';
-import noop from 'lodash/noop';
-
-export const REDUCE_ONLY_TOOLTIP =
-  '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.';

 export interface DealTicketProps {
  market: Market;
-  marketData: StaticMarketData;
-  marketPrice?: string | null;
+  marketData: MarketData;
  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
  submit: (order: OrderSubmission) => void;
  onClickCollateral?: () => void;
  onDeposit: (assetId: string) => void;
 }

-export const useNotionalSize = (
-  price: string | null | undefined,
-  size: string | undefined,
-  decimalPlaces: number,
-  positionDecimalPlaces: number
-) =>
-  useMemo(() => {
-    if (price && size) {
-      return removeDecimal(
-        toBigNum(size, positionDecimalPlaces).multipliedBy(
-          toBigNum(price, decimalPlaces)
-        ),
-        decimalPlaces
-      );
-    }
-    return null;
-  }, [price, size, decimalPlaces, positionDecimalPlaces]);
-
 export const DealTicket = ({
  market,
  onMarketClick,
  marketData,
-  marketPrice,
  submit,
  onClickCollateral,
  onDeposit,
 }: DealTicketProps) => {
  const { pubKey, isReadOnly } = useVegaWallet();
-  const setDealTicketType = useDealTicketTypeStore((state) => state.set);
-  const updateStopOrderFormValues = useStopOrderFormValues(
-    (state) => state.update
-  );
  // store last used tif for market so that when changing OrderType the previous TIF
  // selection for that type is used when switching back

@@ -134,15 +95,11 @@ export const DealTicket = ({

  const asset = market.tradableInstrument.instrument.product.settlementAsset;

-  const {
-    accountBalance: marginAccountBalance,
-    loading: loadingMarginAccountBalance,
-  } = useMarketAccountBalance(market.id);
+  const { accountBalance: marginAccountBalance } = useMarketAccountBalance(
+    market.id
+  );

-  const {
-    accountBalance: generalAccountBalance,
-    loading: loadingGeneralAccountBalance,
-  } = useAccountBalance(asset.id);
+  const { accountBalance: generalAccountBalance } = useAccountBalance(asset.id);

  const balance = (
    BigInt(marginAccountBalance) + BigInt(generalAccountBalance)
@@ -159,20 +116,30 @@ export const DealTicket = ({
    );

  const price = useMemo(() => {
-    return (
-      normalizedOrder &&
-      marketPrice &&
-      getDerivedPrice(normalizedOrder, marketPrice)
-    );
-  }, [normalizedOrder, marketPrice]);
+    return normalizedOrder && getDerivedPrice(normalizedOrder, marketData);
+  }, [normalizedOrder, marketData]);

-  const notionalSize = useNotionalSize(
+  const notionalSize = useMemo(() => {
+    if (price && normalizedOrder?.size) {
+      return removeDecimal(
+        toBigNum(
+          normalizedOrder.size,
+          market.positionDecimalPlaces
+        ).multipliedBy(toBigNum(price, market.decimalPlaces)),
+        market.decimalPlaces
+      );
+    }
+    return null;
+  }, [
    price,
    normalizedOrder?.size,
    market.decimalPlaces,
-    market.positionDecimalPlaces
-  );
+    market.positionDecimalPlaces,
+  ]);

+  const feeEstimate = useEstimateFees(
+    normalizedOrder && { ...normalizedOrder, price }
+  );
  const { data: activeOrders } = useDataProvider({
    dataProvider: activeOrdersProvider,
    variables: { partyId: pubKey || '', marketId: market.id },
@@ -230,10 +197,7 @@ export const DealTicket = ({

    const hasNoBalance =
      !BigInt(generalAccountBalance) && !BigInt(marginAccountBalance);
-    if (
-      hasNoBalance &&
-      !(loadingMarginAccountBalance || loadingGeneralAccountBalance)
-    ) {
+    if (hasNoBalance) {
      setError('summary', {
        message: SummaryValidationType.NoCollateral,
        type: SummaryValidationType.NoCollateral,
@@ -257,8 +221,6 @@ export const DealTicket = ({
    marketTradingMode,
    generalAccountBalance,
    marginAccountBalance,
-    loadingMarginAccountBalance,
-    loadingGeneralAccountBalance,
    pubKey,
    setError,
    clearErrors,
@@ -303,13 +265,11 @@ export const DealTicket = ({
  );

  // if an order doesn't exist one will be created by the store immediately
-  if (!order || !normalizedOrder) {
-    return null;
-  }
+  if (!order || !normalizedOrder) return null;

  return (
    <form
-      onSubmit={isReadOnly ? noop : handleSubmit(onSubmit)}
+      onSubmit={isReadOnly ? undefined : handleSubmit(onSubmit)}
      noValidate
      data-testid="deal-ticket-form"
    >
@@ -324,29 +284,9 @@ export const DealTicket = ({
        }}
        render={() => (
          <TypeSelector
-            value={
-              order.type === OrderType.TYPE_LIMIT
-                ? DealTicketType.Limit
-                : DealTicketType.Market
-            }
-            onValueChange={(dealTicketType) => {
-              setDealTicketType(market.id, dealTicketType);
-              if (
-                dealTicketType !== DealTicketType.Limit &&
-                dealTicketType !== DealTicketType.Market
-              ) {
-                updateStopOrderFormValues(market.id, {
-                  type:
-                    dealTicketType === DealTicketType.StopLimit
-                      ? OrderType.TYPE_LIMIT
-                      : OrderType.TYPE_MARKET,
-                });
-                return;
-              }
-              const type =
-                dealTicketType === DealTicketType.Limit
-                  ? OrderType.TYPE_LIMIT
-                  : OrderType.TYPE_MARKET;
+            value={order.type}
+            onSelect={(type) => {
+              if (type === OrderType.TYPE_NETWORK) return;
              update({
                type,
                // when changing type also update the TIF to what was last used of new type
@@ -393,7 +333,7 @@ export const DealTicket = ({
        render={() => (
          <SideSelector
            value={order.side}
-            onValueChange={(side) => {
+            onSelect={(side) => {
              update({ side });
            }}
          />
@@ -404,7 +344,6 @@ export const DealTicket = ({
        orderType={order.type}
        market={market}
        marketData={marketData}
-        marketPrice={marketPrice || undefined}
        sizeError={errors.size?.message}
        priceError={errors.price?.message}
        update={update}
@@ -528,7 +467,9 @@ export const DealTicket = ({
                        ? t(
                            '"Reduce only" can be used only with non-persistent orders, such as "Fill or Kill" or "Immediate or Cancel".'
                          )
-                        : t(REDUCE_ONLY_TOOLTIP)}
+                        : t(
+                            '"Reduce only" will ensure that this order will not increase the size of an open position. When the order is matched, it will only trade enough volume to bring your open volume towards 0 but never change the direction of your position. If applied to a limit order that is not instantly filled, the order will be stopped.'
+                          )}
                    </span>
                  }
                >
@@ -600,15 +541,9 @@ export const DealTicket = ({
      />
      <DealTicketButton side={order.side} />
      <DealTicketFeeDetails
-        order={
-          normalizedOrder && { ...normalizedOrder, price: price || undefined }
-        }
-        notionalSize={notionalSize}
-        assetSymbol={assetSymbol}
-        market={market}
-      />
-      <DealTicketMarginDetails
        onMarketClick={onMarketClick}
+        feeEstimate={feeEstimate}
+        notionalSize={notionalSize}
        assetSymbol={assetSymbol}
        marginAccountBalance={marginAccountBalance}
        generalAccountBalance={generalAccountBalance}
@@ -634,55 +569,6 @@ interface SummaryMessageProps {
  onClickCollateral?: () => void;
  onDeposit: (assetId: string) => void;
 }
-
-export const NoWalletWarning = ({
-  isReadOnly,
-  pubKey,
-  asset,
-}: Pick<SummaryMessageProps, 'isReadOnly' | 'pubKey' | 'asset'>) => {
-  const assetSymbol = asset.symbol;
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
-  if (isReadOnly) {
-    return (
-      <div className="mb-2">
-        <InputError testId="deal-ticket-error-message-summary">
-          {
-            'You need to connect your own wallet to start trading on this market'
-          }
-        </InputError>
-      </div>
-    );
-  }
-  if (!pubKey) {
-    return (
-      <div className="mb-2">
-        <Notification
-          testId={'deal-ticket-connect-wallet'}
-          intent={Intent.Warning}
-          message={
-            <p className="text-sm pb-2">
-              You need a{' '}
-              <ExternalLink href="https://vega.xyz/wallet">
-                Vega wallet
-              </ExternalLink>{' '}
-              with {assetSymbol} to start trading in this market.
-            </p>
-          }
-          buttonProps={{
-            text: t('Connect wallet'),
-            action: openVegaWalletDialog,
-            dataTestId: 'order-connect-wallet',
-            size: 'small',
-          }}
-        />
-      </div>
-    );
-  }
-  return null;
-};
-
 const SummaryMessage = memo(
  ({
    errorMessage,
@@ -697,16 +583,46 @@ const SummaryMessage = memo(
  }: SummaryMessageProps) => {
    // Specific error UI for if balance is so we can
    // render a deposit dialog
-    if (isReadOnly || !pubKey) {
+    const assetSymbol = asset.symbol;
+    const openVegaWalletDialog = useVegaWalletDialogStore(
+      (store) => store.openVegaWalletDialog
+    );
+    if (isReadOnly) {
      return (
-        <NoWalletWarning
-          isReadOnly={isReadOnly}
-          asset={asset}
-          pubKey={pubKey}
-        />
+        <div className="mb-2">
+          <InputError testId="deal-ticket-error-message-summary">
+            {
+              'You need to connect your own wallet to start trading on this market'
+            }
+          </InputError>
+        </div>
+      );
+    }
+    if (!pubKey) {
+      return (
+        <div className="mb-2">
+          <Notification
+            testId={'deal-ticket-connect-wallet'}
+            intent={Intent.Warning}
+            message={
+              <p className="text-sm pb-2">
+                You need a{' '}
+                <ExternalLink href="https://vega.xyz/wallet">
+                  Vega wallet
+                </ExternalLink>{' '}
+                with {assetSymbol} to start trading in this market.
+              </p>
+            }
+            buttonProps={{
+              text: t('Connect wallet'),
+              action: openVegaWalletDialog,
+              dataTestId: 'order-connect-wallet',
+              size: 'small',
+            }}
+          />
+        </div>
      );
    }
-
    if (errorMessage === SummaryValidationType.NoCollateral) {
      return (
        <div className="mb-2">
@@ -1,7 +1,6 @@
 import { FormGroup, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { formatForInput } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { useRef } from 'react';

 interface ExpirySelectorProps {
  value?: string;
@@ -14,8 +13,7 @@ export const ExpirySelector = ({
  onSelect,
  errorMessage,
 }: ExpirySelectorProps) => {
-  const now = useRef(new Date());
-  const date = value ? new Date(value) : now.current;
+  const date = value ? new Date(value) : new Date();
  const dateFormatted = formatForInput(date);
  const minDate = formatForInput(date);
  return (
@@ -3,8 +3,6 @@ export * from './deal-ticket-container';
 export * from './deal-ticket-limit-amount';
 export * from './deal-ticket-market-amount';
 export * from './deal-ticket';
-export * from './deal-ticket-stop-order';
-export * from './deal-ticket-container';
 export * from './expiry-selector';
 export * from './side-selector';
 export * from './time-in-force-selector';
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
JonRay15	f2eedc434d	Update feature-epic.md	2023-08-02 12:02:21 +01:00
Matthew Russell	4eacbbba1c	chore: add default title	2023-08-02 11:47:59 +01:00
JonRay15	e9188344cf	Update feature-epic.md	2023-08-01 23:24:24 +01:00
JonRay15	16c18b972d	Create feature-epic.md	2023-08-01 23:11:15 +01:00