fix(explorer): use div in place of potentially empty fragment

test(explorer): mock markdown and test bundle exists
chore(explorer): finish splitting up signature bundle component
2023-03-03 10:28:32 +00:00 · 2023-03-02 12:30:53 +00:00 · 2023-03-02 10:43:39 +00:00 · 2023-03-02 10:43:39 +00:00 · 2023-03-02 10:43:39 +00:00 · 2023-03-02 10:43:39 +00:00
241 changed files with 3535 additions and 6697 deletions
@@ -87,7 +87,7 @@ jobs:
        run: ls -alsh /home/runner/.vegacapsule/testnet/logs/

      - uses: actions/upload-artifact@v3
-        if: ${{ failure() }}
+        if: ${{ always() }}
        with:
          name: logs-${{ matrix.project }}
          path: /home/runner/.vegacapsule/testnet/logs
@@ -22,6 +22,7 @@
    "governance.proposal.updateAsset.minProposerBalance",
    "governance.proposal.updateAsset.minVoterBalance",
    "governance.proposal.updateAsset.requiredParticipation",
+    "governance.proposal.updateMarket.minProposerEquityLikeShare",
    "market.fee.factors.infrastructureFee",
    "market.fee.factors.makerFee",
    "market.liquidity.bondPenaltyParameter",
@@ -76,7 +77,6 @@
    "governance.proposal.updateMarket.requiredParticipationLP",
    "governance.proposal.updateNetParam.requiredMajority",
    "governance.proposal.updateNetParam.requiredParticipation",
-    "governance.proposal.updateMarket.minProposerEquityLikeShare",
    "validators.vote.required"
  ],
  "duration": [
@@ -1,7 +1,7 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_NETWORKS='{"SANDBOX":"https://sandbox.explorer.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
@@ -1,7 +1,9 @@
 # App configuration variables
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=CUSTOM
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 # App flags
@@ -2,7 +2,9 @@
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=DEVNET
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
@@ -2,7 +2,9 @@
 NX_TENDERMINT_URL=https://be.explorer.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=MAINNET
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
@@ -2,7 +2,9 @@
 NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mirror-network.json
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_ENV=MIRROR
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
@@ -5,6 +5,7 @@ NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.sandbox.vega.xyz/websocket
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -4,6 +4,7 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
@@ -1,7 +1,9 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
 NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
@@ -3,8 +3,11 @@ NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
+NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=TESTNET
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_VEGA_NETWORKS={}
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
+NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
@@ -3,8 +3,10 @@ NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/validator-testnet-network.json
 NX_VEGA_URL=https://api.validators-testnet.vega.xyz/graphql
 NX_VEGA_REST=https://api.validators-testnet.vega.xyz/
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.xyz
@@ -2,5 +2,6 @@
 NX_TENDERMINT_URL=http://localhost:26607/
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -4,8 +4,9 @@ import {
  getMarketExpiryDateFormatted,
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import type { MarketInfoNoCandlesQuery } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
+import pick from 'lodash/pick';
 import {
  MarketStateMapping,
  MarketTradingModeMapping,
@@ -16,7 +17,11 @@ import BigNumber from 'bignumber.js';
 import { useMemo } from 'react';
 import { Link } from 'react-router-dom';

-export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
+export const MarketDetails = ({
+  market,
+}: {
+  market: MarketInfoNoCandlesQuery['market'];
+}) => {
  const quoteUnit = market?.tradableInstrument.instrument.product.quoteName;
  const assetId = useMemo(
    () => market?.tradableInstrument.instrument.product?.settlementAsset.id,
@@ -27,9 +32,7 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;

  const keyDetails = {
-    decimalPlaces: market.decimalPlaces,
-    positionDecimalPlaces: market.positionDecimalPlaces,
-    tradingMode: market.tradingMode,
+    ...pick(market, 'decimalPlaces', 'positionDecimalPlaces', 'tradingMode'),
    state: MarketStateMapping[market.state],
  };
  const assetDecimals =
@@ -21,7 +21,7 @@ type NavStore = {
  hide: () => void;
 };

-export const useNavStore = create<NavStore>()((set, get) => ({
+export const useNavStore = create<NavStore>((set, get) => ({
  open: false,
  toggle: () => set({ open: !get().open }),
  hide: () => set({ open: false }),
@@ -1,26 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-interface CancelSummaryProps {
-  orderId?: string;
-  marketId?: string;
-}
-
-/**
- * Simple component for rendering a reasonable string from an order cancellation
- */
-export const CancelSummary = ({ orderId, marketId }: CancelSummaryProps) => {
-  return <span className="font-bold">{getLabel(orderId, marketId)}</span>;
-};
-
-export function getLabel(
-  orderId: string | undefined,
-  marketId: string | undefined
-): string {
-  if (!orderId && !marketId) {
-    return t('All orders');
-  } else if (marketId && !orderId) {
-    return t('All in market');
-  }
-
-  return '-';
-}
@@ -2,7 +2,6 @@ import type { BatchCancellationInstruction } from '../../../../routes/types/bloc
 import { TxOrderType } from '../../tx-order-type';
 import { MarketLink } from '../../../links';
 import OrderSummary from '../../../order-summary/order-summary';
-import { CancelSummary } from '../../../order-summary/order-cancellation';

 interface BatchCancelProps {
  index: number;
@@ -20,14 +19,7 @@ export const BatchCancel = ({ index, submission }: BatchCancelProps) => {
        <TxOrderType orderType={'OrderCancellation'} />
      </td>
      <td>
-        {submission.orderId ? (
-          <OrderSummary id={submission.orderId} modifier="cancelled" />
-        ) : (
-          <CancelSummary
-            orderId={submission.orderId}
-            marketId={submission.marketId}
-          />
-        )}
+        <OrderSummary id={submission.orderId} modifier="cancelled" />
      </td>
      <td>
        <MarketLink id={submission.marketId} />
@@ -5,8 +5,6 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
-import { CancelSummary } from '../../order-summary/order-cancellation';
-import Hash from '../../links/hash';

 interface TxDetailsOrderCancelProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -26,8 +24,8 @@ export const TxDetailsOrderCancel = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

-  const marketId: string = txData.command.orderCancellation.marketId;
-  const orderId: string = txData.command.orderCancellation.orderId;
+  const marketId: string = txData.command.orderCancellation.marketId || '-';
+  const orderId: string = txData.command.orderCancellation.orderId || '-';

  return (
    <>
@@ -40,24 +38,18 @@ export const TxDetailsOrderCancel = ({
        <TableRow modifier="bordered">
          <TableCell>{t('Order')}</TableCell>
          <TableCell>
-            {orderId ? (
-              <Hash text={orderId} />
-            ) : (
-              <CancelSummary orderId={orderId} marketId={marketId} />
-            )}
+            <code>{orderId}</code>
+          </TableCell>
+        </TableRow>
+        <TableRow modifier="bordered">
+          <TableCell>{t('Market')}</TableCell>
+          <TableCell>
+            <MarketLink id={marketId} />
          </TableCell>
        </TableRow>
-        {marketId ? (
-          <TableRow modifier="bordered">
-            <TableCell>{t('Market')}</TableCell>
-            <TableCell>
-              <MarketLink id={marketId} />
-            </TableCell>
-          </TableRow>
-        ) : null}
      </TableWithTbody>

-      {orderId ? <DeterministicOrderDetails id={orderId} /> : null}
+      {orderId !== '-' ? <DeterministicOrderDetails id={orderId} /> : null}
    </>
  );
 };
@@ -12,7 +12,6 @@ export const Proposals = () => {

  const { data, loading, error } = useDataProvider({
    dataProvider: proposalsDataProvider,
-    variables: {},
  });

  useDocumentTitle([t('Governance Proposals')]);
@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
-import { useState } from 'react';
+import { useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import { MarketDetails } from '../../components/markets/market-details';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoProvider } from '@vegaprotocol/market-info';
+import { marketInfoNoCandlesDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';

 export const MarketPage = () => {
@@ -16,17 +16,24 @@ export const MarketPage = () => {

  const { marketId } = useParams<{ marketId: string }>();

+  const variables = useMemo(
+    () => ({
+      marketId,
+    }),
+    [marketId]
+  );
+
  const { data, loading, error } = useDataProvider({
-    dataProvider: marketInfoProvider,
+    dataProvider: marketInfoNoCandlesDataProvider,
    skipUpdates: true,
-    variables: {
-      marketId: marketId || '',
-      skip: !marketId,
-    },
+    variables,
  });

  useDocumentTitle(
-    compact(['Market details', data?.tradableInstrument.instrument.name])
+    compact([
+      'Market details',
+      data?.market?.tradableInstrument.instrument.name,
+    ])
  );

  const [dialogOpen, setDialogOpen] = useState<boolean>(false);
@@ -36,10 +43,10 @@ export const MarketPage = () => {
      <section className="relative">
        <PageTitle
          data-testid="markets-heading"
-          title={data?.tradableInstrument.instrument.name || ''}
+          title={data?.market?.tradableInstrument.instrument.name || ''}
          actions={
            <Button
-              disabled={!data}
+              disabled={!data?.market}
              size="xs"
              onClick={() => setDialogOpen(true)}
            >
@@ -53,14 +60,14 @@ export const MarketPage = () => {
          loading={loading}
          error={error}
        >
-          {data && <MarketDetails market={data} />}
+          <MarketDetails market={data?.market} />
        </AsyncRenderer>
      </section>
      <JsonViewerDialog
        open={dialogOpen}
        onChange={(isOpen) => setDialogOpen(isOpen)}
-        title={data?.tradableInstrument.instrument.name || ''}
-        content={data}
+        title={data?.market?.tradableInstrument.instrument.name || ''}
+        content={data?.market}
      />
    </>
  );
@@ -13,7 +13,6 @@ export const MarketsPage = () => {

  const { data, loading, error } = useDataProvider({
    dataProvider: marketsProvider,
-    variables: undefined,
    skipUpdates: true,
  });

@@ -31,7 +31,6 @@ const PERCENTAGE_PARAMS = [
  'governance.proposal.updateMarket.requiredParticipationLP',
  'governance.proposal.updateNetParam.requiredMajority',
  'governance.proposal.updateNetParam.requiredParticipation',
-  'governance.proposal.updateMarket.minProposerEquityLikeShare',
  'validators.vote.required',
 ];

@@ -1,83 +0,0 @@
-export const trancheData = {
-  '0': {
-    tranche_id: 0,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 0,
-    duration: 0,
-  },
-  '1': {
-    tranche_id: 1,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 1670422330,
-    duration: 1670453883,
-  },
-  '107': {
-    tranche_id: 107,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 0,
-    duration: 0,
-  },
-  '110': {
-    tranche_id: 110,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 0,
-    duration: 0,
-  },
-  '154': {
-    tranche_id: 154,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 0,
-    duration: 0,
-  },
-  '2': {
-    tranche_id: 2,
-    users: [
-      '0x8716c75bb3abe54b959adc529e6355f0422454ed',
-      '0xc704da0e96a6b910ffa8d3f9f667d3d35db8e5a1',
-      '0xbb82d4d6e4381ae98f8c33629285867b54d91a03',
-      '0x82ffe4ed818a6c7d4f0f044998611f24ec916c43',
-      '0xb0594132540ebc14f17863f8296f4546a7afe4e7',
-      '0x9015a3db9a922521007a9b495cafda14d8d4128e',
-      '0x5426f7f717fdbe331bb5a99b908ad2fb75dff711',
-      '0xf73e7ad8aa300a7f86bcc4d55e6c4ea25546e057',
-    ],
-    initial_balance: 111300000000000000000,
-    current_balance: 111297025049610000000,
-    cliff_start: 1677578461,
-    duration: 15209600,
-  },
-  '3': {
-    tranche_id: 3,
-    users: [
-      '0xbb82d4d6e4381ae98f8c33629285867b54d91a03',
-      '0x82ffe4ed818a6c7d4f0f044998611f24ec916c43',
-      '0xb0594132540ebc14f17863f8296f4546a7afe4e7',
-      '0x9015a3db9a922521007a9b495cafda14d8d4128e',
-      '0x77a0b7e247b7b8ec99e068a24c401783d6c4dfff',
-      '0x5426f7f717fdbe331bb5a99b908ad2fb75dff711',
-      '0xc704da0e96a6b910ffa8d3f9f667d3d35db8e5a1',
-    ],
-    initial_balance: 21000000000000000000,
-    current_balance: 21000000000000000000,
-    cliff_start: 1677578461,
-    duration: 18628800,
-  },
-  '66': {
-    tranche_id: 66,
-    users: [],
-    initial_balance: 0,
-    current_balance: 0,
-    cliff_start: 0,
-    duration: 0,
-  },
-};
@@ -22,7 +22,7 @@
              "filters": [
                {
                  "key": {
-                    "name": "prices.BTC.value",
+                    "name": "prices.ETH.value",
                    "type": "TYPE_INTEGER",
                    "numberDecimalPlaces": "0"
                  },
@@ -38,34 +38,30 @@
          }
        },
        "dataSourceSpecForTradingTermination": {
-          "external": {
-            "oracle": {
-              "signers": [
+          "signers": [
+            {
+              "pubKey": {
+                "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+              }
+            }
+          ],
+          "filters": [
+            {
+              "key": {
+                "name": "trading.terminated.ETH5",
+                "type": "TYPE_BOOLEAN"
+              },
+              "conditions": [
                {
-                  "pubKey": {
-                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                  }
-                }
-              ],
-              "filters": [
-                {
-                  "key": {
-                    "name": "trading.terminated.ETH5",
-                    "type": "TYPE_BOOLEAN"
-                  },
-                  "conditions": [
-                    {
-                      "operator": "OPERATOR_EQUALS",
-                      "value": "true"
-                    }
-                  ]
+                  "operator": "OPERATOR_EQUALS",
+                  "value": "true"
                }
              ]
            }
-          }
+          ]
        },
        "dataSourceSpecBinding": {
-          "settlementDataProperty": "prices.BTC.value",
+          "settlementPriceProperty": "prices.BTC.value",
          "tradingTerminationProperty": "trading.terminated.ETH5"
        }
      }
@@ -1,86 +0,0 @@
-{
-  "lpPriceRange": "11",
-  "instrument": {
-    "code": "Token.24h",
-    "future": {
-      "quoteName": "fBTC",
-      "dataSourceSpecForSettlementData": {
-        "external": {
-          "oracle": {
-            "signers": [
-              {
-                "pubKey": {
-                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                }
-              }
-            ],
-            "filters": [
-              {
-                "key": {
-                  "name": "prices.BTC.value",
-                  "type": "TYPE_INTEGER"
-                },
-                "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_GREATER_THAN_OR_EQUAL",
-                    "value": "1648684800000000000"
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      },
-      "dataSourceSpecBinding": {
-        "settlementDataProperty": "prices.BTC.value",
-        "tradingTerminationProperty": "trading.terminated.ETH5"
-      }
-    }
-  },
-  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
-  "priceMonitoringParameters": {
-    "triggers": [
-      {
-        "horizon": "43200",
-        "probability": "0.9999999",
-        "auctionExtension": "600"
-      }
-    ]
-  },
-  "logNormal": {
-    "tau": 0.0001140771161,
-    "riskAversionParameter": 0.001,
-    "params": {
-      "mu": 0,
-      "r": 0.016,
-      "sigma": 0.3
-    }
-  }
-}
@@ -1,76 +1,62 @@
 {
-  "lpPriceRange": "10",
  "instrument": {
    "code": "TEST.24h",
    "future": {
      "quoteName": "fUSDC",
+      "settlementDataDecimals": 5,
      "dataSourceSpecForSettlementData": {
-        "external": {
-          "oracle": {
-            "signers": [
+        "signers": [
+          {
+            "pubKey": {
+              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+            }
+          }
+        ],
+        "filters": [
+          {
+            "key": {
+              "name": "prices.ETH.value",
+              "type": "TYPE_INTEGER"
+            },
+            "conditions": [
              {
-                "pubKey": {
-                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                }
-              }
-            ],
-            "filters": [
-              {
-                "key": {
-                  "name": "prices.ETH.value",
-                  "type": "TYPE_INTEGER",
-                  "numberDecimalPlaces": "0"
-                },
-                "conditions": [
-                  {
-                    "operator": "OPERATOR_GREATER_THAN",
-                    "value": "0"
-                  }
-                ]
+                "operator": "OPERATOR_GREATER_THAN",
+                "value": "0"
              }
            ]
          }
-        }
+        ]
      },
      "dataSourceSpecForTradingTermination": {
-        "external": {
-          "oracle": {
-            "signers": [
+        "signers": [
+          {
+            "pubKey": {
+              "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+            }
+          }
+        ],
+        "filters": [
+          {
+            "key": {
+              "name": "trading.terminated.ETH5",
+              "type": "TYPE_BOOLEAN"
+            },
+            "conditions": [
              {
-                "pubKey": {
-                  "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                }
-              }
-            ],
-            "filters": [
-              {
-                "key": {
-                  "name": "trading.terminated.ETH5",
-                  "type": "TYPE_BOOLEAN"
-                },
-                "conditions": [
-                  {
-                    "operator": "OPERATOR_EQUALS",
-                    "value": "true"
-                  }
-                ]
+                "operator": "OPERATOR_GREATER_THAN_OR_EQUAL",
+                "value": "1648684800000000000"
              }
            ]
          }
-        }
+        ]
      },
      "dataSourceSpecBinding": {
-        "settlementDataProperty": "prices.ETH.value",
+        "settlementPriceProperty": "prices.ETH.value",
        "tradingTerminationProperty": "trading.terminated.ETH5"
      }
    }
  },
-  "metadata": [
-    "sector:energy",
-    "sector:food",
-    "source:docs.vega.xyz",
-    "test:update"
-  ],
+  "metadata": ["sector:energy", "sector:food", "source:docs.vega.xyz"],
  "priceMonitoringParameters": {
    "triggers": [
      {
@@ -80,14 +66,6 @@
      }
    ]
  },
-  "liquidityMonitoringParameters": {
-    "targetStakeParameters": {
-      "timeWindow": "3600",
-      "scalingFactor": 10
-    },
-    "triggeringRatio": "0.7",
-    "auctionExtension": "1"
-  },
  "logNormal": {
    "tau": 0.0001140771161,
    "riskAversionParameter": 0.001,
@@ -26,10 +26,6 @@ const enactmentDeadlineError =
  '[data-testid="enactment-before-voting-deadline"]';
 const proposalDownloadBtn = '[data-testid="proposal-download-json"]';
 const feedbackError = '[data-testid="Error"]';
-const viewProposalBtn = 'view-proposal-btn';
-const liquidityVoteStatus = 'liquidity-votes-status';
-const tokenVoteStatus = 'token-votes-status';
-const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

@@ -49,7 +45,6 @@ context(
  { tags: '@slow' },
  function () {
    before('connect wallets and set approval limit', function () {
-      cy.createMarket();
      cy.visit('/');
      cy.vega_wallet_set_specified_approval_amount('1000');
    });
@@ -70,7 +65,7 @@ context(
      // 3002-PROP-007
      cy.get(newProposalDescription).type('E2E test for proposals');

-      cy.get(proposalParameterSelect).find('option').should('have.length', 117);
+      cy.get(proposalParameterSelect).find('option').should('have.length', 116);
      cy.get(proposalParameterSelect).select(
        // 3007-PNEC-002
        'governance_proposal_asset_minEnact'
@@ -180,8 +175,9 @@ context(
      cy.get(enactmentDeadlineError).should('not.exist');
    });

-    // 3003-PMAN-001
-    it('Able to submit valid new market proposal', function () {
+    // Skipping because unclear what the required json is yet for new market proposal, will update once docs have been updated
+    // 3003-todo-PMAN-001
+    it.skip('Able to submit valid new market proposal', function () {
      cy.go_to_make_new_proposal(governanceProposalType.NEW_MARKET);
      cy.get(newProposalTitle).type('Test new market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
@@ -203,7 +199,6 @@ context(
      cy.get(newProposalTitle).type('Test new market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-        newMarketProposal.invalid = 'I am an invalid field';
        let newMarketPayload = JSON.stringify(newMarketProposal);
        cy.get(newProposalTerms).type(newMarketPayload, {
          parseSpecialCharSequences: false,
@@ -214,66 +209,11 @@ context(
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should(
        'have.text',
-        'Invalid params: the transaction is not a valid Vega command: unknown field "invalid" in vega.NewMarket'
+        'Invalid params: the transaction is malformed'
      );
    });

-    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
-    // 3002-PROP-022
-    it('Unable to submit update market proposal without equity-like share in the market', function () {
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
-      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
-        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
-          parseSpecialCharSequences: false,
-          delay: 2,
-        });
-      });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      cy.getByTestId('dialog-content')
-        .find('p')
-        .should('have.text', 'PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
-      cy.ensure_specified_unstaked_tokens_are_associated('1');
-    });
-
-    // 3002-PROP-020
-    it('Unable to submit update market proposal without minimum amount of tokens', function () {
-      cy.vega_wallet_teardown();
-      cy.vega_wallet_faucet_assets_without_check(
-        'fUSDC',
-        '1000000',
-        vegaWalletPublicKey
-      );
-      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
-      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
-        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
-          parseSpecialCharSequences: false,
-          delay: 2,
-        });
-      });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should(
-        'have.text',
-        'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)'
-      );
-    });
-
-    // 3001-VOTE-092
-    it('Able to submit update market proposal and vote for proposal', function () {
-      cy.vega_wallet_faucet_assets_without_check(
-        'fUSDC',
-        '1000000',
-        vegaWalletPublicKey
-      );
+    it.skip('Able to submit update market proposal', function () {
      cy.go_to_make_new_proposal(governanceProposalType.UPDATE_MARKET);
      cy.get(newProposalTitle).type('Test update market proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
@@ -282,10 +222,6 @@ context(
        cy.get('dd').eq(0).should('have.text', 'Test market 1');
        cy.get('dd').eq(1).should('have.text', 'TEST.24h');
        cy.get('dd').eq(2).should('not.be.empty');
-        cy.get('dd').eq(2).invoke('text').as('EnactedMarketId');
-      });
-      cy.get('@EnactedMarketId').then((marketId) => {
-        cy.VegaWalletSubmitLiquidityProvision(marketId, '1');
      });
      cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
        let newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
@@ -296,34 +232,6 @@ context(
      });
      cy.get(newProposalSubmitButton).should('be.visible').click();
      cy.wait_for_proposal_submitted();
-      cy.navigate_to('proposals');
-      cy.get('@EnactedMarketId').then((marketId) => {
-        cy.contains(marketId)
-          .parentsUntil(proposalListItem)
-          .within(() => {
-            cy.getByTestId(viewProposalBtn).click();
-          });
-      });
-      cy.getByTestId(liquidityVoteStatus).should(
-        'contain.text',
-        'Currently expected to fail'
-      );
-      cy.getByTestId(tokenVoteStatus).should(
-        'contain.text',
-        'Currently expected to fail'
-      );
-      cy.vote_for_proposal('for');
-      cy.getByTestId(liquidityVoteStatus).should(
-        'contain.text',
-        'Currently expected to pass'
-      );
-      cy.getByTestId(tokenVoteStatus).should(
-        'contain.text',
-        'Currently expected to pass'
-      );
-      cy.get_proposal_information_from_table('Expected to pass')
-        .contains('👍 by Token vote')
-        .should('be.visible');
    });

    // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
@@ -390,7 +298,7 @@ context(
          .parentsUntil(proposalListItem)
          .within(() => {
            cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
-            cy.getByTestId(viewProposalBtn).click();
+            cy.getByTestId('view-proposal-btn').click();
          });
      });
      cy.get_proposal_information_from_table('Proposed enactment') // 3001-VOTE-044
@@ -1,97 +0,0 @@
-import { trancheData } from '../../fixtures/mocks/tranches';
-
-const tranches = trancheData;
-
-context(
-  'Tranches page - verify elements on the page',
-  { tags: '@smoke' },
-  function () {
-    before('visit homepage', function () {
-      cy.intercept('GET', '**/tranches/stats', { tranches });
-      cy.visit('/');
-    });
-
-    it('Able to navigate to tranches page', function () {
-      cy.navigate_to('supply');
-      cy.url().should('include', '/token/tranches');
-      cy.get('h1').should('contain.text', 'Vesting tranches');
-    });
-
-    // 1005-VEST-001
-    // 1005-VEST-002
-    it('Able to view tranches', function () {
-      cy.getByTestId('tranche-item')
-        .should('have.length', 2)
-        .first()
-        .within(() => {
-          cy.get('a')
-            .should('have.text', 'Tranche 2') // 1005-VEST-003
-            .and('have.attr', 'href', '/token/tranches/2');
-          cy.get('span').eq(1).should('have.text', '111.30'); // 1005-VEST-005
-          cy.contains('Unlocking starts') // 1005-VEST-008
-            .parent()
-            .should('contain.text', '28 Feb 2023');
-          cy.contains('Fully unlocked')
-            .parent()
-            .should('contain.text', '23 Aug 2023');
-          cy.getByTestId('progress-bar').should('exist');
-          cy.getByTestId('currency-locked') // 1005-VEST-006
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('currency-unlocked') // 1005-VEST-007
-            .invoke('text')
-            .should('not.be.empty');
-        });
-    });
-
-    it('Able to see individual tranche data', function () {
-      cy.get('[href="/token/tranches/2"]').click();
-      cy.getByTestId('redeemed-tranche-tokens').within(() => {
-        cy.get('span').eq(1).should('have.text', 0);
-      });
-      cy.getByTestId('key-value-table').within(() => {
-        cy.getByTestId('link')
-          .should('have.length', 8)
-          .each((ethLink) => {
-            cy.wrap(ethLink)
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/address/');
-          });
-        cy.getByTestId('redeem-link')
-          .should('have.length', 8)
-          .each((redeemLink) => {
-            cy.wrap(redeemLink)
-              .should('have.attr', 'href')
-              .and('contain', '/token/redeem/');
-          });
-      });
-    });
-
-    it('Able to view tranches with less than 10 vega', function () {
-      cy.navigate_to('supply');
-      cy.getByTestId('show-all-tranches').click();
-      cy.getByTestId('tranche-item')
-        .should('have.length', 8)
-        .first()
-        .within(() => {
-          cy.get('a')
-            .should('have.text', 'Tranche 0')
-            .and('have.attr', 'href', '/token/tranches/0');
-          cy.get('span').eq(1).should('have.text', '0.00');
-          cy.contains('Unlocking starts')
-            .parent()
-            .should('contain.text', '01 Jan 1970');
-          cy.contains('Fully unlocked')
-            .parent()
-            .should('contain.text', '01 Jan 1970');
-          cy.getByTestId('progress-bar').should('exist');
-          cy.getByTestId('currency-locked')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('currency-unlocked')
-            .invoke('text')
-            .should('not.be.empty');
-        });
-    });
-  }
-);
@@ -1,15 +1,13 @@
 const connectButton = '[data-testid="connect-to-eth-btn"]';
-const lockedTokensInVestingContract = '6,499,972.30';

 context(
  'Vesting Page - verify elements on page',
  { tags: '@smoke' },
  function () {
-    before('navigate to vesting page', function () {
-      cy.visit('/').navigate_to('vesting');
-    });
-
    describe('with wallets disconnected', function () {
+      before('navigate to vesting page', function () {
+        cy.visit('/').navigate_to('vesting');
+      });
      it('should have vesting tab highlighted', function () {
        cy.verify_tab_highlighted('token');
      });
@@ -18,7 +16,10 @@ context(
        cy.verify_page_header('Vesting');
      });

-      // 1005-VEST-018
+      it('should have connect Eth wallet info', function () {
+        cy.get(connectButton).should('be.visible');
+      });
+
      it('should have connect Eth wallet button', function () {
        cy.get(connectButton)
          .should('be.visible')
@@ -26,101 +27,18 @@ context(
      });
    });

-    describe('With Eth wallet connected', function () {
+    describe('with eth wallet connected', function () {
      before('connect eth wallet', function () {
        cy.ethereum_wallet_connect();
-        cy.getByTestId('view-connected-eth-btn').click();
+        cy.visit('/');
      });

-      // 1005-VEST-020 1005-VEST-021
-      it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
-        cy.getByTestId('vega-in-vesting-contract').within(() => {
-          cy.getByTestId('currency-title')
-            .should('contain.text', 'VEGA')
-            .and('contain.text', 'In vesting contract');
-          cy.getByTestId('currency-value').should(
-            'have.text',
-            lockedTokensInVestingContract
-          );
-          cy.getByTestId('currency-locked').should(
-            'have.text',
-            lockedTokensInVestingContract
-          );
-          cy.getByTestId('currency-unlocked').should('have.text', '0.00');
-        });
-      });
-      // 1005-VEST-022 1005-VEST-023
-      it('Tokens amount displayed in vesting page', function () {
-        cy.getByTestId(
-          'redemption-description',
-          Cypress.env('txTimeout')
-        ).should('exist');
-        const redemptionText =
-          'The connected Ethereum wallet (0xEe7D…d94F) has 6,499,972.30 $VEGA tokens in 1 tranche(s) of the vesting contract.';
-
-        cy.getByTestId('redemption-description').should(
-          'have.text',
-          redemptionText
-        );
-        cy.getByTestId('vesting-table').within(() => {
-          cy.getByTestId('key-value-table-row')
-            .eq(0)
-            .within(() => {
-              cy.get('dt').should('have.text', 'Vesting VEGA');
-              cy.get('dd').should('have.text', lockedTokensInVestingContract);
-            });
-          cy.getByTestId('key-value-table-row')
-            .eq(1)
-            .within(() => {
-              cy.get('dt').should('have.text', 'Locked');
-              cy.get('dd').should('have.text', lockedTokensInVestingContract);
-            });
-          cy.getByTestId('key-value-table-row')
-            .eq(2)
-            .within(() => {
-              cy.get('dt').should('have.text', 'Unlocked');
-              cy.get('dd').should('have.text', '0.00');
-            });
-          cy.getByTestId('key-value-table-row')
-            .eq(3)
-            .within(() => {
-              cy.get('dt').should('have.text', 'Associated');
-              cy.get('dd').should('have.text', '0.00');
-            });
-        });
-      });
-
-      // 1005-VEST-024 1005-VEST-025 1005-VEST-026 1005-VEST-036 1005-VEST-037
-      it('Tokens locked in individual tranches are displayed', function () {
-        cy.getByTestId('tranche-table-footer').should(
-          'have.text',
-          'All the tokens in this tranche are locked and must be assigned to a tranche before they can be redeemed.'
-        );
-        cy.getByTestId('tranche-item').within(() => {
-          cy.get('a')
-            .should('have.text', 'Tranche 0')
-            .and('have.attr', 'href', '/token/tranches/0');
-          cy.get('span')
-            .eq(1)
-            .should('have.text', lockedTokensInVestingContract);
-          cy.contains('Unlocking starts') // 1005-VEST-008
-            .parent()
-            .should('contain.text', '01 Jan 1970');
-          cy.contains('Fully unlocked')
-            .parent()
-            .should('contain.text', '01 Jan 1970');
-          cy.getByTestId('progress-bar').should('exist');
-          cy.getByTestId('currency-locked') // 1005-VEST-006
-            .should('have.text', lockedTokensInVestingContract);
-          cy.getByTestId('currency-unlocked') // 1005-VEST-007
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('tranche-item-footer').should(
-            'have.text',
-            'All the tokens in this tranche are locked and can not be redeemed yet.'
-          );
-        });
-        cy.connectVegaWallet();
+      // 1005-VEST-001
+      // 1005-VEST-002
+      it('Able to view tranches', function () {
+        cy.navigate_to('supply');
+        cy.url().should('include', '/token/tranches');
+        cy.get('h1').should('contain.text', 'Vesting tranches');
      });
    });
  }
@@ -82,10 +82,9 @@ Cypress.Commands.add(
 Cypress.Commands.add(
  'get_submitted_proposal_from_proposal_list',
  (proposalTitle) => {
-    cy.get_proposal_id_from_list(proposalTitle).then(() => {
-      cy.get('@proposalIdText').then((proposalId) => {
-        return cy.get(`#${proposalId}`);
-      });
+    cy.get_proposal_id_from_list(proposalTitle);
+    cy.get('@proposalIdText').then((proposalId) => {
+      return cy.get(`#${proposalId}`);
    });
  }
 );
@@ -11,7 +11,7 @@ export const EthConnectPrompt = () => {
  const { appDispatch } = useAppState();
  return (
    <Button
-      variant="default"
+      variant="primary"
      onClick={() =>
        appDispatch({
          type: AppStateActionType.SET_ETH_WALLET_OVERLAY,
@@ -9,28 +9,26 @@ export type PendingTxsStore = {
  resetPendingTxs: () => void;
 };

-export const usePendingBalancesStore = create<PendingTxsStore>()(
-  (set, get) => ({
-    pendingBalances: [],
-    addPendingTxs: (event: Event[]) => {
-      set({
-        pendingBalances: uniqBy(
-          [...get().pendingBalances, ...event],
-          'transactionHash'
+export const usePendingBalancesStore = create<PendingTxsStore>((set, get) => ({
+  pendingBalances: [],
+  addPendingTxs: (event: Event[]) => {
+    set({
+      pendingBalances: uniqBy(
+        [...get().pendingBalances, ...event],
+        'transactionHash'
+      ),
+    });
+  },
+  removePendingTx: (event: Event) => {
+    set({
+      pendingBalances: [
+        ...get().pendingBalances.filter(
+          ({ transactionHash }) => transactionHash !== event.transactionHash
        ),
-      });
-    },
-    removePendingTx: (event: Event) => {
-      set({
-        pendingBalances: [
-          ...get().pendingBalances.filter(
-            ({ transactionHash }) => transactionHash !== event.transactionHash
-          ),
-        ],
-      });
-    },
-    resetPendingTxs: () => {
-      set({ pendingBalances: [] });
-    },
-  })
-);
+      ],
+    });
+  },
+  resetPendingTxs: () => {
+    set({ pendingBalances: [] });
+  },
+}));
@@ -336,7 +336,6 @@
  "withdrawLpNoneDeposited": "You have no SLP tokens deposited or rewards accumulated",
  "withdrawAllLpSuccessCalloutTitle": "Your SLP tokens and rewards have been sent to your Ethereum address",
  "Dissociate VEGA tokens": "Disassociate $VEGA tokens",
-  "DisassociateVegaTokensFromWallet": "Disassociate $VEGA tokens from your Vega wallet",
  "Early Investors": "Early Investors",
  "Team": "Team",
  "Community": "Community",
@@ -483,7 +482,6 @@
  "withdrawFormSubmitButtonIdle": "Withdraw {{amount}} {{symbol}} tokens",
  "withdrawFormSubmitButtonPending": "Preparing",
  "withdrawalsTitle": "Withdrawals",
-  "withdrawalsSubtitle": "Connect your Vega wallet to complete a withdrawal. These withdrawals will be completed with an Ethereum transaction.",
  "withdrawalsText": "These withdrawals need to be completed with an Ethereum transaction.",
  "withdrawalsNone": "You don't have any pending withdrawals.",
  "withdrawalsCompleteButton": "Finish withdrawal",
@@ -554,6 +552,9 @@
  "resourceNotFound": "Resource Not Found",
  "Or": "Or",
  "addTokenToWallet": "Show this token in your Ethereum wallet",
+  "chartBelow": "*Certain activities, for example community incentive tokens, do not have specific dates to be credited and so an approximation has been used. ",
+  "chartTitle": "Token unlocking schedule",
+  "chartAbove": "This chart shows the approximate* schedule for how tokens will unlock from vesting tranches over time.",
  "date": "Date",
  "noEthereumProviderError": "No Ethereum browser extension detected, install MetaMask on desktop or visit from a dApp browser on mobile",
  "unsupportedChainIdError": "You're connected to an unsupported network",
@@ -38,7 +38,7 @@ export interface RefreshBalances {
  vestingAssociatedBalance: BigNumber;
 }

-export const useBalances = create<BalancesStore>()((set) => ({
+export const useBalances = create<BalancesStore>((set) => ({
  associationBreakdown: {
    stakingAssociations: {},
    vestingAssociations: {},
@@ -1,7 +1,7 @@
 import { toBigNum } from '@vegaprotocol/utils';
 import type { TrancheServiceResponse } from '@vegaprotocol/smart-contracts';
 import type BigNumber from 'bignumber.js';
-import { create } from 'zustand';
+import create from 'zustand';
 import { ENV } from '../../config';

 export interface Tranche {
@@ -36,7 +36,7 @@ export type TranchesStore = {

 const secondsToDate = (seconds: number) => new Date(seconds * 1000);

-export const useTranches = create<TranchesStore>()((set) => ({
+export const useTranches = create<TranchesStore>((set) => ({
  tranches: null,
  loading: false,
  error: null,
@@ -56,7 +56,7 @@ export const VoteDetails = ({
      {proposalType === ProposalType.PROPOSAL_UPDATE_MARKET && (
        <section>
          <SubHeading title={t('liquidityVotes')} />
-          <p data-testid="liquidity-votes-status">
+          <p>
            <span>
              <CurrentProposalStatus proposal={proposal} />
            </span>
@@ -105,7 +105,7 @@ export const VoteDetails = ({
      )}
      <section data-testid="votes-table">
        <SubHeading title={t('tokenVotes')} />
-        <p data-testid="token-votes-status">
+        <p>
          <span>
            <CurrentProposalStatus proposal={proposal} />
          </span>
@@ -84,7 +84,6 @@ const RedemptionRouter = () => {
            fill={true}
            variant="primary"
            onClick={() => navigate(`${RoutesConfig.REDEEM}/${account}`)}
-            data-testid="view-connected-eth-btn"
          >
            {t('View connected Eth Wallet')}
          </Button>
@@ -15,12 +15,7 @@ export const DisassociateContainer = () => {
    <>
      <Heading title={t('pageTitleDisassociate')} />
      {!account ? (
-        <>
-          <p className="mb-8">{t('DisassociateVegaTokensFromWallet')}</p>
-          <div className="max-w-[400px]">
-            <EthConnectPrompt />
-          </div>
-        </>
+        <EthConnectPrompt />
      ) : (
        <DisassociatePage address={account} vegaKey={pubKey ?? ''} />
      )}
@@ -73,7 +73,6 @@ export const Tranche = () => {
                    className="underline"
                    title={t('View vesting information')}
                    to={`${Routes.REDEEM}/${user}`}
-                    data-testid="redeem-link"
                  >
                    {t('View vesting information')}
                  </RouterLink>
@@ -1,12 +1,15 @@
 import { useWeb3React } from '@web3-react/core';
-import { useState } from 'react';
+import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ButtonLink } from '@vegaprotocol/ui-toolkit';
-import { useEthereumConfig } from '@vegaprotocol/web3';
+
+import { SubHeading } from '../../components/heading';
 import { TrancheItem } from '../redemption/tranche-item';
 import { TrancheLabel } from './tranche-label';
-import { useTranches } from '../../lib/tranches/tranches-store';
+import { VestingChart } from './vesting-chart';
+import { ButtonLink } from '@vegaprotocol/ui-toolkit';
+import { useEthereumConfig } from '@vegaprotocol/web3';
 import type { Tranche } from '../../lib/tranches/tranches-store';
+import { useTranches } from '../../lib/tranches/tranches-store';

 const trancheMinimum = 10;

@@ -15,7 +18,7 @@ const shouldShowTranche = (t: Tranche) =>

 export const Tranches = () => {
  const tranches = useTranches((state) => state.tranches);
-  const [showAll, setShowAll] = useState<boolean>(false);
+  const [showAll, setShowAll] = React.useState<boolean>(false);
  const { t } = useTranslation();
  const { chainId } = useWeb3React();
  const { config } = useEthereumConfig();
@@ -27,6 +30,10 @@ export const Tranches = () => {

  return (
    <section>
+      <SubHeading title={t('chartTitle')} />
+      <p>{t('chartAbove')}</p>
+      <VestingChart />
+      <p>{t('chartBelow')}</p>
      {tranches?.length ? (
        <ul role="list">
          {(showAll ? tranches : filteredTranches).map((tranche) => {
@@ -48,12 +55,8 @@ export const Tranches = () => {
      ) : (
        <p>{t('No tranches')}</p>
      )}
-
      <section className="text-center mt-4">
-        <ButtonLink
-          data-testid="show-all-tranches"
-          onClick={() => setShowAll(!showAll)}
-        >
+        <ButtonLink onClick={() => setShowAll(!showAll)}>
          {showAll
            ? t(
                'Showing tranches with <{{trancheMinimum}} VEGA, click to hide these tranches',
@@ -0,0 +1,149 @@
+import { format, startOfMonth } from 'date-fns';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import {
+  Area,
+  AreaChart,
+  Label,
+  Legend,
+  ReferenceLine,
+  ResponsiveContainer,
+  Tooltip,
+  XAxis,
+  YAxis,
+} from 'recharts';
+import colors from 'tailwindcss/colors';
+
+import { DATE_FORMAT_LONG } from '../../lib/date-formats';
+import data from './data.json';
+
+import { theme } from '@vegaprotocol/tailwindcss-config';
+const Colors = theme.colors;
+
+const ORDER = ['community', 'publicSale', 'earlyInvestors', 'team'];
+
+export const VestingChart = () => {
+  const { t } = useTranslation();
+  const currentDate = React.useMemo(
+    () => format(startOfMonth(new Date()), DATE_FORMAT_LONG),
+    []
+  );
+  return (
+    <div style={{ marginBottom: 25 }}>
+      <ResponsiveContainer height={400} width="100%">
+        <AreaChart data={data}>
+          <defs>
+            {[
+              ['pink', Colors.vega.pink.DEFAULT],
+              ['green', Colors.vega.green.DEFAULT],
+              ['orange', Colors.warning],
+              ['yellow', Colors.vega.yellow.DEFAULT],
+            ].map(([key, color]) => (
+              <linearGradient key={key} id={key} x1="0" y1="0" x2="0" y2="1">
+                <stop offset="0%" stopColor={color} stopOpacity={0.85} />
+                <stop offset="100%" stopColor={color} stopOpacity={0} />
+              </linearGradient>
+            ))}
+          </defs>
+          <Tooltip
+            contentStyle={{ backgroundColor: colors.black }}
+            separator=":"
+            // @ts-ignore formatter doesnt seem to allow returning JSX but nonetheless it works
+            formatter={(value: number) => {
+              return (
+                <div
+                  style={{
+                    display: 'flex',
+                    textAlign: 'right',
+                  }}
+                >
+                  {Intl.NumberFormat().format(value)}
+                </div>
+              );
+            }}
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            itemSorter={(label: any) => {
+              return ORDER.indexOf(label.dataKey) + 1;
+            }}
+          />
+          <YAxis type="number" width={100}>
+            <Label
+              angle={270}
+              value={t('VEGA').toString()}
+              position="left"
+              offset={-5}
+              fill={colors.white}
+            />
+          </YAxis>
+          <XAxis dataKey="date">
+            <Label
+              value={t('date').toString()}
+              position="bottom"
+              offset={5}
+              fill={colors.white}
+            />
+          </XAxis>
+          <ReferenceLine
+            x={currentDate}
+            stroke={colors.white}
+            strokeWidth={2}
+            label={{
+              position: 'left',
+              value: currentDate,
+              fill: colors.white,
+            }}
+          />
+          <Area
+            dot={false}
+            type="linear"
+            dataKey="team"
+            stroke={Colors.vega.pink.DEFAULT}
+            fill="url(#pink)"
+            yAxisId={0}
+            strokeWidth={2}
+            fillOpacity={0.85}
+            stackId="1"
+            name={t('Team')}
+          />
+          <Area
+            dot={false}
+            type="monotone"
+            dataKey="earlyInvestors"
+            stroke={Colors.vega.green.DEFAULT}
+            fill="url(#green)"
+            yAxisId={0}
+            strokeWidth={2}
+            fillOpacity={0.85}
+            stackId="1"
+            name={t('Early Investors')}
+          />
+          <Area
+            dot={false}
+            type="monotone"
+            dataKey="publicSale"
+            stroke={Colors.vega.yellow.DEFAULT}
+            fill="url(#yellow)"
+            yAxisId={0}
+            strokeWidth={2}
+            stackId="1"
+            fillOpacity={0.85}
+            name={t('Public Sale')}
+          />
+          <Area
+            dot={false}
+            type="monotone"
+            dataKey="community"
+            stroke={Colors.warning}
+            fill="url(#orange)"
+            yAxisId={0}
+            strokeWidth={2}
+            fillOpacity={0.85}
+            stackId="1"
+            name={t('Community')}
+          />
+          <Legend wrapperStyle={{ position: 'relative' }} />
+        </AreaChart>
+      </ResponsiveContainer>
+    </div>
+  );
+};
@@ -17,14 +17,12 @@ import type { RouteChildProps } from '../index';
 const Withdrawals = ({ name }: RouteChildProps) => {
  useDocumentTitle(name);
  const { t } = useTranslation();
-  const { pubKey } = useVegaWallet();

  return (
    <>
      <Heading title={t('withdrawalsTitle')} />
-      {!pubKey && <p className="mb-8">{t('withdrawalsSubtitle')}</p>}
      <VegaWalletContainer>
-        {() => <WithdrawPendingContainer />}
+        {(currVegaKey) => <WithdrawPendingContainer />}
      </VegaWalletContainer>
    </>
  );
@@ -1,4 +1,5 @@
 import type ethers from 'ethers';
+import type { GetState, SetState } from 'zustand';
 import { create } from 'zustand';

 export interface TxData {
@@ -15,25 +16,27 @@ interface TransactionStore {
  remove: (tx: TxData) => void;
 }

-export const useTransactionStore = create<TransactionStore>()((set, get) => ({
-  transactions: [],
-  add: (tx) => {
-    const { transactions } = get();
-    set({ transactions: [...transactions, tx] });
-  },
-  update: (tx) => {
-    const { transactions } = get();
-    set({
-      transactions: [
-        ...transactions.filter((t) => t.tx.hash !== tx.tx.hash),
-        tx,
-      ],
-    });
-  },
-  remove: (tx) => {
-    const { transactions } = get();
-    set({
-      transactions: transactions.filter((t) => t.tx.hash !== tx.tx.hash),
-    });
-  },
-}));
+export const useTransactionStore = create(
+  (set: SetState<TransactionStore>, get: GetState<TransactionStore>) => ({
+    transactions: [],
+    add: (tx) => {
+      const { transactions } = get();
+      set({ transactions: [...transactions, tx] });
+    },
+    update: (tx) => {
+      const { transactions } = get();
+      set({
+        transactions: [
+          ...transactions.filter((t) => t.tx.hash !== tx.tx.hash),
+          tx,
+        ],
+      });
+    },
+    remove: (tx) => {
+      const { transactions } = get();
+      set({
+        transactions: transactions.filter((t) => t.tx.hash !== tx.tx.hash),
+      });
+    },
+  })
+);
@@ -1,4 +1,5 @@
 import { useParams } from 'react-router-dom';
+import { useMemo } from 'react';
 import { makeDerivedDataProvider } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
@@ -42,7 +43,7 @@ const useMarketDetails = (marketId: string | undefined) => {
  const { data, loading, error } = useDataProvider({
    dataProvider: lpDataProvider,
    skipUpdates: true,
-    variables: { marketId: marketId || '' },
+    variables: useMemo(() => ({ marketId }), [marketId]),
  });

  const liquidityProviders = data?.liquidityProviders || [];
@@ -39,11 +39,14 @@ export const Last24hVolume = ({
    [marketId, yTimestamp]
  );

-  const variables24hAgo = {
-    marketId: marketId,
-    interval: Schema.Interval.INTERVAL_I1D,
-    since: yTimestamp,
-  };
+  const variables24hAgo = useMemo(
+    () => ({
+      marketId: marketId,
+      interval: Schema.Interval.INTERVAL_I1D,
+      since: yTimestamp,
+    }),
+    [marketId, yTimestamp]
+  );

  const throttledSetCandles = useRef(
    throttle((data: Candle[]) => {
@@ -61,7 +64,7 @@ export const Last24hVolume = ({
    [throttledSetCandles]
  );

-  const { data, error } = useDataProvider({
+  const { data, error } = useDataProvider<Candle[], Candle>({
    dataProvider: marketCandlesProvider,
    variables: variables,
    update,
@@ -85,7 +88,7 @@ export const Last24hVolume = ({
    [throttledSetVolumeChange]
  );

-  useDataProvider({
+  useDataProvider<Candle[], Candle>({
    dataProvider: marketCandlesProvider,
    update: updateCandle24hAgo,
    variables: variables24hAgo,
@@ -41,7 +41,6 @@ const completeWithdrawalBtn = 'complete-withdrawal';
 const submitTransferBtn = '[type="submit"]';
 const transferForm = 'transfer-form';
 const depositSubmit = 'deposit-submit';
-const approveSubmit = 'approve-submit';

 // Because the tests are run on a live network to optimize time, the tests are interdependent and must be run in the given order.
 describe('capsule - without MultiSign', { tags: '@slow' }, () => {
@@ -74,13 +73,13 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
    cy.get(assetSelectField, txTimeout).select(btcName, { force: true });
-    cy.getByTestId('approve-default').should(
+    cy.getByTestId('approve-warning').should(
      'contain.text',
-      `Before you can make a deposit of your chosen asset, ${btcSymbol}, you need to approve its use in your Ethereum wallet`
+      `Deposits of ${btcSymbol} not approved`
    );
-    cy.getByTestId(approveSubmit).click();
-    cy.getByTestId('approve-pending').should('exist');
-    cy.getByTestId('approve-confirmed').should('exist');
+    cy.getByTestId(depositSubmit).click();
+    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
+    cy.get('[data-testid="Return to deposit"]').click();
    cy.get(amountField).clear().type('10');
    cy.getByTestId(depositSubmit).click();
    cy.getByTestId(toastContent, txTimeout).should(
@@ -31,13 +31,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
  it('handles empty fields', () => {
    cy.getByTestId('deposit-submit').click();
    cy.getByTestId(formFieldError).should('contain.text', 'Required');
-    // once Ethereum wallet is connected and key selected the only field that will
-    // error is the asset select
-    cy.getByTestId(formFieldError).should('have.length', 1);
-    cy.get('[data-testid="input-error-text"][aria-describedby="asset"]').should(
-      'have.length',
-      1
-    );
+    cy.getByTestId(formFieldError).should('have.length', 2);
  });

  it('unable to select assets not enabled', () => {
@@ -47,13 +41,12 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
    cy.get(assetSelectField + ' option:contains(Asset 4)').should('not.exist');
  });

-  it('invalid public key when entering address manually', () => {
-    cy.getByTestId('enter-pubkey-manually').click();
-    cy.get(toAddressField).clear().type('INVALID_DEPOSIT_TO_ADDRESS');
-    cy.get(`[data-testid="${formFieldError}"][aria-describedby="to"]`).should(
-      'have.text',
-      'Invalid Vega key'
-    );
+  it('invalid public key', () => {
+    cy.get(toAddressField)
+      .clear()
+      .type('INVALID_DEPOSIT_TO_ADDRESS')
+      .next(`[data-testid="${formFieldError}"]`)
+      .should('have.text', 'Invalid Vega key');
  });

  it('invalid amount', () => {
@@ -26,20 +26,20 @@ describe('market info is displayed', { tags: '@smoke' }, () => {

  it('market price', () => {
    cy.getByTestId(marketTitle).contains('Market price').click();
-    validateMarketDataRow(0, 'Mark Price', '46,126.90058');
-    validateMarketDataRow(1, 'Best Bid Price', '44,126.90058 ');
-    validateMarketDataRow(2, 'Best Offer Price', '48,126.90058 ');
+    validateMarketDataRow(0, 'Mark Price', '0.05749');
+    validateMarketDataRow(1, 'Best Bid Price', '6.81765 ');
+    validateMarketDataRow(2, 'Best Offer Price', '6.81769 ');
    validateMarketDataRow(3, 'Quote Unit', 'BTC');
  });

  it('market volume displayed', () => {
    cy.getByTestId(marketTitle).contains('Market volume').click();
-    validateMarketDataRow(0, '24 Hour Volume', '1');
+    validateMarketDataRow(0, '24 Hour Volume', '-');
    validateMarketDataRow(1, 'Open Interest', '0');
-    validateMarketDataRow(2, 'Best Bid Volume', '1');
-    validateMarketDataRow(3, 'Best Offer Volume', '3');
-    validateMarketDataRow(4, 'Best Static Bid Volume', '2');
-    validateMarketDataRow(5, 'Best Static Offer Volume', '4');
+    validateMarketDataRow(2, 'Best Bid Volume', '5');
+    validateMarketDataRow(3, 'Best Offer Volume', '1');
+    validateMarketDataRow(4, 'Best Static Bid Volume', '5');
+    validateMarketDataRow(5, 'Best Static Offer Volume', '1');
  });

  it('insurance pool displayed', () => {
@@ -149,9 +149,9 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
      .contains(/Liquidity(?! m)/)
      .click();

-    validateMarketDataRow(0, 'Target Stake', '10.00 tBTC');
-    validateMarketDataRow(1, 'Supplied Stake', '0.01 tBTC');
-    validateMarketDataRow(2, 'Market Value Proxy', '20.00 tBTC');
+    validateMarketDataRow(0, 'Target Stake', '0.56789 tBTC');
+    validateMarketDataRow(1, 'Supplied Stake', '0.56767 tBTC');
+    validateMarketDataRow(2, 'Market Value Proxy', '6.77678 tBTC');

    cy.getByTestId('view-liquidity-link').should(
      'have.text',
@@ -163,8 +163,8 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    cy.getByTestId(marketTitle).contains('Liquidity price range').click();

    validateMarketDataRow(0, 'Liquidity Price Range', '2.00% of mid price');
-    validateMarketDataRow(1, 'Lowest Price', '45,204.362 BTC');
-    validateMarketDataRow(2, 'Highest Price', '47,049.438 BTC');
+    validateMarketDataRow(1, 'Lowest Price', '0.05634 BTC');
+    validateMarketDataRow(2, 'Highest Price', '0.05864 BTC');
  });

  it('oracle displayed', () => {
@@ -38,7 +38,7 @@ describe('accounts', { tags: '@smoke' }, () => {
    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="deposited"]')
-      .should('have.text', '100,001.01');
+      .should('have.text', '1,001.00');
  });
  describe('sorting by ag-grid columns should work well', () => {
    it('sorting by asset', () => {
@@ -58,24 +58,24 @@ describe('accounts', { tags: '@smoke' }, () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
        '1,000.00002',
-        '100,001.01',
+        '1,001.00',
+        '1,000.01',
        '1,000.01',
-        '1,000.00',
        '1,000.00001',
      ];
      const marketsSortedAsc = [
-        '1,000.00',
        '1,000.00001',
        '1,000.00002',
        '1,000.01',
-        '100,001.01',
+        '1,000.01',
+        '1,001.00',
      ];
      const marketsSortedDesc = [
-        '100,001.01',
+        '1,001.00',
+        '1,000.01',
        '1,000.01',
        '1,000.00002',
        '1,000.00001',
-        '1,000.00',
      ];
      checkSorting(
        'deposited',
@@ -87,9 +87,9 @@ describe('accounts', { tags: '@smoke' }, () => {

    it('sorting by used', () => {
      cy.getByTestId('Collateral').click();
-      const marketsSortedDefault = ['0.00', '1.01', '0.01', '0.00', '0.00'];
-      const marketsSortedAsc = ['0.00', '0.00', '0.00', '0.01', '1.01'];
-      const marketsSortedDesc = ['1.01', '0.01', '0.00', '0.00', '0.00'];
+      const marketsSortedDefault = ['0.00', '1.00', '0.01', '0.01', '0.00'];
+      const marketsSortedAsc = ['0.00', '0.00', '0.01', '0.01', '1.00'];
+      const marketsSortedDesc = ['1.00', '0.01', '0.01', '0.00', '0.00'];
      checkSorting(
        'used',
        marketsSortedDefault,
@@ -102,24 +102,24 @@ describe('accounts', { tags: '@smoke' }, () => {
      cy.getByTestId('Collateral').click();
      const marketsSortedDefault = [
        '1,000.00002',
-        '100,000.00',
+        '1,000.00',
        '1,000.00',
        '1,000.00',
        '1,000.00001',
      ];
      const marketsSortedAsc = [
+        '1,000.00',
        '1,000.00',
        '1,000.00',
        '1,000.00001',
        '1,000.00002',
-        '100,000.00',
      ];
      const marketsSortedDesc = [
-        '100,000.00',
        '1,000.00002',
        '1,000.00001',
        '1,000.00',
        '1,000.00',
+        '1,000.00',
      ];

      checkSorting(
@@ -2,11 +2,7 @@ import * as Schema from '@vegaprotocol/types';
 import { aliasGQLQuery, mockConnectWallet } from '@vegaprotocol/cypress';
 import { testOrderSubmission } from '../support/order-validation';
 import type { OrderSubmission } from '@vegaprotocol/wallet';
-import {
-  accountsQuery,
-  estimateOrderQuery,
-  amendGeneralAccountBalance,
-} from '@vegaprotocol/mock';
+import { accountsQuery, estimateOrderQuery } from '@vegaprotocol/mock';
 import { createOrder } from '../support/create-order';

 const orderSizeField = 'order-size';
@@ -587,10 +583,6 @@ describe('suspended market validation', { tags: '@regression' }, () => {
      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
    );
-    const accounts = accountsQuery();
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'Accounts', accounts);
-    });
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
@@ -640,10 +632,30 @@ describe('account validation', { tags: '@regression' }, () => {
    beforeEach(() => {
      cy.setVegaWallet();
      cy.mockTradingPage();
-      const accounts = accountsQuery();
-      amendGeneralAccountBalance(accounts, 'market-0', '0');
      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'Accounts', accounts);
+        aliasGQLQuery(
+          req,
+          'Accounts',
+          accountsQuery({
+            party: {
+              accountsConnection: {
+                edges: [
+                  {
+                    node: {
+                      type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
+                      balance: '0',
+                      market: null,
+                      asset: {
+                        __typename: 'Asset',
+                        id: 'asset-0',
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          })
+        );
      });
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -657,7 +669,7 @@ describe('account validation', { tags: '@regression' }, () => {
        'have.text',
        'You need ' +
          'tDAI' +
-          ' in your wallet to trade in this market.See all your collateral.Make a deposit'
+          ' in your wallet to trade in this market. See all your collateral.Make a deposit'
      );
      cy.getByTestId('deal-ticket-deposit-dialog-button').should('exist');
    });
@@ -667,13 +679,19 @@ describe('account validation', { tags: '@regression' }, () => {
    beforeEach(() => {
      cy.setVegaWallet();
      cy.mockTradingPage();
-      const accounts = accountsQuery();
-      amendGeneralAccountBalance(accounts, 'market-0', '100000000');
      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'Accounts', accounts);
-      });
-      cy.mockGQL((req) => {
-        aliasGQLQuery(req, 'EstimateOrder', estimateOrderQuery());
+        aliasGQLQuery(
+          req,
+          'EstimateOrder',
+          estimateOrderQuery({
+            estimateOrder: {
+              marginLevels: {
+                __typename: 'MarginLevels',
+                initialLevel: '1000000000',
+              },
+            },
+          })
+        );
      });
      cy.mockSubscription();
      cy.visit('/#/markets/market-0');
@@ -689,7 +707,7 @@ describe('account validation', { tags: '@regression' }, () => {
      );
      cy.getByTestId('dealticket-warning-margin').should(
        'contain.text',
-        'You may not have enough margin available to open this position. 2,354.72283 tDAI is currently required. You have only 1,000.01 tDAI available.'
+        '9,999.99 tDAI is currently required. You have only 1,000.00 tDAI available.Deposit tDAI'
      );
      cy.getByTestId('deal-ticket-deposit-dialog-button').click();
      cy.getByTestId('dialog-content')
@@ -31,7 +31,7 @@ describe('orders list', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
    cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
    });
    cy.wait('@Markets');
  });
@@ -136,7 +136,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
    cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
    });
  });
  const orderId = '1234567890';
@@ -354,7 +354,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
    cy.visit('/#/markets/market-0');
    cy.getByTestId('Orders').click();
    cy.wait('@Orders').then(() => {
-      expect(subscriptionMocks.OrdersUpdate).to.be.calledThrice;
+      expect(subscriptionMocks.OrdersUpdate).to.be.calledTwice;
    });
    cy.mockVegaWalletTransaction();
  });
@@ -164,10 +164,10 @@ describe('positions', { tags: '@smoke' }, () => {

      cy.get('[col-id="liquidationPrice"]').should('contain.text', '0'); // liquidation price

-      cy.get('[col-id="currentLeverage"]').should('contain.text', '2.846.1');
+      cy.get('[col-id="currentLeverage"]').should('contain.text', '138.446.1');

      cy.get('[col-id="marginAccountBalance"]') // margin allocated
-        .should('contain.text', '0.01');
+        .should('contain.text', '1,000');

      cy.get('[col-id="unrealisedPNL"]').each(($unrealisedPnl) => {
        cy.wrap($unrealisedPnl).invoke('text').should('not.be.empty');
@@ -17,13 +17,6 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
  });

  it('can connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-003
-    // 0002-WCON-039
-    // 0002-WCON-017
-    // 0002-WCON-018
-    // 0002-WCON-019
-
    // Mock authentication
    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
      body: {
@@ -48,9 +41,6 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
      },
    });
    cy.getByTestId(connectVegaBtn).click();
-    cy.contains(
-      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
-    );
    cy.contains('Connect Vega wallet');
    cy.contains('Hosted Fairground wallet');

@@ -61,13 +51,9 @@ describe('connect hosted wallet', { tags: '@smoke' }, () => {
    cy.getByTestId(form).find('#passphrase').click().type('pass');
    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
    cy.getByTestId(manageVegaBtn).should('exist');
-    cy.getByTestId('manage-vega-wallet').click();
-    cy.getByTestId('keypair-list').should('exist');
  });

  it('doesnt connect with invalid credentials', () => {
-    // 0002-WCON-020
-
    // Mock incorrect username/password
    cy.intercept('POST', 'https://wallet.testnet.vega.xyz/api/v1/auth/token', {
      body: {
@@ -113,10 +99,6 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
  });

  it('can connect', () => {
-    // 0002-WCON-002
-    // 0002-WCON-005
-    // 0002-WCON-007
-
    mockConnectWallet();
    cy.getByTestId(connectVegaBtn).click();
    cy.getByTestId('connectors-list')
@@ -128,40 +110,16 @@ describe('connect vega wallet', { tags: '@smoke' }, () => {
  });

  it('can change selected public key and disconnect', () => {
-    // 0002-WCON-022
-    // 0002-WCON-023
-    // 0002-WCON-025
-    // 0002-WCON-026
-    // 0002-WCON-021
-    // 0002-WCON-027
-    // 0002-WCON-030
-    // 0002-WCON-029
-    // 0002-WCON-008
-    // 0002-WCON-035
-    // 0002-WCON-014
-    // 0002-WCON-010
-
-    mockConnectWallet();
    const key2 = Cypress.env('VEGA_PUBLIC_KEY2');
    const truncatedKey2 = Cypress.env('TRUNCATED_VEGA_PUBLIC_KEY2');
    cy.connectVegaWallet();
    cy.getByTestId('manage-vega-wallet').click();
    cy.getByTestId('keypair-list').should('exist');
    cy.getByTestId(`key-${key2}`).should('contain.text', truncatedKey2);
-    cy.getByTestId(`key-${key2}`)
-      .find('[data-testid="copy-vega-public-key"]')
-      .should('be.visible');
    cy.get(`[data-testid="key-${key2}"] > .mr-2`).click();
-    cy.getByTestId('keypair-list')
-      .find('[data-state="checked"]')
-      .should('be.visible');
    cy.getByTestId('disconnect').click();
    cy.getByTestId('connect-vega-wallet').should('exist');
    cy.getByTestId('manage-vega-wallet').should('not.exist');
-    cy.getByTestId('connect-vega-wallet').click();
-    cy.contains(
-      'Choose wallet app to connect, or to change port or server URL enter a custom wallet location first'
-    );
  });
 });

@@ -193,7 +151,7 @@ describe('ethereum wallet', { tags: '@smoke' }, () => {
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('MetaMask');
-    cy.getByTestId('ethereum-address').should('have.text', ethWalletAddress);
+    cy.get('#ethereum-address').should('have.value', ethWalletAddress);
    cy.getByTestId('disconnect-ethereum-wallet')
      .should('have.text', 'Disconnect')
      .click();
@@ -76,9 +76,6 @@ describe(
      cy.getByTestId(closeDialog).click();
      cy.getByTestId('Trading').first().click();
      cy.getByTestId(collateralTab).click();
-      cy.getByTestId(openTransferDialog).should('not.exist');
-      cy.getByTestId('Portfolio').eq(0).click();
-      cy.getByTestId(collateralTab).click();
      cy.getByTestId(openTransferDialog).click();
      cy.getByTestId(dialogTransferText).should(
        'contain.text',
@@ -7,13 +7,13 @@ import type { onMessage } from '@vegaprotocol/cypress';
 import type { PartialDeep } from 'type-fest';
 import { orderUpdateSubscription } from '@vegaprotocol/mock';

-const sendOrderUpdate: ((data: OrdersUpdateSubscription) => void)[] = [];
+let sendOrderUpdate: (data: OrdersUpdateSubscription) => void;
 const getOnOrderUpdate = () => {
  const onOrderUpdate: onMessage<
    OrdersUpdateSubscription,
    OrdersUpdateSubscriptionVariables
  > = (send) => {
-    sendOrderUpdate.push(send);
+    sendOrderUpdate = send;
  };
  return onOrderUpdate;
 };
@@ -31,5 +31,5 @@ export function updateOrder(
  if (!sendOrderUpdate) {
    throw new Error('OrderSub not called');
  }
-  sendOrderUpdate.forEach((send) => send(update));
+  sendOrderUpdate(update);
 }
@@ -28,6 +28,7 @@ import {
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import type { MarketInfoQuery } from '@vegaprotocol/market-info';

 type MarketPageMockData = {
  state: Schema.MarketState;
@@ -68,6 +69,18 @@ const marketsDataOverride = (
  },
 });

+const marketInfoOverride = (
+  data: MarketPageMockData
+): PartialDeep<MarketInfoQuery> => ({
+  market: {
+    state: data.state,
+    tradingMode: data.tradingMode,
+    data: {
+      trigger: data.trigger,
+    },
+  },
+});
+
 const mockTradingPage = (
  req: CyHttpMessages.IncomingHttpRequest,
  state: Schema.MarketState = Schema.MarketState.STATE_ACTIVE,
@@ -96,7 +109,11 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'Margins', marginsQuery());
  aliasGQLQuery(req, 'Assets', assetsQuery());
  aliasGQLQuery(req, 'Asset', assetQuery());
-  aliasGQLQuery(req, 'MarketInfo', marketInfoQuery());
+  aliasGQLQuery(
+    req,
+    'MarketInfo',
+    marketInfoQuery(marketInfoOverride({ state, tradingMode, trigger }))
+  );
  aliasGQLQuery(req, 'Trades', tradesQuery());
  aliasGQLQuery(req, 'Chart', chartQuery());
  aliasGQLQuery(req, 'Candles', candlesQuery());
@@ -12,7 +12,6 @@ export const Home = () => {
  // should be the oldest market that is currently trading in     us mode(i.e. not in auction).
  const { data, error, loading } = useDataProvider({
    dataProvider: marketsWithDataProvider,
-    variables: undefined,
  });
  const update = useGlobalStore((store) => store.update);
  const marketId = useGlobalStore((store) => store.marketId);
@@ -47,8 +47,7 @@ export const Liquidity = () => {
 const useReloadLiquidityData = (marketId: string | undefined) => {
  const { reload } = useDataProvider({
    dataProvider: liquidityProvisionsDataProvider,
-    variables: { marketId: marketId || '' },
-    skip: !marketId,
+    variables: useMemo(() => ({ marketId }), [marketId]),
  });
  useEffect(() => {
    const interval = setInterval(reload, 10000);
@@ -78,8 +77,7 @@ export const LiquidityContainer = ({
  const { data, loading, error } = useDataProvider({
    dataProvider: lpAggregatedDataProvider,
    update,
-    variables: { marketId: marketId || '' },
-    skip: !marketId,
+    variables: useMemo(() => ({ marketId }), [marketId]),
  });

  const assetDecimalPlaces =
@@ -163,8 +161,7 @@ export const LiquidityViewContainer = ({
  } = useDataProvider({
    dataProvider: lpAggregatedDataProvider,
    update,
-    variables: { marketId: marketId || '' },
-    skip: !marketId,
+    variables: useMemo(() => ({ marketId }), [marketId]),
  });

  const targetStake = marketData?.targetStake;
@@ -7,6 +7,10 @@ import {
  useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
+import type {
+  MarketData,
+  MarketDataUpdateFieldsFragment,
+} from '@vegaprotocol/market-list';

 import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
@@ -31,10 +35,13 @@ const TitleUpdater = ({
 }) => {
  const pageTitle = usePageTitleStore((store) => store.pageTitle);
  const updateTitle = usePageTitleStore((store) => store.updateTitle);
-  const { data: marketData } = useThrottledDataProvider(
+  const { data: marketData } = useThrottledDataProvider<
+    MarketData,
+    MarketDataUpdateFieldsFragment
+  >(
    {
      dataProvider: marketDataProvider,
-      variables: { marketId: marketId || '' },
+      variables: useMemo(() => ({ marketId }), [marketId]),
      skip: !marketId,
    },
    1000
@@ -179,10 +179,7 @@ const MainGrid = ({
            </Tab>
            <Tab id="accounts" name={t('Collateral')}>
              <VegaWalletContainer>
-                <TradingViews.Collateral
-                  pinnedAsset={pinnedAsset}
-                  hideButtons
-                />
+                <TradingViews.Collateral pinnedAsset={pinnedAsset} />
              </VegaWalletContainer>
            </Tab>
          </Tabs>
@@ -111,11 +111,11 @@ export const TradeMarketHeader = ({
          </div>
        </HeaderStat>
      ) : null}
+      <MarketProposalNotification marketId={market?.id} />
      <MarketLiquiditySupplied
        marketId={market?.id}
        assetDecimals={asset?.decimals || 0}
      />
-      <MarketProposalNotification marketId={market?.id} />
    </Header>
  );
 };
@@ -2,16 +2,10 @@ import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useDepositDialog, DepositsTable } from '@vegaprotocol/deposits';
 import { depositsProvider } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/i18n';
-import {
-  useDataProvider,
-  useBottomPlaceholder,
-} from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { useRef } from 'react';
-import type { AgGridReact } from 'ag-grid-react';

 export const DepositsContainer = () => {
-  const gridRef = useRef<AgGridReact | null>(null);
  const { pubKey, isReadOnly } = useVegaWallet();
  const { data, loading, error, reload } = useDataProvider({
    dataProvider: depositsProvider,
@@ -19,15 +13,13 @@ export const DepositsContainer = () => {
    skip: !pubKey,
  });
  const openDepositDialog = useDepositDialog((state) => state.open);
-  const bottomPlaceholderProps = useBottomPlaceholder({ gridRef });
+
  return (
-    <div className="h-full">
+    <div className="h-full grid grid-rows-[1fr,min-content]">
      <div className="h-full relative">
        <DepositsTable
          rowData={data || []}
          noRowsOverlayComponent={() => null}
-          ref={gridRef}
-          {...bottomPlaceholderProps}
        />
        <div className="pointer-events-none absolute inset-0">
          <AsyncRenderer
@@ -41,9 +33,8 @@ export const DepositsContainer = () => {
        </div>
      </div>
      {!isReadOnly && (
-        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
+        <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
          <Button
-            variant="primary"
            size="sm"
            onClick={() => openDepositDialog()}
            data-testid="deposit-button"
@@ -49,10 +49,7 @@ export const Portfolio = () => {
              </Tab>
              <Tab id="positions" name={t('Positions')}>
                <VegaWalletContainer>
-                  <PositionsContainer
-                    onMarketClick={onMarketClick}
-                    noBottomPlaceholder
-                  />
+                  <PositionsContainer onMarketClick={onMarketClick} />
                </VegaWalletContainer>
              </Tab>
              <Tab id="orders" name={t('Orders')}>
@@ -20,35 +20,36 @@ export const WithdrawalsContainer = () => {

  return (
    <VegaWalletContainer>
-      <div className="h-full relative">
-        <WithdrawalsTable
-          data-testid="withdrawals-history"
-          rowData={data}
-          noRowsOverlayComponent={() => null}
-        />
-        <div className="pointer-events-none absolute inset-0">
-          <AsyncRenderer
-            data={data}
-            loading={loading}
-            error={error}
-            noDataCondition={(data) => !(data && data.length)}
-            noDataMessage={t('No withdrawals')}
-            reload={reload}
+      <div className="h-full relative grid grid-rows-[1fr,min-content]">
+        <div className="h-full relative">
+          <WithdrawalsTable
+            data-testid="withdrawals-history"
+            rowData={data}
+            noRowsOverlayComponent={() => null}
          />
+          <div className="pointer-events-none absolute inset-0">
+            <AsyncRenderer
+              data={data}
+              loading={loading}
+              error={error}
+              noDataCondition={(data) => !(data && data.length)}
+              noDataMessage={t('No withdrawals')}
+              reload={reload}
+            />
+          </div>
        </div>
+        {!isReadOnly && (
+          <div className="w-full dark:bg-black bg-white absolute bottom-0 h-auto flex justify-end px-[11px] py-2">
+            <Button
+              size="sm"
+              onClick={() => openWithdrawDialog()}
+              data-testid="withdraw-dialog-button"
+            >
+              {t('Make withdrawal')}
+            </Button>
+          </div>
+        )}
      </div>
-      {!isReadOnly && (
-        <div className="h-auto flex justify-end px-[11px] py-2 bottom-0 right-3 absolute dark:bg-black/75 bg-white/75 rounded">
-          <Button
-            variant="primary"
-            size="sm"
-            onClick={() => openWithdrawDialog()}
-            data-testid="withdraw-dialog-button"
-          >
-            {t('Make withdrawal')}
-          </Button>
-        </div>
-      )}
    </VegaWalletContainer>
  );
 };
@@ -11,10 +11,8 @@ import { useDepositDialog } from '@vegaprotocol/deposits';

 export const AccountsContainer = ({
  pinnedAsset,
-  hideButtons,
 }: {
  pinnedAsset?: PinnedAsset;
-  hideButtons?: boolean;
 }) => {
  const { pubKey, isReadOnly } = useVegaWallet();
  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
@@ -38,30 +36,27 @@ export const AccountsContainer = ({
  }

  return (
-    <div className="h-full relative">
-      <AccountManager
-        partyId={pubKey}
-        onClickAsset={onClickAsset}
-        onClickWithdraw={openWithdrawalDialog}
-        onClickDeposit={openDepositDialog}
-        isReadOnly={isReadOnly}
-        pinnedAsset={pinnedAsset}
-      />
-      {!isReadOnly && !hideButtons && (
-        <div className="flex gap-2 justify-end p-2 px-[11px] absolute lg:fixed bottom-0 right-3 dark:bg-black/75 bg-white/75 rounded">
+    <div className="h-full relative grid grid-rows-[1fr,min-content]">
+      <div>
+        <AccountManager
+          partyId={pubKey}
+          onClickAsset={onClickAsset}
+          onClickWithdraw={openWithdrawalDialog}
+          onClickDeposit={openDepositDialog}
+          isReadOnly={isReadOnly}
+          pinnedAsset={pinnedAsset}
+        />
+      </div>
+      {!isReadOnly && (
+        <div className="flex gap-2 justify-end p-2 px-[11px]">
          <Button
-            variant="primary"
            size="sm"
            data-testid="open-transfer-dialog"
            onClick={() => openTransferDialog()}
          >
            {t('Transfer')}
          </Button>
-          <Button
-            variant="primary"
-            size="sm"
-            onClick={() => openDepositDialog()}
-          >
+          <Button size="sm" onClick={() => openDepositDialog()}>
            {t('Deposit')}
          </Button>
        </div>
@@ -14,7 +14,7 @@ export const Footer = () => {
  const { blockDiff, datanodeBlockHeight } = useNodeHealth();

  return (
-    <footer className="px-4 py-1 text-xs border-t border-default text-vega-light-300 dark:text-vega-dark-300 lg:fixed bottom-0 left-0 border-r bg-white dark:bg-black">
+    <footer className="px-4 py-1 text-xs border-t border-default text-vega-light-300 dark:text-vega-dark-300">
      {/* Pull left to align with top nav, due to button padding */}
      <div className="-ml-2">
        {VEGA_URL && (
@@ -1,4 +1,5 @@
 import type { RefObject } from 'react';
+import { useMemo } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { isNumeric } from '@vegaprotocol/utils';
 import {
@@ -8,6 +9,7 @@ import {
 import { PriceChangeCell } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
 import type { CandleClose } from '@vegaprotocol/types';
+import type { Candle } from '@vegaprotocol/market-list';
 import { marketCandlesProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';

@@ -28,14 +30,19 @@ export const Last24hPriceChange = ({
 }: Props) => {
  const [ref, inView] = useInView({ root: inViewRoot?.current });
  const yesterday = useYesterday();
-  const { data, error } = useThrottledDataProvider(
+  const variables = useMemo(
+    () => ({
+      marketId: marketId,
+      interval: Schema.Interval.INTERVAL_I1H,
+      since: new Date(yesterday).toISOString(),
+    }),
+    [marketId, yesterday]
+  );
+
+  const { data, error } = useThrottledDataProvider<Candle[], Candle>(
    {
      dataProvider: marketCandlesProvider,
-      variables: {
-        marketId: marketId || '',
-        interval: Schema.Interval.INTERVAL_I1H,
-        since: new Date(yesterday).toISOString(),
-      },
+      variables,
      skip: !marketId || !inView,
    },
    THROTTLE_UPDATE_TIME
@@ -10,6 +10,8 @@ import {
  useYesterday,
 } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
+import { useMemo } from 'react';
+import type { Candle } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';

 interface Props {
@@ -30,14 +32,19 @@ export const Last24hVolume = ({
  const yesterday = useYesterday();
  const [ref, inView] = useInView({ root: inViewRoot?.current });

-  const { data } = useThrottledDataProvider(
+  const variables = useMemo(
+    () => ({
+      marketId: marketId,
+      interval: Schema.Interval.INTERVAL_I1H,
+      since: new Date(yesterday).toISOString(),
+    }),
+    [marketId, yesterday]
+  );
+
+  const { data } = useThrottledDataProvider<Candle[], Candle>(
    {
      dataProvider: marketCandlesProvider,
-      variables: {
-        marketId: marketId || '',
-        interval: Schema.Interval.INTERVAL_I1H,
-        since: new Date(yesterday).toISOString(),
-      },
+      variables,
      skip: !(inView && marketId),
    },
    THROTTLE_UPDATE_TIME
@@ -4,7 +4,10 @@ import {
  useDataProvider,
  useNetworkParams,
 } from '@vegaprotocol/react-helpers';
-import type { MarketData } from '@vegaprotocol/market-list';
+import type {
+  MarketData,
+  MarketDataUpdateFieldsFragment,
+} from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
@@ -67,7 +70,7 @@ export const MarketLiquiditySupplied = ({
    [noUpdate]
  );

-  useDataProvider({
+  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
    dataProvider: marketDataProvider,
    update,
    variables,
@@ -1,8 +1,13 @@
 import type { RefObject } from 'react';
+import { useMemo } from 'react';
 import { useInView } from 'react-intersection-observer';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
 import { PriceCell } from '@vegaprotocol/datagrid';
+import type {
+  MarketData,
+  MarketDataUpdateFieldsFragment,
+} from '@vegaprotocol/market-list';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';

@@ -22,10 +27,15 @@ export const MarketMarkPrice = ({
  asPriceCell,
 }: Props) => {
  const [ref, inView] = useInView({ root: inViewRoot?.current });
-  const { data } = useThrottledDataProvider(
+  const variables = useMemo(() => ({ marketId }), [marketId]);
+
+  const { data } = useThrottledDataProvider<
+    MarketData,
+    MarketDataUpdateFieldsFragment
+  >(
    {
      dataProvider: marketDataProvider,
-      variables: { marketId: marketId || '' },
+      variables,
      skip: !inView,
    },
    THROTTLE_UPDATE_TIME
@@ -1,11 +1,15 @@
 import throttle from 'lodash/throttle';
-import type { MarketData, Market } from '@vegaprotocol/market-list';
+import type {
+  MarketData,
+  MarketDataUpdateFieldsFragment,
+  Market,
+} from '@vegaprotocol/market-list';
 import { marketDataProvider } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import * as constants from '../constants';

 export const MarketState = ({ market }: { market: Market | null }) => {
@@ -29,10 +33,14 @@ export const MarketState = ({ market }: { market: Market | null }) => {
    [throttledSetMarketState]
  );

-  useDataProvider({
+  const variables = useMemo(
+    () => ({ marketId: market?.id || '' }),
+    [market?.id]
+  );
+  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
    dataProvider: marketDataProvider,
    update,
-    variables: { marketId: market?.id || '' },
+    variables,
    skip: !market?.id,
  });

@@ -1,16 +1,24 @@
-import { useCallback, useRef, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type { MarketData } from '@vegaprotocol/market-list';
+import type {
+  MarketData,
+  MarketDataUpdateFieldsFragment,
+} from '@vegaprotocol/market-list';
 import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';

 export const MarketVolume = ({ marketId }: { marketId: string }) => {
  const [marketVolume, setMarketVolume] = useState<string>('-');
-  const variables = { marketId };
+  const variables = useMemo(
+    () => ({
+      marketId: marketId,
+    }),
+    [marketId]
+  );
  const { data } = useDataProvider({
    dataProvider: marketProvider,
    variables,
@@ -38,7 +46,7 @@ export const MarketVolume = ({ marketId }: { marketId: string }) => {
    [data?.positionDecimalPlaces, throttledSetMarketVolume]
  );

-  useDataProvider({
+  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
    dataProvider: marketDataProvider,
    update,
    variables,
@@ -106,13 +106,14 @@ export const SelectMarketPopover = ({
    loading: marketsLoading,
    reload: marketListReload,
  } = useMarketList();
+  const variables = useMemo(() => ({ partyId: pubKey }), [pubKey]);
  const {
    data: positions,
    loading: positionsLoading,
    reload,
  } = useDataProvider({
    dataProvider: positionsDataProvider,
-    variables: { partyId: pubKey || '' },
+    variables,
    skip: !pubKey,
  });
  const onSelectMarket = useCallback(
@@ -20,7 +20,6 @@ export const WelcomeDialog = () => {
  const [riskAccepted] = useLocalStorage(constants.RISK_ACCEPTED_KEY);
  const { data } = useDataProvider({
    dataProvider: activeMarketsProvider,
-    variables: undefined,
  });

  const { update, shouldDisplayWelcomeDialog } = useGlobalStore((store) => ({
@@ -177,14 +177,22 @@ export const useEthereumTransactionToasts = () => {
    store.remove,
  ]);

-  const dismissTx = useEthTransactionStore((state) => state.dismiss);
+  const [dismissTx, deleteTx] = useEthTransactionStore((state) => [
+    state.dismiss,
+    state.delete,
+  ]);

  const onClose = useCallback(
    (tx: EthStoredTxState) => () => {
-      dismissTx(tx.id);
+      const safeToDelete = isFinal(tx);
+      if (safeToDelete) {
+        deleteTx(tx.id);
+      } else {
+        dismissTx(tx.id);
+      }
      removeToast(`eth-${tx.id}`);
    },
-    [dismissTx, removeToast]
+    [deleteTx, dismissTx, removeToast]
  );

  const fromEthTransaction = useCallback(
@@ -72,7 +72,7 @@ function AppBody({ Component }: AppProps) {

  const gridClasses = classNames(
    'h-full relative z-0 grid',
-    'grid-rows-[repeat(3,min-content),1fr]'
+    'grid-rows-[repeat(3,min-content),1fr,min-content]'
  );

  return (
@@ -15,7 +15,7 @@ interface PageTitleStore {
  updateTitle: (title: string) => void;
 }

-export const useGlobalStore = create<GlobalStore>()((set) => ({
+export const useGlobalStore = create<GlobalStore>((set) => ({
  nodeSwitcherDialog: false,
  marketId: LocalStorage.getItem('marketId') || null,
  shouldDisplayWelcomeDialog: false,
@@ -18,7 +18,6 @@ import type {
  AccountFieldsFragment,
  AccountsQuery,
  AccountEventsSubscription,
-  AccountsQueryVariables,
 } from './__generated__/Accounts';
 import type { Market } from '@vegaprotocol/market-list';
 import type { Asset } from '@vegaprotocol/assets';
@@ -86,8 +85,7 @@ export const accountsOnlyDataProvider = makeDataProvider<
  AccountsQuery,
  AccountFieldsFragment[],
  AccountEventsSubscription,
-  AccountEventsSubscription['accounts'],
-  AccountsQueryVariables
+  AccountEventsSubscription['accounts']
 >({
  query: AccountsDocument,
  subscriptionQuery: AccountEventsDocument,
@@ -161,16 +159,8 @@ const getAssetAccountAggregation = (
  return { ...balanceAccount, breakdown };
 };

-export const accountsDataProvider = makeDerivedDataProvider<
-  Account[],
-  never,
-  AccountsQueryVariables
->(
-  [
-    accountsOnlyDataProvider,
-    (callback, client) => marketsProvider(callback, client, undefined),
-    (callback, client) => assetsProvider(callback, client, undefined),
-  ],
+export const accountsDataProvider = makeDerivedDataProvider<Account[], never>(
+  [accountsOnlyDataProvider, marketsProvider, assetsProvider],
  ([accounts, markets, assets]): Account[] | null => {
    return accounts
      ? accounts
@@ -204,8 +194,7 @@ export const accountsDataProvider = makeDerivedDataProvider<

 export const aggregatedAccountsDataProvider = makeDerivedDataProvider<
  AccountFields[],
-  never,
-  AccountsQueryVariables
+  never
 >(
  [accountsDataProvider],
  (parts) => parts[0] && getAccountData(parts[0] as Account[])
@@ -1,16 +1,12 @@
-import { useRef, useMemo, memo, useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import {
-  useDataProvider,
-  useBottomPlaceholder,
-} from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
+import { useRef, useMemo, memo } from 'react';
 import type { AccountFields } from './accounts-data-provider';
 import { aggregatedAccountsDataProvider } from './accounts-data-provider';
 import type { PinnedAsset } from './accounts-table';
 import { AccountTable } from './accounts-table';
-import type { RowHeightParams } from 'ag-grid-community';

 interface AccountManagerProps {
  partyId: string;
@@ -31,26 +27,14 @@ export const AccountManager = ({
 }: AccountManagerProps) => {
  const gridRef = useRef<AgGridReact | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const { data, loading, error, reload } = useDataProvider({
+
+  const { data, loading, error, reload } = useDataProvider<
+    AccountFields[],
+    never
+  >({
    dataProvider: aggregatedAccountsDataProvider,
    variables,
  });
-  const setId = useCallback(
-    (data: AccountFields) => ({
-      ...data,
-      asset: { ...data.asset, id: `${data.asset.id}-1` },
-    }),
-    []
-  );
-  const bottomPlaceholderProps = useBottomPlaceholder<AccountFields>({
-    gridRef,
-    setId,
-  });
-
-  const getRowHeight = useCallback(
-    (params: RowHeightParams) => (params.node.rowPinned ? 32 : 22),
-    []
-  );
  return (
    <div className="relative h-full">
      <AccountTable
@@ -62,8 +46,6 @@ export const AccountManager = ({
        isReadOnly={isReadOnly}
        noRowsOverlayComponent={() => null}
        pinnedAsset={pinnedAsset}
-        getRowHeight={getRowHeight}
-        {...bottomPlaceholderProps}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -1,21 +1,13 @@
 import { forwardRef, useMemo, useState } from 'react';
-import {
-  addDecimalsFormatNumber,
-  isNumeric,
-  toBigNum,
-} from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
-  VegaValueGetterParams,
 } from '@vegaprotocol/datagrid';
-import { Button, ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit';
+import { ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
-import {
-  AgGridDynamic as AgGrid,
-  CenteredGridCellWrapper,
-} from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { AgGridColumn } from 'ag-grid-react';
 import type { IDatasource, IGetRowsParams } from 'ag-grid-community';
 import type { AgGridReact, AgGridReactProps } from 'ag-grid-react';
@@ -94,202 +86,139 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
            cellRenderer={({
              value,
              data,
-              node,
            }: VegaICellRendererParams<AccountFields, 'asset.symbol'>) => {
              return value ? (
-                <CenteredGridCellWrapper
-                  className={node.rowPinned ? 'h-[30px]' : undefined}
+                <ButtonLink
+                  data-testid="asset"
+                  onClick={() => {
+                    if (data) {
+                      onClickAsset(data.asset.id);
+                    }
+                  }}
                >
-                  <ButtonLink
-                    data-testid="asset"
-                    onClick={() => {
-                      if (data) {
-                        onClickAsset(data.asset.id);
-                      }
-                    }}
-                  >
-                    {value}
-                  </ButtonLink>
-                </CenteredGridCellWrapper>
+                  {value}
+                </ButtonLink>
              ) : null;
            }}
            maxWidth={300}
          />
          <AgGridColumn
            headerName={t('Total')}
-            type="rightAligned"
            field="deposited"
            headerTooltip={t(
              'This is the total amount of collateral used plus the amount available in your general account.'
            )}
-            valueGetter={({
+            valueFormatter={({
+              value,
              data,
-            }: VegaValueGetterParams<AccountFields, 'deposited'>) => {
-              return !data?.deposited
-                ? undefined
-                : toBigNum(data.deposited, data.asset.decimals).toNumber();
-            }}
+            }: VegaValueFormatterParams<AccountFields, 'deposited'>) =>
+              data &&
+              data.asset &&
+              isNumeric(value) &&
+              addDecimalsFormatNumber(value, data.asset.decimals)
+            }
            maxWidth={300}
-            cellRenderer={({
-              data,
-              node,
-            }: VegaICellRendererParams<AccountFields, 'deposited'>) => {
-              const valueFormatted =
-                data &&
-                data.asset &&
-                isNumeric(data.deposited) &&
-                addDecimalsFormatNumber(data.deposited, data.asset.decimals);
-              return node.rowPinned ? (
-                <CenteredGridCellWrapper className="h-[30px] justify-end">
-                  {valueFormatted}
-                </CenteredGridCellWrapper>
-              ) : (
-                valueFormatted
-              );
-            }}
          />
          <AgGridColumn
            headerName={t('Used')}
-            type="rightAligned"
            field="used"
            headerTooltip={t(
              'This is the amount of collateral used from your general account.'
            )}
-            valueGetter={({
+            valueFormatter={({
+              value,
              data,
-            }: VegaValueGetterParams<AccountFields, 'used'>) => {
-              return !data?.used
-                ? undefined
-                : toBigNum(data.used, data.asset.decimals).toNumber();
-            }}
+            }: VegaValueFormatterParams<AccountFields, 'used'>) =>
+              data &&
+              data.asset &&
+              isNumeric(value) &&
+              addDecimalsFormatNumber(value, data.asset.decimals)
+            }
            maxWidth={300}
-            cellRenderer={({
-              data,
-              node,
-            }: VegaICellRendererParams<AccountFields, 'used'>) => {
-              const valueFormatted =
-                data &&
-                data.asset &&
-                isNumeric(data.used) &&
-                addDecimalsFormatNumber(data.used, data.asset.decimals);
-              return node.rowPinned ? (
-                <CenteredGridCellWrapper className="h-[30px] justify-end">
-                  {valueFormatted}
-                </CenteredGridCellWrapper>
-              ) : (
-                valueFormatted
-              );
-            }}
          />
          <AgGridColumn
            headerName={t('Available')}
            field="available"
-            type="rightAligned"
            headerTooltip={t(
              'This is the amount of collateral available in your general account.'
            )}
-            valueGetter={({
-              data,
-            }: VegaValueGetterParams<AccountFields, 'available'>) => {
-              return !data?.available
-                ? undefined
-                : toBigNum(data.available, data.asset.decimals).toNumber();
-            }}
            valueFormatter={({
+              value,
              data,
            }: VegaValueFormatterParams<AccountFields, 'available'>) =>
              data &&
              data.asset &&
-              isNumeric(data.available) &&
-              addDecimalsFormatNumber(data.available, data.asset.decimals)
+              isNumeric(value) &&
+              addDecimalsFormatNumber(value, data.asset.decimals)
            }
            maxWidth={300}
-            cellRenderer={({
-              data,
-              node,
-            }: VegaICellRendererParams<AccountFields, 'available'>) => {
-              const valueFormatted =
-                data &&
-                data.asset &&
-                isNumeric(data.available) &&
-                addDecimalsFormatNumber(data.available, data.asset.decimals);
-              return node.rowPinned ? (
-                <CenteredGridCellWrapper className="h-[30px] justify-end">
-                  {valueFormatted}
-                </CenteredGridCellWrapper>
-              ) : (
-                valueFormatted
-              );
-            }}
          />
-          <AgGridColumn
-            colId="breakdown"
-            headerName=""
-            sortable={false}
-            minWidth={200}
-            type="rightAligned"
-            cellRenderer={({
-              data,
-            }: VegaICellRendererParams<AccountFields>) => {
-              if (!data) return null;
-              else {
-                if (
-                  data.asset.id === pinnedAssetId &&
-                  new BigNumber(data.deposited).isLessThanOrEqualTo(0)
-                ) {
-                  return (
-                    <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
-                      <Button
-                        size="xs"
-                        variant="primary"
+          {
+            <AgGridColumn
+              colId="breakdown"
+              headerName=""
+              sortable={false}
+              minWidth={200}
+              type="rightAligned"
+              cellRenderer={({
+                data,
+              }: VegaICellRendererParams<AccountFields>) => {
+                if (!data) return null;
+                else {
+                  if (
+                    data.asset.id === pinnedAssetId &&
+                    new BigNumber(data.deposited).isLessThanOrEqualTo(0)
+                  ) {
+                    return (
+                      <ButtonLink
                        data-testid="deposit"
                        onClick={() => {
                          onClickDeposit && onClickDeposit(data.asset.id);
                        }}
                      >
                        {t('Deposit to trade')}
-                      </Button>
-                    </CenteredGridCellWrapper>
-                  );
-                }
-                return (
-                  <>
-                    <ButtonLink
-                      data-testid="breakdown"
-                      onClick={() => {
-                        setOpenBreakdown(!openBreakdown);
-                        setBreakdown(data.breakdown || null);
-                      }}
-                    >
-                      {t('Breakdown')}
-                    </ButtonLink>
-                    <span className="mx-1" />
-                    {!props.isReadOnly && (
+                      </ButtonLink>
+                    );
+                  }
+                  return (
+                    <>
                      <ButtonLink
-                        data-testid="deposit"
+                        data-testid="breakdown"
                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
+                          setOpenBreakdown(!openBreakdown);
+                          setBreakdown(data.breakdown || null);
                        }}
                      >
-                        {t('Deposit')}
+                        {t('Breakdown')}
                      </ButtonLink>
-                    )}
-                    <span className="mx-1" />
-                    {!props.isReadOnly && (
-                      <ButtonLink
-                        data-testid="withdraw"
-                        onClick={() =>
-                          onClickWithdraw && onClickWithdraw(data.asset.id)
-                        }
-                      >
-                        {t('Withdraw')}
-                      </ButtonLink>
-                    )}
-                  </>
-                );
-              }
-            }}
-          />
+                      <span className="mx-1" />
+                      {!props.isReadOnly && (
+                        <ButtonLink
+                          data-testid="deposit"
+                          onClick={() => {
+                            onClickDeposit && onClickDeposit(data.asset.id);
+                          }}
+                        >
+                          {t('Deposit')}
+                        </ButtonLink>
+                      )}
+                      <span className="mx-1" />
+                      {!props.isReadOnly && (
+                        <ButtonLink
+                          data-testid="withdraw"
+                          onClick={() =>
+                            onClickWithdraw && onClickWithdraw(data.asset.id)
+                          }
+                        >
+                          {t('Withdraw')}
+                        </ButtonLink>
+                      )}
+                    </>
+                  );
+                }
+              }}
+            />
+          }
        </AgGrid>
        <Dialog size="medium" open={openBreakdown} onChange={setOpenBreakdown}>
          <div className="h-[35vh] w-full m-auto flex flex-col">
@@ -43,6 +43,10 @@ export const accountFields: AccountFieldsFragment[] = [
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
    balance: '100000000',
+    market: {
+      id: 'market-0',
+      __typename: 'Market',
+    },
    asset: {
      __typename: 'Asset',
      id: 'asset-id-2',
@@ -71,7 +75,7 @@ export const accountFields: AccountFieldsFragment[] = [
    },
    asset: {
      __typename: 'Asset',
-      id: 'asset-0',
+      id: 'asset-id-2',
    },
  },
  {
@@ -90,7 +94,7 @@ export const accountFields: AccountFieldsFragment[] = [
  {
    __typename: 'AccountBalance',
    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '10000000000',
+    balance: '100000000',
    market: null,
    asset: {
      __typename: 'Asset',
@@ -137,25 +141,3 @@ export const accountEventsSubscription = (
  };
  return merge(defaultResult, override);
 };
-
-export const amendGeneralAccountBalance = (
-  accounts: AccountsQuery,
-  marketId: string,
-  balance: string
-) => {
-  if (accounts.party?.accountsConnection?.edges) {
-    const marginAccount = accounts.party.accountsConnection.edges.find(
-      (edge) => edge?.node.market?.id === marketId
-    );
-    if (marginAccount) {
-      const generalAccount = accounts.party.accountsConnection.edges.find(
-        (edge) =>
-          edge?.node.asset.id === marginAccount.node.asset.id &&
-          !edge?.node.market
-      );
-      if (generalAccount) {
-        generalAccount.node.balance = balance;
-      }
-    }
-  }
-};
@@ -20,7 +20,7 @@ export const TransferContainer = () => {
  const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
  const { data } = useDataProvider({
    dataProvider: accountsDataProvider,
-    variables: { partyId: pubKey || '' },
+    variables: { partyId: pubKey },
    skip: !pubKey,
  });
  const create = useVegaTransactionStore((store) => store.create);
@@ -11,7 +11,7 @@ interface Actions {
  open: (open?: boolean) => void;
 }

-export const useTransferDialog = create<State & Actions>()((set) => ({
+export const useTransferDialog = create<State & Actions>((set) => ({
  isOpen: false,
  open: (open = true) => {
    set(() => ({ isOpen: open }));
@@ -9,4 +9,4 @@ type HeaderStore = {
  [url: string]: HeaderEntry | undefined;
 };

-export const useHeaderStore = create<HeaderStore>()(() => ({}));
+export const useHeaderStore = create<HeaderStore>(() => ({}));
@@ -1,11 +1,8 @@
 import { makeDataProvider } from '@vegaprotocol/utils';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useMemo } from 'react';

-import type {
-  AssetQuery,
-  AssetFieldsFragment,
-  AssetQueryVariables,
-} from './__generated__/Asset';
+import type { AssetQuery, AssetFieldsFragment } from './__generated__/Asset';
 import { AssetDocument } from './__generated__/Asset';

 export type Asset = AssetFieldsFragment;
@@ -18,21 +15,21 @@ export const getData = (responseData: AssetQuery | null | undefined) => {
  return null;
 };

-export const assetProvider = makeDataProvider<
-  AssetQuery,
-  Asset,
-  never,
-  never,
-  AssetQueryVariables
->({
+export const assetProvider = makeDataProvider<AssetQuery, Asset, never, never>({
  query: AssetDocument,
  getData,
 });

 export const useAssetDataProvider = (assetId: string) => {
+  const variables = useMemo(
+    () => ({
+      assetId,
+    }),
+    [assetId]
+  );
  return useDataProvider({
    dataProvider: assetProvider,
-    variables: { assetId: assetId || '' },
+    variables,
    skip: !assetId,
  });
 };
@@ -20,7 +20,7 @@ export type AssetDetailsDialogStore = {
  open: (id: string, trigger?: HTMLElement | null, asJson?: boolean) => void;
 };

-export const useAssetDetailsDialogStore = create<AssetDetailsDialogStore>()(
+export const useAssetDetailsDialogStore = create<AssetDetailsDialogStore>(
  (set) => ({
    isOpen: false,
    id: '',
@@ -40,5 +40,4 @@ export const enabledAssetsProvider = makeDerivedDataProvider<
 export const useAssetsDataProvider = () =>
  useDataProvider({
    dataProvider: assetsProvider,
-    variables: undefined,
  });
@@ -19,7 +19,6 @@ import { addCreateMarket } from './lib/commands/create-market';
 import { addConnectPublicKey } from './lib/commands/add-connect-public-key';
 import { addVegaWalletSubmitProposal } from './lib/commands/vega-wallet-submit-proposal';
 import { addGetNodes } from './lib/commands/get-nodes';
-import { addVegaWalletSubmitLiquidityProvision } from './lib/commands/vega-wallet-submit-liquidity-provision';

 addGetTestIdcommand();
 addSlackCommand();
@@ -40,7 +39,6 @@ addMockTransactionResponse();
 addCreateMarket();
 addConnectPublicKey();
 addVegaWalletSubmitProposal();
-addVegaWalletSubmitLiquidityProvision();

 export { mockConnectWallet } from './lib/commands/vega-wallet-connect';
 export type { onMessage } from './lib/mock-ws';
@@ -1,67 +0,0 @@
-import { PeggedReference } from '@vegaprotocol/types';
-import type { LiquidityProvisionSubmission } from '@vegaprotocol/wallet';
-import { createWalletClient, sendVegaTx } from '../capsule/wallet-client';
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace Cypress {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    interface Chainable<Subject> {
-      VegaWalletSubmitLiquidityProvision(
-        marketId: string,
-        amount: string
-      ): void;
-    }
-  }
-}
-
-export const addVegaWalletSubmitLiquidityProvision = () => {
-  Cypress.Commands.add(
-    'VegaWalletSubmitLiquidityProvision',
-    (marketId, amount) => {
-      const vegaWalletUrl = Cypress.env('VEGA_WALLET_URL');
-      const token = Cypress.env('VEGA_WALLET_API_TOKEN');
-      const vegaPubKey = Cypress.env('VEGA_PUBLIC_KEY');
-
-      const liquidityProvisionTx: LiquidityProvisionSubmission = {
-        liquidityProvisionSubmission: {
-          marketId: marketId,
-          commitmentAmount: amount,
-          fee: '0.001',
-          buys: [
-            {
-              offset: '10',
-              proportion: '1',
-              reference: PeggedReference.PEGGED_REFERENCE_MID,
-            },
-            {
-              offset: '12',
-              proportion: '2',
-              reference: PeggedReference.PEGGED_REFERENCE_MID,
-            },
-          ],
-          sells: [
-            {
-              offset: '10',
-              proportion: '2',
-              reference: PeggedReference.PEGGED_REFERENCE_MID,
-            },
-            {
-              offset: '12',
-              proportion: '2',
-              reference: PeggedReference.PEGGED_REFERENCE_MID,
-            },
-          ],
-        },
-        pubKey: vegaPubKey,
-        propagate: true,
-      };
-
-      createWalletClient(vegaWalletUrl, token);
-
-      cy.highlight('Submitting liquidity provision');
-
-      sendVegaTx(vegaPubKey, liquidityProvisionTx);
-    }
-  );
-};
@@ -8,7 +8,6 @@ export * from './lib/cells/price-cell';
 export * from './lib/cells/price-change-cell';
 export * from './lib/cells/price-flash-cell';
 export * from './lib/cells/vol-cell';
-export * from './lib/cells/centered-grid-cell';

 export * from './lib/filters/date-range-filter';
 export * from './lib/filters/set-filter';
@@ -22,15 +22,13 @@ const agGridDarkVariables = `
    border-width: 1px 0;
    border-bottom: 1px solid transparent;
  }
-  .ag-theme-balham-dark .ag-row.no-hover, .ag-theme-balham-dark .ag-row.no-hover:hover {
-    background: black;
-  }
+
  .ag-theme-balham-dark .ag-react-container {
    overflow: hidden;
    text-overflow: ellipsis;
  }

-  .ag-theme-balham-dark .ag-cell, .ag-theme-balham-dark .ag-full-width-row .ag-cell-wrapper.ag-row-group {
+  .ag-theme-balham-dark .ag-cell, .ag-theme-balham-dark .ag-full-width-row .ag-cell-wrapper.ag-row-group {    
    line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
  }
 `;
@@ -22,15 +22,13 @@ const agGridLightVariables = `
    border-width: 1px 0;
    border-bottom: 1px solid transparent;
  }
-  .ag-theme-balham .ag-row.no-hover, .ag-theme-balham .ag-row.no-hover:hover {
-    background: white;
-  }
+
  .ag-theme-balham .ag-react-container {
    overflow: hidden;
    text-overflow: ellipsis;
  }

-  .ag-theme-balham .ag-cell, .ag-theme-balham .ag-full-width-row .ag-cell-wrapper.ag-row-group {
+  .ag-theme-balham .ag-cell, .ag-theme-balham .ag-full-width-row .ag-cell-wrapper.ag-row-group {    
    line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
  }
 `;
@@ -1,16 +0,0 @@
-import type { ReactNode } from 'react';
-import classNames from 'classnames';
-
-export const CenteredGridCellWrapper = ({
-  children,
-  className,
-}: {
-  children: ReactNode;
-  className?: string;
-}) => (
-  <div
-    className={classNames('flex h-[20px] p-0 justify-items-center', className)}
-  >
-    <div className="self-center">{children}</div>
-  </div>
-);
@@ -61,9 +61,10 @@ export const SetFilter = forwardRef((props: IFilterParams, ref) => {
    <div className="ag-filter-body-wrapper">
      <fieldset className="ag-simple-filter-body-wrapper">
        {Object.keys(props.colDef.filterParams.set).map((key) => (
-          <label className="flex" key={key}>
+          <label className="flex">
            <input
              type="checkbox"
+              key={key}
              value={key}
              className="mr-1"
              checked={value.includes(key)}
@@ -1,21 +0,0 @@
-import type { StateCreator } from 'zustand';
-import { act } from 'react-dom/test-utils';
-const { create: actualCreate } = jest.requireActual('zustand'); // if using jest
-
-// a variable to hold reset functions for all stores declared in the app
-const storeResetFns = new Set<() => void>();
-
-// when creating a store, we get its initial state, create a reset function and add it in the set
-export const create =
-  () =>
-  <S>(createState: StateCreator<S>) => {
-    const store = actualCreate(createState);
-    const initialState = store.getState();
-    storeResetFns.add(() => store.setState(initialState, true));
-    return store;
-  };
-
-// Reset all stores after each test run
-beforeEach(() => {
-  act(() => storeResetFns.forEach((resetFn) => resetFn()));
-});
@@ -1,7 +1,7 @@
-import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { formatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { Notification, Intent } from '@vegaprotocol/ui-toolkit';
-import { useDepositDialog } from '@vegaprotocol/deposits';
+import { DepositDialog, useDepositDialog } from '@vegaprotocol/deposits';

 interface Props {
  margin: string;
@@ -16,22 +16,25 @@ interface Props {
 export const MarginWarning = ({ margin, balance, asset }: Props) => {
  const openDepositDialog = useDepositDialog((state) => state.open);
  return (
-    <Notification
-      intent={Intent.Warning}
-      testId="dealticket-warning-margin"
-      message={`You may not have enough margin available to open this position. ${addDecimalsFormatNumber(
-        margin,
-        asset.decimals
-      )} ${asset.symbol} ${t(
-        'is currently required. You have only'
-      )} ${addDecimalsFormatNumber(balance, asset.decimals)} ${
-        asset.symbol
-      } ${t('available.')}`}
-      buttonProps={{
-        text: t(`Deposit ${asset.symbol}`),
-        action: () => openDepositDialog(asset.id),
-        dataTestId: 'deal-ticket-deposit-dialog-button',
-      }}
-    />
+    <>
+      <Notification
+        intent={Intent.Warning}
+        testId="dealticket-warning-margin"
+        message={`You may not have enough margin available to open this position. ${formatNumber(
+          margin,
+          asset.decimals
+        )} ${asset.symbol} ${t(
+          'is currently required. You have only'
+        )} ${formatNumber(balance, asset.decimals)} ${asset.symbol} ${t(
+          'available.'
+        )}`}
+        buttonProps={{
+          text: t(`Deposit ${asset.symbol}`),
+          action: () => openDepositDialog(asset.id),
+          dataTestId: 'deal-ticket-deposit-dialog-button',
+        }}
+      />
+      <DepositDialog />
+    </>
  );
 };
@@ -7,7 +7,7 @@ interface ZeroBalanceErrorProps {
    id: string;
    symbol: string;
  };
-  onClickCollateral?: () => void;
+  onClickCollateral: () => void;
 }

 export const ZeroBalanceError = ({
@@ -21,12 +21,8 @@ export const ZeroBalanceError = ({
      testId="dealticket-error-message-zero-balance"
      message={
        <>
-          You need {asset.symbol} in your wallet to trade in this market.
-          {onClickCollateral && (
-            <>
-              See all your <Link onClick={onClickCollateral}>collateral</Link>.
-            </>
-          )}
+          You need {asset.symbol} in your wallet to trade in this market. See
+          all your <Link onClick={onClickCollateral}>collateral</Link>.
        </>
      }
      buttonProps={{
@@ -1,21 +1,17 @@
-import type { Control } from 'react-hook-form';
+import type { UseFormRegister } from 'react-hook-form';
 import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';
-import type { OrderObj } from '@vegaprotocol/orders';
-import type { OrderFormFields } from '../../hooks/use-order-form';
+import type { DealTicketFormFields } from './deal-ticket';

 export interface DealTicketAmountProps {
-  control: Control<OrderFormFields>;
  orderType: Schema.OrderType;
  marketData: MarketData;
  market: Market;
+  register: UseFormRegister<DealTicketFormFields>;
  sizeError?: string;
  priceError?: string;
-  update: (obj: Partial<OrderObj>) => void;
-  size: string;
-  price?: string;
 }

 export const DealTicketAmount = ({
@@ -1,3 +1,4 @@
+import { useMemo } from 'react';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useThrottledDataProvider } from '@vegaprotocol/react-helpers';
@@ -28,7 +29,7 @@ export const DealTicketContainer = ({
  } = useThrottledDataProvider(
    {
      dataProvider: marketDataProvider,
-      variables: { marketId },
+      variables: useMemo(() => ({ marketId }), [marketId]),
    },
    1000
  );
@@ -46,7 +47,7 @@ export const DealTicketContainer = ({
          market={market}
          marketData={marketData}
          submit={(orderSubmission) => create({ orderSubmission })}
-          onClickCollateral={onClickCollateral}
+          onClickCollateral={onClickCollateral || (() => null)}
        />
      ) : (
        <Splash>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edd	782368285c	fix(explorer): use div in place of potentially empty fragment	2023-03-03 10:28:32 +00:00
Edd	ca24fb0ca3	test(explorer): mock markdown and test bundle exists	2023-03-02 12:30:53 +00:00
Edd	a67f8e0155	chore(explorer): finish splitting up signature bundle component	2023-03-02 10:43:39 +00:00
Edd	c637ba86b2	chore(explorer): update i18n imports after rebase	2023-03-02 10:43:39 +00:00
Edd	faa8bb8481	feat(explorer): add basic signature bundle component	2023-03-02 10:43:39 +00:00
Edd	f44013fa94	feat(explorer): expand proposal details component	2023-03-02 10:43:39 +00:00
Edd	e6cf5bfe1d	feat(explorer): proposal details	2023-03-02 10:43:39 +00:00
Edd	6c72fff23c	feat(explorer): basic proposal overview	2023-03-02 10:43:39 +00:00
Edd	6588327454	feat(explorer): wip proposal view	2023-03-02 10:43:39 +00:00