fix: added vega wallet provider to test

.github/ISSUE_TEMPLATE/feature-epic.md

@@ -1,6 +1,7 @@
 ---
 name: Feature Epic
-about: A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
+about: 
+  A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
 title: 'Epic: '
 labels: feature-epic
 ---

apps/explorer/src/app/components/footer/footer.tsx

@@ -23,7 +23,7 @@ export const Footer = () => {
   );
 
   return (
-    <footer className="grid grid-cols-[1fr_auto] items-center text-xs md:text-md lg:flex md:col-span-2 px-4 pt-2 pb-3 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
+    <footer className="grid grid-rows-2 lg:grid-cols-[1fr_auto] text-xs md:text-md lg:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
       <div className="flex justify-between gap-2 align-middle">
         {GIT_COMMIT_HASH && (
           <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">
@@ -43,12 +43,9 @@ export const Footer = () => {
           </div>
         )}
 
-        <div className="content-center flex pr-4 md:border-r border-neutral-700 dark:border-neutral-300">
-          <span className="pr-2">{VEGA_URL && <NodeUrl url={VEGA_URL} />}</span>
-          <Link
-            className="ml-2 underline-offset-4"
-            onClick={() => setNodeSwitcherOpen(true)}
-          >
+        <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
+          {VEGA_URL && <NodeUrl url={VEGA_URL} />}
+          <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
             {t('Change')}
           </Link>
         </div>
@@ -62,10 +59,7 @@ export const Footer = () => {
         ) : null}
       </div>
       <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
-        <RouteLink
-          to={`/${Routes.DISCLAIMER}`}
-          className="underline underline-offset-4"
-        >
+        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
           Disclaimer
         </RouteLink>
       </div>

apps/governance-e2e/src/fixtures/proposals/successor-market.json

@@ -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"
-    }
-  }
-}

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

@@ -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();

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

@@ -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');
       });
   });

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

@@ -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);

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

@@ -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')

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

@@ -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();
 

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -1,8 +1,4 @@
-import {
-  VegaConnectDialog,
-  VegaManageDialog,
-  ViewAsDialog,
-} from '@vegaprotocol/wallet';
+import { VegaConnectDialog, VegaManageDialog } from '@vegaprotocol/wallet';
 import {
   AppStateActionType,
   useAppState,
@@ -29,8 +25,6 @@ export const VegaWalletDialogs = () => {
           })
         }
       />
-
-      <ViewAsDialog connector={Connectors.view} />
     </>
   );
 };

apps/governance/src/components/vega-wallet/download-wallet-prompt.tsx

@@ -0,0 +1,17 @@
+import { Link } from '@vegaprotocol/ui-toolkit';
+import { useTranslation } from 'react-i18next';
+import { ExternalLinks } from '@vegaprotocol/environment';
+
+export const DownloadWalletPrompt = () => {
+  const { t } = useTranslation();
+  return (
+    <>
+      <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
+      <p>
+        <Link className="text-neutral-500" href={ExternalLinks.VEGA_WALLET_URL}>
+          {t('getWalletLink')}
+        </Link>
+      </p>
+    </>
+  );
+};

apps/governance/src/components/vega-wallet/vega-wallet-prompt.tsx

@@ -1,25 +0,0 @@
-import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
-import { useTranslation } from 'react-i18next';
-import { ExternalLinks } from '@vegaprotocol/environment';
-import { useViewAsDialog } from '@vegaprotocol/wallet';
-
-export const VegaWalletPrompt = () => {
-  const { t } = useTranslation();
-  const setViewAsDialog = useViewAsDialog((state) => state.setOpen);
-  return (
-    <>
-      <h3 className="mt-4 mb-2">{t('getWallet')}</h3>
-      <div className="flex flex-row gap-4">
-        <Link className="text-neutral-500" href={ExternalLinks.VEGA_WALLET_URL}>
-          {t('getWalletLink')}
-        </Link>
-        <ButtonLink
-          className="text-neutral-500"
-          onClick={() => setViewAsDialog(true)}
-        >
-          {t('viewAsParty')}
-        </ButtonLink>
-      </div>
-    </>
-  );
-};

apps/governance/src/components/vega-wallet/vega-wallet.tsx

@@ -20,7 +20,7 @@ import {
   WalletCardHeader,
   WalletCardRow,
 } from '../wallet-card';
-import { VegaWalletPrompt } from './vega-wallet-prompt';
+import { DownloadWalletPrompt } from './download-wallet-prompt';
 import { usePollForDelegations } from './hooks';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { Button, ButtonLink } from '@vegaprotocol/ui-toolkit';
@@ -85,7 +85,7 @@ const VegaWalletNotConnected = () => {
       >
         {t('connectVegaWalletToUseAssociated')}
       </Button>
-      <VegaWalletPrompt />
+      <DownloadWalletPrompt />
     </>
   );
 };

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

@@ -855,6 +855,5 @@
   "Estimated time to upgrade": "Estimated time to upgrade",
   "Upgraded at": "Upgraded at",
   "dataIsIdentical": "Data is identical",
-  "updatesToMarket": "Updates to market",
-  "viewAsParty": "View as party"
+  "updatesToMarket": "Updates to market"
 }

apps/trading-e2e/src/integration/charts-depth.cy.ts

@@ -5,11 +5,12 @@ describe('charts', { tags: '@smoke' }, () => {
     cy.setOnBoardingViewed();
     cy.visit('/#/markets/market-0');
     cy.wait('@Markets');
+    cy.getByTestId('Depth').click();
   });
 
   it('can see market depth chart', () => {
     // 6006-DEPC-001
-    cy.getByTestId('Depth').click();
     cy.getByTestId('tab-depth').should('be.visible');
+    cy.get('.depth-chart-module_canvas__260De').should('be.visible');
   });
 });

apps/trading-e2e/src/integration/deposit.cy.ts

@@ -104,11 +104,11 @@ describe('deposit actions', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-1');
   });
 
-  it('Deposit to trade is visible', () => {
+  it('Deposit to trade is visble', () => {
     cy.getByTestId('Collateral').click();
-    cy.get('[row-id="asset-id"]').contains('tEURO').should('be.visible');
-    cy.contains('[data-testid="deposit"]', 'Deposit').should('be.visible');
-    cy.contains('[data-testid="deposit"]', 'Deposit').click();
+    cy.contains('[data-testid="deposit"]', 'Deposit')
+      .should('be.visible')
+      .click();
     cy.getByTestId('deposit-submit').should('be.visible');
   });
 });

apps/trading-e2e/src/integration/trading-chart.cy.ts

@@ -155,10 +155,7 @@ describe(
         { name: 'Volume', infoText: 'Volume: 55,000' },
       ];
       cy.get(indicatorInfo).eq(1).realHover();
-      cy.get('.chart__wrapper [data-testid="split-view-view"]')
-        .last()
-        .find('[role="button"][title="Close"]')
-        .click({ force: true });
+      cy.get('.close-button-module_closeButton__2ifkl').click({ force: true });
       cy.get(indicatorInfo).should('have.length', 1);
 
       checkMenuItemCheckbox('Studies', studyInfo);

apps/trading-e2e/src/integration/trading-deal-ticket-basics.cy.ts

@@ -22,8 +22,9 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
   it('must show place order button and connect wallet if wallet is not connected', () => {
     // 0003-WTXN-001
     cy.getByTestId('connect-vega-wallet'); // Not connected
+    cy.getByTestId('order-connect-wallet').should('exist');
     cy.getByTestId(placeOrderBtn).should('exist');
-    cy.getByTestId('get-started-button').should('exist');
+    cy.getByTestId('deal-ticket-connect-wallet').should('exist');
   });
 
   it('must be able to select order direction - long/short', function () {
@@ -44,7 +45,7 @@ describe('deal ticket basics', { tags: '@smoke' }, () => {
     mockConnectWallet();
     cy.getByTestId(toggleLimit).click();
     cy.getByTestId(orderPriceField).clear().type('101');
-    cy.getByTestId('get-started-button').click();
+    cy.getByTestId('order-connect-wallet').click();
     cy.getByTestId('dialog-content').should('be.visible');
     cy.getByTestId('connectors-list')
       .find('[data-testid="connector-jsonRpc"]')

apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts

@@ -63,7 +63,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
       cy.getByTestId(orderTIFDropDown).select('TIME_IN_FORCE_GTC');
       cy.getByTestId(orderSizeField).clear().type('1');
       cy.getByTestId(orderPriceField).clear().type('1.123456');
-      cy.getByTestId(placeOrderBtn).click();
       cy.getByTestId('deal-ticket-error-message-price-limit').should(
         'have.text',
         'Price accepts up to 5 decimal places'
@@ -74,7 +73,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
   describe('market order', () => {
     before(() => {
       cy.getByTestId(toggleMarket).click();
-      cy.getByTestId(placeOrderBtn).click();
     });
 
     it('must not see the price unit', function () {

apps/trading-e2e/src/integration/trading-deal-ticket-submit-suspended.cy.ts

@@ -48,7 +48,6 @@ describe('suspended market validation', { tags: '@regression' }, () => {
     cy.getByTestId(orderPriceField).clear().type('0.1');
     cy.getByTestId(orderSizeField).clear().type('1');
     cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId(placeOrderBtn).click();
     cy.getByTestId('deal-ticket-warning-auction').should(
       'have.text',
       'Any orders placed now will not trade until the auction ends'
@@ -61,7 +60,6 @@ describe('suspended market validation', { tags: '@regression' }, () => {
       TIFlist.filter((item) => item.code === 'FOK')[0].value
     );
     cy.getByTestId(placeOrderBtn).should('be.enabled');
-    cy.getByTestId(placeOrderBtn).click();
     cy.getByTestId('deal-ticket-error-message-tif').should(
       'have.text',
       'This market is in auction until it reaches sufficient liquidity. Until the auction ends, you can only place GFA, GTT, or GTC limit orders'

apps/trading-e2e/src/integration/trading-positions.cy.ts

@@ -251,13 +251,11 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
   it('I can see warnings', () => {
     visitAndClickPositions();
 
-    cy.get('[col-id="openVolume"]')
-      .eq(3)
-      .within(() => {
-        cy.get('[aria-label="warning-sign icon"]')
-          .should('be.visible')
-          .realHover();
-      });
+    cy.get('[col-id="openVolume"]').within(() => {
+      cy.get('[aria-label="warning-sign icon"]')
+        .should('be.visible')
+        .realHover();
+    });
     // 7004-POSI-011
     cy.getByTestId(tooltipContent).should('be.visible');
   });
@@ -291,11 +289,9 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
 
   it('View settlement asset', () => {
     visitAndClickPositions();
-    cy.get('[col-id="asset"]')
-      .eq(3)
-      .within(() => {
-        cy.get('button[type="button"]').click();
-      });
+    cy.get('[col-id="asset"]').within(() => {
+      cy.get('button[type="button"]').first().click();
+    });
     // 7004-POSI-008
     cy.getByTestId(dialogContent).should('be.visible');
     cy.getByTestId(dialogCloseX).click();

apps/trading-e2e/src/integration/withdraw-key-to-key-validation-fees.cy.ts

@@ -1,119 +0,0 @@
-import { selectAsset } from '../support/helpers';
-
-const amountField = 'input[name="amount"]';
-const includeTransferFeeRadioBtn = 'include-transfer-fee';
-const manageVegaWallet = 'manage-vega-wallet';
-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_SEPOLIA_TBTC = 2;
-
-describe.skip(
-  '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');
-    });
-  }
-);

apps/trading-e2e/src/integration/withdraw-key-to-key-validation.cy.ts

@@ -4,16 +4,118 @@ 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 },
@@ -30,8 +132,6 @@ describe(
 
       cy.wait('@Accounts');
       cy.wait('@Assets');
-
-      cy.mockVegaWalletTransaction();
     });
 
     it('transfer Text', () => {

apps/trading/.env.testnet

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

apps/trading/client-pages/deposit/deposit.tsx

@@ -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>
-  );
-};

apps/trading/client-pages/deposit/index.ts

@@ -1,3 +0,0 @@
-import { Deposit } from './deposit';
-
-export default Deposit;

apps/trading/client-pages/market/market.tsx

@@ -10,6 +10,7 @@ import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import { ViewType, useSidebar } from '../../components/sidebar';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
@@ -64,6 +65,8 @@ export const MarketPage = () => {
   const update = useGlobalStore((store) => store.update);
   const lastMarketId = useGlobalStore((store) => store.marketId);
 
+  const onSelect = useMarketClickHandler();
+
   const { data, error, loading } = useMarket(marketId);
 
   useEffect(() => {
@@ -84,6 +87,7 @@ export const MarketPage = () => {
       return (
         <TradeGrid
           market={data}
+          onSelect={onSelect}
           pinnedAsset={
             data?.tradableInstrument.instrument.product.settlementAsset
           }
@@ -93,12 +97,11 @@ export const MarketPage = () => {
     return (
       <TradePanels
         market={data}
-        pinnedAsset={
-          data?.tradableInstrument.instrument.product.settlementAsset
-        }
+        onSelect={onSelect}
+        onClickCollateral={() => navigate('/portfolio')}
       />
     );
-  }, [largeScreen, data]);
+  }, [largeScreen, data, onSelect, navigate]);
 
   if (!data && marketId) {
     return (

apps/trading/client-pages/market/trade-grid.tsx

@@ -9,6 +9,7 @@ import { OracleBanner } from '@vegaprotocol/markets';
 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 {
   ResizableGrid,
   ResizableGridPanel,
@@ -23,6 +24,7 @@ import { FLAGS } from '@vegaprotocol/environment';
 
 interface TradeGridProps {
   market: Market | null;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
   pinnedAsset?: PinnedAsset;
 }
 
@@ -38,19 +40,20 @@ const MainGrid = memo(
     const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
       id: 'middle-1',
     });
+    const onMarketClick = useMarketClickHandler(true);
 
     return (
       <ResizableGrid vertical onChange={handleOnLayoutChange}>
-        <ResizableGridPanel
-          preferredSize={sizes[0]}
-          priority={LayoutPriority.High}
-          minSize={200}
-        >
-          <ResizableGrid onChange={handleOnMiddleLayoutChange}>
+        <ResizableGridPanel minSize={75} priority={LayoutPriority.High}>
+          <ResizableGrid
+            proportionalLayout={false}
+            minSize={200}
+            onChange={handleOnMiddleLayoutChange}
+          >
             <ResizableGridPanel
               priority={LayoutPriority.High}
               minSize={200}
-              preferredSize={sizesMiddle[0] || '75%'}
+              preferredSize={sizesMiddle[1] || '50%'}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-left">
@@ -71,8 +74,8 @@ const MainGrid = memo(
               </TradeGridChild>
             </ResizableGridPanel>
             <ResizableGridPanel
+              preferredSize={sizesMiddle[2] || 300}
               minSize={200}
-              preferredSize={sizesMiddle[1] || 300}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-right">
@@ -88,34 +91,37 @@ const MainGrid = memo(
           </ResizableGrid>
         </ResizableGridPanel>
         <ResizableGridPanel
+          priority={LayoutPriority.Low}
           preferredSize={sizes[1] || '25%'}
           minSize={50}
-          priority={LayoutPriority.Low}
         >
           <TradeGridChild>
             <Tabs storageKey="console-trade-grid-bottom">
               <Tab id="positions" name={t('Positions')}>
-                <TradingViews.positions.component />
+                <TradingViews.positions.component
+                  onMarketClick={onMarketClick}
+                />
               </Tab>
-              <Tab
-                id="open-orders"
-                name={t('Open')}
-                menu={<TradingViews.activeOrders.menu marketId={marketId} />}
-              >
-                <TradingViews.orders.component filter={Filter.Open} />
+              <Tab id="open-orders" name={t('Open')}>
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Open}
+                />
               </Tab>
               <Tab id="closed-orders" name={t('Closed')}>
-                <TradingViews.orders.component filter={Filter.Closed} />
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Closed}
+                />
               </Tab>
               <Tab id="rejected-orders" name={t('Rejected')}>
-                <TradingViews.orders.component filter={Filter.Rejected} />
+                <TradingViews.orders.component
+                  marketId={marketId}
+                  filter={Filter.Rejected}
+                />
               </Tab>
-              <Tab
-                id="orders"
-                name={t('All')}
-                menu={<TradingViews.orders.menu marketId={marketId} />}
-              >
-                <TradingViews.orders.component />
+              <Tab id="orders" name={t('All')}>
+                <TradingViews.orders.component marketId={marketId} />
               </Tab>
               {FLAGS.STOP_ORDERS ? (
                 <Tab id="stop-orders" name={t('Stop orders')}>
@@ -123,14 +129,17 @@ const MainGrid = memo(
                 </Tab>
               ) : null}
               <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component marketId={marketId} />
+                <TradingViews.fills.component
+                  marketId={marketId}
+                  onMarketClick={onMarketClick}
+                />
               </Tab>
-              <Tab
-                id="accounts"
-                name={t('Collateral')}
-                menu={<TradingViews.collateral.menu />}
-              >
-                <TradingViews.collateral.component pinnedAsset={pinnedAsset} />
+              <Tab id="accounts" name={t('Collateral')}>
+                <TradingViews.collateral.component
+                  pinnedAsset={pinnedAsset}
+                  onMarketClick={onMarketClick}
+                  hideButtons
+                />
               </Tab>
             </Tabs>
           </TradeGridChild>

apps/trading/client-pages/market/trade-panels.tsx

@@ -1,9 +1,13 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import type { Market } from '@vegaprotocol/markets';
 import { OracleBanner } from '@vegaprotocol/markets';
+import {
+  useMarketClickHandler,
+  useMarketLiquidityClickHandler,
+} from '../../lib/hooks/use-market-click-handler';
 import type { TradingView } from './trade-views';
 import { TradingViews } from './trade-views';
-import { useState } from 'react';
+import { memo, useState } from 'react';
 import { Splash } from '@vegaprotocol/ui-toolkit';
 import { NO_MARKET } from './constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
@@ -16,14 +20,33 @@ import { FLAGS } from '@vegaprotocol/environment';
 
 interface TradePanelsProps {
   market: Market | null;
+  onSelect: (marketId: string, metaKey?: boolean) => void;
+  onMarketClick?: (marketId: string) => void;
+  onOrderTypeClick?: (marketId: string) => void;
+  onClickCollateral: () => void;
   pinnedAsset?: PinnedAsset;
 }
 
-export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
+export const TradePanels = ({
+  market,
+  onSelect,
+  onClickCollateral,
+  pinnedAsset,
+}: TradePanelsProps) => {
+  const onMarketClick = useMarketClickHandler(true);
+  const onOrderTypeClick = useMarketLiquidityClickHandler();
+
   const [view, setView] = useState<TradingView>('candles');
 
   const renderView = () => {
-    const Component = TradingViews[view].component;
+    const Component = memo<{
+      marketId: string;
+      onSelect: (marketId: string, metaKey?: boolean) => void;
+      onMarketClick?: (marketId: string) => void;
+      onOrderTypeClick?: (marketId: string) => void;
+      onClickCollateral: () => void;
+      pinnedAsset?: PinnedAsset;
+    }>(TradingViews[view].component);
 
     if (!Component) {
       throw new Error(`No component for view: ${view}`);
@@ -31,7 +54,16 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
 
     if (!market) return <Splash>{NO_MARKET}</Splash>;
 
-    return <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
+    return (
+      <Component
+        marketId={market?.id}
+        onSelect={onSelect}
+        onClickCollateral={onClickCollateral}
+        pinnedAsset={pinnedAsset}
+        onMarketClick={onMarketClick}
+        onOrderTypeClick={onOrderTypeClick}
+      />
+    );
   };
 
   const renderMenu = () => {
@@ -39,10 +71,9 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
 
     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 marketId={market?.id || ''} />
+          <Menu />
         </div>
       );
     }

apps/trading/client-pages/market/trade-views.tsx

@@ -6,7 +6,7 @@ import {
   CandlesChartContainer,
   CandlesMenu,
 } from '@vegaprotocol/candles-chart';
-import { Filter, OpenOrdersMenu } from '@vegaprotocol/orders';
+import { Filter } from '@vegaprotocol/orders';
 import { NO_MARKET } from './constants';
 import { OrderbookContainer } from '../../components/orderbook-container';
 import { FillsContainer } from '../../components/fills-container';
@@ -16,7 +16,6 @@ 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';
-import { AccountsMenu } from '../../components/accounts-menu';
 
 type MarketDependantView =
   | typeof CandlesChartContainer
@@ -63,7 +62,6 @@ export const TradingViews = {
     component: (props: OrderContainerProps) => (
       <OrdersContainer {...props} filter={Filter.Open} />
     ),
-    menu: OpenOrdersMenu,
   },
   closedOrders: {
     label: 'Closed',
@@ -80,16 +78,11 @@ export const TradingViews = {
   orders: {
     label: 'All',
     component: OrdersContainer,
-    menu: OpenOrdersMenu,
   },
   stopOrders: {
     label: 'Stop',
     component: StopOrdersContainer,
   },
-  collateral: {
-    label: 'Collateral',
-    component: AccountsContainer,
-    menu: AccountsMenu,
-  },
+  collateral: { label: 'Collateral', component: AccountsContainer },
   fills: { label: 'Fills', component: FillsContainer },
 };

apps/trading/client-pages/portfolio/deposits-container.tsx

@@ -0,0 +1,41 @@
+import { Button } from '@vegaprotocol/ui-toolkit';
+import { DepositsTable } from '@vegaprotocol/deposits';
+import { depositsProvider } from '@vegaprotocol/deposits';
+import { t } from '@vegaprotocol/i18n';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useRef } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
+import { useSidebar, ViewType } from '../../components/sidebar';
+
+export const DepositsContainer = () => {
+  const gridRef = useRef<AgGridReact | null>(null);
+  const { pubKey, isReadOnly } = useVegaWallet();
+  const { data, error } = useDataProvider({
+    dataProvider: depositsProvider,
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+  const setView = useSidebar((store) => store.setView);
+  return (
+    <div className="h-full">
+      <DepositsTable
+        rowData={data}
+        ref={gridRef}
+        overlayNoRowsTemplate={error ? error.message : t('No deposits')}
+      />
+      {!isReadOnly && (
+        <div className="h-auto flex justify-end p-2 bottom-0 right-0 absolute dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Deposit })}
+            data-testid="deposit-button"
+          >
+            {t('Deposit')}
+          </Button>
+        </div>
+      )}
+    </div>
+  );
+};

apps/trading/client-pages/portfolio/portfolio.tsx

@@ -6,11 +6,12 @@ import { t } from '@vegaprotocol/i18n';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
 import { usePageTitleStore } from '../../stores';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 import { AccountsContainer } from '../../components/accounts-container';
-import { DepositsContainer } from '../../components/deposits-container';
+import { DepositsContainer } from './deposits-container';
 import { FillsContainer } from '../../components/fills-container';
 import { PositionsContainer } from '../../components/positions-container';
-import { WithdrawalsContainer } from '../../components/withdrawals-container';
+import { WithdrawalsContainer } from './withdrawals-container';
 import { OrdersContainer } from '../../components/orders-container';
 import { LedgerContainer } from '../../components/ledger-container';
 import { AccountHistoryContainer } from './account-history-container';
@@ -20,9 +21,6 @@ import {
   usePaneLayout,
 } from '../../components/resizable-grid';
 import { ViewType, useSidebar } from '../../components/sidebar';
-import { AccountsMenu } from '../../components/accounts-menu';
-import { DepositsMenu } from '../../components/deposits-menu';
-import { WithdrawalsMenu } from '../../components/withdrawals-menu';
 
 const WithdrawalsIndicator = () => {
   const { ready } = useIncompleteWithdrawals();
@@ -53,6 +51,7 @@ export const Portfolio = () => {
     }
   }, [init, view, setView]);
 
+  const onMarketClick = useMarketClickHandler(true);
   const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';
   return (
@@ -65,13 +64,13 @@ export const Portfolio = () => {
                 <AccountHistoryContainer />
               </Tab>
               <Tab id="positions" name={t('Positions')}>
-                <PositionsContainer allKeys />
+                <PositionsContainer onMarketClick={onMarketClick} allKeys />
               </Tab>
               <Tab id="orders" name={t('Orders')}>
                 <OrdersContainer />
               </Tab>
               <Tab id="fills" name={t('Fills')}>
-                <FillsContainer />
+                <FillsContainer onMarketClick={onMarketClick} />
               </Tab>
               <Tab id="ledger-entries" name={t('Ledger entries')}>
                 <LedgerContainer />
@@ -86,21 +85,16 @@ export const Portfolio = () => {
         >
           <PortfolioGridChild>
             <Tabs storageKey="console-portfolio-bottom">
-              <Tab
-                id="collateral"
-                name={t('Collateral')}
-                menu={<AccountsMenu />}
-              >
+              <Tab id="collateral" name={t('Collateral')}>
                 <AccountsContainer />
               </Tab>
-              <Tab id="deposits" name={t('Deposits')} menu={<DepositsMenu />}>
+              <Tab id="deposits" name={t('Deposits')}>
                 <DepositsContainer />
               </Tab>
               <Tab
                 id="withdrawals"
                 name={t('Withdrawals')}
                 indicator={<WithdrawalsIndicator />}
-                menu={<WithdrawalsMenu />}
               >
                 <WithdrawalsContainer />
               </Tab>

apps/trading/client-pages/portfolio/withdrawals-container.tsx

@@ -0,0 +1,47 @@
+import { Button } from '@vegaprotocol/ui-toolkit';
+import {
+  withdrawalProvider,
+  WithdrawalsTable,
+  useIncompleteWithdrawals,
+} from '@vegaprotocol/withdraws';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { t } from '@vegaprotocol/i18n';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { ViewType, useSidebar } from '../../components/sidebar';
+
+export const WithdrawalsContainer = () => {
+  const { pubKey, isReadOnly } = useVegaWallet();
+  const { data, error } = useDataProvider({
+    dataProvider: withdrawalProvider,
+    variables: { partyId: pubKey || '' },
+    skip: !pubKey,
+  });
+  const setView = useSidebar((store) => store.setView);
+  const { ready, delayed } = useIncompleteWithdrawals();
+
+  return (
+    <>
+      <div className="h-full relative">
+        <WithdrawalsTable
+          data-testid="withdrawals-history"
+          rowData={data}
+          overlayNoRowsTemplate={error ? error.message : t('No withdrawals')}
+          ready={ready}
+          delayed={delayed}
+        />
+      </div>
+      {!isReadOnly && (
+        <div className="h-auto flex justify-end p-2 bottom-0 right-0 absolute dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Withdraw })}
+            data-testid="withdraw-dialog-button"
+          >
+            {t('Make withdrawal')}
+          </Button>
+        </div>
+      )}
+    </>
+  );
+};

apps/trading/components/accounts-container/accounts-container.tsx

@@ -1,4 +1,5 @@
 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';
@@ -11,14 +12,16 @@ import { useDataGridEvents } from '@vegaprotocol/datagrid';
 import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { ViewType, useSidebar } from '../sidebar';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 export const AccountsContainer = ({
   pinnedAsset,
+  hideButtons,
+  onMarketClick,
 }: {
   pinnedAsset?: PinnedAsset;
+  hideButtons?: boolean;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
 }) => {
-  const onMarketClick = useMarketClickHandler(true);
   const { pubKey, isReadOnly } = useVegaWallet();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
   const setView = useSidebar((store) => store.setView);
@@ -45,23 +48,44 @@ export const AccountsContainer = ({
   }
 
   return (
-    <AccountManager
-      partyId={pubKey}
-      onClickAsset={onClickAsset}
-      onClickWithdraw={(assetId) => {
-        setView({ type: ViewType.Withdraw, assetId });
-      }}
-      onClickDeposit={(assetId) => {
-        setView({ type: ViewType.Deposit, assetId });
-      }}
-      onClickTransfer={(assetId) => {
-        setView({ type: ViewType.Transfer, assetId });
-      }}
-      onMarketClick={onMarketClick}
-      isReadOnly={isReadOnly}
-      pinnedAsset={pinnedAsset}
-      gridProps={gridStoreCallbacks}
-    />
+    <div className="h-full relative">
+      <AccountManager
+        partyId={pubKey}
+        onClickAsset={onClickAsset}
+        onClickWithdraw={(assetId) => {
+          setView({ type: ViewType.Withdraw, assetId });
+        }}
+        onClickDeposit={(assetId) => {
+          setView({ type: ViewType.Deposit, assetId });
+        }}
+        onClickTransfer={(assetId) => {
+          setView({ type: ViewType.Transfer, assetId });
+        }}
+        onMarketClick={onMarketClick}
+        isReadOnly={isReadOnly}
+        pinnedAsset={pinnedAsset}
+        gridProps={gridStoreCallbacks}
+      />
+      {!isReadOnly && !hideButtons && (
+        <div className="flex gap-2 justify-end p-2 absolute bottom-0 right-0 dark:bg-black/75 bg-white/75 rounded">
+          <Button
+            variant="primary"
+            size="sm"
+            data-testid="open-transfer"
+            onClick={() => setView({ type: ViewType.Transfer })}
+          >
+            {t('Transfer')}
+          </Button>
+          <Button
+            variant="primary"
+            size="sm"
+            onClick={() => setView({ type: ViewType.Deposit })}
+          >
+            {t('Deposit')}
+          </Button>
+        </div>
+      )}
+    </div>
   );
 };
 

apps/trading/components/accounts-menu/accounts-menu.tsx

@@ -1,27 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const AccountsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <>
-      <TradingButton
-        intent={Intent.Primary}
-        size="extra-small"
-        data-testid="open-transfer"
-        onClick={() => setView({ type: ViewType.Transfer })}
-      >
-        {t('Transfer')}
-      </TradingButton>
-      <TradingButton
-        intent={Intent.Primary}
-        size="extra-small"
-        onClick={() => setView({ type: ViewType.Deposit })}
-      >
-        {t('Deposit')}
-      </TradingButton>
-    </>
-  );
-};

apps/trading/components/accounts-menu/index.ts

@@ -1 +0,0 @@
-export * from './accounts-menu';

apps/trading/components/deposits-container/deposits-container.tsx

@@ -1,24 +0,0 @@
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import { DepositsTable } from '@vegaprotocol/deposits';
-import { depositsProvider } from '@vegaprotocol/deposits';
-import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-
-export const DepositsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, error } = useDataProvider({
-    dataProvider: depositsProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
-  return (
-    <DepositsTable
-      rowData={data}
-      overlayNoRowsTemplate={error ? error.message : t('No deposits')}
-    />
-  );
-};

apps/trading/components/deposits-container/index.ts

@@ -1 +0,0 @@
-export * from './deposits-container';

apps/trading/components/deposits-menu/deposits-menu.tsx

@@ -1,18 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const DepositsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <TradingButton
-      intent={Intent.Primary}
-      size="extra-small"
-      onClick={() => setView({ type: ViewType.Deposit })}
-      data-testid="deposit-button"
-    >
-      {t('Deposit')}
-    </TradingButton>
-  );
-};

apps/trading/components/deposits-menu/index.ts

@@ -1 +0,0 @@
-export * from './deposits-menu';

apps/trading/components/fills-container/fills-container.tsx

@@ -7,10 +7,14 @@ 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';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
-export const FillsContainer = ({ marketId }: { marketId?: string }) => {
-  const onMarketClick = useMarketClickHandler(true);
+export const FillsContainer = ({
+  marketId,
+  onMarketClick,
+}: {
+  marketId?: string;
+  onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+}) => {
   const { pubKey } = useVegaWallet();
 
   const gridStore = useFillsStore((store) => store.gridStore);

apps/trading/components/navbar/navbar.tsx

@@ -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>

apps/trading/components/orderbook-container/orderbook-container.tsx

@@ -1,15 +1,27 @@
 import { OrderbookManager } from '@vegaprotocol/market-depth';
+import { useCreateOrderStore } from '@vegaprotocol/orders';
 import { ViewType, useSidebar } from '../sidebar';
-import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
+import { useStopOrderFormValues } from '@vegaprotocol/deal-ticket';
 
 export const OrderbookContainer = ({ marketId }: { marketId: string }) => {
-  const update = useDealTicketFormValues((state) => state.updateAll);
+  const useOrderStoreRef = useCreateOrderStore();
+  const updateOrder = useOrderStoreRef((store) => store.update);
+  const updateStoredFormValues = useStopOrderFormValues(
+    (state) => state.update
+  );
   const setView = useSidebar((store) => store.setView);
   return (
     <OrderbookManager
       marketId={marketId}
-      onClick={(values) => {
-        update(marketId, values);
+      onClick={({ price, size }) => {
+        if (price) {
+          updateOrder(marketId, { price });
+          updateStoredFormValues(marketId, { price });
+        }
+        if (size) {
+          updateOrder(marketId, { size });
+          updateStoredFormValues(marketId, { size });
+        }
         setView({ type: ViewType.Order });
       }}
     />

apps/trading/components/orders-container/orders-container.tsx

@@ -25,10 +25,11 @@ export const FilterStatusValue = {
 };
 
 export interface OrderContainerProps {
+  marketId?: string;
   filter?: Filter;
 }
 
-export const OrdersContainer = ({ filter }: OrderContainerProps) => {
+export const OrdersContainer = ({ marketId, filter }: OrderContainerProps) => {
   const { pubKey, isReadOnly } = useVegaWallet();
   const onMarketClick = useMarketClickHandler(true);
   const onOrderTypeClick = useMarketLiquidityClickHandler();
@@ -44,6 +45,7 @@ export const OrdersContainer = ({ filter }: OrderContainerProps) => {
   return (
     <OrderListManager
       partyId={pubKey}
+      marketId={marketId}
       filter={filter}
       onMarketClick={onMarketClick}
       onOrderTypeClick={onOrderTypeClick}

apps/trading/components/positions-container/positions-container.tsx

@@ -7,10 +7,14 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
-export const PositionsContainer = ({ allKeys }: { allKeys?: boolean }) => {
-  const onMarketClick = useMarketClickHandler(true);
+export const PositionsContainer = ({
+  onMarketClick,
+  allKeys,
+}: {
+  onMarketClick?: (marketId: string) => void;
+  allKeys?: boolean;
+}) => {
   const { pubKey, pubKeys, isReadOnly } = useVegaWallet();
 
   const gridStore = usePositionsStore((store) => store.gridStore);

apps/trading/components/sidebar/sidebar.tsx

@@ -156,16 +156,14 @@ export const SidebarButton = ({
     }
   };
 
-  const buttonClasses = classNames(
-    'flex items-center p-1 rounded',
-    'disabled:cursor-not-allowed disabled:text-vega-clight-500 dark:disabled:text-vega-cdark-500',
-    {
-      'text-vega-clight-200 dark:text-vega-cdark-200 enabled:hover:bg-vega-clight-500 dark:enabled:hover:bg-vega-cdark-500':
-        !view || view !== currView?.type,
-      'bg-vega-yellow enabled:hover:bg-vega-yellow-550 text-black':
-        view && view === currView?.type,
-    }
-  );
+  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,
+    '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,
+  });
 
   return (
     <Tooltip

apps/trading/components/welcome-dialog/get-started.spec.tsx

@@ -1,31 +0,0 @@
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { GetStarted } from './get-started';
-import { render, screen } from '@testing-library/react';
-
-describe('GetStarted', () => {
-  const renderComponent = (context: Partial<VegaWalletContextShape> = {}) => {
-    return render(
-      <VegaWalletContext.Provider value={context as VegaWalletContextShape}>
-        <GetStarted />
-      </VegaWalletContext.Provider>
-    );
-  };
-
-  it('renders full get started content if not connected and no browser wallet detected', () => {
-    renderComponent();
-    expect(screen.getByTestId('get-started-banner')).toBeInTheDocument();
-  });
-
-  it('renders connect prompt if no pubKey but wallet installed', () => {
-    globalThis.window.vega = {} as Vega;
-    renderComponent();
-    expect(screen.getByTestId('order-connect-wallet')).toBeInTheDocument();
-    globalThis.window.vega = undefined as unknown as Vega;
-  });
-
-  it('renders nothing if connected', () => {
-    const { container } = renderComponent({ pubKey: 'my-pubkey' });
-    expect(container).toBeEmptyDOMElement();
-  });
-});

apps/trading/components/welcome-dialog/get-started.tsx

@@ -16,6 +16,7 @@ interface Props {
 
 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';
 
@@ -32,18 +33,18 @@ export const GetStarted = ({ lead }: Props) => {
     setOnboardingViewed('true');
   };
 
-  const wrapperClasses = classNames(
-    'flex flex-col py-4 px-6 gap-4 rounded',
-    'bg-vega-blue-300 dark:bg-vega-blue-700',
-    'border border-vega-blue-350 dark:border-vega-blue-650',
-    { 'mt-8': !lead }
-  );
-
   if (!pubKey && !isBrowserWalletInstalled()) {
     return (
-      <div className={wrapperClasses} data-testid="get-started-banner">
+      <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 className="text-lg">{t('Get started')}</h3>
+        <h3>{t('Get started')}</h3>
         <div>
           <ul className="list-decimal list-inside">
             <li>{t('Get a Vega wallet')}</li>
@@ -56,6 +57,7 @@ export const GetStarted = ({ lead }: Props) => {
           <TradingButton
             intent={Intent.Info}
             onClick={onButtonClick}
+            className="block w-full"
             data-testid="get-started-button"
           >
             {t('Get started')}
@@ -80,28 +82,5 @@ export const GetStarted = ({ lead }: Props) => {
       </div>
     );
   }
-
-  if (!pubKey) {
-    return (
-      <div className={wrapperClasses}>
-        <p className="text-sm mb-1">
-          You need a{' '}
-          <ExternalLink href="https://vega.xyz/wallet">
-            Vega wallet
-          </ExternalLink>{' '}
-          to start trading in this market.
-        </p>
-        <TradingButton
-          onClick={openVegaWalletDialog}
-          size="small"
-          data-testid="order-connect-wallet"
-          intent={Intent.Info}
-        >
-          {t('Connect wallet')}
-        </TradingButton>
-      </div>
-    );
-  }
-
   return null;
 };

apps/trading/components/welcome-dialog/welcome-dialog-content.tsx

@@ -6,7 +6,6 @@ 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();
@@ -26,134 +25,206 @@ export const WelcomeDialogContent = () => {
           '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-custodial and pseudonymous')}
-            text={t('No third party has access to your funds.')}
-          />
-          <ListItemContent
-            icon={<PurposeBuiltIcon />}
-            title={t('Purpose built proof of stake blockchain')}
-            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 className="flex flex-col pb-2">
+      <div className="flex gap-8">
+        <div className="w-1/2 flex flex-col justify-between pt-3">
+          <ul className="ml-0">
+            <li className="my-3 flex gap-3 text-default">
+              <div className="shrink-0 pt-1.5">
+                <svg
+                  width="40"
+                  height="40"
+                  viewBox="0 0 30 30"
+                  fill="currentColor"
+                >
+                  <rect x="14" y="20" width="2" height="2" />
+                  <rect x="12" y="18" width="2" height="2" />
+                  <rect x="10" y="8" width="2" height="10" />
+                  <rect x="16" y="18" width="2" height="2" />
+                  <rect x="20" y="16" width="2" height="2" />
+                  <rect x="18" y="8" width="2" height="8" />
+                  <rect x="28" y="2" width="2" height="26" />
+                  <rect y="2" width="2" height="26" />
+                  <rect
+                    x="28"
+                    width="2"
+                    height="26"
+                    transform="rotate(90 28 0)"
+                  />
+                  <rect
+                    x="28"
+                    y="28"
+                    width="2"
+                    height="26"
+                    transform="rotate(90 28 28)"
+                  />
+                </svg>
+              </div>
+              <div>
+                <h3 className="text-lg">{t('Trade with no KYC')}</h3>
+                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
+                  {t(
+                    'Pseudonomously trade Futures markets. Spot and perps comming soon'
+                  )}
+                </span>
+              </div>
+            </li>
+            <li className="my-3 flex gap-3 text-vega-clight-50 dark:text-vega-cdark-50">
+              <div className="shrink-0 pt-1.5">
+                <svg
+                  width="40"
+                  height="40"
+                  viewBox="0 0 30 30"
+                  fill="currentColor"
+                >
+                  <g clip-path="url(#clip0_5168_49089)">
+                    <path d="M22 7H18V9H22V7Z" />
+                    <path d="M22 13H18V15H22V13Z" />
+                    <path d="M24 17H16V19H24V17Z" />
+                    <path d="M24 9H22V13H24V9Z" />
+                    <path d="M18 9H16V13H18V9Z" />
+                    <path d="M6 19H4V23H6V19Z" />
+                    <path d="M16 19H14V23H16V19Z" />
+                    <path d="M26 19H24V23H26V19Z" />
+                    <path d="M12 7H8V9H12V7Z" />
+                    <path d="M12 13H8V15H12V13Z" />
+                    <path d="M14 17H6V19H14V17Z" />
+                    <path d="M14 9H12V13H14V9Z" />
+                    <path d="M8 9H6V13H8V9Z" />
+                    <path d="M30 2H28V28H30V2Z" />
+                    <path d="M2 2H0V28H2V2Z" />
+                    <path d="M28 0H2V2H28V0Z" />
+                    <path d="M28 28H2V30H28V28Z" />
+                  </g>
+                  <defs>
+                    <clipPath id="clip0_5168_49089">
+                      <rect width="30" height="30" />
+                    </clipPath>
+                  </defs>
+                </svg>
+              </div>
+              <div>
+                <h3 className="text-lg">
+                  {t('Community generated trading pairs')}
+                </h3>
+                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
+                  {t('All markets are proposed and enacted by the community')}
+                </span>
+              </div>
+            </li>
+            <li className="my-3 flex gap-3 text-vega-clight-50 dark:text-vega-cdark-50">
+              <div className="shrink-0 pt-1.5">
+                <svg
+                  width="40"
+                  height="40"
+                  viewBox="0 0 30 30"
+                  fill="currentColor"
+                >
+                  <rect x="6" y="16" width="4" height="2" />
+                  <rect x="10" y="14" width="2" height="2" />
+                  <rect
+                    x="12"
+                    y="24"
+                    width="4"
+                    height="2"
+                    transform="rotate(-90 12 24)"
+                  />
+                  <rect
+                    x="10"
+                    y="20"
+                    width="2"
+                    height="2"
+                    transform="rotate(-90 10 20)"
+                  />
+                  <rect
+                    x="20"
+                    y="18"
+                    width="4"
+                    height="2"
+                    transform="rotate(-180 20 18)"
+                  />
+                  <rect
+                    x="16"
+                    y="20"
+                    width="2"
+                    height="2"
+                    transform="rotate(-180 16 20)"
+                  />
+                  <rect
+                    x="16"
+                    y="14"
+                    width="2"
+                    height="2"
+                    transform="rotate(90 16 14)"
+                  />
+                  <rect
+                    x="22"
+                    y="10"
+                    width="2"
+                    height="2"
+                    transform="rotate(90 22 10)"
+                  />
+                  <rect
+                    x="20"
+                    y="8"
+                    width="2"
+                    height="2"
+                    transform="rotate(90 20 8)"
+                  />
+                  <rect
+                    x="24"
+                    y="8"
+                    width="2"
+                    height="2"
+                    transform="rotate(90 24 8)"
+                  />
+                  <rect
+                    x="22"
+                    y="6"
+                    width="2"
+                    height="2"
+                    transform="rotate(90 22 6)"
+                  />
+                  <rect x="12" y="10" width="2" height="4" />
+                  <rect x="28" y="2" width="2" height="26" />
+                  <rect y="2" width="2" height="26" />
+                  <rect
+                    x="28"
+                    width="2"
+                    height="26"
+                    transform="rotate(90 28 0)"
+                  />
+                  <rect
+                    x="28"
+                    y="28"
+                    width="2"
+                    height="26"
+                    transform="rotate(90 28 28)"
+                  />
+                </svg>
+              </div>
+              <div>
+                <h3 className="text-lg">{t('Rewards')}</h3>
+                <span className="text-sm text-vega-clight-100 dark:text-vega-cdark-100 leading-4">
+                  {t(
+                    'Earn rewards for trading, market making and providing liquidity'
+                  )}
+                </span>
+              </div>
+            </li>
+          </ul>
+          <TradingButton
+            onClick={browseMarkets}
+            className="block w-full"
+            data-testid="browse-markets-button"
+          >
+            {t('Browse the markets')}
+          </TradingButton>
+        </div>
+        <div className="w-1/2 -mr-3 flex flex-grow">
+          <GetStarted lead={lead} />
+        </div>
       </div>
     </div>
   );
 };
-
-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>
-  );
-};

apps/trading/components/withdrawals-container/index.ts

@@ -1 +0,0 @@
-export * from './withdrawals-container';

apps/trading/components/withdrawals-container/withdrawals-container.tsx

@@ -1,31 +0,0 @@
-import { Splash } from '@vegaprotocol/ui-toolkit';
-import {
-  withdrawalProvider,
-  WithdrawalsTable,
-  useIncompleteWithdrawals,
-} from '@vegaprotocol/withdraws';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-
-export const WithdrawalsContainer = () => {
-  const { pubKey } = useVegaWallet();
-  const { data, error } = useDataProvider({
-    dataProvider: withdrawalProvider,
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-  const { ready, delayed } = useIncompleteWithdrawals();
-  if (!pubKey) {
-    return <Splash>{t('Please connect Vega wallet')}</Splash>;
-  }
-  return (
-    <WithdrawalsTable
-      data-testid="withdrawals-history"
-      rowData={data}
-      overlayNoRowsTemplate={error ? error.message : t('No withdrawals')}
-      ready={ready}
-      delayed={delayed}
-    />
-  );
-};

apps/trading/components/withdrawals-menu/index.ts

@@ -1 +0,0 @@
-export * from './withdrawals-menu';

apps/trading/components/withdrawals-menu/withdrawals-menu.tsx

@@ -1,18 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const WithdrawalsMenu = () => {
-  const setView = useSidebar((store) => store.setView);
-
-  return (
-    <TradingButton
-      intent={Intent.Primary}
-      size="extra-small"
-      onClick={() => setView({ type: ViewType.Withdraw })}
-      data-testid="withdraw-dialog-button"
-    >
-      {t('Make withdrawal')}
-    </TradingButton>
-  );
-};

apps/trading/pages/client-router.tsx

@@ -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: (

commitlint.config-ci.js

@@ -7,7 +7,7 @@ module.exports = {
     'scope-enum': async (ctx) => [
       2,
       'always',
-      ['ci', 'docs', 'specs', ...(await utils.getProjects(ctx))],
+      ['ci', 'docs', ...(await utils.getProjects(ctx))],
     ],
   },
 };

libs/accounts/src/lib/accounts-manager.tsx

@@ -118,6 +118,7 @@ export const AccountManager = ({
   onMarketClick,
   gridProps,
 }: AccountManagerProps) => {
+  const gridRef = useRef<AgGridReact | null>(null);
   const [breakdownAssetId, setBreakdownAssetId] = useState<string>();
   const { data, error } = useDataProvider({
     dataProvider: aggregatedAccountsDataProvider,
@@ -137,6 +138,7 @@ export const AccountManager = ({
   return (
     <div className="relative h-full">
       <AccountTable
+        ref={gridRef}
         rowData={data}
         onClickAsset={onClickAsset}
         onClickDeposit={onClickDeposit}

libs/accounts/src/lib/accounts-table.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useCallback } from 'react';
+import { forwardRef, useMemo, useCallback } from 'react';
 import {
   addDecimalsFormatNumber,
   addDecimalsFormatNumberQuantum,
@@ -21,7 +21,7 @@ import type {
   RowHeightParams,
   ColDef,
 } from 'ag-grid-community';
-import type { AgGridReactProps } from 'ag-grid-react';
+import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
 import type { AccountFields } from './accounts-data-provider';
 import type { Asset } from '@vegaprotocol/types';
 import { CenteredGridCellWrapper } from '@vegaprotocol/datagrid';
@@ -75,250 +75,256 @@ export interface AccountTableProps extends AgGridReactProps {
   pinnedAsset?: PinnedAsset;
 }
 
-export const AccountTable = ({
-  onClickAsset,
-  onClickWithdraw,
-  onClickDeposit,
-  onClickBreakdown,
-  onClickTransfer,
-  rowData,
-  isReadOnly,
-  pinnedAsset,
-  ...props
-}: AccountTableProps) => {
-  const pinnedRow = useMemo(() => {
-    if (!pinnedAsset) {
-      return;
-    }
-    const currentPinnedAssetRow = rowData?.find(
-      (row) => row.asset.id === pinnedAsset?.id
-    );
-    if (!currentPinnedAssetRow) {
-      return {
-        asset: pinnedAsset,
-        available: '0',
-        used: '0',
-        total: '0',
-        balance: '0',
-      };
-    }
-    return currentPinnedAssetRow;
-  }, [pinnedAsset, rowData]);
-
-  const { getRowHeight } = props;
-
-  const getPinnedAssetRowHeight = useCallback(
-    (params: RowHeightParams) => {
-      if (
-        params.node.rowPinned &&
-        params.data.asset.id === pinnedAsset?.id &&
-        new BigNumber(params.data.total).isLessThanOrEqualTo(0)
-      ) {
-        return 32;
-      }
-      return getRowHeight ? getRowHeight(params) : undefined;
+export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
+  (
+    {
+      onClickAsset,
+      onClickWithdraw,
+      onClickDeposit,
+      onClickBreakdown,
+      onClickTransfer,
+      rowData,
+      isReadOnly,
+      pinnedAsset,
+      ...props
     },
-    [pinnedAsset?.id, getRowHeight]
-  );
+    ref
+  ) => {
+    const pinnedRow = useMemo(() => {
+      if (!pinnedAsset) {
+        return;
+      }
+      const currentPinnedAssetRow = rowData?.find(
+        (row) => row.asset.id === pinnedAsset?.id
+      );
+      if (!currentPinnedAssetRow) {
+        return {
+          asset: pinnedAsset,
+          available: '0',
+          used: '0',
+          total: '0',
+          balance: '0',
+        };
+      }
+      return currentPinnedAssetRow;
+    }, [pinnedAsset, rowData]);
 
-  const showDepositButton = pinnedRow?.balance === '0';
+    const { getRowHeight } = props;
 
-  const colDefs = useMemo(() => {
-    const defs: ColDef[] = [
-      {
-        headerName: t('Asset'),
-        field: 'asset.symbol',
-        headerTooltip: t(
-          'Asset is the collateral that is deposited into the Vega protocol.'
-        ),
-        cellClass: 'underline',
-        onCellClicked: ({ data }) => {
-          if (data) {
-            onClickAsset(data.asset.id);
-          }
-        },
+    const getPinnedAssetRowHeight = useCallback(
+      (params: RowHeightParams) => {
+        if (
+          params.node.rowPinned &&
+          params.data.asset.id === pinnedAsset?.id &&
+          new BigNumber(params.data.total).isLessThanOrEqualTo(0)
+        ) {
+          return 32;
+        }
+        return getRowHeight ? getRowHeight(params) : undefined;
       },
-      {
-        headerName: t('Used'),
-        type: 'rightAligned',
-        field: 'used',
-        headerTooltip: t(
-          'Currently allocated to a market as margin or bond. Check the breakdown for details.'
-        ),
-        tooltipValueGetter: ({ value, data }) => {
-          if (!value || !data) return null;
-          return addDecimalsFormatNumber(value, data.asset.decimals);
+      [pinnedAsset?.id, getRowHeight]
+    );
+
+    const showDepositButton = pinnedRow?.balance === '0';
+
+    const colDefs = useMemo(() => {
+      const defs: ColDef[] = [
+        {
+          headerName: t('Asset'),
+          field: 'asset.symbol',
+          headerTooltip: t(
+            'Asset is the collateral that is deposited into the Vega protocol.'
+          ),
+          cellClass: 'underline',
+          onCellClicked: ({ data }) => {
+            if (data) {
+              onClickAsset(data.asset.id);
+            }
+          },
         },
-        onCellClicked: ({ data }) => {
-          if (!data || !onClickBreakdown) return;
-          onClickBreakdown(data.asset.id);
-        },
-        cellRenderer: ({
-          data,
-          value,
-        }: VegaICellRendererParams<AccountFields, 'used'>) => {
-          if (!value || !data) return '-';
-          const percentageUsed = percentageValue(value, data.total);
-          const valueFormatted = addDecimalsFormatNumberQuantum(
+        {
+          headerName: t('Used'),
+          type: 'rightAligned',
+          field: 'used',
+          headerTooltip: t(
+            'Currently allocated to a market as margin or bond. Check the breakdown for details.'
+          ),
+          tooltipValueGetter: ({ value, data }) => {
+            if (!value || !data) return null;
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          },
+          onCellClicked: ({ data }) => {
+            if (!data || !onClickBreakdown) return;
+            onClickBreakdown(data.asset.id);
+          },
+          cellRenderer: ({
+            data,
             value,
-            data.asset.decimals,
-            data.asset.quantum
-          );
-
-          return data.breakdown ? (
-            <>
-              <span className="underline">{valueFormatted}</span>
-              <span
-                className={classNames(
-                  colorClass(percentageUsed),
-                  'ml-1 inline-block w-14'
-                )}
-              >
-                {percentageUsed.toFixed(2)}%
-              </span>
-            </>
-          ) : (
-            <>
-              <span className="underline">{valueFormatted}</span>
-              <span className="ml-2 inline-block w-14 text-muted">
-                {t('0.00%')}
-              </span>
-            </>
-          );
-        },
-      },
-      {
-        headerName: t('Available'),
-        field: 'available',
-        type: 'rightAligned',
-        headerTooltip: t(
-          'Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.'
-        ),
-        tooltipValueGetter: ({ value, data }) => {
-          if (!value || !data) return null;
-          return addDecimalsFormatNumber(value, data.asset.decimals);
-        },
-        cellClass: ({ data }) => {
-          const percentageUsed = percentageValue(data?.used, data?.total);
-          return colorClass(percentageUsed, true);
-        },
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<AccountFields, 'available'>) => {
-          if (!value || !data) return '-';
-          return addDecimalsFormatNumberQuantum(
-            value,
-            data.asset.decimals,
-            data.asset.quantum
-          );
-        },
-      },
-
-      {
-        headerName: t('Total'),
-        type: 'rightAligned',
-        field: 'total',
-        headerTooltip: t(
-          'The total amount of each asset on this key. Includes used and available collateral.'
-        ),
-        tooltipValueGetter: ({ value, data }) => {
-          if (!value || !data) return null;
-          return addDecimalsFormatNumber(value, data.asset.decimals);
-        },
-        valueFormatter: ({
-          data,
-          value,
-        }: VegaValueFormatterParams<AccountFields, 'total'>) => {
-          if (!data || !value) return '-';
-          return addDecimalsFormatNumberQuantum(
-            value,
-            data.asset.decimals,
-            data.asset.quantum
-          );
-        },
-      },
-      {
-        colId: 'accounts-actions',
-        field: 'asset.id',
-        ...COL_DEFS.actions,
-        minWidth: showDepositButton ? 130 : COL_DEFS.actions.minWidth,
-        maxWidth: showDepositButton ? 130 : COL_DEFS.actions.maxWidth,
-        cellRenderer: ({
-          value: assetId,
-          node,
-        }: VegaICellRendererParams<AccountFields, 'asset.id'>) => {
-          if (!assetId) return null;
-          if (node.rowPinned && node.data?.total === '0') {
-            return (
-              <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
-                <Button
-                  size="xs"
-                  variant="primary"
-                  data-testid="deposit"
-                  onClick={() => {
-                    onClickDeposit && onClickDeposit(assetId);
-                  }}
-                >
-                  <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
-                </Button>
-              </CenteredGridCellWrapper>
+          }: VegaICellRendererParams<AccountFields, 'used'>) => {
+            if (!value || !data) return '-';
+            const percentageUsed = percentageValue(value, data.total);
+            const valueFormatted = addDecimalsFormatNumberQuantum(
+              value,
+              data.asset.decimals,
+              data.asset.quantum
             );
-          }
-          return isReadOnly ? null : (
-            <AccountsActionsDropdown
-              assetId={assetId}
-              assetContractAddress={
-                node.data?.asset.source?.__typename === 'ERC20'
-                  ? node.data.asset.source.contractAddress
-                  : undefined
-              }
-              onClickDeposit={() => {
-                onClickDeposit && onClickDeposit(assetId);
-              }}
-              onClickWithdraw={() => {
-                onClickWithdraw && onClickWithdraw(assetId);
-              }}
-              onClickBreakdown={() => {
-                onClickBreakdown && onClickBreakdown(assetId);
-              }}
-              onClickTransfer={() => {
-                onClickTransfer && onClickTransfer(assetId);
-              }}
-            />
-          );
+
+            return data.breakdown ? (
+              <>
+                <span className="underline">{valueFormatted}</span>
+                <span
+                  className={classNames(
+                    colorClass(percentageUsed),
+                    'ml-1 inline-block w-14'
+                  )}
+                >
+                  {percentageUsed.toFixed(2)}%
+                </span>
+              </>
+            ) : (
+              <>
+                <span className="underline">{valueFormatted}</span>
+                <span className="ml-2 inline-block w-14 text-muted">
+                  {t('0.00%')}
+                </span>
+              </>
+            );
+          },
+        },
+        {
+          headerName: t('Available'),
+          field: 'available',
+          type: 'rightAligned',
+          headerTooltip: t(
+            'Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.'
+          ),
+          tooltipValueGetter: ({ value, data }) => {
+            if (!value || !data) return null;
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          },
+          cellClass: ({ data }) => {
+            const percentageUsed = percentageValue(data?.used, data?.total);
+            return colorClass(percentageUsed, true);
+          },
+          valueFormatter: ({
+            value,
+            data,
+          }: VegaValueFormatterParams<AccountFields, 'available'>) => {
+            if (!value || !data) return '-';
+            return addDecimalsFormatNumberQuantum(
+              value,
+              data.asset.decimals,
+              data.asset.quantum
+            );
+          },
         },
-      },
-    ];
-    return defs;
-  }, [
-    onClickAsset,
-    onClickBreakdown,
-    onClickDeposit,
-    onClickWithdraw,
-    onClickTransfer,
-    isReadOnly,
-    showDepositButton,
-  ]);
 
-  const data = rowData?.filter((data) => data.asset.id !== pinnedAsset?.id);
+        {
+          headerName: t('Total'),
+          type: 'rightAligned',
+          field: 'total',
+          headerTooltip: t(
+            'The total amount of each asset on this key. Includes used and available collateral.'
+          ),
+          tooltipValueGetter: ({ value, data }) => {
+            if (!value || !data) return null;
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          },
+          valueFormatter: ({
+            data,
+            value,
+          }: VegaValueFormatterParams<AccountFields, 'total'>) => {
+            if (!data || !value) return '-';
+            return addDecimalsFormatNumberQuantum(
+              value,
+              data.asset.decimals,
+              data.asset.quantum
+            );
+          },
+        },
+        {
+          colId: 'accounts-actions',
+          field: 'asset.id',
+          ...COL_DEFS.actions,
+          minWidth: showDepositButton ? 130 : COL_DEFS.actions.minWidth,
+          maxWidth: showDepositButton ? 130 : COL_DEFS.actions.maxWidth,
+          cellRenderer: ({
+            value: assetId,
+            node,
+          }: VegaICellRendererParams<AccountFields, 'asset.id'>) => {
+            if (!assetId) return null;
+            if (node.rowPinned && node.data?.total === '0') {
+              return (
+                <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
+                  <Button
+                    size="xs"
+                    variant="primary"
+                    data-testid="deposit"
+                    onClick={() => {
+                      onClickDeposit && onClickDeposit(assetId);
+                    }}
+                  >
+                    <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
+                  </Button>
+                </CenteredGridCellWrapper>
+              );
+            }
+            return isReadOnly ? null : (
+              <AccountsActionsDropdown
+                assetId={assetId}
+                assetContractAddress={
+                  node.data?.asset.source?.__typename === 'ERC20'
+                    ? node.data.asset.source.contractAddress
+                    : undefined
+                }
+                onClickDeposit={() => {
+                  onClickDeposit && onClickDeposit(assetId);
+                }}
+                onClickWithdraw={() => {
+                  onClickWithdraw && onClickWithdraw(assetId);
+                }}
+                onClickBreakdown={() => {
+                  onClickBreakdown && onClickBreakdown(assetId);
+                }}
+                onClickTransfer={() => {
+                  onClickTransfer && onClickTransfer(assetId);
+                }}
+              />
+            );
+          },
+        },
+      ];
+      return defs;
+    }, [
+      onClickAsset,
+      onClickBreakdown,
+      onClickDeposit,
+      onClickWithdraw,
+      onClickTransfer,
+      isReadOnly,
+      showDepositButton,
+    ]);
 
-  return (
-    <AgGrid
-      {...props}
-      style={{ width: '100%', height: '100%' }}
-      getRowId={({ data }: { data: AccountFields }) => data.asset.id}
-      tooltipShowDelay={500}
-      rowData={data}
-      defaultColDef={{
-        resizable: true,
-        tooltipComponent: TooltipCellComponent,
-        sortable: true,
-        comparator: accountValuesComparator,
-      }}
-      columnDefs={colDefs}
-      getRowHeight={getPinnedAssetRowHeight}
-      pinnedTopRowData={pinnedRow ? [pinnedRow] : undefined}
-    />
-  );
-};
+    const data = rowData?.filter((data) => data.asset.id !== pinnedAsset?.id);
+
+    return (
+      <AgGrid
+        {...props}
+        style={{ width: '100%', height: '100%' }}
+        getRowId={({ data }: { data: AccountFields }) => data.asset.id}
+        ref={ref}
+        tooltipShowDelay={500}
+        rowData={data}
+        defaultColDef={{
+          resizable: true,
+          tooltipComponent: TooltipCellComponent,
+          sortable: true,
+          comparator: accountValuesComparator,
+        }}
+        columnDefs={colDefs}
+        getRowHeight={getPinnedAssetRowHeight}
+        pinnedTopRowData={pinnedRow ? [pinnedRow] : undefined}
+      />
+    );
+  }
+);

libs/candles-chart/jest.config.ts

@@ -4,25 +4,9 @@ export default {
   preset: '../../jest.preset.js',
   transform: {
     '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
-    '^.+\\.[tj]sx?$': [
-      'babel-jest',
-      {
-        presets: ['@nx/react/babel'],
-        // required for pennant to work in jest, due to having untranspiled exports
-        plugins: [
-          [
-            '@babel/plugin-proposal-private-methods',
-            {
-              loose: true,
-            },
-          ],
-        ],
-      },
-    ],
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/candles-chart',
   setupFilesAfterEnv: ['./src/setup-tests.ts'],
-  // dont ignore pennant from transpilation
-  transformIgnorePatterns: ['<rootDir>/node_modules/pennant'],
 };

libs/datagrid/src/index.ts

@@ -21,4 +21,5 @@ export * from './lib/type-helpers';
 
 export * from './lib/cells/grid-progress-bar';
 
+export * from './lib/ag-grid-update';
 export * from './lib/use-datagrid-events';

libs/datagrid/src/lib/ag-grid-update.ts

@@ -0,0 +1,20 @@
+import type { MutableRefObject, RefObject } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
+
+type AnyArray = Array<any> | null; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+export const isXOrWasEmpty = (prev?: AnyArray, curr?: AnyArray) =>
+  Boolean(Number(!!prev?.length) ^ Number(!!curr?.length));
+
+export const updateGridData = (
+  dataRef: MutableRefObject<AnyArray>,
+  data: AnyArray,
+  gridRef: RefObject<AgGridReact>
+) => {
+  const rerender = isXOrWasEmpty(dataRef.current, data);
+  dataRef.current = data;
+  if (gridRef.current?.api?.getModel().getType() === 'infinite') {
+    gridRef.current?.api?.refreshInfiniteCache();
+  }
+  return !rerender;
+};

libs/deal-ticket/src/components/deal-ticket-validation/zero-balance-error.tsx

@@ -1,4 +1,4 @@
-import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
+import { Intent, Notification, Link } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 
 interface ZeroBalanceErrorProps {
@@ -6,11 +6,13 @@ interface ZeroBalanceErrorProps {
     id: string;
     symbol: string;
   };
+  onClickCollateral?: () => void;
   onDeposit: (assetId: string) => void;
 }
 
 export const ZeroBalanceError = ({
   asset,
+  onClickCollateral,
   onDeposit,
 }: ZeroBalanceErrorProps) => {
   return (
@@ -23,6 +25,12 @@ export const ZeroBalanceError = ({
             'You need %s in your wallet to trade in this market. ',
             asset.symbol
           )}
+          {onClickCollateral && (
+            <>
+              {t('See all your')}{' '}
+              <Link onClick={onClickCollateral}>collateral</Link>.
+            </>
+          )}
         </>
       }
       buttonProps={{

libs/deal-ticket/src/components/deal-ticket/deal-ticket-amount.tsx

@@ -3,25 +3,29 @@ import type { Market, StaticMarketData } from '@vegaprotocol/markets';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';
-import type { OrderFormValues } from '../../hooks/use-form-values';
+import type { OrderObj } from '@vegaprotocol/orders';
+import type { OrderFormFields } from '../../hooks/use-order-form';
 
 export interface DealTicketAmountProps {
-  control: Control<OrderFormValues>;
-  type: Schema.OrderType;
+  control: Control<OrderFormFields>;
+  orderType: Schema.OrderType;
   marketData: StaticMarketData;
   marketPrice?: string;
   market: Market;
   sizeError?: string;
   priceError?: string;
+  update: (obj: Partial<OrderObj>) => void;
+  size: string;
+  price?: string;
 }
 
 export const DealTicketAmount = ({
-  type,
+  orderType,
   marketData,
   marketPrice,
   ...props
 }: DealTicketAmountProps) => {
-  switch (type) {
+  switch (orderType) {
     case Schema.OrderType.TYPE_MARKET:
       return (
         <DealTicketMarketAmount
@@ -33,7 +37,7 @@ export const DealTicketAmount = ({
     case Schema.OrderType.TYPE_LIMIT:
       return <DealTicketLimitAmount {...props} />;
     default: {
-      throw new Error('Invalid ticket type ' + type);
+      throw new Error('Invalid ticket type');
     }
   }
 };

libs/deal-ticket/src/components/deal-ticket/deal-ticket-container.tsx

@@ -1,8 +1,8 @@
 import { useVegaTransactionStore } from '@vegaprotocol/wallet';
 import {
-  isStopOrderType,
-  useDealTicketFormValues,
-} from '../../hooks/use-form-values';
+  DealTicketType,
+  useDealTicketTypeStore,
+} from '../../hooks/use-type-store';
 import { StopOrder } from './deal-ticket-stop-order';
 import {
   useStaticMarketData,
@@ -17,6 +17,7 @@ import { FLAGS } from '@vegaprotocol/environment';
 interface DealTicketContainerProps {
   marketId: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
+  onClickCollateral?: () => void;
   onDeposit: (assetId: string) => void;
 }
 
@@ -24,9 +25,7 @@ export const DealTicketContainer = ({
   marketId,
   ...props
 }: DealTicketContainerProps) => {
-  const showStopOrder = useDealTicketFormValues((state) =>
-    isStopOrderType(state.formValues[marketId]?.type)
-  );
+  const type = useDealTicketTypeStore((state) => state.type[marketId]);
   const {
     data: market,
     error: marketError,
@@ -49,7 +48,9 @@ export const DealTicketContainer = ({
       reload={reload}
     >
       {market && marketData ? (
-        FLAGS.STOP_ORDERS && showStopOrder ? (
+        FLAGS.STOP_ORDERS &&
+        (type === DealTicketType.StopLimit ||
+          type === DealTicketType.StopMarket) ? (
           <StopOrder
             market={market}
             marketPrice={marketPrice}

libs/deal-ticket/src/components/deal-ticket/deal-ticket-limit-amount.tsx

@@ -5,8 +5,8 @@ import type { DealTicketAmountProps } from './deal-ticket-amount';
 import { Controller } from 'react-hook-form';
 
 export type DealTicketLimitAmountProps = Omit<
-  DealTicketAmountProps,
-  'marketData' | 'type'
+  Omit<DealTicketAmountProps, 'marketData'>,
+  'orderType'
 >;
 
 export const DealTicketLimitAmount = ({
@@ -14,6 +14,9 @@ export const DealTicketLimitAmount = ({
   market,
   sizeError,
   priceError,
+  update,
+  price,
+  size,
 }: DealTicketLimitAmountProps) => {
   const priceStep = toDecimal(market?.decimalPlaces);
   const sizeStep = toDecimal(market?.positionDecimalPlaces);
@@ -59,16 +62,17 @@ export const DealTicketLimitAmount = ({
                 },
                 validate: validateAmount(sizeStep, 'Size'),
               }}
-              render={({ field }) => (
+              render={() => (
                 <Input
                   id="input-order-size-limit"
                   className="w-full"
                   type="number"
+                  value={size}
+                  onChange={(e) => update({ size: e.target.value })}
                   step={sizeStep}
                   min={sizeStep}
                   data-testid="order-size"
                   onWheel={(e) => e.currentTarget.blur()}
-                  {...field}
                 />
               )}
             />
@@ -91,17 +95,19 @@ export const DealTicketLimitAmount = ({
                   value: priceStep,
                   message: t('Price cannot be lower than ' + priceStep),
                 },
+                // @ts-ignore this fulfills the interface but still errors
                 validate: validateAmount(priceStep, 'Price'),
               }}
-              render={({ field }) => (
+              render={() => (
                 <Input
                   id="input-price-quote"
                   className="w-full"
                   type="number"
+                  value={price}
+                  onChange={(e) => update({ price: e.target.value })}
                   step={priceStep}
                   data-testid="order-price"
                   onWheel={(e) => e.currentTarget.blur()}
-                  {...field}
                 />
               )}
             />

libs/deal-ticket/src/components/deal-ticket/deal-ticket-market-amount.tsx

@@ -10,7 +10,10 @@ import type { DealTicketAmountProps } from './deal-ticket-amount';
 import { Controller } from 'react-hook-form';
 import classNames from 'classnames';
 
-export type DealTicketMarketAmountProps = Omit<DealTicketAmountProps, 'type'>;
+export type DealTicketMarketAmountProps = Omit<
+  DealTicketAmountProps,
+  'orderType'
+>;
 
 export const DealTicketMarketAmount = ({
   control,
@@ -18,6 +21,8 @@ export const DealTicketMarketAmount = ({
   marketData,
   marketPrice,
   sizeError,
+  update,
+  size,
 }: DealTicketMarketAmountProps) => {
   const quoteName = market.tradableInstrument.instrument.product.quoteName;
   const sizeStep = toDecimal(market?.positionDecimalPlaces);
@@ -45,16 +50,17 @@ export const DealTicketMarketAmount = ({
               },
               validate: validateAmount(sizeStep, 'Size'),
             }}
-            render={({ field }) => (
+            render={() => (
               <Input
                 id="input-order-size-market"
                 className="w-full"
                 type="number"
+                value={size}
+                onChange={(e) => update({ size: e.target.value })}
                 step={sizeStep}
                 min={sizeStep}
                 onWheel={(e) => e.currentTarget.blur()}
                 data-testid="order-size"
-                {...field}
               />
             )}
           />

libs/deal-ticket/src/components/deal-ticket/deal-ticket-size-iceberg.tsx

@@ -1,6 +1,7 @@
 import { Controller, type Control } from 'react-hook-form';
 import type { Market } from '@vegaprotocol/markets';
-import type { OrderFormValues } from '../../hooks/use-form-values';
+import type { OrderObj } from '@vegaprotocol/orders';
+import type { OrderFormFields } from '../../hooks/use-order-form';
 import { toDecimal, validateAmount } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -11,21 +12,25 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 
 export interface DealTicketSizeIcebergProps {
-  control: Control<OrderFormValues>;
+  control: Control<OrderFormFields>;
   market: Market;
   peakSizeError?: string;
   minimumVisibleSizeError?: string;
+  update: (obj: Partial<OrderObj>) => void;
+  peakSize: string;
+  minimumVisibleSize: string;
   size: string;
-  peakSize?: string;
 }
 
 export const DealTicketSizeIceberg = ({
   control,
   market,
+  update,
   peakSizeError,
   minimumVisibleSizeError,
-  size,
   peakSize,
+  minimumVisibleSize,
+  size,
 }: DealTicketSizeIcebergProps) => {
   const sizeStep = toDecimal(market?.positionDecimalPlaces);
 
@@ -75,7 +80,7 @@ export const DealTicketSizeIceberg = ({
             className="!mb-1"
           >
             <Controller
-              name="peakSize"
+              name="icebergOpts.peakSize"
               control={control}
               rules={{
                 required: t('You need to provide a peak size'),
@@ -92,17 +97,25 @@ export const DealTicketSizeIceberg = ({
                 },
                 validate: validateAmount(sizeStep, 'peakSize'),
               }}
-              render={({ field }) => (
+              render={() => (
                 <Input
                   id="input-order-peak-size"
                   className="w-full"
                   type="number"
+                  value={peakSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize: e.target.value,
+                        minimumVisibleSize,
+                      },
+                    })
+                  }
                   step={sizeStep}
                   min={sizeStep}
                   max={size}
                   data-testid="order-peak-size"
                   onWheel={(e) => e.currentTarget.blur()}
-                  {...field}
                 />
               )}
             />
@@ -131,7 +144,7 @@ export const DealTicketSizeIceberg = ({
             className="!mb-1"
           >
             <Controller
-              name="minimumVisibleSize"
+              name="icebergOpts.minimumVisibleSize"
               control={control}
               rules={{
                 required: t('You need to provide a minimum visible size'),
@@ -141,7 +154,7 @@ export const DealTicketSizeIceberg = ({
                     'Minimum visible size cannot be lower than ' + sizeStep
                   ),
                 },
-                max: peakSize && {
+                max: {
                   value: peakSize,
                   message: t(
                     'Minimum visible size cannot be greater than the peak size (%s)',
@@ -150,17 +163,25 @@ export const DealTicketSizeIceberg = ({
                 },
                 validate: validateAmount(sizeStep, 'minimumVisibleSize'),
               }}
-              render={({ field }) => (
+              render={() => (
                 <Input
                   id="input-order-minimum-size"
                   className="w-full"
                   type="number"
+                  value={minimumVisibleSize}
+                  onChange={(e) =>
+                    update({
+                      icebergOpts: {
+                        peakSize,
+                        minimumVisibleSize: e.target.value,
+                      },
+                    })
+                  }
                   step={sizeStep}
                   min={sizeStep}
                   max={peakSize}
                   data-testid="order-minimum-size"
                   onWheel={(e) => e.currentTarget.blur()}
-                  {...field}
                 />
               )}
             />

libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.spec.tsx

@@ -6,11 +6,8 @@ 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-form-values';
-import {
-  DealTicketType,
-  useDealTicketFormValues,
-} from '../../hooks/use-form-values';
+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');
@@ -134,11 +131,9 @@ describe('StopOrder', () => {
       expiresAt: '2023-07-27T16:43:27.000',
     };
 
-    useDealTicketFormValues.setState({
+    useStopOrderFormValues.setState({
       formValues: {
-        [market.id]: {
-          [DealTicketType.StopLimit]: values,
-        },
+        [market.id]: values,
       },
     });
 
@@ -163,13 +158,16 @@ describe('StopOrder', () => {
     );
   });
 
-  it('does not submit if no wallet connected', async () => {
+  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 () => {
@@ -212,13 +210,11 @@ describe('StopOrder', () => {
     // switch to market order type error should disappear
     await userEvent.click(screen.getByTestId(orderTypeTrigger));
     await userEvent.click(screen.getByTestId(orderTypeMarket));
-    await userEvent.click(screen.getByTestId(submitButton));
     expect(screen.queryByTestId(priceErrorMessage)).toBeNull();
 
     // switch back to limit type
     await userEvent.click(screen.getByTestId(orderTypeTrigger));
     await userEvent.click(screen.getByTestId(orderTypeLimit));
-    await userEvent.click(screen.getByTestId(submitButton));
     expect(screen.getByTestId(priceErrorMessage)).toBeInTheDocument();
 
     // to small value should be invalid

libs/deal-ticket/src/components/deal-ticket/deal-ticket-stop-order.tsx

@@ -1,3 +1,4 @@
+import type { FormEventHandler } from 'react';
 import { useRef, useCallback, useEffect } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { StopOrdersSubmission } from '@vegaprotocol/wallet';
@@ -7,7 +8,7 @@ import {
   toDecimal,
   validateAmount,
 } from '@vegaprotocol/utils';
-import { useForm, Controller, useController } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 import * as Schema from '@vegaprotocol/types';
 import {
   Radio,
@@ -23,22 +24,22 @@ import { getDerivedPrice, type Market } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ExpirySelector } from './expiry-selector';
 import { SideSelector } from './side-selector';
-import { timeInForceLabel } from '@vegaprotocol/orders';
+import { timeInForceLabel, useOrder } from '@vegaprotocol/orders';
 import {
   NoWalletWarning,
   REDUCE_ONLY_TOOLTIP,
-  stopSubmit,
-  getNotionalSize,
+  useNotionalSize,
 } from './deal-ticket';
 import { TypeToggle } from './type-selector';
 import {
-  useDealTicketFormValues,
-  DealTicketType,
+  useStopOrderFormValues,
   type StopOrderFormValues,
-  dealTicketTypeToOrderType,
-  isStopOrderType,
-} from '../../hooks/use-form-values';
-import { mapFormValuesToStopOrdersSubmission } from '../../utils/map-form-values-to-submission';
+} 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';
@@ -49,36 +50,32 @@ export interface StopOrderProps {
   submit: (order: StopOrdersSubmission) => void;
 }
 
-const getDefaultValues = (
-  type: Schema.OrderType,
-  storedValues?: Partial<StopOrderFormValues>
-): StopOrderFormValues => ({
-  type,
+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,
-  expire: false,
   expiryStrategy: Schema.StopOrderExpiryStrategy.EXPIRY_STRATEGY_SUBMIT,
   size: '0',
-  ...storedValues,
-});
+};
+
+const stopSubmit: FormEventHandler = (e) => e.preventDefault();
 
 export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
   const { pubKey, isReadOnly } = useVegaWallet();
-  const setType = useDealTicketFormValues((state) => state.setType);
-  const updateStoredFormValues = useDealTicketFormValues(
-    (state) => state.updateStopOrder
+  const setDealTicketType = useDealTicketTypeStore((state) => state.set);
+  const [, updateOrder] = useOrder(market.id);
+  const updateStoredFormValues = useStopOrderFormValues(
+    (state) => state.update
   );
-  const storedFormValues = useDealTicketFormValues(
+  const storedFormValues = useStopOrderFormValues(
     (state) => state.formValues[market.id]
   );
-  const dealTicketType = storedFormValues?.type ?? DealTicketType.StopLimit;
-  const type = dealTicketTypeToOrderType(dealTicketType);
-  const { handleSubmit, setValue, watch, control, formState, reset } =
+  const { handleSubmit, setValue, watch, control, formState } =
     useForm<StopOrderFormValues>({
-      defaultValues: getDefaultValues(type, storedFormValues?.[dealTicketType]),
+      defaultValues: { ...defaultValues, ...storedFormValues },
     });
   const { errors } = formState;
   const lastSubmitTime = useRef(0);
@@ -105,22 +102,16 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
   const triggerType = watch('triggerType');
   const triggerPrice = watch('triggerPrice');
   const timeInForce = watch('timeInForce');
+  const type = watch('type');
   const rawPrice = watch('price');
   const rawSize = watch('size');
 
-  useEffect(() => {
-    const size = storedFormValues?.[dealTicketType]?.size;
-    if (size && rawSize !== size) {
-      setValue('size', size);
-    }
-  }, [storedFormValues, dealTicketType, rawSize, setValue]);
-
-  useEffect(() => {
-    const price = storedFormValues?.[dealTicketType]?.price;
-    if (price && rawPrice !== price) {
-      setValue('price', price);
-    }
-  }, [storedFormValues, dealTicketType, rawPrice, setValue]);
+  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);
@@ -136,7 +127,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
         : marketPrice
     );
 
-  const notionalSize = getNotionalSize(
+  const notionalSize = useNotionalSize(
     price,
     size,
     market.decimalPlaces,
@@ -162,28 +153,47 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
       ? formatNumber(triggerPrice, market.decimalPlaces)
       : undefined;
 
-  useController({
-    name: 'type',
-    control,
-  });
-
   return (
     <form
       onSubmit={isReadOnly || !pubKey ? stopSubmit : handleSubmit(onSubmit)}
       noValidate
     >
-      <TypeToggle
-        value={dealTicketType}
-        onValueChange={(dealTicketType) => {
-          setType(market.id, dealTicketType);
-          if (isStopOrderType(dealTicketType)) {
-            reset(
-              getDefaultValues(
-                dealTicketTypeToOrderType(dealTicketType),
-                storedFormValues?.[dealTicketType]
-              )
-            );
-          }
+      <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 && (
@@ -478,7 +488,19 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           </InputError>
         )}
       </div>
-      <div className="flex gap-2 pb-2 justify-between">
+      <div className="flex gap-2 pb-2 justify-end">
+        <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>
+      <div className="mb-2">
         <Controller
           name="expire"
           control={control}
@@ -489,21 +511,11 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
                 onCheckedChange={onCheckedChange}
                 checked={value}
                 name="expire"
-                label={<span className="text-xs">{t('Expire')}</span>}
+                label={'Expire'}
               />
             );
           }}
         />
-        <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 && (
         <>
@@ -558,7 +570,7 @@ export const StopOrder = ({ market, marketPrice, submit }: StopOrderProps) => {
           </div>
         </>
       )}
-      <NoWalletWarning isReadOnly={isReadOnly} />
+      <NoWalletWarning pubKey={pubKey} isReadOnly={isReadOnly} asset={asset} />
       <DealTicketButton side={side} label={t('Submit Stop Order')} />
       <DealTicketFeeDetails
         order={{

libs/deal-ticket/src/components/deal-ticket/deal-ticket.spec.tsx

@@ -1,6 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { VegaWalletContext } from '@vegaprotocol/wallet';
-import { act, render, screen, waitFor } from '@testing-library/react';
+import {
+  act,
+  render,
+  renderHook,
+  screen,
+  waitFor,
+} from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { generateMarket, generateMarketData } from '../../test-helpers';
 import { DealTicket } from './deal-ticket';
@@ -9,10 +15,7 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { addDecimal } from '@vegaprotocol/utils';
 import type { OrdersQuery } from '@vegaprotocol/orders';
-import {
-  DealTicketType,
-  useDealTicketFormValues,
-} from '../../hooks/use-form-values';
+import { useCreateOrderStore } from '@vegaprotocol/orders';
 import * as positionsTools from '@vegaprotocol/positions';
 import { OrdersDocument } from '@vegaprotocol/orders';
 
@@ -47,6 +50,9 @@ function generateJsx(mocks: MockedResponse[] = []) {
 }
 
 describe('DealTicket', () => {
+  const { result } = renderHook(() => useCreateOrderStore());
+  const useOrderStore = result.current;
+
   beforeEach(() => {
     jest.clearAllMocks();
     localStorage.clear();
@@ -160,11 +166,9 @@ describe('DealTicket', () => {
       persist: true,
     };
 
-    useDealTicketFormValues.setState({
-      formValues: {
-        [expectedOrder.marketId]: {
-          [DealTicketType.Limit]: expectedOrder,
-        },
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
       },
     });
 
@@ -200,11 +204,9 @@ describe('DealTicket', () => {
       reduceOnly: true,
       postOnly: false,
     };
-    useDealTicketFormValues.setState({
-      formValues: {
-        [expectedOrder.marketId]: {
-          [DealTicketType.Limit]: expectedOrder,
-        },
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
       },
     });
 
@@ -245,11 +247,9 @@ describe('DealTicket', () => {
       postOnly: true,
     };
 
-    useDealTicketFormValues.setState({
-      formValues: {
-        [expectedOrder.marketId]: {
-          [DealTicketType.Limit]: expectedOrder,
-        },
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
       },
     });
 
@@ -295,11 +295,9 @@ describe('DealTicket', () => {
       },
     };
 
-    useDealTicketFormValues.setState({
-      formValues: {
-        [expectedOrder.marketId]: {
-          [DealTicketType.Limit]: expectedOrder,
-        },
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
       },
     });
 
@@ -341,11 +339,9 @@ describe('DealTicket', () => {
       reduceOnly: false,
       postOnly: false,
     };
-    useDealTicketFormValues.setState({
-      formValues: {
-        [expectedOrder.marketId]: {
-          [DealTicketType.Limit]: expectedOrder,
-        },
+    useOrderStore.setState({
+      orders: {
+        [expectedOrder.marketId]: expectedOrder,
       },
     });
 
@@ -374,7 +370,6 @@ describe('DealTicket', () => {
     expect(screen.getByTestId('iceberg')).not.toBeChecked();
   });
 
-  // eslint-disable-next-line jest/no-disabled-tests
   it('handles TIF select box dependent on order type', async () => {
     render(generateJsx());
 

libs/deal-ticket/src/components/deal-ticket/deal-ticket.tsx

@@ -1,8 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import type { FormEventHandler } from 'react';
-import { memo, useCallback, useEffect, useRef, useMemo } from 'react';
-import { Controller, useController, useForm } from 'react-hook-form';
+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 {
@@ -14,10 +13,14 @@ import { SideSelector } from './side-selector';
 import { TimeInForceSelector } from './time-in-force-selector';
 import { TypeSelector } from './type-selector';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { mapFormValuesToOrderSubmission } from '../../utils/map-form-values-to-submission';
+import {
+  normalizeOrderSubmission,
+  useVegaWallet,
+  useVegaWalletDialogStore,
+} from '@vegaprotocol/wallet';
 import {
   Checkbox,
+  ExternalLink,
   InputError,
   Intent,
   Notification,
@@ -53,15 +56,14 @@ import {
   useAccountBalance,
 } from '@vegaprotocol/accounts';
 
-import { OrderType } from '@vegaprotocol/types';
+import { OrderTimeInForce, OrderType } from '@vegaprotocol/types';
+import { useOrderForm } from '../../hooks/use-order-form';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import {
   DealTicketType,
-  dealTicketTypeToOrderType,
-  isStopOrderType,
-} from '../../hooks/use-form-values';
-import type { OrderFormValues } from '../../hooks/use-form-values';
-import { useDealTicketFormValues } from '../../hooks/use-form-values';
+  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';
 
@@ -74,45 +76,27 @@ export interface DealTicketProps {
   marketPrice?: string | null;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   submit: (order: OrderSubmission) => void;
+  onClickCollateral?: () => void;
   onDeposit: (assetId: string) => void;
 }
 
-export const getNotionalSize = (
+export const useNotionalSize = (
   price: string | null | undefined,
   size: string | undefined,
   decimalPlaces: number,
   positionDecimalPlaces: number
-) => {
-  if (price && size) {
-    return removeDecimal(
-      toBigNum(size, positionDecimalPlaces).multipliedBy(
-        toBigNum(price, decimalPlaces)
-      ),
-      decimalPlaces
-    );
-  }
-  return null;
-};
-
-export const stopSubmit: FormEventHandler = (e) => e.preventDefault();
-
-const getDefaultValues = (
-  type: Schema.OrderType,
-  storedValues?: Partial<OrderFormValues>
-): OrderFormValues => ({
-  type,
-  side: Schema.Side.SIDE_BUY,
-  timeInForce:
-    type === Schema.OrderType.TYPE_LIMIT
-      ? Schema.OrderTimeInForce.TIME_IN_FORCE_GTC
-      : Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-  size: '0',
-  price: '0',
-  expiresAt: undefined,
-  postOnly: false,
-  reduceOnly: false,
-  ...storedValues,
-});
+) =>
+  useMemo(() => {
+    if (price && size) {
+      return removeDecimal(
+        toBigNum(size, positionDecimalPlaces).multipliedBy(
+          toBigNum(price, decimalPlaces)
+        ),
+        decimalPlaces
+      );
+    }
+    return null;
+  }, [price, size, decimalPlaces, positionDecimalPlaces]);
 
 export const DealTicket = ({
   market,
@@ -120,32 +104,36 @@ export const DealTicket = ({
   marketData,
   marketPrice,
   submit,
+  onClickCollateral,
   onDeposit,
 }: DealTicketProps) => {
   const { pubKey, isReadOnly } = useVegaWallet();
-  const setType = useDealTicketFormValues((state) => state.setType);
-  const storedFormValues = useDealTicketFormValues(
-    (state) => state.formValues[market.id]
+  const setDealTicketType = useDealTicketTypeStore((state) => state.set);
+  const updateStopOrderFormValues = useStopOrderFormValues(
+    (state) => state.update
   );
-  const updateStoredFormValues = useDealTicketFormValues(
-    (state) => state.updateOrder
-  );
-  const dealTicketType = storedFormValues?.type ?? DealTicketType.Limit;
-  const type = dealTicketTypeToOrderType(dealTicketType);
+  // store last used tif for market so that when changing OrderType the previous TIF
+  // selection for that type is used when switching back
+
+  const [lastTIF, setLastTIF] = useState({
+    [OrderType.TYPE_MARKET]: OrderTimeInForce.TIME_IN_FORCE_IOC,
+    [OrderType.TYPE_LIMIT]: OrderTimeInForce.TIME_IN_FORCE_GTC,
+  });
 
   const {
     control,
-    reset,
-    formState: { errors },
+    errors,
+    order,
+    setError,
+    clearErrors,
+    update,
     handleSubmit,
-    setValue,
-    watch,
-  } = useForm<OrderFormValues>({
-    defaultValues: getDefaultValues(type, storedFormValues?.[dealTicketType]),
-  });
+  } = useOrderForm(market.id);
+
   const lastSubmitTime = useRef(0);
 
   const asset = market.tradableInstrument.instrument.product.settlementAsset;
+
   const {
     accountBalance: marginAccountBalance,
     loading: loadingMarginAccountBalance,
@@ -161,54 +149,24 @@ export const DealTicket = ({
   ).toString();
 
   const { marketState, marketTradingMode } = marketData;
-  const timeInForce = watch('timeInForce');
 
-  const side = watch('side');
-  const rawSize = watch('size');
-  const rawPrice = watch('price');
-  const iceberg = watch('iceberg');
-  const peakSize = watch('peakSize');
+  const normalizedOrder =
+    order &&
+    normalizeOrderSubmission(
+      order,
+      market.decimalPlaces,
+      market.positionDecimalPlaces
+    );
 
-  useEffect(() => {
-    const size = storedFormValues?.[dealTicketType]?.size;
-    if (size && rawSize !== size) {
-      setValue('size', size);
-    }
-  }, [storedFormValues, dealTicketType, rawSize, setValue]);
+  const price = useMemo(() => {
+    return (
+      normalizedOrder &&
+      marketPrice &&
+      getDerivedPrice(normalizedOrder, marketPrice)
+    );
+  }, [normalizedOrder, marketPrice]);
 
-  useEffect(() => {
-    const price = storedFormValues?.[dealTicketType]?.price;
-    if (price && rawPrice !== price) {
-      setValue('price', price);
-    }
-  }, [storedFormValues, dealTicketType, rawPrice, setValue]);
-
-  useEffect(() => {
-    const subscription = watch((value, { name, type }) => {
-      updateStoredFormValues(market.id, value);
-    });
-    return () => subscription.unsubscribe();
-  }, [watch, market.id, updateStoredFormValues]);
-
-  const normalizedOrder = mapFormValuesToOrderSubmission(
-    {
-      price: rawPrice || undefined,
-      side,
-      size: rawSize,
-      timeInForce,
-      type,
-    },
-    market.id,
-    market.decimalPlaces,
-    market.positionDecimalPlaces
-  );
-
-  const price =
-    normalizedOrder &&
-    marketPrice &&
-    getDerivedPrice(normalizedOrder, marketPrice);
-
-  const notionalSize = getNotionalSize(
+  const notionalSize = useNotionalSize(
     price,
     normalizedOrder?.size,
     market.decimalPlaces,
@@ -252,20 +210,22 @@ export const DealTicket = ({
   const assetSymbol =
     market.tradableInstrument.instrument.product.settlementAsset.symbol;
 
-  const summaryError = useMemo(() => {
+  useEffect(() => {
     if (!pubKey) {
-      return {
+      setError('summary', {
         message: t('No public key selected'),
         type: SummaryValidationType.NoPubKey,
-      };
+      });
+      return;
     }
 
     const marketStateError = validateMarketState(marketState);
     if (marketStateError !== true) {
-      return {
+      setError('summary', {
         message: marketStateError,
         type: SummaryValidationType.MarketState,
-      };
+      });
+      return;
     }
 
     const hasNoBalance =
@@ -274,21 +234,24 @@ export const DealTicket = ({
       hasNoBalance &&
       !(loadingMarginAccountBalance || loadingGeneralAccountBalance)
     ) {
-      return {
+      setError('summary', {
         message: SummaryValidationType.NoCollateral,
         type: SummaryValidationType.NoCollateral,
-      };
+      });
+      return;
     }
 
     const marketTradingModeError = validateMarketTradingMode(marketTradingMode);
     if (marketTradingModeError !== true) {
-      return {
+      setError('summary', {
         message: marketTradingModeError,
         type: SummaryValidationType.TradingMode,
-      };
+      });
+      return;
     }
 
-    return undefined;
+    // No error found above clear the error in case it was active on a previous render
+    clearErrors('summary');
   }, [
     marketState,
     marketTradingMode,
@@ -297,83 +260,156 @@ export const DealTicket = ({
     loadingMarginAccountBalance,
     loadingGeneralAccountBalance,
     pubKey,
+    setError,
+    clearErrors,
   ]);
 
-  const disablePostOnlyCheckbox = [
-    Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-    Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-  ].includes(timeInForce);
+  const disablePostOnlyCheckbox = useMemo(() => {
+    const disabled = order
+      ? [
+          Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+          Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        ].includes(order.timeInForce)
+      : true;
+    return disabled;
+  }, [order]);
 
-  const disableReduceOnlyCheckbox = !disablePostOnlyCheckbox;
+  const disableReduceOnlyCheckbox = useMemo(() => {
+    const disabled = order
+      ? ![
+          Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
+          Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
+        ].includes(order.timeInForce)
+      : true;
+    return disabled;
+  }, [order]);
 
   const onSubmit = useCallback(
-    (formValues: OrderFormValues) => {
+    (order: OrderSubmission) => {
       const now = new Date().getTime();
       if (lastSubmitTime.current && now - lastSubmitTime.current < 1000) {
         return;
       }
       submit(
-        mapFormValuesToOrderSubmission(
-          formValues,
-          market.id,
+        normalizeOrderSubmission(
+          order,
           market.decimalPlaces,
           market.positionDecimalPlaces
         )
       );
       lastSubmitTime.current = now;
     },
-    [submit, market.decimalPlaces, market.positionDecimalPlaces, market.id]
+    [submit, market.decimalPlaces, market.positionDecimalPlaces]
   );
-  useController({
-    name: 'type',
-    control,
-    rules: {
-      validate: validateType(marketData.marketTradingMode, marketData.trigger),
-    },
-  });
+
+  // if an order doesn't exist one will be created by the store immediately
+  if (!order || !normalizedOrder) {
+    return null;
+  }
 
   return (
     <form
-      onSubmit={
-        isReadOnly || !pubKey
-          ? stopSubmit
-          : handleSubmit(summaryError ? noop : onSubmit)
-      }
+      onSubmit={isReadOnly ? noop : handleSubmit(onSubmit)}
       noValidate
       data-testid="deal-ticket-form"
     >
-      <TypeSelector
-        value={dealTicketType}
-        onValueChange={(dealTicketType) => {
-          setType(market.id, dealTicketType);
-          if (!isStopOrderType(dealTicketType)) {
-            reset(
-              getDefaultValues(
-                dealTicketTypeToOrderType(dealTicketType),
-                storedFormValues?.[dealTicketType]
-              )
-            );
-          }
+      <Controller
+        name="type"
+        control={control}
+        rules={{
+          validate: validateType(
+            marketData.marketTradingMode,
+            marketData.trigger
+          ),
         }}
-        market={market}
-        marketData={marketData}
-        errorMessage={errors.type?.message}
+        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;
+              update({
+                type,
+                // when changing type also update the TIF to what was last used of new type
+                timeInForce: lastTIF[type] || order.timeInForce,
+                postOnly:
+                  type === OrderType.TYPE_MARKET ? false : order.postOnly,
+                iceberg:
+                  type === OrderType.TYPE_MARKET ||
+                  [
+                    OrderTimeInForce.TIME_IN_FORCE_FOK,
+                    OrderTimeInForce.TIME_IN_FORCE_IOC,
+                  ].includes(lastTIF[type] || order.timeInForce)
+                    ? false
+                    : order.iceberg,
+                icebergOpts:
+                  type === OrderType.TYPE_MARKET ||
+                  [
+                    OrderTimeInForce.TIME_IN_FORCE_FOK,
+                    OrderTimeInForce.TIME_IN_FORCE_IOC,
+                  ].includes(lastTIF[type] || order.timeInForce)
+                    ? undefined
+                    : order.icebergOpts,
+                reduceOnly:
+                  type === OrderType.TYPE_LIMIT &&
+                  ![
+                    OrderTimeInForce.TIME_IN_FORCE_FOK,
+                    OrderTimeInForce.TIME_IN_FORCE_IOC,
+                  ].includes(lastTIF[type] || order.timeInForce)
+                    ? false
+                    : order.postOnly,
+                expiresAt: undefined,
+              });
+              clearErrors(['expiresAt', 'price']);
+            }}
+            market={market}
+            marketData={marketData}
+            errorMessage={errors.type?.message}
+          />
+        )}
       />
       <Controller
         name="side"
         control={control}
-        render={({ field }) => (
-          <SideSelector value={field.value} onValueChange={field.onChange} />
+        render={() => (
+          <SideSelector
+            value={order.side}
+            onValueChange={(side) => {
+              update({ side });
+            }}
+          />
         )}
       />
       <DealTicketAmount
-        type={type}
         control={control}
+        orderType={order.type}
         market={market}
         marketData={marketData}
         marketPrice={marketPrice || undefined}
         sizeError={errors.size?.message}
         priceError={errors.price?.message}
+        update={update}
+        size={order.size}
+        price={order.price}
       />
       <Controller
         name="timeInForce"
@@ -384,29 +420,58 @@ export const DealTicket = ({
             marketData.trigger
           ),
         }}
-        render={({ field }) => (
+        render={() => (
           <TimeInForceSelector
-            value={field.value}
-            orderType={type}
-            onSelect={field.onChange}
+            value={order.timeInForce}
+            orderType={order.type}
+            onSelect={(timeInForce) => {
+              // Reset post only and reduce only when changing TIF
+              update({
+                timeInForce,
+                postOnly: [
+                  OrderTimeInForce.TIME_IN_FORCE_FOK,
+                  OrderTimeInForce.TIME_IN_FORCE_IOC,
+                ].includes(timeInForce)
+                  ? false
+                  : order.postOnly,
+                reduceOnly: ![
+                  OrderTimeInForce.TIME_IN_FORCE_FOK,
+                  OrderTimeInForce.TIME_IN_FORCE_IOC,
+                ].includes(timeInForce)
+                  ? false
+                  : order.reduceOnly,
+              });
+              // Set TIF value for the given order type, so that when switching
+              // types we know the last used TIF for the given order type
+              setLastTIF((curr) => ({
+                ...curr,
+                [order.type]: timeInForce,
+                expiresAt: undefined,
+              }));
+              clearErrors('expiresAt');
+            }}
             market={market}
             marketData={marketData}
             errorMessage={errors.timeInForce?.message}
           />
         )}
       />
-      {type === Schema.OrderType.TYPE_LIMIT &&
-        timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT && (
+      {order.type === Schema.OrderType.TYPE_LIMIT &&
+        order.timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT && (
           <Controller
             name="expiresAt"
             control={control}
             rules={{
               validate: validateExpiration,
             }}
-            render={({ field }) => (
+            render={() => (
               <ExpirySelector
-                value={field.value}
-                onSelect={(expiresAt) => field.onChange(expiresAt)}
+                value={order.expiresAt}
+                onSelect={(expiresAt) =>
+                  update({
+                    expiresAt: expiresAt || undefined,
+                  })
+                }
                 errorMessage={errors.expiresAt?.message}
               />
             )}
@@ -416,14 +481,13 @@ export const DealTicket = ({
         <Controller
           name="postOnly"
           control={control}
-          render={({ field }) => (
+          render={() => (
             <Checkbox
               name="post-only"
-              checked={!disablePostOnlyCheckbox && field.value}
+              checked={order.postOnly}
               disabled={disablePostOnlyCheckbox}
-              onCheckedChange={(postOnly) => {
-                field.onChange(postOnly);
-                setValue('reduceOnly', false);
+              onCheckedChange={() => {
+                update({ postOnly: !order.postOnly, reduceOnly: false });
               }}
               label={
                 <Tooltip
@@ -448,14 +512,13 @@ export const DealTicket = ({
         <Controller
           name="reduceOnly"
           control={control}
-          render={({ field }) => (
+          render={() => (
             <Checkbox
               name="reduce-only"
-              checked={!disableReduceOnlyCheckbox && field.value}
+              checked={order.reduceOnly}
               disabled={disableReduceOnlyCheckbox}
-              onCheckedChange={(reduceOnly) => {
-                field.onChange(reduceOnly);
-                setValue('postOnly', false);
+              onCheckedChange={() => {
+                update({ postOnly: false, reduceOnly: !order.reduceOnly });
               }}
               label={
                 <Tooltip
@@ -476,49 +539,53 @@ export const DealTicket = ({
           )}
         />
       </div>
-      {type === Schema.OrderType.TYPE_LIMIT && (
-        <>
-          <div className="flex gap-2 pb-2 justify-between">
-            <Controller
-              name="iceberg"
-              control={control}
-              render={({ field }) => (
-                <Checkbox
-                  name="iceberg"
-                  checked={field.value}
-                  onCheckedChange={field.onChange}
-                  label={
-                    <Tooltip
-                      description={
-                        <p>
-                          {t(`Trade only a fraction of the order size at once.
+      <div className="flex gap-2 pb-2 justify-between">
+        {order.type === Schema.OrderType.TYPE_LIMIT && (
+          <Controller
+            name="iceberg"
+            control={control}
+            render={() => (
+              <Checkbox
+                name="iceberg"
+                checked={order.iceberg}
+                onCheckedChange={() => {
+                  update({ iceberg: !order.iceberg, icebergOpts: undefined });
+                }}
+                label={
+                  <Tooltip
+                    description={
+                      <p>
+                        {t(`Trade only a fraction of the order size at once.
                             After the peak size of the order has traded, the size is reset. This is repeated until the order is cancelled, expires, or its full volume trades away.
                             For example, an iceberg order with a size of 1000 and a peak size of 100 will effectively be split into 10 orders with a size of 100 each.
                             Note that the full volume of the order is not hidden and is still reflected in the order book.`)}
-                        </p>
-                      }
-                    >
-                      <span className="text-xs">{t('Iceberg')}</span>
-                    </Tooltip>
-                  }
-                />
-              )}
-            />
-          </div>
-          {iceberg && (
-            <DealTicketSizeIceberg
-              market={market}
-              peakSizeError={errors.peakSize?.message}
-              minimumVisibleSizeError={errors.minimumVisibleSize?.message}
-              control={control}
-              size={rawSize}
-              peakSize={peakSize}
-            />
-          )}
-        </>
+                      </p>
+                    }
+                  >
+                    <span className="text-xs">{t('Iceberg')}</span>
+                  </Tooltip>
+                }
+              />
+            )}
+          />
+        )}
+      </div>
+      {order.iceberg && (
+        <DealTicketSizeIceberg
+          update={update}
+          market={market}
+          peakSizeError={errors.icebergOpts?.peakSize?.message}
+          minimumVisibleSizeError={
+            errors.icebergOpts?.minimumVisibleSize?.message
+          }
+          control={control}
+          size={order.size}
+          peakSize={order.icebergOpts?.peakSize || ''}
+          minimumVisibleSize={order.icebergOpts?.minimumVisibleSize || ''}
+        />
       )}
       <SummaryMessage
-        error={summaryError}
+        errorMessage={errors.summary?.message}
         asset={asset}
         marketTradingMode={marketData.marketTradingMode}
         balance={balance}
@@ -528,9 +595,10 @@ export const DealTicket = ({
         }
         isReadOnly={isReadOnly}
         pubKey={pubKey}
+        onClickCollateral={onClickCollateral}
         onDeposit={onDeposit}
       />
-      <DealTicketButton side={side} />
+      <DealTicketButton side={order.side} />
       <DealTicketFeeDetails
         order={
           normalizedOrder && { ...normalizedOrder, price: price || undefined }
@@ -556,19 +624,26 @@ export const DealTicket = ({
  * renders warnings about current state of the market
  */
 interface SummaryMessageProps {
-  error?: { message: string; type: string };
+  errorMessage?: string;
   asset: { id: string; symbol: string; name: string; decimals: number };
   marketTradingMode: MarketData['marketTradingMode'];
   balance: string;
   margin: string;
   isReadOnly: boolean;
   pubKey: string | null;
+  onClickCollateral?: () => void;
   onDeposit: (assetId: string) => void;
 }
 
 export const NoWalletWarning = ({
   isReadOnly,
-}: Pick<SummaryMessageProps, '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">
@@ -580,41 +655,77 @@ export const NoWalletWarning = ({
       </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(
   ({
-    error,
+    errorMessage,
     asset,
     marketTradingMode,
     balance,
     margin,
     isReadOnly,
     pubKey,
+    onClickCollateral,
     onDeposit,
   }: SummaryMessageProps) => {
     // Specific error UI for if balance is so we can
     // render a deposit dialog
     if (isReadOnly || !pubKey) {
-      return <NoWalletWarning isReadOnly={isReadOnly} />;
+      return (
+        <NoWalletWarning
+          isReadOnly={isReadOnly}
+          asset={asset}
+          pubKey={pubKey}
+        />
+      );
     }
 
-    if (error?.type === SummaryValidationType.NoCollateral) {
+    if (errorMessage === SummaryValidationType.NoCollateral) {
       return (
         <div className="mb-2">
-          <ZeroBalanceError asset={asset} onDeposit={onDeposit} />
+          <ZeroBalanceError
+            asset={asset}
+            onClickCollateral={onClickCollateral}
+            onDeposit={onDeposit}
+          />
         </div>
       );
     }
 
     // If we have any other full error which prevents
     // submission render that first
-    if (error?.message) {
+    if (errorMessage) {
       return (
         <div className="mb-2">
           <InputError testId="deal-ticket-error-message-summary">
-            {error?.message}
+            {errorMessage}
           </InputError>
         </div>
       );

libs/deal-ticket/src/components/deal-ticket/time-in-force-selector.tsx

@@ -21,13 +21,6 @@ interface TimeInForceSelectorProps {
   errorMessage?: string;
 }
 
-const typeLimitOptions = Object.entries(Schema.OrderTimeInForce);
-const typeMarketOptions = typeLimitOptions.filter(
-  ([_, timeInForce]) =>
-    timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_FOK ||
-    timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_IOC
-);
-
 export const TimeInForceSelector = ({
   value,
   orderType,
@@ -38,8 +31,12 @@ export const TimeInForceSelector = ({
 }: TimeInForceSelectorProps) => {
   const options =
     orderType === Schema.OrderType.TYPE_LIMIT
-      ? typeLimitOptions
-      : typeMarketOptions;
+      ? Object.entries(Schema.OrderTimeInForce)
+      : Object.entries(Schema.OrderTimeInForce).filter(
+          ([_, timeInForce]) =>
+            timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_FOK ||
+            timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_IOC
+        );
 
   const renderError = (errorType: string) => {
     if (errorType === MarketModeValidationType.Auction) {

libs/deal-ticket/src/components/deal-ticket/type-selector.tsx

@@ -1,4 +1,5 @@
 import {
+  Icon,
   InputError,
   SimpleGrid,
   Tooltip,
@@ -9,14 +10,12 @@ import {
   TradingDropdownRadioGroup,
   TradingDropdownRadioItem,
   TradingDropdownTrigger,
-  VegaIcon,
-  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import type { Market, StaticMarketData } from '@vegaprotocol/markets';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';
-import { DealTicketType } from '../../hooks/use-form-values';
+import { DealTicketType } from '../../hooks/use-type-store';
 import * as RadioGroup from '@radix-ui/react-radio-group';
 import classNames from 'classnames';
 import { FLAGS } from '@vegaprotocol/environment';
@@ -82,11 +81,11 @@ export const TypeToggle = ({
                 }
               )}
             >
-              <button className="flex gap-1">
+              <button>
                 <span className="text-ellipsis whitespace-nowrap shrink overflow-hidden">
                   {t(selectedOption ? selectedOption.label : 'Stop')}
                 </span>
-                <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={14} />
+                <Icon name="chevron-down" className="ml-1" />
               </button>
             </TradingDropdownTrigger>
           }

libs/deal-ticket/src/hooks/index.ts

@@ -1,3 +1,4 @@
 export * from './__generated__/EstimateOrder';
 export * from './use-estimate-fees';
-export * from './use-form-values';
+export * from './use-type-store';
+export * from './use-stop-order-form-values';

libs/deal-ticket/src/hooks/use-form-values.ts

@@ -1,144 +0,0 @@
-import { create } from 'zustand';
-import { persist, subscribeWithSelector } from 'zustand/middleware';
-import type { OrderTimeInForce, Side, OrderType } from '@vegaprotocol/types';
-import * as Schema from '@vegaprotocol/types';
-import { immer } from 'zustand/middleware/immer';
-
-export enum DealTicketType {
-  Limit = 'Limit',
-  Market = 'Market',
-  StopLimit = 'StopLimit',
-  StopMarket = 'StopMarket',
-}
-
-export interface StopOrderFormValues {
-  side: Side;
-
-  triggerDirection: Schema.StopOrderTriggerDirection;
-
-  triggerType: 'price' | 'trailingPercentOffset';
-  triggerPrice?: string;
-  triggerTrailingPercentOffset?: string;
-
-  type: OrderType;
-  size: string;
-  timeInForce: OrderTimeInForce;
-  price?: string;
-
-  expire: boolean;
-  expiryStrategy?: Schema.StopOrderExpiryStrategy;
-  expiresAt?: string;
-}
-
-export type OrderFormValues = {
-  type: OrderType;
-  side: Side;
-  size: string;
-  timeInForce: OrderTimeInForce;
-  price?: string;
-  expiresAt?: string | undefined;
-  postOnly?: boolean;
-  reduceOnly?: boolean;
-  iceberg?: boolean;
-  peakSize?: string;
-  minimumVisibleSize?: string;
-};
-
-type UpdateOrder = (marketId: string, values: Partial<OrderFormValues>) => void;
-
-type UpdateStopOrder = (
-  marketId: string,
-  values: Partial<StopOrderFormValues>
-) => void;
-
-type Store = {
-  updateOrder: UpdateOrder;
-  updateStopOrder: UpdateStopOrder;
-  setType: (marketId: string, value: DealTicketType) => void;
-  updateAll: (
-    marketId: string,
-    values: { size?: string; price?: string }
-  ) => void;
-  formValues: Record<
-    string,
-    | {
-        [DealTicketType.Limit]?: Partial<OrderFormValues>;
-        [DealTicketType.Market]?: Partial<OrderFormValues>;
-        [DealTicketType.StopLimit]?: Partial<StopOrderFormValues>;
-        [DealTicketType.StopMarket]?: Partial<StopOrderFormValues>;
-        type?: DealTicketType;
-      }
-    | undefined
-  >;
-};
-
-export const dealTicketTypeToOrderType = (dealTicketType?: DealTicketType) =>
-  dealTicketType === DealTicketType.Limit ||
-  dealTicketType === DealTicketType.StopLimit
-    ? Schema.OrderType.TYPE_LIMIT
-    : Schema.OrderType.TYPE_MARKET;
-
-export const isStopOrderType = (dealTicketType?: DealTicketType) =>
-  dealTicketType === DealTicketType.StopLimit ||
-  dealTicketType === DealTicketType.StopMarket;
-
-export const useDealTicketFormValues = create<Store>()(
-  immer(
-    persist(
-      subscribeWithSelector((set) => ({
-        formValues: {},
-        updateStopOrder: (marketId, formValues) => {
-          set((state) => {
-            const type =
-              formValues.type === Schema.OrderType.TYPE_LIMIT
-                ? DealTicketType.StopLimit
-                : DealTicketType.StopMarket;
-            const market = state.formValues[marketId] || {};
-            if (!state.formValues[marketId]) {
-              state.formValues[marketId] = market;
-            }
-            market[type] = Object.assign(market[type] ?? {}, formValues);
-          });
-        },
-        updateOrder: (marketId, formValues) => {
-          set((state) => {
-            const type =
-              formValues.type === Schema.OrderType.TYPE_LIMIT
-                ? DealTicketType.Limit
-                : DealTicketType.Market;
-            const market = state.formValues[marketId] || {};
-            if (!state.formValues[marketId]) {
-              state.formValues[marketId] = market;
-            }
-            market[type] = Object.assign(market[type] ?? {}, formValues);
-          });
-        },
-        updateAll: (
-          marketId: string,
-          formValues: { size?: string; price?: string }
-        ) => {
-          set((state) => {
-            const market = state.formValues[marketId] || {};
-            if (!state.formValues[marketId]) {
-              state.formValues[marketId] = market;
-            }
-            for (const type of Object.values(DealTicketType)) {
-              market[type] = Object.assign(market[type] ?? {}, formValues);
-            }
-          });
-        },
-        setType: (marketId, type) => {
-          set((state) => {
-            state.formValues[marketId] = Object.assign(
-              state.formValues[marketId] ?? {},
-              { type }
-            );
-          });
-        },
-      })),
-      {
-        name: 'vega_deal_ticket_store',
-      }
-    )
-  )
-);

libs/deal-ticket/src/hooks/use-order-form.spec.ts

@@ -0,0 +1,68 @@
+import omit from 'lodash/omit';
+import { act, renderHook } from '@testing-library/react';
+import { getDefaultOrder, useCreateOrderStore } from '@vegaprotocol/orders';
+import { useOrderForm } from './use-order-form';
+
+jest.mock('zustand');
+
+describe('useOrderForm', () => {
+  const marketId = 'market-id';
+  const setup = (marketId: string) => {
+    return renderHook(() => useOrderForm(marketId));
+  };
+  const { result } = renderHook(() => useCreateOrderStore());
+  const useOrderStore = result.current;
+
+  it('updates form fields when the order changes', async () => {
+    const order = getDefaultOrder(marketId);
+    const { result } = setup(marketId);
+    // expect default values
+    expect(result.current.order).toEqual(order);
+    expect(result.current.getValues()).toEqual(order);
+
+    const priceUpdate = {
+      ...order,
+      price: '100',
+      size: '22',
+    };
+
+    await act(async () => {
+      useOrderStore.setState({
+        orders: {
+          [marketId]: priceUpdate,
+        },
+      });
+    });
+
+    // check order store has updated fields
+    expect(result.current.order).toEqual(priceUpdate);
+    // check react-hook-form has updated fields
+    expect(result.current.getValues()).toEqual(priceUpdate);
+  });
+
+  it('removes persist key on submit', async () => {
+    const order = {
+      ...getDefaultOrder(marketId),
+      price: '99',
+      size: '22',
+    };
+    const onSubmit = jest.fn();
+    const { result } = setup(marketId);
+
+    await act(async () => {
+      useOrderStore.setState({
+        orders: {
+          [marketId]: order,
+        },
+      });
+    });
+
+    await act(async () => {
+      result.current.handleSubmit(onSubmit)();
+    });
+
+    expect(onSubmit).toHaveBeenCalledTimes(1);
+    expect(onSubmit.mock.calls[0][0]).toEqual(omit(order, 'persist'));
+    expect(onSubmit.mock.calls[0][0].persist).toBeUndefined();
+  });
+});

libs/deal-ticket/src/hooks/use-order-form.ts

@@ -0,0 +1,71 @@
+import omit from 'lodash/omit';
+import type { OrderObj } from '@vegaprotocol/orders';
+import { getDefaultOrder, useOrder } from '@vegaprotocol/orders';
+import { useEffect } from 'react';
+import { useForm } from 'react-hook-form';
+import type { OrderSubmission } from '@vegaprotocol/wallet';
+
+export type OrderFormFields = OrderObj & {
+  summary: string;
+};
+
+/**
+ * Connects the order store to a react-hook-form instance. Any time a field
+ * changes in the store the form will be updated so that validation rules
+ * for those fields are applied
+ */
+export const useOrderForm = (marketId: string) => {
+  const [order, update] = useOrder(marketId);
+  const {
+    control,
+    formState: { errors, isSubmitted },
+    handleSubmit,
+    setError,
+    setValue,
+    clearErrors,
+    getValues,
+  } = useForm<OrderFormFields>({
+    // order can be undefined if there is nothing in the store, it
+    // will be created but the form still needs some default values
+    defaultValues: order || getDefaultOrder(marketId),
+  });
+
+  // Keep form fields in sync with the store values,
+  // inputs are updating the store, fields need updating
+  // to ensure validation rules are applied
+  useEffect(() => {
+    if (!order) return;
+    const currOrder = getValues();
+    for (const k in order) {
+      const key = k as keyof typeof order;
+      const curr = currOrder[key];
+      const value = order[key];
+      if (value !== curr) {
+        setValue(key, value, {
+          shouldValidate: isSubmitted, // only apply validation after the form has been submitted and failed
+          shouldDirty: true,
+          shouldTouch: true,
+        });
+      }
+    }
+  }, [order, isSubmitted, getValues, setValue]);
+
+  const handleSubmitWrapper = (cb: (o: OrderSubmission) => void) => {
+    return handleSubmit(() => {
+      // remove the persist and iceberg key from the order in the store, the wallet will reject
+      // an order that contains unrecognized additional keys
+      cb(omit(order, 'persist', 'iceberg'));
+    });
+  };
+
+  return {
+    order,
+    update,
+    control,
+    errors,
+    setError,
+    clearErrors,
+    getValues, // returned for test purposes only
+    handleSubmit: handleSubmitWrapper,
+  };
+};

libs/deal-ticket/src/hooks/use-stop-order-form-values.ts

@@ -0,0 +1,62 @@
+import { create } from 'zustand';
+import { persist, subscribeWithSelector } from 'zustand/middleware';
+import type { OrderTimeInForce, Side, OrderType } from '@vegaprotocol/types';
+import type * as Schema from '@vegaprotocol/types';
+
+export interface StopOrderFormValues {
+  side: Side;
+
+  triggerDirection: Schema.StopOrderTriggerDirection;
+
+  triggerType: 'price' | 'trailingPercentOffset';
+  triggerPrice: string;
+  triggerTrailingPercentOffset: string;
+
+  type: OrderType;
+  size: string;
+  timeInForce: OrderTimeInForce;
+  price?: string;
+
+  expire: boolean;
+  expiryStrategy?: Schema.StopOrderExpiryStrategy;
+  expiresAt?: string;
+}
+
+type StopOrderFormValuesMap = {
+  [marketId: string]: Partial<StopOrderFormValues> | undefined;
+};
+
+type Update = (
+  marketId: string,
+  formValues: Partial<StopOrderFormValues>,
+  persist?: boolean
+) => void;
+
+interface Store {
+  formValues: StopOrderFormValuesMap;
+  update: Update;
+}
+
+export const useStopOrderFormValues = create<Store>()(
+  persist(
+    subscribeWithSelector((set) => ({
+      formValues: {},
+      update: (marketId, formValues, persist = true) => {
+        set((state) => {
+          return {
+            formValues: {
+              ...state.formValues,
+              [marketId]: {
+                ...state.formValues[marketId],
+                ...formValues,
+              },
+            },
+          };
+        });
+      },
+    })),
+    {
+      name: 'vega_stop_order_store',
+    }
+  )
+);

libs/deal-ticket/src/hooks/use-type-store.ts

@@ -0,0 +1,28 @@
+import { create } from 'zustand';
+import { persist, subscribeWithSelector } from 'zustand/middleware';
+
+export enum DealTicketType {
+  Limit = 'Limit',
+  Market = 'Market',
+  StopLimit = 'StopLimit',
+  StopMarket = 'StopMarket',
+}
+
+export const useDealTicketTypeStore = create<{
+  set: (marketId: string, type: DealTicketType) => void;
+  type: Record<string, DealTicketType>;
+}>()(
+  persist(
+    subscribeWithSelector((set) => ({
+      type: {},
+      set: (marketId: string, type: DealTicketType) =>
+        set((state) => ({
+          ...state,
+          type: { ...state.type, [marketId]: type },
+        })),
+    })),
+    {
+      name: 'deal_ticket_type',
+    }
+  )
+);

libs/deal-ticket/src/utils/map-form-values-to-stop-order-submission.ts

@@ -1,64 +1,12 @@
 import type {
-  OrderSubmission,
   StopOrderSetup,
   StopOrdersSubmission,
 } from '@vegaprotocol/wallet';
-import type {
-  OrderFormValues,
-  StopOrderFormValues,
-} from '../hooks/use-form-values';
+import { normalizeOrderSubmission } from '@vegaprotocol/wallet';
+import type { StopOrderFormValues } from '../hooks/use-stop-order-form-values';
 import * as Schema from '@vegaprotocol/types';
 import { removeDecimal, toNanoSeconds } from '@vegaprotocol/utils';
 
-export const mapFormValuesToOrderSubmission = (
-  order: OrderFormValues,
-  marketId: string,
-  decimalPlaces: number,
-  positionDecimalPlaces: number
-): OrderSubmission => ({
-  marketId: marketId,
-  type: order.type,
-  side: order.side,
-  timeInForce: order.timeInForce,
-  price:
-    order.type === Schema.OrderType.TYPE_LIMIT && order.price
-      ? removeDecimal(order.price, decimalPlaces)
-      : undefined,
-  size: removeDecimal(order.size, positionDecimalPlaces),
-  expiresAt:
-    order.expiresAt &&
-    order.timeInForce === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT
-      ? toNanoSeconds(order.expiresAt)
-      : undefined,
-  postOnly:
-    order.type === Schema.OrderType.TYPE_MARKET ? false : order.postOnly,
-  reduceOnly:
-    order.type === Schema.OrderType.TYPE_LIMIT &&
-    ![
-      Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-      Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-    ].includes(order.timeInForce)
-      ? false
-      : order.reduceOnly,
-  icebergOpts:
-    (order.type === Schema.OrderType.TYPE_MARKET ||
-      [
-        Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-        Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-      ].includes(order.timeInForce)) &&
-    order.iceberg &&
-    order.peakSize &&
-    order.minimumVisibleSize
-      ? {
-          peakSize: removeDecimal(order.peakSize, positionDecimalPlaces),
-          minimumVisibleSize: removeDecimal(
-            order.minimumVisibleSize,
-            positionDecimalPlaces
-          ),
-        }
-      : undefined,
-});
-
 export const mapFormValuesToStopOrdersSubmission = (
   data: StopOrderFormValues,
   marketId: string,
@@ -67,8 +15,9 @@ export const mapFormValuesToStopOrdersSubmission = (
 ): StopOrdersSubmission => {
   const submission: StopOrdersSubmission = {};
   const stopOrderSetup: StopOrderSetup = {
-    orderSubmission: mapFormValuesToOrderSubmission(
+    orderSubmission: normalizeOrderSubmission(
       {
+        marketId,
         type: data.type,
         side: data.side,
         size: data.size,
@@ -76,16 +25,12 @@ export const mapFormValuesToStopOrdersSubmission = (
         price: data.price,
         reduceOnly: true,
       },
-      marketId,
       decimalPlaces,
       positionDecimalPlaces
     ),
   };
   if (data.triggerType === 'price') {
-    stopOrderSetup.price = removeDecimal(
-      data.triggerPrice ?? '',
-      decimalPlaces
-    );
+    stopOrderSetup.price = removeDecimal(data.triggerPrice, decimalPlaces);
   } else if (data.triggerType === 'trailingPercentOffset') {
     stopOrderSetup.trailingPercentOffset = (
       Number(data.triggerTrailingPercentOffset) / 100

libs/deal-ticket/src/utils/map-form-values-to-submisstion.spec.ts

@@ -1,64 +0,0 @@
-import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-import { mapFormValuesToOrderSubmission } from './map-form-values-to-submission';
-import * as Schema from '@vegaprotocol/types';
-
-describe('mapFormValuesToOrderSubmission', () => {
-  it('sets and formats price only for limit orders', () => {
-    expect(
-      mapFormValuesToOrderSubmission(
-        { price: '100' } as unknown as OrderSubmissionBody['orderSubmission'],
-        'marketId',
-        2,
-        1
-      ).price
-    ).toBeUndefined();
-    expect(
-      mapFormValuesToOrderSubmission(
-        {
-          price: '100',
-          type: Schema.OrderType.TYPE_LIMIT,
-        } as unknown as OrderSubmissionBody['orderSubmission'],
-        'marketId',
-        2,
-        1
-      ).price
-    ).toEqual('10000');
-  });
-
-  it('sets and formats expiresAt only for time in force orders', () => {
-    expect(
-      mapFormValuesToOrderSubmission(
-        {
-          expiresAt: '2022-01-01T00:00:00.000Z',
-        } as OrderSubmissionBody['orderSubmission'],
-        'marketId',
-        2,
-        1
-      ).expiresAt
-    ).toBeUndefined();
-    expect(
-      mapFormValuesToOrderSubmission(
-        {
-          expiresAt: '2022-01-01T00:00:00.000Z',
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        } as OrderSubmissionBody['orderSubmission'],
-        'marketId',
-        2,
-        1
-      ).expiresAt
-    ).toEqual('1640995200000000000');
-  });
-
-  it('formats size', () => {
-    expect(
-      mapFormValuesToOrderSubmission(
-        {
-          size: '100',
-        } as OrderSubmissionBody['orderSubmission'],
-        'marketId',
-        2,
-        1
-      ).size
-    ).toEqual('1000');
-  });
-});

libs/deposits/src/lib/deposits-table.tsx

@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { forwardRef, useMemo } from 'react';
 import {
   addDecimalsFormatNumber,
   getDateTimeFormat,
@@ -6,6 +6,7 @@ import {
   isNumeric,
 } from '@vegaprotocol/utils';
 import type { ColDef } from 'ag-grid-community';
+import type { AgGridReact } from 'ag-grid-react';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
@@ -16,9 +17,10 @@ import type { DepositFieldsFragment } from './__generated__/Deposit';
 import { EtherscanLink } from '@vegaprotocol/environment';
 import { DepositStatusMapping } from '@vegaprotocol/types';
 
-export const DepositsTable = (
-  props: TypedDataAgGrid<DepositFieldsFragment>
-) => {
+export const DepositsTable = forwardRef<
+  AgGridReact,
+  TypedDataAgGrid<DepositFieldsFragment>
+>((props, ref) => {
   const columnDefs = useMemo<ColDef[]>(
     () => [
       { headerName: 'Asset', field: 'asset.symbol' },
@@ -77,10 +79,11 @@ export const DepositsTable = (
   );
   return (
     <AgGrid
+      ref={ref}
       defaultColDef={{ flex: 1 }}
       columnDefs={columnDefs}
       style={{ width: '100%', height: '100%' }}
       {...props}
     />
   );
-};
+});

libs/ledger/src/lib/ledger-manager.tsx

@@ -1,7 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
 import type * as Schema from '@vegaprotocol/types';
 import type { FilterChangedEvent } from 'ag-grid-community';
-import { useCallback, useState, useMemo } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
+import { useCallback, useRef, useState, useMemo } from 'react';
 import { subDays, formatRFC3339 } from 'date-fns';
 import { ledgerEntriesProvider } from './ledger-entries-data-provider';
 import type { LedgerEntriesQueryVariables } from './__generated__/LedgerEntries';
@@ -31,6 +32,7 @@ export const LedgerManager = ({
   partyId: string;
   gridProps: ReturnType<typeof useDataGridEvents>;
 }) => {
+  const gridRef = useRef<AgGridReact | null>(null);
   const [filter, setFilter] = useState<Filter>(defaultFilter);
 
   const variables = useMemo<LedgerEntriesQueryVariables>(
@@ -62,6 +64,7 @@ export const LedgerManager = ({
   return (
     <div className="h-full relative">
       <LedgerTable
+        ref={gridRef}
         rowData={data}
         overlayNoRowsTemplate={error ? error.message : t('No entries')}
         {...gridProps}

libs/ledger/src/lib/ledger-table.tsx

@@ -14,6 +14,7 @@ import {
   DateRangeFilter,
   SetFilter,
 } from '@vegaprotocol/datagrid';
+import type { AgGridReact } from 'ag-grid-react';
 import type * as Types from '@vegaprotocol/types';
 import type { ColDef } from 'ag-grid-community';
 import {
@@ -22,7 +23,7 @@ import {
   TransferTypeMapping,
 } from '@vegaprotocol/types';
 import type { LedgerEntry } from './ledger-entries-data-provider';
-import { useMemo } from 'react';
+import { forwardRef, useMemo } from 'react';
 import { formatRFC3339, subDays } from 'date-fns';
 
 export const TransferTooltipCellComponent = ({
@@ -44,159 +45,162 @@ const dateRangeFilterParams = {
 };
 type LedgerEntryProps = TypedDataAgGrid<LedgerEntry>;
 
-export const LedgerTable = (props: LedgerEntryProps) => {
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Sender'),
-        field: 'fromAccountPartyId',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountPartyId'>) =>
-          truncateByChars(value || ''),
-      },
-      {
-        headerName: t('Account type'),
-        filter: SetFilter,
-        filterParams: {
-          set: AccountTypeMapping,
+export const LedgerTable = forwardRef<AgGridReact, LedgerEntryProps>(
+  (props, ref) => {
+    const columnDefs = useMemo<ColDef[]>(
+      () => [
+        {
+          headerName: t('Sender'),
+          field: 'fromAccountPartyId',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'fromAccountPartyId'>) =>
+            truncateByChars(value || ''),
         },
-        field: 'fromAccountType',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountType'>) =>
-          value ? AccountTypeMapping[value] : '-',
-      },
-      {
-        headerName: t('Market'),
-        field: 'marketSender.tradableInstrument.instrument.code',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<
-          LedgerEntry,
-          'marketSender.tradableInstrument.instrument.code'
-        >) => value || '-',
-      },
-      {
-        headerName: t('Receiver'),
-        field: 'toAccountPartyId',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountPartyId'>) =>
-          truncateByChars(value || ''),
-      },
-      {
-        headerName: t('Account type'),
-        filter: SetFilter,
-        filterParams: {
-          set: AccountTypeMapping,
+        {
+          headerName: t('Account type'),
+          filter: SetFilter,
+          filterParams: {
+            set: AccountTypeMapping,
+          },
+          field: 'fromAccountType',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'fromAccountType'>) =>
+            value ? AccountTypeMapping[value] : '-',
         },
-        field: 'toAccountType',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountType'>) =>
-          value ? AccountTypeMapping[value] : '-',
-      },
-      {
-        headerName: t('Market'),
-        field: 'marketReceiver.tradableInstrument.instrument.code',
-        cellRenderer: ({
-          value,
-        }: VegaValueFormatterParams<
-          LedgerEntry,
-          'marketReceiver.tradableInstrument.instrument.code'
-        >) => value || '-',
-      },
-      {
-        headerName: t('Transfer type'),
-        field: 'transferType',
-        tooltipField: 'transferType',
-        filter: SetFilter,
-        filterParams: {
-          set: TransferTypeMapping,
+        {
+          headerName: t('Market'),
+          field: 'marketSender.tradableInstrument.instrument.code',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<
+            LedgerEntry,
+            'marketSender.tradableInstrument.instrument.code'
+          >) => value || '-',
         },
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'transferType'>) =>
-          value ? TransferTypeMapping[value] : '',
-      },
-      {
-        headerName: t('Quantity'),
-        field: 'quantity',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'quantity'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
+        {
+          headerName: t('Receiver'),
+          field: 'toAccountPartyId',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'toAccountPartyId'>) =>
+            truncateByChars(value || ''),
         },
-      },
-      {
-        headerName: t('Asset'),
-        field: 'assetId',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'asset'>) =>
-          data?.asset?.symbol || '',
-      },
-      {
-        headerName: t('Sender account balance'),
-        field: 'fromAccountBalance',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'fromAccountBalance'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
+        {
+          headerName: t('Account type'),
+          filter: SetFilter,
+          filterParams: {
+            set: AccountTypeMapping,
+          },
+          field: 'toAccountType',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'toAccountType'>) =>
+            value ? AccountTypeMapping[value] : '-',
         },
-      },
-      {
-        headerName: t('Receiver account balance'),
-        field: 'toAccountBalance',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<LedgerEntry, 'toAccountBalance'>) => {
-          const assetDecimalPlaces = data?.asset?.decimals || 0;
-          return value
-            ? addDecimalsFormatNumber(value, assetDecimalPlaces)
-            : '';
+        {
+          headerName: t('Market'),
+          field: 'marketReceiver.tradableInstrument.instrument.code',
+          cellRenderer: ({
+            value,
+          }: VegaValueFormatterParams<
+            LedgerEntry,
+            'marketReceiver.tradableInstrument.instrument.code'
+          >) => value || '-',
         },
-      },
-      {
-        headerName: t('Vega time'),
-        field: 'vegaTime',
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<LedgerEntry, 'vegaTime'>) =>
-          value ? getDateTimeFormat().format(fromNanoSeconds(value)) : '-',
-        filterParams: dateRangeFilterParams,
-        filter: DateRangeFilter,
-        flex: 1,
-      },
-    ],
-    []
-  );
-  return (
-    <AgGrid
-      style={{ width: '100%', height: '100%' }}
-      tooltipShowDelay={500}
-      defaultColDef={{
-        resizable: true,
-        sortable: true,
-        tooltipComponent: TransferTooltipCellComponent,
-        filterParams: {
-          ...dateRangeFilterParams,
-          buttons: ['reset'],
+        {
+          headerName: t('Transfer type'),
+          field: 'transferType',
+          tooltipField: 'transferType',
+          filter: SetFilter,
+          filterParams: {
+            set: TransferTypeMapping,
+          },
+          valueFormatter: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'transferType'>) =>
+            value ? TransferTypeMapping[value] : '',
         },
-      }}
-      columnDefs={columnDefs}
-      {...props}
-    />
-  );
-};
+        {
+          headerName: t('Quantity'),
+          field: 'quantity',
+          valueFormatter: ({
+            value,
+            data,
+          }: VegaValueFormatterParams<LedgerEntry, 'quantity'>) => {
+            const assetDecimalPlaces = data?.asset?.decimals || 0;
+            return value
+              ? addDecimalsFormatNumber(value, assetDecimalPlaces)
+              : '';
+          },
+        },
+        {
+          headerName: t('Asset'),
+          field: 'assetId',
+          valueFormatter: ({
+            value,
+            data,
+          }: VegaValueFormatterParams<LedgerEntry, 'asset'>) =>
+            data?.asset?.symbol || '',
+        },
+        {
+          headerName: t('Sender account balance'),
+          field: 'fromAccountBalance',
+          valueFormatter: ({
+            value,
+            data,
+          }: VegaValueFormatterParams<LedgerEntry, 'fromAccountBalance'>) => {
+            const assetDecimalPlaces = data?.asset?.decimals || 0;
+            return value
+              ? addDecimalsFormatNumber(value, assetDecimalPlaces)
+              : '';
+          },
+        },
+        {
+          headerName: t('Receiver account balance'),
+          field: 'toAccountBalance',
+          valueFormatter: ({
+            value,
+            data,
+          }: VegaValueFormatterParams<LedgerEntry, 'toAccountBalance'>) => {
+            const assetDecimalPlaces = data?.asset?.decimals || 0;
+            return value
+              ? addDecimalsFormatNumber(value, assetDecimalPlaces)
+              : '';
+          },
+        },
+        {
+          headerName: t('Vega time'),
+          field: 'vegaTime',
+          valueFormatter: ({
+            value,
+          }: VegaValueFormatterParams<LedgerEntry, 'vegaTime'>) =>
+            value ? getDateTimeFormat().format(fromNanoSeconds(value)) : '-',
+          filterParams: dateRangeFilterParams,
+          filter: DateRangeFilter,
+          flex: 1,
+        },
+      ],
+      []
+    );
+    return (
+      <AgGrid
+        style={{ width: '100%', height: '100%' }}
+        ref={ref}
+        tooltipShowDelay={500}
+        defaultColDef={{
+          resizable: true,
+          sortable: true,
+          tooltipComponent: TransferTooltipCellComponent,
+          filterParams: {
+            ...dateRangeFilterParams,
+            buttons: ['reset'],
+          },
+        }}
+        columnDefs={columnDefs}
+        {...props}
+      />
+    );
+  }
+);

libs/market-depth/jest.config.ts

@@ -4,25 +4,9 @@ export default {
   preset: '../../jest.preset.js',
   transform: {
     '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
-    '^.+\\.[tj]sx?$': [
-      'babel-jest',
-      {
-        presets: ['@nx/react/babel'],
-        // required for pennant to work in jest, due to having untranspiled exports
-        plugins: [
-          [
-            '@babel/plugin-proposal-private-methods',
-            {
-              loose: true,
-            },
-          ],
-        ],
-      },
-    ],
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/market-depth',
   setupFilesAfterEnv: ['./src/setup-tests.ts'],
-  // dont ignore pennant from transpilation
-  transformIgnorePatterns: ['<rootDir>/node_modules/pennant'],
 };

libs/markets/src/lib/SuccessorMarket.graphql

@@ -34,8 +34,5 @@ query SuccessorMarket($marketId: ID!) {
         code
       }
     }
-    proposal {
-      id
-    }
   }
 }

libs/markets/src/lib/__generated__/SuccessorMarket.ts

@@ -27,7 +27,7 @@ export type SuccessorMarketQueryVariables = Types.Exact<{
 }>;
 
 
-export type SuccessorMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, positionDecimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } }, proposal?: { __typename?: 'Proposal', id?: string | null } | null } | null };
+export type SuccessorMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, positionDecimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } } } | null };
 
 
 export const SuccessorMarketIdDocument = gql`
@@ -153,9 +153,6 @@ export const SuccessorMarketDocument = gql`
         code
       }
     }
-    proposal {
-      id
-    }
   }
 }
     `;

libs/markets/src/lib/components/market-info/market-info-accordion.tsx

@@ -1,8 +1,4 @@
-import {
-  FLAGS,
-  TokenStaticLinks,
-  useEnvironment,
-} from '@vegaprotocol/environment';
+import { TokenStaticLinks, useEnvironment } from '@vegaprotocol/environment';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
@@ -38,7 +34,6 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-  SuccessionLineInfoPanel,
 } from './market-info-panels';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';
@@ -296,13 +291,6 @@ export const MarketInfoAccordion = ({
                 </>
               }
             />
-            {FLAGS.SUCCESSOR_MARKETS && (
-              <AccordionItem
-                itemId="succession-line"
-                title={t('Succession line')}
-                content={<SuccessionLineInfoPanel market={market} />}
-              />
-            )}
           </Accordion>
         </div>
       )}

libs/markets/src/lib/components/market-info/market-info-panels.spec.tsx

@@ -1,11 +1,9 @@
-import { render, screen, waitFor } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import {
   ConditionOperator,
   ConditionOperatorMapping,
 } from '@vegaprotocol/types';
-import { DataSourceProof, SuccessionLineInfoPanel } from './market-info-panels';
-import { MockedProvider } from '@apollo/react-testing';
-import { SuccessorMarketIdsDocument } from '../../__generated__';
+import { DataSourceProof } from './market-info-panels';
 
 jest.mock('../../hooks/use-oracle-markets', () => ({
   useOracleMarkets: () => [],
@@ -139,93 +137,3 @@ describe('DataSourceProof', () => {
     ).toBeInTheDocument();
   });
 });
-
-describe('SuccessionLineInfoPanel', () => {
-  const mocks = [
-    {
-      request: {
-        query: SuccessorMarketIdsDocument,
-      },
-      result: {
-        data: {
-          __typename: 'Query',
-          marketsConnection: {
-            __typename: 'MarketConnection',
-            edges: [
-              {
-                __typename: 'MarketEdge',
-                node: {
-                  __typename: 'Market',
-                  id: 'abc',
-                  successorMarketID: 'def',
-                  parentMarketID: null,
-                },
-              },
-              {
-                __typename: 'MarketEdge',
-                node: {
-                  __typename: 'Market',
-                  id: 'def',
-                  successorMarketID: 'ghi',
-                  parentMarketID: 'abc',
-                },
-              },
-              {
-                __typename: 'MarketEdge',
-                node: {
-                  __typename: 'Market',
-                  id: 'ghi',
-                  successorMarketID: null,
-                  parentMarketID: 'def',
-                },
-              },
-            ],
-          },
-        },
-      },
-    },
-  ];
-
-  it.each([
-    ['abc', 1],
-    ['def', 2],
-    ['ghi', 3],
-  ])(
-    'renders succession line for %s (current position %d)',
-    async (id, number) => {
-      render(
-        <MockedProvider mocks={mocks}>
-          <SuccessionLineInfoPanel
-            market={{
-              id,
-            }}
-          />
-        </MockedProvider>
-      );
-
-      await waitFor(() => {
-        const items = screen.getAllByTestId('succession-line-item');
-        expect(items.length).toBe(3);
-        expect(
-          items[0].querySelector(
-            '[data-testid="succession-line-item-market-id"]'
-          )?.textContent
-        ).toBe('abc');
-        expect(
-          items[1].querySelector(
-            '[data-testid="succession-line-item-market-id"]'
-          )?.textContent
-        ).toBe('def');
-        expect(
-          items[2].querySelector(
-            '[data-testid="succession-line-item-market-id"]'
-          )?.textContent
-        ).toBe('ghi');
-
-        expect(
-          items[number - 1].querySelector('[data-testid="icon-bullet"]')
-        ).toBeInTheDocument();
-      });
-    }
-  );
-});

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -1,17 +1,11 @@
 import type { ReactNode } from 'react';
-import { Fragment, useState } from 'react';
+import { useState } from 'react';
 import { useMemo } from 'react';
 import { AssetDetailsTable, useAssetDataProvider } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { marketDataProvider } from '../../market-data-provider';
 import { totalFeesPercentage } from '../../market-utils';
-import {
-  ExternalLink,
-  Splash,
-  Tooltip,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
 import {
   addDecimalsFormatNumber,
   formatNumber,
@@ -29,26 +23,14 @@ import BigNumber from 'bignumber.js';
 import type { DataSourceDefinition, SignerKind } from '@vegaprotocol/types';
 import { ConditionOperatorMapping } from '@vegaprotocol/types';
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
-import {
-  DApp,
-  FLAGS,
-  TOKEN_PROPOSAL,
-  useEnvironment,
-  useLinks,
-} from '@vegaprotocol/environment';
+import { FLAGS, useEnvironment } from '@vegaprotocol/environment';
 import type { Provider } from '../../oracle-schema';
 import { OracleBasicProfile } from '../../components/oracle-basic-profile';
 import { useOracleProofs } from '../../hooks';
 import { OracleDialog } from '../oracle-dialog/oracle-dialog';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import {
-  useParentMarketIdQuery,
-  useSuccessorMarketIdsQuery,
-  useSuccessorMarketQuery,
-} from '../../__generated__';
+import { useParentMarketIdQuery } from '../../__generated__';
 import { useSuccessorMarketProposalDetailsQuery } from '@vegaprotocol/proposals';
-import classNames from 'classnames';
-import compact from 'lodash/compact';
 
 type MarketInfoProps = {
   market: MarketInfo;
@@ -209,126 +191,6 @@ export const KeyDetailsInfoPanel = ({ market }: MarketInfoProps) => {
   );
 };
 
-const SuccessionLineItem = ({
-  marketId,
-  isCurrent,
-}: {
-  marketId: string;
-  isCurrent?: boolean;
-}) => {
-  const { data } = useSuccessorMarketQuery({
-    variables: {
-      marketId,
-    },
-  });
-
-  const marketData = data?.market;
-  const governanceLink = useLinks(DApp.Token);
-  const proposalLink = marketData?.proposal?.id
-    ? governanceLink(TOKEN_PROPOSAL.replace(':id', marketData?.proposal?.id))
-    : undefined;
-
-  return (
-    <div
-      data-testid="succession-line-item"
-      className={classNames(
-        'rounded p-2 bg-vega-clight-700 dark:bg-vega-cdark-700',
-        'font-alpha',
-        'flex flex-col '
-      )}
-    >
-      <div className="flex justify-between">
-        <div>
-          {marketData ? (
-            proposalLink ? (
-              <ExternalLink href={proposalLink}>
-                {marketData.tradableInstrument.instrument.code}
-              </ExternalLink>
-            ) : (
-              marketData.tradableInstrument.instrument.code
-            )
-          ) : (
-            <span className="block w-20 h-4 mb-1 bg-vega-clight-500 dark:bg-vega-cdark-500 animate-pulse"></span>
-          )}
-        </div>
-        {isCurrent && (
-          <Tooltip description={t('This market')}>
-            <div className="text-vega-clight-200 dark:text-vega-cdark-200 cursor-help">
-              <VegaIcon name={VegaIconNames.BULLET} size={16} />
-            </div>
-          </Tooltip>
-        )}
-      </div>
-      <div className="text-xs">
-        {marketData ? (
-          marketData.tradableInstrument.instrument.name
-        ) : (
-          <span className="block w-28 h-4 bg-vega-clight-500 dark:bg-vega-cdark-500 animate-pulse"></span>
-        )}
-      </div>
-      <div
-        data-testid="succession-line-item-market-id"
-        className="text-xs truncate mt-1"
-      >
-        {marketId}
-      </div>
-    </div>
-  );
-};
-
-const SuccessionLink = () => (
-  <div className="text-center leading-none" aria-hidden>
-    <VegaIcon name={VegaIconNames.ARROW_DOWN} size={12} />
-  </div>
-);
-
-const buildSuccessionLine = (
-  all: {
-    id: string;
-    successorMarketID?: string | null | undefined;
-    parentMarketID?: string | null | undefined;
-  }[],
-  id: string
-) => {
-  let line = [id];
-  const find = (id: string, dir?: 'up' | 'down') => {
-    const item = all.find((a) => a.id === id);
-    const anc = dir === 'up' && item?.parentMarketID;
-    const des = dir === 'down' && item?.successorMarketID;
-    if (anc) {
-      line = [anc, ...line];
-      find(anc, 'up');
-    }
-    if (des) {
-      line = [...line, des];
-      find(des, 'down');
-    }
-  };
-  find(id, 'up');
-  find(id, 'down');
-  return line;
-};
-export const SuccessionLineInfoPanel = ({
-  market,
-}: {
-  market: Pick<MarketInfo, 'id'>;
-}) => {
-  const { data } = useSuccessorMarketIdsQuery();
-  const ids = compact(data?.marketsConnection?.edges.map((e) => e.node));
-  const line = buildSuccessionLine(ids, market.id);
-
-  return (
-    <div className="flex flex-col gap-2">
-      {line.map((id, i) => (
-        <Fragment key={i}>
-          {i > 0 && <SuccessionLink />}
-          <SuccessionLineItem marketId={id} isCurrent={id === market.id} />
-        </Fragment>
-      ))}
-    </div>
-  );
-};
-
 export const InstrumentInfoPanel = ({ market }: MarketInfoProps) => (
   <MarketInfoTable
     data={{

libs/markets/src/lib/components/markets-container/market-list-table.tsx

@@ -1,9 +1,11 @@
+import React, { forwardRef } from 'react';
 import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
 import {
   AgGridLazy as AgGrid,
   PriceFlashCell,
   MarketNameCell,
 } from '@vegaprotocol/datagrid';
+import type { AgGridReact } from 'ag-grid-react';
 import type { MarketMaybeWithData } from '../../markets-provider';
 import { OracleStatus } from './oracle-status';
 import { useColumnDefs } from './use-column-defs';
@@ -41,15 +43,14 @@ const defaultColDef = {
   filterParams: { buttons: ['reset'] },
   minWidth: 100,
 };
-type Props = TypedDataAgGrid<MarketMaybeWithData> & {
-  onMarketClick: (marketId: string, metaKey?: boolean) => void;
-  SuccessorMarketRenderer?: React.FC<{ value: string }>;
-};
-export const MarketListTable = ({
-  onMarketClick,
-  SuccessorMarketRenderer,
-  ...props
-}: Props) => {
+
+export const MarketListTable = forwardRef<
+  AgGridReact,
+  TypedDataAgGrid<MarketMaybeWithData> & {
+    onMarketClick: (marketId: string, metaKey?: boolean) => void;
+    SuccessorMarketRenderer?: React.FC<{ value: string }>;
+  }
+>(({ onMarketClick, SuccessorMarketRenderer, ...props }, ref) => {
   const columnDefs = useColumnDefs({ onMarketClick });
   const components = {
     PriceFlashCell,
@@ -60,6 +61,7 @@ export const MarketListTable = ({
     <AgGrid
       style={{ width: '100%', height: '100%' }}
       getRowId={getRowId}
+      ref={ref}
       defaultColDef={defaultColDef}
       columnDefs={columnDefs}
       suppressCellFocus
@@ -67,6 +69,6 @@ export const MarketListTable = ({
       {...props}
     />
   );
-};
+});
 
 export default MarketListTable;

libs/markets/src/lib/components/markets-container/markets-container.tsx

@@ -1,5 +1,6 @@
 import type { MouseEvent } from 'react';
-import React, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
 import type { CellClickedEvent } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';
 import { MarketListTable } from './market-list-table';
@@ -17,6 +18,8 @@ export const MarketsContainer = ({
   onSelect,
   SuccessorMarketRenderer,
 }: MarketsContainerProps) => {
+  const gridRef = useRef<AgGridReact | null>(null);
+
   const { data, error, reload } = useDataProvider({
     dataProvider,
     variables: undefined,
@@ -34,6 +37,7 @@ export const MarketsContainer = ({
   return (
     <div className="h-full relative">
       <MarketListTable
+        ref={gridRef}
         rowData={data}
         onCellClicked={(cellEvent: CellClickedEvent) => {
           const { data, column, event } = cellEvent;

libs/orders/src/lib/components/index.ts

@@ -1,4 +1,3 @@
-export * from './open-orders-menu';
 export * from './order-data-provider';
 export * from './order-list';
 export * from './order-list-manager';

libs/orders/src/lib/components/open-orders-menu/index.ts

@@ -1 +0,0 @@
-export * from './open-orders-menu';

libs/orders/src/lib/components/open-orders-menu/open-orders-menu.tsx

@@ -1,39 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingButton } from '@vegaprotocol/ui-toolkit';
-import { useVegaTransactionStore, useVegaWallet } from '@vegaprotocol/wallet';
-import { useHasAmendableOrder } from '../../order-hooks';
-
-export const OpenOrdersMenu = ({ marketId }: { marketId: string }) => {
-  const { isReadOnly } = useVegaWallet();
-  const create = useVegaTransactionStore((state) => state.create);
-  const hasAmendableOrder = useHasAmendableOrder(marketId);
-
-  if (isReadOnly) {
-    return null;
-  }
-
-  if (!hasAmendableOrder) {
-    return null;
-  }
-
-  return (
-    <CancelAllOrdersButton
-      onClick={() => {
-        create({
-          orderCancellation: {},
-        });
-      }}
-    />
-  );
-};
-
-const CancelAllOrdersButton = ({ onClick }: { onClick: () => void }) => (
-  <TradingButton
-    intent={Intent.Primary}
-    size="extra-small"
-    onClick={onClick}
-    data-testid="cancelAll"
-  >
-    {t('Cancel all')}
-  </TradingButton>
-);

libs/orders/src/lib/components/order-actions-dropdown/index.ts

@@ -0,0 +1 @@
+export * from './order-actions-dropdown';

libs/orders/src/lib/components/order-actions-dropdown/order-actions-dropdown.tsx

@@ -0,0 +1,13 @@
+import {
+  ActionsDropdown,
+  TradingDropdownCopyItem,
+} from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+
+export const OrderActionsDropdown = ({ id }: { id: string }) => {
+  return (
+    <ActionsDropdown data-testid="order-actions-content">
+      <TradingDropdownCopyItem value={id} text={t('Copy order ID')} />
+    </ActionsDropdown>
+  );
+};

libs/orders/src/lib/components/order-list-manager/order-list-manager.tsx

@@ -1,7 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
 import { useCallback, useRef, useState } from 'react';
+import { Button } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { OrderListTable } from '../order-list/order-list';
+import { useHasAmendableOrder } from '../../order-hooks/use-has-amendable-order';
 import type { useDataGridEvents } from '@vegaprotocol/datagrid';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { ordersWithMarketProvider } from '../order-data-provider/order-data-provider';
@@ -12,7 +14,6 @@ import {
 import type { OrderTxUpdateFieldsFragment } from '@vegaprotocol/wallet';
 import { OrderEditDialog } from '../order-list/order-edit-dialog';
 import type { Order } from '../order-data-provider';
-import { OrderViewDialog } from '../order-list/order-view-dialog';
 
 export enum Filter {
   'Open' = 'Open',
@@ -22,6 +23,7 @@ export enum Filter {
 
 export interface OrderListManagerProps {
   partyId: string;
+  marketId?: string;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   onOrderTypeClick?: (marketId: string, metaKey?: boolean) => void;
   isReadOnly: boolean;
@@ -31,6 +33,7 @@ export interface OrderListManagerProps {
 
 export const OrderListManager = ({
   partyId,
+  marketId,
   onMarketClick,
   onOrderTypeClick,
   isReadOnly,
@@ -39,8 +42,8 @@ export const OrderListManager = ({
 }: OrderListManagerProps) => {
   const gridRef = useRef<AgGridReact | null>(null);
   const [editOrder, setEditOrder] = useState<Order | null>(null);
-  const [viewOrder, setViewOrder] = useState<Order | null>(null);
   const create = useVegaTransactionStore((state) => state.create);
+  const hasAmendableOrder = useHasAmendableOrder(marketId);
   const variables =
     filter === Filter.Open
       ? { partyId, filter: { liveOnly: true } }
@@ -71,6 +74,12 @@ export const OrderListManager = ({
     [create]
   );
 
+  const cancelAll = useCallback(() => {
+    create({
+      orderCancellation: {},
+    });
+  }, [create]);
+
   return (
     <>
       <div className="h-full relative">
@@ -80,7 +89,6 @@ export const OrderListManager = ({
           filter={filter}
           onCancel={cancel}
           onEdit={setEditOrder}
-          onView={setViewOrder}
           onMarketClick={onMarketClick}
           onOrderTypeClick={onOrderTypeClick}
           isReadOnly={isReadOnly}
@@ -89,6 +97,9 @@ export const OrderListManager = ({
           {...gridProps}
         />
       </div>
+      {!isReadOnly && hasAmendableOrder && (
+        <CancelAllOrdersButton onClick={cancelAll} />
+      )}
       {editOrder && (
         <OrderEditDialog
           isOpen={Boolean(editOrder)}
@@ -123,14 +134,19 @@ export const OrderListManager = ({
           }}
         />
       )}
-      {viewOrder && (
-        <OrderViewDialog
-          isOpen={Boolean(viewOrder)}
-          order={viewOrder}
-          onChange={() => setViewOrder(null)}
-          onMarketClick={onMarketClick}
-        />
-      )}
     </>
   );
 };
+
+const CancelAllOrdersButton = ({ onClick }: { onClick: () => void }) => (
+  <div className="dark:bg-black/75 bg-white/75 h-auto flex justify-end p-2 absolute bottom-0 right-0 rounded">
+    <Button
+      variant="primary"
+      size="sm"
+      onClick={onClick}
+      data-testid="cancelAll"
+    >
+      {t('Cancel all')}
+    </Button>
+  </div>
+);

libs/orders/src/lib/components/order-list/order-list.spec.tsx

@@ -27,7 +27,6 @@ const defaultProps: OrderListTableProps = {
   rowData: [],
   onEdit: jest.fn(),
   onCancel: jest.fn(),
-  onView: jest.fn(),
   isReadOnly: false,
 };
 
@@ -114,11 +113,9 @@ describe('OrderListTable', () => {
   it('should apply correct formatting applied for an iceberg order', async () => {
     const icebergOrder = {
       ...limitOrder,
-      size: '100',
-      remaining: '50',
       icebergOrder: {
         __typename: 'IcebergOrder',
-        minimumVisibleSize: '1',
+        minimumVisibleSize: '100',
         peakSize: '50',
         reservedRemaining: '50',
       } as OrderFieldsFragment['icebergOrder'],
@@ -129,8 +126,8 @@ describe('OrderListTable', () => {
     const cells = screen.getAllByRole('gridcell');
     const expectedValues: string[] = [
       icebergOrder.market?.tradableInstrument.instrument.code || '',
-      '0.00',
-      '+1.00',
+      '0.05',
+      '0.10',
       Schema.OrderTypeMapping[
         icebergOrder.type || Schema.OrderType.TYPE_LIMIT
       ] + ' (Iceberg)',

libs/orders/src/lib/components/order-list/order-list.stories.tsx

@@ -22,9 +22,6 @@ const Template: Story = (args) => {
         onEdit={() => {
           return;
         }}
-        onView={() => {
-          return;
-        }}
         isReadOnly={false}
       />
     </div>
@@ -52,9 +49,6 @@ const Template2: Story = (args) => {
           rowData={args.data}
           onCancel={cancel}
           onEdit={setEditOrder}
-          onView={() => {
-            return;
-          }}
           isReadOnly={false}
         />
       </div>

libs/orders/src/lib/components/order-list/order-list.tsx

@@ -6,14 +6,7 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
-import {
-  ActionsDropdown,
-  ButtonLink,
-  TradingDropdownCopyItem,
-  DropdownMenuItem,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { ForwardedRef } from 'react';
 import { memo, forwardRef, useMemo } from 'react';
 import {
@@ -34,6 +27,7 @@ import type {
 } from '@vegaprotocol/datagrid';
 import type { AgGridReact } from 'ag-grid-react';
 import type { Order } from '../order-data-provider';
+import { OrderActionsDropdown } from '../order-actions-dropdown';
 import { Filter } from '../order-list-manager';
 import type { ColDef } from 'ag-grid-community';
 
@@ -41,7 +35,6 @@ export type OrderListTableProps = TypedDataAgGrid<Order> & {
   marketId?: string;
   onCancel: (order: Order) => void;
   onEdit: (order: Order) => void;
-  onView: (order: Order) => void;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   onOrderTypeClick?: (marketId: string, metaKey?: boolean) => void;
   filter?: Filter;
@@ -53,15 +46,7 @@ export const OrderListTable = memo<
 >(
   forwardRef<AgGridReact, OrderListTableProps>(
     (
-      {
-        onCancel,
-        onEdit,
-        onView,
-        onMarketClick,
-        onOrderTypeClick,
-        filter,
-        ...props
-      },
+      { onCancel, onEdit, onMarketClick, onOrderTypeClick, filter, ...props },
       ref
     ) => {
       const showAllActions = props.isReadOnly
@@ -86,13 +71,21 @@ export const OrderListTable = memo<
             valueGetter: ({ data }: VegaValueGetterParams<Order>) => {
               if (data?.icebergOrder) {
                 return data?.size && data.market
-                  ? BigInt(data.size) -
-                      BigInt(data.remaining) -
-                      BigInt(data.icebergOrder.reservedRemaining)
+                  ? toBigNum(
+                      (
+                        BigInt(data.size) -
+                        BigInt(data.remaining) -
+                        BigInt(data.icebergOrder.reservedRemaining)
+                      ).toString(),
+                      data.market.positionDecimalPlaces ?? 0
+                    ).toNumber()
                   : undefined;
               }
               return data?.size && data.market
-                ? BigInt(data.size) - BigInt(data.remaining)
+                ? toBigNum(
+                    (BigInt(data.size) - BigInt(data.remaining)).toString(),
+                    data.market.positionDecimalPlaces ?? 0
+                  ).toNumber()
                 : undefined;
             },
             valueFormatter: ({
@@ -106,8 +99,8 @@ export const OrderListTable = memo<
                 return '-';
               }
               return addDecimalsFormatNumber(
-                value,
-                data.market.positionDecimalPlaces ?? 0
+                (BigInt(data.size) - BigInt(data.remaining)).toString(),
+                data.market.positionDecimalPlaces
               );
             },
             minWidth: 50,
@@ -302,20 +295,7 @@ export const OrderListTable = memo<
                       </ButtonLink>
                     </>
                   )}
-                  <ActionsDropdown data-testid="market-actions-content">
-                    <TradingDropdownCopyItem
-                      value={data.id}
-                      text={t('Copy order ID')}
-                    />
-                    <DropdownMenuItem
-                      key={'view-order'}
-                      data-testid="view-order"
-                      onClick={() => onView(data)}
-                    >
-                      <VegaIcon name={VegaIconNames.INFO} size={16} />
-                      {t('View order details')}
-                    </DropdownMenuItem>
-                  </ActionsDropdown>
+                  <OrderActionsDropdown id={data?.id} />
                 </div>
               );
             },
@@ -325,7 +305,6 @@ export const OrderListTable = memo<
           filter,
           onCancel,
           onEdit,
-          onView,
           onMarketClick,
           onOrderTypeClick,
           props.isReadOnly,