fix(trading): game cards are not showing

.github/workflows/console-test-run.yml

@@ -205,7 +205,7 @@ jobs:
       # run tests
       #----------------------------------------------
       - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v --numprocesses 4 --dist loadfile --durations=45
+        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v --numprocesses 1 --dist loadfile --durations=45
         working-directory: apps/trading/e2e
       #----------------------------------------------
       # upload traces

README.md

@@ -4,7 +4,7 @@ The front-end monorepo provides a toolkit for building apps that interact with V
 
 This repository is managed using [Nx](https://nx.dev).
 
-## 🔎 Applications in this repo
+# 🔎 Applications in this repo
 
 ### [Block explorer](./apps/explorer)
 
@@ -30,7 +30,7 @@ Hosting for static content being shared across apps, for example fonts.
 
 The utility dApp for validators wishing to add or remove themselves as a signer of the multisig contract.
 
-## 🧱 Libraries in this repo
+# 🧱 Libraries in this repo
 
 ### [UI toolkit](./libs/ui-toolkit)
 
@@ -53,7 +53,7 @@ A utility library for connecting to the Ethereum network and interacting with Ve
 
 Generic react helpers that can be used across multiple applications, along with other utilities.
 
-## 💻 Develop
+# 💻 Develop
 
 ### Set up
 
@@ -103,7 +103,7 @@ In CI linting, formatting and also run. These checks can be seen in the [CI work
 
 Visit the [Nx Documentation](https://nx.dev/getting-started/intro) to learn more.
 
-## 🐋 Hosting a console
+# 🐋 Hosting a console
 
 To host a console there are two possible build scenarios for running the frontends: nx performed **outside** or **inside** docker build. For specific build instructions follow [build instructions](#build-instructions).
 
@@ -226,6 +226,6 @@ Note: The script is only needed if capsule was built for first time or fresh. To
 vega wallet service run -n DV --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet
 ```
 
-## 📑 License
+# 📑 License
 
 [MIT](./LICENSE)

apps/explorer-e2e/src/integration/proposal.cy.js

@@ -24,6 +24,10 @@ context('Proposal page', { tags: '@smoke' }, function () {
           cy.get_element_by_col_id('title').should('have.text', proposalTitle);
           cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
           cy.get_element_by_col_id('state').should('have.text', 'Enacted');
+          cy.getByTestId('vote-progress').should('be.visible');
+          cy.getByTestId('vote-progress-bar-for')
+            .invoke('attr', 'style')
+            .should('eq', 'width: 100%;');
           cy.get('[col-id="cDate"]')
             .invoke('text')
             .should('match', dateTimeRegex);
@@ -69,6 +73,10 @@ context('Proposal page', { tags: '@smoke' }, function () {
             'have.text',
             'Waiting for Node Vote'
           );
+          cy.getByTestId('vote-progress').should('be.visible');
+          cy.getByTestId('vote-progress-bar-against')
+            .invoke('attr', 'style')
+            .should('eq', 'width: 100%;');
           cy.get('[col-id="cDate"]')
             .invoke('text')
             .should('match', dateTimeRegex);

apps/explorer/src/app/components/links/hash.tsx

@@ -1,4 +1,4 @@
-export type HashProps = React.HTMLProps<HTMLSpanElement> & {
+export type HashProps = {
   text: string;
   truncate?: boolean;
 };

apps/explorer/src/app/components/links/index.ts

@@ -2,5 +2,4 @@ export { default as BlockLink } from './block-link/block-link';
 export { default as PartyLink } from './party-link/party-link';
 export { default as NodeLink } from './node-link/node-link';
 export { default as MarketLink } from './market-link/market-link';
-export { default as NetworkParameterLink } from './network-parameter-link/network-parameter-link';
 export * from './asset-link/asset-link';

apps/explorer/src/app/components/links/network-parameter-link/network-parameter-link.tsx

@@ -1,30 +0,0 @@
-import React from 'react';
-import { Routes } from '../../../routes/route-names';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-import Hash from '../hash';
-
-export type NetworkParameterLinkProps = Partial<ComponentProps<typeof Link>> & {
-  parameter: string;
-};
-
-/**
- * Links a given network parameter to the relevant page and anchor on the page
- */
-const NetworkParameterLink = ({
-  parameter,
-  ...props
-}: NetworkParameterLinkProps) => {
-  return (
-    <Link
-      className="underline"
-      {...props}
-      to={`/${Routes.NETWORK_PARAMETERS}#${parameter}`}
-    >
-      <Hash text={parameter} />
-    </Link>
-  );
-};
-
-export default NetworkParameterLink;

apps/explorer/src/app/components/links/proposal-link/proposal-link.tsx

@@ -26,7 +26,7 @@ const ProposalLink = ({ id, text }: ProposalLinkProps) => {
   >;
 
   const base = ENV.dataSources.governanceUrl;
-  const label = proposal?.rationale?.title || id;
+  const label = proposal?.rationale.title || id;
 
   return (
     <ExternalLink href={`${base}/proposals/${id}`}>

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -1,4 +1,5 @@
 import { type ProposalListFieldsFragment } from '@vegaprotocol/proposals';
+import { VoteProgress } from '@vegaprotocol/proposals';
 import { type AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { AgGrid } from '@vegaprotocol/datagrid';
@@ -11,7 +12,12 @@ import { type ColDef } from 'ag-grid-community';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
+import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { JsonViewerDialog } from '../dialogs/json-viewer-dialog';
@@ -25,7 +31,15 @@ type ProposalsTableProps = {
   data: ProposalListFieldsFragment[] | null;
 };
 export const ProposalsTable = ({ data }: ProposalsTableProps) => {
+  const { params } = useNetworkParams([
+    NetworkParams.governance_proposal_market_requiredMajority,
+  ]);
   const tokenLink = useLinks(DApp.Governance);
+  const requiredMajorityPercentage = useMemo(() => {
+    const requiredMajority =
+      params?.governance_proposal_market_requiredMajority ?? 1;
+    return new BigNumber(requiredMajority).times(100);
+  }, [params?.governance_proposal_market_requiredMajority]);
 
   const gridRef = useRef<AgGridReact>(null);
   useLayoutEffect(() => {
@@ -76,6 +90,33 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
           return value ? ProposalStateMapping[value] : '-';
         },
       },
+      {
+        colId: 'voting',
+        maxWidth: 100,
+        hide: window.innerWidth <= BREAKPOINT_MD,
+        headerName: t('Voting'),
+        cellRenderer: ({
+          data,
+        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+          if (data) {
+            const yesTokens = new BigNumber(data.votes.yes.totalTokens);
+            const noTokens = new BigNumber(data.votes.no.totalTokens);
+            const totalTokensVoted = yesTokens.plus(noTokens);
+            const yesPercentage = totalTokensVoted.isZero()
+              ? new BigNumber(0)
+              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
+            return (
+              <div className="flex h-full items-center justify-center pt-2 uppercase">
+                <VoteProgress
+                  threshold={requiredMajorityPercentage}
+                  progress={yesPercentage}
+                />
+              </div>
+            );
+          }
+          return '-';
+        },
+      },
       {
         colId: 'cDate',
         maxWidth: 150,
@@ -143,7 +184,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
         },
       },
     ],
-    [tokenLink]
+    [requiredMajorityPercentage, tokenLink]
   );
   return (
     <>

apps/explorer/src/app/components/txs/details/proposal/Proposal.graphql

@@ -5,10 +5,5 @@ query ExplorerProposalStatus($id: ID!) {
       state
       rejectionReason
     }
-    ... on BatchProposal {
-      id
-      state
-      rejectionReason
-    }
   }
 }

apps/explorer/src/app/components/txs/details/proposal/__generated__/Proposal.ts

@@ -8,7 +8,7 @@ export type ExplorerProposalStatusQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };
+export type ExplorerProposalStatusQuery = { __typename?: 'Query', proposal?: { __typename?: 'BatchProposal' } | { __typename?: 'Proposal', id?: string | null, state: Types.ProposalState, rejectionReason?: Types.ProposalRejectionReason | null } | null };
 
 
 export const ExplorerProposalStatusDocument = gql`
@@ -19,11 +19,6 @@ export const ExplorerProposalStatusDocument = gql`
       state
       rejectionReason
     }
-    ... on BatchProposal {
-      id
-      state
-      rejectionReason
-    }
   }
 }
     `;

apps/explorer/src/app/components/txs/details/proposal/batch-item.spec.tsx

@@ -1,257 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BatchItem } from './batch-item';
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { components } from '../../../../../types/explorer';
-type Item = components['schemas']['vegaBatchProposalTermsChange'];
-
-describe('BatchItem', () => {
-  it('Renders "Unknown proposal type" by default', () => {
-    const item = {};
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
-  });
-
-  it('Renders "Unknown proposal type" for unknown items', () => {
-    const item = {
-      newLochNessMonster: {
-        location: 'Loch Ness',
-      },
-    } as unknown as Item;
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Unknown proposal type')).toBeInTheDocument();
-  });
-
-  it('Renders "New spot market"', () => {
-    const item = {
-      newSpotMarket: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New spot market')).toBeInTheDocument();
-  });
-
-  it('Renders "Cancel transfer"', () => {
-    const item = {
-      cancelTransfer: {
-        changes: {
-          transferId: 'transfer123',
-        },
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
-    expect(screen.getByText('transf')).toBeInTheDocument();
-  });
-
-  it('Renders "Cancel transfer" without an id', () => {
-    const item = {
-      cancelTransfer: {
-        changes: {},
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Cancel transfer')).toBeInTheDocument();
-  });
-
-  it('Renders "New freeform"', () => {
-    const item = {
-      newFreeform: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New freeform proposal')).toBeInTheDocument();
-  });
-
-  it('Renders "New market"', () => {
-    const item = {
-      newMarket: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New market')).toBeInTheDocument();
-  });
-
-  it('Renders "New transfer"', () => {
-    const item = {
-      newTransfer: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('New transfer')).toBeInTheDocument();
-  });
-
-  it('Renders "Update asset" with assetId', () => {
-    const item = {
-      updateAsset: {
-        assetId: 'asset123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update asset')).toBeInTheDocument();
-    expect(screen.getByText('asset123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update asset" even if assetId is not set', () => {
-    const item = {
-      updateAsset: {
-        assetId: undefined,
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update asset')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market state" with marketId', () => {
-    const item = {
-      updateMarketState: {
-        changes: {
-          marketId: 'market123',
-        },
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market state')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market state" even if marketId is not set', () => {
-    const item = {
-      updateMarketState: {
-        changes: {
-          marketId: undefined,
-        },
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market state')).toBeInTheDocument();
-  });
-
-  it('Renders "Update network parameter" with parameter', () => {
-    const item = {
-      updateNetworkParameter: {
-        changes: {
-          key: 'parameter123',
-        },
-      },
-    };
-    render(
-      <MockedProvider>
-        <MemoryRouter>
-          <BatchItem item={item} />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-    expect(screen.getByText('Update network parameter')).toBeInTheDocument();
-    expect(screen.getByText('parameter123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update network parameter" even if parameter is not set', () => {
-    const item = {
-      updateNetworkParameter: {
-        changes: {
-          key: undefined,
-        },
-      },
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update network parameter')).toBeInTheDocument();
-  });
-
-  it('Renders "Update referral program"', () => {
-    const item = {
-      updateReferralProgram: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(screen.getByText('Update referral program')).toBeInTheDocument();
-  });
-
-  it('Renders "Update spot market" with marketId', () => {
-    const item = {
-      updateSpotMarket: {
-        marketId: 'market123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update spot market')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update spot market" even if marketId is not set', () => {
-    const item = {
-      updateSpotMarket: {
-        marketId: undefined,
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update spot market')).toBeInTheDocument();
-  });
-  it('Renders "Update market" with marketId', () => {
-    const item = {
-      updateMarket: {
-        marketId: 'market123',
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market')).toBeInTheDocument();
-    expect(screen.getByText('market123')).toBeInTheDocument();
-  });
-
-  it('Renders "Update market" even if marketId is not set', () => {
-    const item = {
-      updateMarket: {
-        marketId: undefined,
-      },
-    };
-    render(
-      <MemoryRouter>
-        <MockedProvider>
-          <BatchItem item={item} />
-        </MockedProvider>
-      </MemoryRouter>
-    );
-    expect(screen.getByText('Update market')).toBeInTheDocument();
-  });
-
-  it('Renders "Update volume discount program"', () => {
-    const item = {
-      updateVolumeDiscountProgram: {},
-    };
-    render(<BatchItem item={item} />);
-    expect(
-      screen.getByText('Update volume discount program')
-    ).toBeInTheDocument();
-  });
-});

apps/explorer/src/app/components/txs/details/proposal/batch-item.tsx

@@ -1,87 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { AssetLink, MarketLink, NetworkParameterLink } from '../../../links';
-import type { components } from '../../../../../types/explorer';
-import Hash from '../../../links/hash';
-
-type Item = components['schemas']['vegaBatchProposalTermsChange'];
-
-export interface BatchItemProps {
-  item: Item;
-}
-
-/**
- * Produces a one line summary for an item in a batch proposal. Could
- * easily be adapted to summarise individual proposals, but there is no
- * place for that yet.
- *
- * Details (like IDs) should be shown and linked if available, but handled
- * if not available. This is adequate as the ProposalSummary component contains
- * a JSON viewer for the full proposal.
- */
-export const BatchItem = ({ item }: BatchItemProps) => {
-  if (item.cancelTransfer) {
-    const transferId = item?.cancelTransfer?.changes?.transferId || false;
-    return (
-      <span>
-        {t('Cancel transfer')}&nbsp;
-        {transferId && (
-          <Hash className="ml-1" truncate={true} text={transferId} />
-        )}
-      </span>
-    );
-  } else if (item.newFreeform) {
-    return <span>{t('New freeform proposal')}</span>;
-  } else if (item.newMarket) {
-    return <span>{t('New market')}</span>;
-  } else if (item.newSpotMarket) {
-    return <span>{t('New spot market')}</span>;
-  } else if (item.newTransfer) {
-    return <span>{t('New transfer')}</span>;
-  } else if (item.updateAsset) {
-    const assetId = item?.updateAsset?.assetId || false;
-    return (
-      <span>
-        {t('Update asset')}
-        {assetId && <AssetLink className="ml-1" assetId={assetId} />}
-      </span>
-    );
-  } else if (item.updateMarket) {
-    const marketId = item?.updateMarket?.marketId || false;
-    return (
-      <span>
-        {t('Update market')}{' '}
-        {marketId && <MarketLink className="ml-1" id={marketId} />}
-      </span>
-    );
-  } else if (item.updateMarketState) {
-    const marketId = item?.updateMarketState?.changes?.marketId || false;
-    return (
-      <span>
-        {t('Update market state')}
-        {marketId && <MarketLink className="ml-1" id={marketId} />}
-      </span>
-    );
-  } else if (item.updateNetworkParameter) {
-    const param = item?.updateNetworkParameter?.changes?.key || false;
-    return (
-      <span>
-        {t('Update network parameter')}
-        {param && <NetworkParameterLink className="ml-1" parameter={param} />}
-      </span>
-    );
-  } else if (item.updateReferralProgram) {
-    return <span>{t('Update referral program')}</span>;
-  } else if (item.updateSpotMarket) {
-    const marketId = item?.updateSpotMarket?.marketId || '';
-    return (
-      <span>
-        {t('Update spot market')}
-        <MarketLink className="ml-1" id={marketId} />
-      </span>
-    );
-  } else if (item.updateVolumeDiscountProgram) {
-    return <span>{t('Update volume discount program')}</span>;
-  }
-
-  return <span>{t('Unknown proposal type')}</span>;
-};

apps/explorer/src/app/components/txs/details/proposal/summary.tsx

@@ -1,4 +1,6 @@
+import type { ProposalTerms } from '../tx-proposal';
 import { useState } from 'react';
+import type { components } from '../../../../../types/explorer';
 import { JsonViewerDialog } from '../../../dialogs/json-viewer-dialog';
 import ProposalLink from '../../../links/proposal-link/proposal-link';
 import truncate from 'lodash/truncate';
@@ -7,12 +9,7 @@ import ReactMarkdown from 'react-markdown';
 import { ProposalDate } from './proposal-date';
 import { t } from '@vegaprotocol/i18n';
 
-import type { ProposalTerms } from '../tx-proposal';
-import type { components } from '../../../../../types/explorer';
-import { BatchItem } from './batch-item';
-
 type Rationale = components['schemas']['vegaProposalRationale'];
-type Batch = components['schemas']['v1BatchProposalSubmissionTerms']['changes'];
 
 type ProposalTermsDialog = {
   open: boolean;
@@ -24,7 +21,6 @@ interface ProposalSummaryProps {
   id: string;
   rationale?: Rationale;
   terms?: ProposalTerms;
-  batch?: Batch;
 }
 
 /**
@@ -35,7 +31,6 @@ export const ProposalSummary = ({
   id,
   rationale,
   terms,
-  batch,
 }: ProposalSummaryProps) => {
   const [dialog, setDialog] = useState<ProposalTermsDialog>({
     open: false,
@@ -77,18 +72,6 @@ export const ProposalSummary = ({
           </ReactMarkdown>
         </div>
       )}
-      {batch && (
-        <section className="pt-2 text-sm leading-tight my-3">
-          <h2 className="text-lg pb-1">{t('Changes')}</h2>
-          <ol>
-            {batch.map((change, index) => (
-              <li className="ml-4 list-decimal" key={`batch-${index}`}>
-                <BatchItem item={change} />
-              </li>
-            ))}
-          </ol>
-        </section>
-      )}
       <div className="pt-5">
         <button className="underline max-md:hidden mr-5" onClick={openDialog}>
           {t('View terms')}

apps/explorer/src/app/components/txs/details/tx-batch-proposal.tsx

@@ -1,75 +0,0 @@
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { sharedHeaderProps, TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
-import { ProposalSummary } from './proposal/summary';
-import Hash from '../../links/hash';
-import { t } from '@vegaprotocol/i18n';
-
-export type Proposal = components['schemas']['v1BatchProposalSubmission'];
-export type ProposalTerms = components['schemas']['vegaProposalTerms'];
-
-interface TxBatchProposalProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- *
- */
-export const TxBatchProposal = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxBatchProposalProps) => {
-  if (!txData || !txData.command.batchProposalSubmission) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-  let deterministicId = '';
-
-  const proposal: Proposal = txData.command.batchProposalSubmission;
-  const sig = txData?.signature?.value;
-  if (sig) {
-    deterministicId = txSignatureToDeterministicId(sig);
-  }
-
-  return (
-    <>
-      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TableRow modifier="bordered">
-          <TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
-          <TableCell>{t('Batch proposal')}</TableCell>
-        </TableRow>
-        <TxDetailsShared
-          txData={txData}
-          pubKey={pubKey}
-          blockData={blockData}
-          hideTypeRow={true}
-        />
-        <TableRow modifier="bordered">
-          <TableCell>{t('Batch size')}</TableCell>
-          <TableCell>
-            {proposal.terms?.changes?.length || t('No changes')}
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Proposal ID')}</TableCell>
-          <TableCell>
-            <Hash text={deterministicId} />
-          </TableCell>
-        </TableRow>
-      </TableWithTbody>
-      {proposal && (
-        <ProposalSummary
-          id={deterministicId}
-          rationale={proposal?.rationale}
-          terms={proposal.terms}
-          batch={proposal.terms?.changes}
-        />
-      )}
-    </>
-  );
-};

apps/explorer/src/app/components/txs/details/tx-details-wrapper.tsx

@@ -33,7 +33,6 @@ import { TxDetailsApplyReferralCode } from './tx-apply-referral-code';
 import { TxDetailsUpdateReferralSet } from './tx-update-referral-set';
 import { TxDetailsJoinTeam } from './tx-join-team';
 import { TxDetailsUpdateMarginMode } from './tx-update-margin-mode';
-import { TxBatchProposal } from './tx-batch-proposal';
 
 interface TxDetailsWrapperProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -137,8 +136,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
       return TxDetailsJoinTeam;
     case 'Update Margin Mode':
       return TxDetailsUpdateMarginMode;
-    case 'Batch Proposal':
-      return TxBatchProposal;
     default:
       return TxDetailsGeneric;
   }

apps/explorer/src/app/components/txs/tx-filter.tsx

@@ -20,7 +20,6 @@ export type FilterOption =
   | 'Amend Order'
   | 'Apply Referral Code'
   | 'Batch Market Instructions'
-  | 'Batch Proposal'
   | 'Cancel LiquidityProvision Order'
   | 'Cancel Order'
   | 'Cancel Transfer Funds'
@@ -68,13 +67,7 @@ export const filterOptions: Record<string, FilterOption[]> = {
     'Cancel Transfer Funds',
     'Withdraw',
   ],
-  Governance: [
-    'Batch Proposal',
-    'Delegate',
-    'Undelegate',
-    'Vote on Proposal',
-    'Proposal',
-  ],
+  Governance: ['Delegate', 'Undelegate', 'Vote on Proposal', 'Proposal'],
   Referrals: [
     'Apply Referral Code',
     'Create Referral Set',

apps/explorer/src/assets/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "Explorer VEGA",
-  "name": "Vega Protocol - Explorer",
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
   "icons": [
     {
       "src": "favicon.ico",

apps/governance/src/assets/manifest.json

@@ -1,6 +1,6 @@
 {
-  "short_name": "Governance VEGA",
-  "name": "Vega Protocol - Governance",
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
   "icons": [
     {
       "src": "favicon.ico",

apps/static/src/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="X-UA-Compatible" content="ie=edge" />
-    <title>Vega Protocol static assets</title>
+    <title>Vega Protocol static asseets</title>
     <link rel="stylesheet" href="fonts.css" />
     <link rel="icon" type="image/x-icon" href="favicon.ico" />
   </head>

apps/trading/assets/manifest.json

@@ -1,12 +1,6 @@
 {
-  "name": "Vega Protocol - Trading",
-  "short_name": "Console",
-  "description": "Vega Protocol - Trading dApp",
-  "start_url": "/",
-  "display": "standalone",
-  "orientation": "portrait",
-  "theme_color": "#000000",
-  "background_color": "#ffffff",
+  "short_name": "Mainnet Stats",
+  "name": "Vega Mainnet statistics",
   "icons": [
     {
       "src": "favicon.ico",
@@ -18,5 +12,9 @@
       "type": "image/png",
       "sizes": "192x192"
     }
-  ]
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
 }

apps/trading/client-pages/competitions/competitions-create-team.tsx

@@ -71,27 +71,18 @@ const CreateTeamFormContainer = ({ isSolo }: { isSolo: boolean }) => {
 
   if (status === 'confirmed') {
     return (
-      <div
-        className="flex flex-col items-start gap-2"
-        data-testid="team-creation-success-message"
-      >
+      <div className="flex flex-col items-start gap-2">
         <p className="text-sm">{t('Team creation transaction successful')}</p>
         {code && (
           <>
             <p className="text-sm">
               Your team ID is:{' '}
-              <span
-                className="font-mono break-all"
-                data-testid="team-id-display"
-              >
-                {code}
-              </span>
+              <span className="font-mono break-all">{code}</span>
             </p>
             <TradingAnchorButton
               href={Links.COMPETITIONS_TEAM(code)}
               intent={Intent.Info}
               size="small"
-              data-testid="view-team-button"
             >
               {t('View team')}
             </TradingAnchorButton>

apps/trading/client-pages/competitions/competitions-home.tsx

@@ -16,8 +16,6 @@ import { CompetitionsLeaderboard } from '../../components/competitions/competiti
 import { useTeams } from '../../lib/hooks/use-teams';
 import take from 'lodash/take';
 import { usePageTitle } from '../../lib/hooks/use-page-title';
-import { TeamCard } from '../../components/competitions/team-card';
-import { useMyTeam } from '../../lib/hooks/use-my-team';
 
 export const CompetitionsHome = () => {
   const t = useT();
@@ -35,13 +33,6 @@ export const CompetitionsHome = () => {
 
   const { data: teamsData, loading: teamsLoading } = useTeams();
 
-  const {
-    team: myTeam,
-    stats: myTeamStats,
-    games: myTeamGames,
-    rank: myTeamRank,
-  } = useMyTeam();
-
   return (
     <ErrorBoundary>
       <CompetitionsHeader title={t('Competitions')}>
@@ -52,83 +43,65 @@ export const CompetitionsHome = () => {
         </p>
       </CompetitionsHeader>
 
-      {/** Team card */}
-      {myTeam ? (
-        <>
-          <h2 className="text-2xl mb-6">{t('My team')}</h2>
-          <div className="mb-12">
-            <TeamCard
-              team={myTeam}
-              rank={myTeamRank}
-              stats={myTeamStats}
-              games={myTeamGames}
-            />
-          </div>
-        </>
-      ) : (
-        <>
-          {/** Get started */}
-          <h2 className="text-2xl mb-6">{t('Get started')}</h2>
+      {/** Get started */}
+      <h2 className="text-2xl mb-6">{t('Get started')}</h2>
 
-          <CompetitionsActionsContainer>
-            <CompetitionsAction
-              variant="A"
-              title={t('Create a team')}
-              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
-              )}
-              actionElement={
-                <TradingButton
-                  intent={Intent.Primary}
-                  onClick={(e) => {
-                    e.preventDefault();
-                    navigate(Links.COMPETITIONS_CREATE_TEAM());
-                  }}
-                  data-testId="create-public-team-button"
-                >
-                  {t('Create a public team')}
-                </TradingButton>
-              }
-            />
-            <CompetitionsAction
-              variant="B"
-              title={t('Solo team / lone wolf')}
-              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
-              )}
-              actionElement={
-                <TradingButton
-                  intent={Intent.Primary}
-                  onClick={(e) => {
-                    e.preventDefault();
-                    navigate(Links.COMPETITIONS_CREATE_TEAM_SOLO());
-                  }}
-                >
-                  {t('Create a private team')}
-                </TradingButton>
-              }
-            />
-            <CompetitionsAction
-              variant="C"
-              title={t('Join a team')}
-              description={t(
-                'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
-              )}
-              actionElement={
-                <TradingButton
-                  intent={Intent.Primary}
-                  onClick={(e) => {
-                    e.preventDefault();
-                    navigate(Links.COMPETITIONS_TEAMS());
-                  }}
-                >
-                  {t('Choose a team')}
-                </TradingButton>
-              }
-            />
-          </CompetitionsActionsContainer>
-        </>
-      )}
+      <CompetitionsActionsContainer>
+        <CompetitionsAction
+          variant="A"
+          title={t('Create a team')}
+          description={t(
+            'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+          )}
+          actionElement={
+            <TradingButton
+              intent={Intent.Primary}
+              onClick={(e) => {
+                e.preventDefault();
+                navigate(Links.COMPETITIONS_CREATE_TEAM());
+              }}
+            >
+              {t('Create a public team')}
+            </TradingButton>
+          }
+        />
+        <CompetitionsAction
+          variant="B"
+          title={t('Solo team / lone wolf')}
+          description={t(
+            'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+          )}
+          actionElement={
+            <TradingButton
+              intent={Intent.Primary}
+              onClick={(e) => {
+                e.preventDefault();
+                navigate(Links.COMPETITIONS_CREATE_TEAM_SOLO());
+              }}
+            >
+              {t('Create a private team')}
+            </TradingButton>
+          }
+        />
+        <CompetitionsAction
+          variant="C"
+          title={t('Join a team')}
+          description={t(
+            'Lorem ipsum dolor sit amet, consectetur adipisicing elit placeat ipsum minus nemo error dicta.'
+          )}
+          actionElement={
+            <TradingButton
+              intent={Intent.Primary}
+              onClick={(e) => {
+                e.preventDefault();
+                navigate(Links.COMPETITIONS_TEAMS());
+              }}
+            >
+              {t('Choose a team')}
+            </TradingButton>
+          }
+        />
+      </CompetitionsActionsContainer>
 
       {/** List of available games */}
       <h2 className="text-2xl mb-6">{t('Games')}</h2>

apps/trading/client-pages/competitions/join-team.tsx

@@ -105,11 +105,7 @@ export const JoinButton = ({
   // Party is in a team, but not this one
   else if (partyTeam && partyTeam.teamId !== team.teamId) {
     return (
-      <Button
-        onClick={() => onJoin('switch')}
-        intent={Intent.Primary}
-        data-testid="switch-team-button"
-      >
+      <Button onClick={() => onJoin('switch')} intent={Intent.Primary}>
         {t('Switch team')}{' '}
       </Button>
     );
@@ -219,11 +215,7 @@ const DialogContent = ({
         </>
       )}
       <div className="flex justify-between gap-2">
-        <Button
-          onClick={joinTeam}
-          intent={Intent.Success}
-          data-testid="confirm-switch-button"
-        >
+        <Button onClick={joinTeam} intent={Intent.Success}>
           {t('Confirm')}
         </Button>
         <Button onClick={onCancel} intent={Intent.Danger}>

apps/trading/client-pages/competitions/team-form.tsx

@@ -6,8 +6,6 @@ import {
   TextArea,
   TradingButton,
   Intent,
-  VegaIcon,
-  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { URL_REGEX, isValidVegaPublicKey } from '@vegaprotocol/utils';
 
@@ -19,8 +17,6 @@ import type {
   UpdateReferralSet,
   Status,
 } from '@vegaprotocol/wallet';
-import classNames from 'classnames';
-import { useLayoutEffect, useState } from 'react';
 
 export type FormFields = {
   id: string;
@@ -115,12 +111,9 @@ export const TeamForm = ({
     <form onSubmit={handleSubmit(sendTransaction)}>
       <input type="hidden" {...register('id')} />
       <TradingFormGroup label={t('Team name')} labelFor="name">
-        <TradingInput
-          {...register('name', { required: t('Required') })}
-          data-testid="team-name-input"
-        />
+        <TradingInput {...register('name', { required: t('Required') })} />
         {errors.name?.message && (
-          <TradingInputError forInput="name" data-testid="team-name-error">
+          <TradingInputError forInput="name">
             {errors.name.message}
           </TradingInputError>
         )}
@@ -136,10 +129,9 @@ export const TeamForm = ({
           {...register('url', {
             pattern: { value: URL_REGEX, message: t('Invalid URL') },
           })}
-          data-testid="team-url-input"
         />
         {errors.url?.message && (
-          <TradingInputError forInput="url" data-testid="team-url-error">
+          <TradingInputError forInput="url">
             {errors.url.message}
           </TradingInputError>
         )}
@@ -156,13 +148,9 @@ export const TeamForm = ({
               message: t('Invalid image URL'),
             },
           })}
-          data-testid="avatar-url-input"
         />
         {errors.avatarUrl?.message && (
-          <TradingInputError
-            forInput="avatarUrl"
-            data-testid="avatar-url-error"
-          >
+          <TradingInputError forInput="avatarUrl">
             {errors.avatarUrl.message}
           </TradingInputError>
         )}
@@ -187,7 +175,6 @@ export const TeamForm = ({
                       onCheckedChange={(value) => {
                         field.onChange(value);
                       }}
-                      data-testid="team-private-checkbox"
                     />
                   );
                 }}
@@ -216,13 +203,9 @@ export const TeamForm = ({
                       },
                     },
                   })}
-                  data-testid="team-allow-list-textarea"
                 />
                 {errors.allowList?.message && (
-                  <TradingInputError
-                    forInput="avatarUrl"
-                    data-testid="team-allow-list-error"
-                  >
+                  <TradingInputError forInput="avatarUrl">
                     {errors.allowList.message}
                   </TradingInputError>
                 )}
@@ -256,57 +239,16 @@ const SubmitButton = ({
     text = t('Update');
   }
 
-  let confirmedText = t('Created');
-  if (type === TransactionType.UpdateReferralSet) {
-    confirmedText = t('Updated');
-  }
-
   if (status === 'requested') {
     text = t('Confirm in wallet...');
   } else if (status === 'pending') {
     text = t('Confirming transaction...');
   }
 
-  const [showConfirmed, setShowConfirmed] = useState<boolean>(false);
-  useLayoutEffect(() => {
-    let to: ReturnType<typeof setTimeout>;
-    if (status === 'confirmed' && !showConfirmed) {
-      to = setTimeout(() => {
-        setShowConfirmed(true);
-      }, 100);
-    }
-    return () => {
-      clearTimeout(to);
-    };
-  }, [showConfirmed, status]);
-
-  const confirmed = (
-    <span
-      className={classNames('text-sm transition-opacity opacity-0', {
-        'opacity-100': showConfirmed,
-      })}
-    >
-      <VegaIcon
-        name={VegaIconNames.TICK}
-        size={18}
-        className="text-vega-green-500"
-      />{' '}
-      {confirmedText}
-    </span>
-  );
-
   return (
-    <div className="flex gap-2 items-baseline">
-      <TradingButton
-        type="submit"
-        intent={Intent.Info}
-        disabled={disabled}
-        data-testid="team-form-submit-button"
-      >
-        {text}
-      </TradingButton>
-      {status === 'confirmed' && confirmed}
-    </div>
+    <TradingButton type="submit" intent={Intent.Info} disabled={disabled}>
+      {text}
+    </TradingButton>
   );
 };
 

apps/trading/client-pages/competitions/update-team-button.tsx

@@ -1,24 +1,16 @@
-import { type Team } from '../../lib/hooks/use-team';
-import { type ComponentProps } from 'react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { type Team } from '../../lib/hooks/use-team';
 import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { Links } from '../../lib/links';
 import { useT } from '../../lib/use-t';
 
-export const UpdateTeamButton = ({
-  team,
-  size = 'medium',
-}: {
-  team: Pick<Team, 'teamId' | 'referrer'>;
-  size?: ComponentProps<typeof TradingAnchorButton>['size'];
-}) => {
+export const UpdateTeamButton = ({ team }: { team: Team }) => {
   const t = useT();
   const { pubKey, isReadOnly } = useVegaWallet();
 
   if (pubKey && !isReadOnly && pubKey === team.referrer) {
     return (
       <TradingAnchorButton
-        size={size}
         data-testid="update-team-button"
         href={Links.COMPETITIONS_UPDATE_TEAM(team.teamId)}
         intent={Intent.Info}

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

@@ -19,7 +19,6 @@ import {
   useFundingRate,
   useMarketTradingMode,
   useExternalTwap,
-  getQuoteName,
 } from '@vegaprotocol/markets';
 import { MarketState as State } from '@vegaprotocol/types';
 import { HeaderStat } from '../../components/header';
@@ -42,7 +41,6 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
 
   const asset = getAsset(market);
-  const quoteUnit = getQuoteName(market);
 
   return (
     <>
@@ -56,15 +54,12 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
         <Last24hPriceChange
           marketId={market.id}
           decimalPlaces={market.decimalPlaces}
-          fallback={<span>-</span>}
         />
       </HeaderStat>
       <HeaderStat heading={t('Volume (24h)')} testId="market-volume">
         <Last24hVolume
           marketId={market.id}
           positionDecimalPlaces={market.positionDecimalPlaces}
-          marketDecimals={market.decimalPlaces}
-          quoteUnit={quoteUnit}
         />
       </HeaderStat>
       <HeaderStatMarketTradingMode
@@ -113,7 +108,7 @@ export const MarketHeaderStats = ({ market }: MarketHeaderStatsProps) => {
           heading={`${t('Funding Rate')} / ${t('Countdown')}`}
           testId="market-funding"
         >
-          <div className="flex gap-2">
+          <div className="flex justify-between gap-2">
             <FundingRate marketId={market.id} />
             <FundingCountdown marketId={market.id} />
           </div>

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

@@ -3,6 +3,7 @@ import { type Market } from '@vegaprotocol/markets';
 // TODO: handle oracle banner
 // import { OracleBanner } from '@vegaprotocol/markets';
 import { useState } from 'react';
+import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
 import {
   Popover,
@@ -11,21 +12,21 @@ import {
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { useT } from '../../lib/use-t';
+import { MarketBanner } from '../../components/market-banner';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { type TradingView } from './trade-views';
 import { TradingViews } from './trade-views';
+
 interface TradePanelsProps {
   market: Market;
   pinnedAsset?: PinnedAsset;
 }
 
 export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
-  const [topView, setTopView] = useState<TradingView>('chart');
-  const topViewCfg = TradingViews[topView];
-  const [bottomView, setBottomView] = useState<TradingView>('positions');
-  const bottomViewCfg = TradingViews[bottomView];
+  const [view, setView] = useState<TradingView>('chart');
+  const viewCfg = TradingViews[view];
 
-  const renderView = (view: TradingView) => {
+  const renderView = () => {
     const Component = TradingViews[view].component;
 
     if (!Component) {
@@ -38,13 +39,12 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
     // so watch out for clashes in props
     return (
       <ErrorBoundary feature={view}>
-        <Component marketId={market?.id} pinnedAsset={pinnedAsset} />
+        <Component marketId={market?.id} pinnedAsset={pinnedAsset} />;
       </ErrorBoundary>
     );
   };
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const renderMenu = (viewCfg: any) => {
+  const renderMenu = () => {
     if ('menu' in viewCfg || 'settings' in viewCfg) {
       return (
         <div className="flex items-center justify-end gap-1 p-1 bg-vega-clight-800 dark:bg-vega-cdark-800 border-b border-default">
@@ -69,80 +69,55 @@ export const TradePanels = ({ market, pinnedAsset }: TradePanelsProps) => {
   };
 
   return (
-    <div className="h-full flex flex-col lg:grid grid-rows-[min-content_min-content_1fr_min-content]">
-      <div className="flex flex-col w-full overflow-hidden">
-        <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
-          {['chart', 'orderbook', 'trades', 'liquidity', 'fundingPayments']
-            // filter to control available views for the current market
-            // e.g. only perpetuals should get the funding views
-            .filter((_key) => {
-              const key = _key as TradingView;
-              const perpOnlyViews = ['funding', 'fundingPayments'];
-
-              if (
-                market?.tradableInstrument.instrument.product.__typename ===
-                'Perpetual'
-              ) {
-                return true;
-              }
-
-              if (perpOnlyViews.includes(key)) {
-                return false;
-              }
-
-              return true;
-            })
-            .map((_key) => {
-              const key = _key as TradingView;
-              const isActive = topView === key;
-              return (
-                <ViewButton
-                  key={key}
-                  view={key}
-                  isActive={isActive}
-                  onClick={() => {
-                    setTopView(key);
-                  }}
-                />
-              );
-            })}
-        </div>
-        <div className="h-[50vh] lg:h-full relative">
-          <div>{renderMenu(topViewCfg)}</div>
-          <div className="overflow-auto h-full">{renderView(topView)}</div>
-        </div>
+    <div className="h-full grid grid-rows-[min-content_min-content_1fr_min-content]">
+      <div>
+        <MarketBanner market={market} />
       </div>
-
-      <div className="flex flex-col w-full grow">
-        <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
-          {[
-            'positions',
-            'activeOrders',
-            'closedOrders',
-            'rejectedOrders',
-            'orders',
-            'stopOrders',
-            'collateral',
-            'fills',
-          ].map((_key) => {
+      <div>{renderMenu()}</div>
+      <div className="h-full relative">
+        <AutoSizer>
+          {({ width, height }) => (
+            <div style={{ width, height }} className="overflow-auto">
+              {renderView()}
+            </div>
+          )}
+        </AutoSizer>
+      </div>
+      <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
+        {Object.keys(TradingViews)
+          // filter to control available views for the current market
+          // eg only perps should get the funding views
+          .filter((_key) => {
             const key = _key as TradingView;
-            const isActive = bottomView === key;
+            const perpOnlyViews = ['funding', 'fundingPayments'];
+
+            if (
+              market?.tradableInstrument.instrument.product.__typename ===
+              'Perpetual'
+            ) {
+              return true;
+            }
+
+            if (perpOnlyViews.includes(key)) {
+              return false;
+            }
+
+            return true;
+          })
+          .map((_key) => {
+            const key = _key as TradingView;
+            const isActive = view === key;
             return (
               <ViewButton
                 key={key}
                 view={key}
                 isActive={isActive}
                 onClick={() => {
-                  setBottomView(key);
+                  setView(key);
                 }}
               />
             );
           })}
-        </div>
-        <div className="relative grow">
-          <div className="flex flex-col">{renderMenu(bottomViewCfg)}</div>
-          <div className="overflow-auto h-full">{renderView(bottomView)}</div>
-        </div>
       </div>
     </div>
   );
@@ -182,7 +157,7 @@ const useViewLabel = (view: TradingView) => {
     depth: t('Depth'),
     liquidity: t('Liquidity'),
     funding: t('Funding'),
-    fundingPayments: t('Funding'),
+    fundingPayments: t('Funding Payments'),
     orderbook: t('Orderbook'),
     trades: t('Trades'),
     positions: t('Positions'),

apps/trading/client-pages/markets/market-list-table.tsx

@@ -5,7 +5,7 @@ import {
   useDataGridEvents,
 } from '@vegaprotocol/datagrid';
 import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import { useMarketsColumnDefs } from './use-column-defs';
+import { useColumnDefs } from './use-column-defs';
 import type { DataGridStore } from '../../stores/datagrid-store-slice';
 import { type StateCreator, create } from 'zustand';
 import { persist } from 'zustand/middleware';
@@ -50,7 +50,7 @@ export const useMarketsStore = create<DataGridSlice>()(
 );
 
 export const MarketListTable = (props: Props) => {
-  const columnDefs = useMarketsColumnDefs();
+  const columnDefs = useColumnDefs();
   const gridStore = useMarketsStore((store) => store.gridStore);
   const updateGridStore = useMarketsStore((store) => store.updateGridStore);
 

apps/trading/client-pages/markets/use-column-defs.tsx

@@ -7,31 +7,21 @@ import type {
 } from '@vegaprotocol/datagrid';
 import { COL_DEFS, SetFilter } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
-import {
-  addDecimalsFormatNumber,
-  formatNumber,
-  toBigNum,
-} from '@vegaprotocol/utils';
+import { addDecimalsFormatNumber, toBigNum } from '@vegaprotocol/utils';
 import { ButtonLink, Tooltip } from '@vegaprotocol/ui-toolkit';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type {
-  MarketFieldsFragment,
   MarketMaybeWithData,
   MarketMaybeWithDataAndCandles,
 } from '@vegaprotocol/markets';
 import { MarketActionsDropdown } from './market-table-actions';
-import {
-  calcCandleVolume,
-  calcCandleVolumePrice,
-  getAsset,
-  getQuoteName,
-} from '@vegaprotocol/markets';
+import { calcCandleVolume, getAsset } from '@vegaprotocol/markets';
 import { MarketCodeCell } from './market-code-cell';
 import { useT } from '../../lib/use-t';
 
 const { MarketTradingMode, AuctionTrigger } = Schema;
 
-export const useMarketsColumnDefs = () => {
+export const useColumnDefs = () => {
   const t = useT();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
   return useMemo<ColDef[]>(
@@ -168,25 +158,11 @@ export const useMarketsColumnDefs = () => {
         }: ValueFormatterParams<MarketMaybeWithDataAndCandles, 'candles'>) => {
           const candles = data?.candles;
           const vol = candles ? calcCandleVolume(candles) : '0';
-          const quoteName = getQuoteName(data as MarketFieldsFragment);
-          const volPrice =
-            candles &&
-            calcCandleVolumePrice(
-              candles,
-              data.decimalPlaces,
-              data.positionDecimalPlaces
-            );
-
           const volume =
             data && vol && vol !== '0'
               ? addDecimalsFormatNumber(vol, data.positionDecimalPlaces)
               : '0.00';
-          const volumePrice =
-            volPrice && formatNumber(volPrice, data?.decimalPlaces);
-
-          return volumePrice
-            ? `${volume} (${volumePrice} ${quoteName})`
-            : volume;
+          return volume;
         },
       },
       {

apps/trading/components/competitions/box.tsx

@@ -5,11 +5,7 @@ export const BORDER_COLOR = 'border-vega-clight-500 dark:border-vega-cdark-500';
 export const GRADIENT =
   'bg-gradient-to-b from-vega-clight-800 dark:from-vega-cdark-800 to-transparent';
 
-export const Box = ({
-  children,
-  backgroundImage,
-  ...props
-}: HTMLAttributes<HTMLDivElement> & { backgroundImage?: string }) => {
+export const Box = (props: HTMLAttributes<HTMLDivElement>) => {
   return (
     <div
       {...props}
@@ -17,22 +13,9 @@ export const Box = ({
         BORDER_COLOR,
         GRADIENT,
         'border rounded-lg',
-        'relative p-6 overflow-hidden',
+        'p-6',
         props.className
       )}
-    >
-      {Boolean(backgroundImage?.length) && (
-        <div
-          className={classNames(
-            'pointer-events-none',
-            'bg-no-repeat bg-center bg-[length:500px_500px]',
-            'absolute top-0 left-0 w-full h-full -z-10 opacity-30 blur-lg'
-          )}
-          style={{ backgroundImage: `url("${backgroundImage}")` }}
-        ></div>
-      )}
-
-      {children}
-    </div>
+    />
   );
 };

apps/trading/components/competitions/team-avatar.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 const NUM_AVATARS = 20;
 const AVATAR_PATHNAME_PATTERN = '/team-avatars/{id}.png';
 
-export const getFallbackAvatar = (teamId: string) => {
+const getFallbackAvatar = (teamId: string) => {
   const avatarId = ((parseInt(teamId, 16) % NUM_AVATARS) + 1)
     .toString()
     .padStart(2, '0'); // between 01 - 20

apps/trading/components/competitions/team-card.tsx

@@ -1,154 +0,0 @@
-import { type TeamGame, type TeamStats } from '../../lib/hooks/use-team';
-import { type TeamsFieldsFragment } from '../../lib/hooks/__generated__/Teams';
-import { TeamAvatar, getFallbackAvatar } from './team-avatar';
-import { FavoriteGame, Stat } from './team-stats';
-import { useT } from '../../lib/use-t';
-import { formatNumberRounded } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-import { Box } from './box';
-import { Intent, Tooltip, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
-import { Links } from '../../lib/links';
-import orderBy from 'lodash/orderBy';
-import { take } from 'lodash';
-import { DispatchMetricLabels } from '@vegaprotocol/types';
-import classNames from 'classnames';
-import { UpdateTeamButton } from '../../client-pages/competitions/update-team-button';
-
-export const TeamCard = ({
-  rank,
-  team,
-  stats,
-  games,
-}: {
-  rank: number;
-  team: TeamsFieldsFragment;
-  stats?: TeamStats;
-  games?: TeamGame[];
-}) => {
-  const t = useT();
-
-  const lastGames = take(
-    orderBy(
-      games?.map((g) => ({
-        rank: g.team.rank,
-        metric: g.team.rewardMetric,
-        epoch: g.epoch,
-      })),
-      (i) => i.epoch,
-      'desc'
-    ),
-    5
-  );
-
-  return (
-    <div
-      className={classNames(
-        'gap-6 grid grid-cols-1 grid-rows-1',
-        'md:grid-cols-3'
-      )}
-    >
-      {/** Card */}
-      <Box
-        backgroundImage={team.avatarUrl || getFallbackAvatar(team.teamId)}
-        className="flex flex-col items-center gap-3 min-w-[80px] lg:min-w-[112px]"
-      >
-        <TeamAvatar teamId={team.teamId} imgUrl={team.avatarUrl} />
-        <h1 className="calt lg:text-2xl" data-testid="team-name">
-          {team.name}
-        </h1>
-        {games && <FavoriteGame games={games} noLabel />}
-        <TradingAnchorButton
-          size="extra-small"
-          intent={Intent.Primary}
-          href={Links.COMPETITIONS_TEAM(team.teamId)}
-        >
-          {t('Profile')}
-        </TradingAnchorButton>
-        <UpdateTeamButton team={team} size="extra-small" />
-      </Box>
-
-      {/** Tiles */}
-      <Box className="w-full md:col-span-2">
-        <div
-          className={classNames(
-            'grid gap-3 w-full mb-4',
-            'md:grid-cols-3 md:grid-rows-2',
-            'grid-cols-2 grid-rows-3'
-          )}
-        >
-          <Stat
-            className="flex flex-col-reverse"
-            value={rank}
-            label={t('Rank')}
-            valueTestId="team-rank"
-          />
-          <Stat
-            className="flex flex-col-reverse"
-            value={team.totalMembers || 0}
-            label={t('Members')}
-            valueTestId="members-count-stat"
-          />
-          <Stat
-            className="flex flex-col-reverse"
-            value={stats?.totalGamesPlayed || 0}
-            label={t('Total games')}
-            valueTestId="total-games-stat"
-          />
-          <Stat
-            className="flex flex-col-reverse"
-            value={
-              stats?.totalQuantumVolume
-                ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumVolume || 0),
-                    '1e3'
-                  )
-                : 0
-            }
-            label={t('Total volume')}
-            valueTestId="total-volume-stat"
-          />
-          <Stat
-            className="flex flex-col-reverse"
-            value={
-              stats?.totalQuantumRewards
-                ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumRewards || 0),
-                    '1e3'
-                  )
-                : 0
-            }
-            label={t('Rewards paid out')}
-            valueTestId="rewards-paid-stat"
-          />
-        </div>
-
-        <dl className="w-full pt-4 border-t border-vega-clight-700 dark:border-vega-cdark-700">
-          <dt className="mb-1 text-sm text-muted">
-            {t('Last {{games}} games result', {
-              replace: { games: lastGames.length || '' },
-            })}
-          </dt>
-          <dd className="flex flex-row flex-wrap gap-2">
-            {lastGames.length === 0 && t('None available')}
-            {lastGames.map((game, i) => (
-              <Tooltip key={i} description={DispatchMetricLabels[game.metric]}>
-                <button className="cursor-help text-sm bg-vega-clight-700 dark:bg-vega-cdark-700 px-2 py-1 rounded-full">
-                  <RankLabel rank={game.rank} />
-                </button>
-              </Tooltip>
-            ))}
-          </dd>
-        </dl>
-      </Box>
-    </div>
-  );
-};
-
-/**
- * Sets the english ordinal for given rank only if the current language is set
- * to english.
- */
-const RankLabel = ({ rank }: { rank: number }) => {
-  const t = useT();
-  return t('place', { count: rank, ordinal: true });
-};

apps/trading/components/competitions/team-stats.tsx

@@ -15,7 +15,6 @@ import {
 } from '../../lib/hooks/use-team';
 import { useT } from '../../lib/use-t';
 import { DispatchMetricLabels, type DispatchMetric } from '@vegaprotocol/types';
-import classNames from 'classnames';
 
 export const TeamStats = ({
   stats,
@@ -103,13 +102,7 @@ const LatestResults = ({ games }: { games: TeamGame[] }) => {
   );
 };
 
-export const FavoriteGame = ({
-  games,
-  noLabel = false,
-}: {
-  games: TeamGame[];
-  noLabel?: boolean;
-}) => {
+const FavoriteGame = ({ games }: { games: TeamGame[] }) => {
   const t = useT();
 
   const rewardMetrics = games.map(
@@ -135,13 +128,7 @@ export const FavoriteGame = ({
 
   return (
     <dl className="flex flex-col gap-1">
-      <dt
-        className={classNames('text-muted text-sm', {
-          hidden: noLabel,
-        })}
-      >
-        {t('Favorite game')}
-      </dt>
+      <dt className="text-muted text-sm">{t('Favorite game')}</dt>
       <dd>
         <Pill className="inline-flex items-center gap-1 bg-transparent text-sm">
           <VegaIcon
@@ -155,7 +142,7 @@ export const FavoriteGame = ({
   );
 };
 
-export const StatSection = ({ children }: { children: ReactNode }) => {
+const StatSection = ({ children }: { children: ReactNode }) => {
   return (
     <section className="flex flex-col lg:flex-row gap-4 lg:gap-8">
       {children}
@@ -163,11 +150,11 @@ export const StatSection = ({ children }: { children: ReactNode }) => {
   );
 };
 
-export const StatSectionSeparator = () => {
+const StatSectionSeparator = () => {
   return <div className="hidden md:block border-r border-default" />;
 };
 
-export const StatList = ({ children }: { children: ReactNode }) => {
+const StatList = ({ children }: { children: ReactNode }) => {
   return (
     <dl className="grid grid-cols-2 md:flex gap-4 md:gap-6 lg:gap-8 whitespace-nowrap">
       {children}
@@ -175,21 +162,19 @@ export const StatList = ({ children }: { children: ReactNode }) => {
   );
 };
 
-export const Stat = ({
+const Stat = ({
   value,
   label,
   tooltip,
   valueTestId,
-  className,
 }: {
   value: ReactNode;
   label: ReactNode;
   tooltip?: string;
   valueTestId?: string;
-  className?: classNames.Argument;
 }) => {
   return (
-    <div className={classNames(className)}>
+    <div>
       <dd className="text-3xl lg:text-4xl" data-testid={valueTestId}>
         {value}
       </dd>

apps/trading/components/layouts/layout-with-sidebar.tsx

@@ -3,6 +3,7 @@ import { Outlet } from 'react-router-dom';
 import { Sidebar, SidebarContent, useSidebar } from '../sidebar';
 import classNames from 'classnames';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
+
 export const LayoutWithSidebar = ({
   header,
   sidebar,
@@ -26,13 +27,10 @@ export const LayoutWithSidebar = ({
     <div className={gridClasses}>
       <div className="col-span-full">{header}</div>
       <main
-        className={classNames(
-          'col-start-1 col-end-1 overflow-hidden lg:overflow-y-auto grow lg:grow-0',
-          {
-            'lg:col-end-3': !sidebarOpen,
-            'hidden lg:block lg:col-end-2': sidebarOpen,
-          }
-        )}
+        className={classNames('col-start-1 col-end-1 overflow-y-auto', {
+          'lg:col-end-3': !sidebarOpen,
+          'hidden lg:block lg:col-end-2': sidebarOpen,
+        })}
       >
         <Outlet />
       </main>

apps/trading/components/market-header/index.ts

@@ -1,2 +1 @@
 export * from './market-header';
-export * from './mobile-market-header';

apps/trading/components/market-header/mobile-market-header.tsx

@@ -1,133 +0,0 @@
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { MarketSelector } from '../market-selector';
-import {
-  Last24hPriceChange,
-  useMarket,
-  useMarketList,
-} from '@vegaprotocol/markets';
-import { useParams } from 'react-router-dom';
-import * as PopoverPrimitive from '@radix-ui/react-popover';
-import { useState } from 'react';
-import { useT } from '../../lib/use-t';
-import classNames from 'classnames';
-import { MarketHeaderStats } from '../../client-pages/market/market-header-stats';
-import { MarketMarkPrice } from '../market-mark-price';
-/**
- * This is only rendered for the mobile navigation
- */
-export const MobileMarketHeader = () => {
-  const t = useT();
-  const { marketId } = useParams();
-  const { data } = useMarket(marketId);
-  const [openMarket, setOpenMarket] = useState(false);
-  const [openPrice, setOpenPrice] = useState(false);
-
-  // Ensure that markets are kept cached so opening the list
-  // shows all markets instantly
-  useMarketList();
-
-  if (!marketId) return null;
-
-  return (
-    <div className="pl-3 pr-2 flex justify-between gap-2 h-10 bg-vega-clight-700 dark:bg-vega-cdark-700">
-      <FullScreenPopover
-        open={openMarket}
-        onOpenChange={(x) => {
-          setOpenMarket(x);
-        }}
-        trigger={
-          <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-base leading-3 md:text-lg whitespace-nowrap">
-            {data
-              ? data.tradableInstrument.instrument.code
-              : t('Select market')}
-            <span
-              className={classNames(
-                'transition-transform ease-in-out duration-300 flex',
-                {
-                  'rotate-180': openMarket,
-                }
-              )}
-            >
-              <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={16} />
-            </span>
-          </h1>
-        }
-      >
-        <MarketSelector
-          currentMarketId={marketId}
-          onSelect={() => setOpenMarket(false)}
-        />
-      </FullScreenPopover>
-      <FullScreenPopover
-        open={openPrice}
-        onOpenChange={(x) => {
-          setOpenPrice(x);
-        }}
-        trigger={
-          <span className="flex gap-2 items-end md:text-md whitespace-nowrap leading-3">
-            {data && (
-              <>
-                <span className="text-xs">
-                  <Last24hPriceChange
-                    marketId={data.id}
-                    decimalPlaces={data.decimalPlaces}
-                  />
-                </span>
-                <span className="flex items-center gap-1">
-                  <MarketMarkPrice
-                    marketId={data.id}
-                    decimalPlaces={data.decimalPlaces}
-                  />
-                  <VegaIcon
-                    name={VegaIconNames.CHEVRON_DOWN}
-                    size={16}
-                    className={classNames(
-                      'transition-transform ease-in-out duration-300',
-                      {
-                        'rotate-180': openPrice,
-                      }
-                    )}
-                  />
-                </span>
-              </>
-            )}
-          </span>
-        }
-      >
-        {data && (
-          <div className="px-3 py-6 text-sm grid grid-cols-2 items-center gap-x-4 gap-y-6">
-            <MarketHeaderStats market={data} />
-          </div>
-        )}
-      </FullScreenPopover>
-    </div>
-  );
-};
-
-export interface PopoverProps extends PopoverPrimitive.PopoverProps {
-  trigger: React.ReactNode | string;
-}
-
-export const FullScreenPopover = ({
-  trigger,
-  children,
-  open,
-  onOpenChange,
-}: PopoverProps) => {
-  return (
-    <PopoverPrimitive.Root open={open} onOpenChange={onOpenChange}>
-      <PopoverPrimitive.Trigger data-testid="popover-trigger">
-        {trigger}
-      </PopoverPrimitive.Trigger>
-      <PopoverPrimitive.Portal>
-        <PopoverPrimitive.Content
-          data-testid="popover-content"
-          className="w-screen bg-vega-clight-800 dark:bg-vega-cdark-800 border-y border-default"
-          sideOffset={0}
-        >
-          {children}
-        </PopoverPrimitive.Content>
-      </PopoverPrimitive.Portal>
-    </PopoverPrimitive.Root>
-  );
-};

apps/trading/components/navbar/index.tsx

@@ -1 +1,2 @@
 export * from './navbar';
+export * from './nav-header';

apps/trading/components/navbar/nav-header.tsx

@@ -0,0 +1,81 @@
+import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
+import { MarketSelector } from '../market-selector';
+import { useMarket, useMarketList } from '@vegaprotocol/markets';
+import { useParams } from 'react-router-dom';
+import * as PopoverPrimitive from '@radix-ui/react-popover';
+import { useState } from 'react';
+import { useT } from '../../lib/use-t';
+import classNames from 'classnames';
+
+/**
+ * This is only rendered for the mobile navigation
+ */
+export const NavHeader = () => {
+  const t = useT();
+  const { marketId } = useParams();
+  const { data } = useMarket(marketId);
+  const [open, setOpen] = useState(false);
+
+  // Ensure that markets are kept cached so opening the list
+  // shows all markets instantly
+  useMarketList();
+
+  if (!marketId) return null;
+
+  return (
+    <FullScreenPopover
+      open={open}
+      onOpenChange={(x) => {
+        setOpen(x);
+      }}
+      trigger={
+        <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-default text-lg whitespace-nowrap xl:pr-4 xl:border-r border-default">
+          {data ? data.tradableInstrument.instrument.code : t('Select market')}
+          <span
+            className={classNames(
+              'transition-transform ease-in-out duration-300',
+              {
+                'rotate-180': open,
+              }
+            )}
+          >
+            <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
+          </span>
+        </h1>
+      }
+    >
+      <MarketSelector
+        currentMarketId={marketId}
+        onSelect={() => setOpen(false)}
+      />
+    </FullScreenPopover>
+  );
+};
+
+export interface PopoverProps extends PopoverPrimitive.PopoverProps {
+  trigger: React.ReactNode | string;
+}
+
+export const FullScreenPopover = ({
+  trigger,
+  children,
+  open,
+  onOpenChange,
+}: PopoverProps) => {
+  return (
+    <PopoverPrimitive.Root open={open} onOpenChange={onOpenChange}>
+      <PopoverPrimitive.Trigger data-testid="popover-trigger">
+        {trigger}
+      </PopoverPrimitive.Trigger>
+      <PopoverPrimitive.Portal>
+        <PopoverPrimitive.Content
+          data-testid="popover-content"
+          className="w-screen bg-vega-clight-800 dark:bg-vega-cdark-800 text-default border border-default"
+          sideOffset={5}
+        >
+          {children}
+        </PopoverPrimitive.Content>
+      </PopoverPrimitive.Portal>
+    </PopoverPrimitive.Root>
+  );
+};

apps/trading/components/navbar/navbar.tsx

@@ -34,7 +34,13 @@ import { supportedLngs } from '../../lib/i18n';
 type MenuState = 'wallet' | 'nav' | null;
 type Theme = 'system' | 'yellow';
 
-export const Navbar = ({ theme = 'system' }: { theme?: Theme }) => {
+export const Navbar = ({
+  children,
+  theme = 'system',
+}: {
+  children?: ReactNode;
+  theme?: Theme;
+}) => {
   const i18n = useI18n();
   const t = useT();
   // menu state for small screens
@@ -69,6 +75,8 @@ export const Navbar = ({ theme = 'system' }: { theme?: Theme }) => {
       >
         <VLogo className="w-4" />
       </NavLink>
+      {/* Left section */}
+      <div className="flex items-center lg:hidden">{children}</div>
       {/* Used to show header in nav on mobile */}
       <div className="hidden lg:block">
         <NavbarMenu onClick={() => setMenu(null)} />

apps/trading/components/rewards-container/active-rewards.tsx

@@ -152,11 +152,7 @@ export const ActiveRewards = ({ currentEpoch }: { currentEpoch: number }) => {
   if (!enrichedTransfers || !enrichedTransfers.length) return null;
 
   return (
-    <Card
-      title={t('Active rewards')}
-      className="lg:col-span-full"
-      data-testid="active-rewards-card"
-    >
+    <Card title={t('Active rewards')} className="lg:col-span-full">
       {enrichedTransfers.length > 1 && (
         <TradingInput
           onChange={(e) =>
@@ -316,30 +312,49 @@ export const ActiveRewardCard = ({
         MarketState.STATE_CLOSED,
       ].includes(m.state)
   );
-
   if (marketSettled) {
     return null;
   }
 
-  const assetInActiveMarket =
+  const assetInSettledMarket =
     allMarkets &&
     Object.values(allMarkets).some((m: MarketFieldsFragment | null) => {
       if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) {
-        return m?.state && MarketState.STATE_ACTIVE === m.state;
+        return (
+          m?.state &&
+          [
+            MarketState.STATE_TRADING_TERMINATED,
+            MarketState.STATE_SETTLED,
+            MarketState.STATE_CANCELLED,
+            MarketState.STATE_CLOSED,
+          ].includes(m.state)
+        );
       }
       return false;
     });
 
-  const marketSuspended = transferNode.markets?.some(
+  // Gray out the cards that are related to suspended markets
+  const suspended = transferNode.markets?.some(
     (m) =>
       m?.state === MarketState.STATE_SUSPENDED ||
       m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE
   );
 
+  const assetInSuspendedMarket =
+    allMarkets &&
+    Object.values(allMarkets).some((m: MarketFieldsFragment | null) => {
+      if (m && getAsset(m).id === dispatchStrategy.dispatchMetricAssetId) {
+        return (
+          m?.state === MarketState.STATE_SUSPENDED ||
+          m?.state === MarketState.STATE_SUSPENDED_VIA_GOVERNANCE
+        );
+      }
+      return false;
+    });
+
   // Gray out the cards that are related to suspended markets
-  // Or settlement assets in markets that are not active and eligible for rewards
   const { gradientClassName, mainClassName } =
-    marketSuspended || !assetInActiveMarket
+    suspended || assetInSuspendedMarket || assetInSettledMarket
       ? {
           gradientClassName: 'from-vega-cdark-500 to-vega-clight-400',
           mainClassName: 'from-vega-cdark-400 dark:from-vega-cdark-600 to-20%',
@@ -356,7 +371,6 @@ export const ActiveRewardCard = ({
           'rounded-lg',
           gradientClassName
         )}
-        data-testid="active-rewards-card"
       >
         <div
           className={classNames(
@@ -368,7 +382,7 @@ export const ActiveRewardCard = ({
             <div className="flex flex-col gap-2 items-center text-center">
               <EntityIcon transfer={transfer} />
               {entityScope && (
-                <span className="text-muted text-xs" data-testid="entity-scope">
+                <span className="text-muted text-xs">
                   {EntityScopeLabelMapping[entityScope] || t('Unspecified')}
                 </span>
               )}
@@ -376,7 +390,7 @@ export const ActiveRewardCard = ({
 
             <div className="flex flex-col gap-2 items-center text-center">
               <h3 className="flex flex-col gap-1 text-2xl shrink-1 text-center">
-                <span className="font-glitch" data-testid="reward-value">
+                <span className="font-glitch">
                   {addDecimalsFormatNumber(
                     transferNode.transfer.amount,
                     transferNode.transfer.asset?.decimals || 0,
@@ -397,7 +411,7 @@ export const ActiveRewardCard = ({
                   )}
                   underline={true}
                 >
-                  <span className="text-xs" data-testid="distribution-strategy">
+                  <span className="text-xs">
                     {
                       DistributionStrategyMapping[
                         dispatchStrategy.distributionStrategy
@@ -415,10 +429,7 @@ export const ActiveRewardCard = ({
                   'Number of epochs after distribution to delay vesting of rewards by'
                 )}
               />
-              <span
-                className="text-muted text-xs whitespace-nowrap"
-                data-testid="locked-for"
-              >
+              <span className="text-muted text-xs whitespace-nowrap">
                 {t('numberEpochs', '{{count}} epochs', {
                   count: kind.dispatchStrategy?.lockPeriod,
                 })}
@@ -427,15 +438,15 @@ export const ActiveRewardCard = ({
           </div>
 
           <span className="border-[0.5px] border-gray-700" />
-          <span data-testid="dispatch-metric-info">
+          <span>
             {DispatchMetricLabels[dispatchStrategy.dispatchMetric]} •{' '}
             <Tooltip
-              underline={marketSuspended}
+              underline={suspended}
               description={
-                (marketSuspended || !assetInActiveMarket) &&
+                (suspended || assetInSuspendedMarket) &&
                 (specificMarkets
                   ? t('Eligible market(s) currently suspended')
-                  : !assetInActiveMarket
+                  : assetInSuspendedMarket
                   ? t('Currently no markets eligible for reward')
                   : '')
               }
@@ -447,8 +458,8 @@ export const ActiveRewardCard = ({
           <div className="flex items-center gap-8 flex-wrap">
             {kind.endEpoch && (
               <span className="flex flex-col">
-                <span className="text-muted text-xs">{t('Ends in')} </span>
-                <span data-testid="ends-in">
+                <span className="text-muted text-xs">{t('Ends in')}</span>
+                <span>
                   {t('numberEpochs', '{{count}} epochs', {
                     count: kind.endEpoch - currentEpoch,
                   })}
@@ -459,7 +470,7 @@ export const ActiveRewardCard = ({
             {
               <span className="flex flex-col">
                 <span className="text-muted text-xs">{t('Assessed over')}</span>
-                <span data-testid="assessed-over">
+                <span>
                   {t('numberEpochs', '{{count}} epochs', {
                     count: dispatchStrategy.windowLength,
                   })}
@@ -502,7 +513,7 @@ const RewardRequirements = ({
             entity: EntityScopeLabelMapping[dispatchStrategy.entityScope],
           })}
         </dt>
-        <dd className="flex items-center gap-1" data-testid="scope">
+        <dd className="flex items-center gap-1">
           <RewardEntityScope dispatchStrategy={dispatchStrategy} />
         </dd>
       </div>
@@ -511,10 +522,7 @@ const RewardRequirements = ({
         <dt className="flex items-center gap-1 text-muted">
           {t('Staked VEGA')}
         </dt>
-        <dd
-          className="flex items-center gap-1"
-          data-testid="staking-requirement"
-        >
+        <dd className="flex items-center gap-1">
           {addDecimalsFormatNumber(
             dispatchStrategy?.stakingRequirement || 0,
             assetDecimalPlaces
@@ -526,7 +534,7 @@ const RewardRequirements = ({
         <dt className="flex items-center gap-1 text-muted">
           {t('Average position')}
         </dt>
-        <dd className="flex items-center gap-1" data-testid="average-position">
+        <dd className="flex items-center gap-1">
           {addDecimalsFormatNumber(
             dispatchStrategy?.notionalTimeWeightedAveragePositionRequirement ||
               0,

apps/trading/components/settings/settings.tsx

@@ -81,7 +81,6 @@ export const Settings = () => {
               intent={Intent.Primary}
               onClick={() => {
                 localStorage.clear();
-                sessionStorage.clear();
                 window.location.reload();
               }}
             >

apps/trading/e2e/.env

@@ -1,3 +1,3 @@
 CONSOLE_IMAGE_NAME=vegaprotocol/trading:latest
-VEGA_VERSION=v0.74.0-preview.10
+VEGA_VERSION=v0.74.0-preview.8
 LOCAL_SERVER=false

apps/trading/e2e/conftest.py

@@ -111,7 +111,6 @@ def init_vega(request=None):
                 f"Container {container.id} started",
                 extra={"worker_id": os.environ.get("PYTEST_XDIST_WORKER")},
             )
-            vega.container = container
             yield vega
         except APIError as e:
             logger.info(f"Container creation failed.")
@@ -178,34 +177,10 @@ def init_page(vega: VegaServiceNull, browser: Browser, request: pytest.FixtureRe
 
 @pytest.fixture
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))
-        yield vega_instance
+    with init_vega(request) as vega:
+        yield vega
 
 
-
-def cleanup_container(vega_instance):
-    try:
-        # Attempt to stop the container if it's still running
-        if vega_instance.container.status == 'running':
-            print(f"Stopping container {vega_instance.container.id}")
-            vega_instance.container.stop()
-        else:
-            print(f"Container {vega_instance.container.id} is not running.")
-    except docker.errors.NotFound:
-        print(f"Container {vega_instance.container.id} not found, may have been stopped and removed.")
-    except Exception as e:
-        print(f"Error during cleanup: {str(e)}")
-
-    try:
-        # Attempt to remove the container
-        vega_instance.container.remove()
-        print(f"Container {vega_instance.container.id} removed.")
-    except docker.errors.NotFound:
-        print(f"Container {vega_instance.container.id} not found, may have been removed.")
-    except Exception as e:
-        print(f"Error during container removal: {str(e)}")
-
 @pytest.fixture
 def page(vega, browser, request):
     with init_page(vega, browser, request) as page_instance:

apps/trading/e2e/tests/deal_ticket/test_basic.py

@@ -2,7 +2,7 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from datetime import datetime, timedelta
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market
 from actions.utils import wait_for_toast_confirmation
 
@@ -17,10 +17,8 @@ expire = "expire"
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/deal_ticket/test_stop_order.py

@@ -3,7 +3,7 @@ from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
 from datetime import datetime, timedelta
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
 stop_order_btn = "order-type-Stop"
@@ -259,10 +259,9 @@ def test_submit_stop_limit_order_cancel(
 
 class TestStopOcoValidation:
     @pytest.fixture(scope="class")
-    def vega(request):
-        with init_vega(request) as vega_instance:
-            request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-            yield vega_instance
+    def vega(self, request):
+        with init_vega(request) as vega:
+            yield vega
 
     @pytest.fixture(scope="class")
     def continuous_market(self, vega):

apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py

@@ -2,7 +2,7 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.utils import change_keys
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
 order_size = "order-size"
@@ -14,9 +14,8 @@ deal_ticket_deposit_dialog_button = "deal-ticket-deposit-dialog-button"
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")
@@ -34,7 +33,7 @@ def test_should_display_info_and_button_for_deposit(continuous_market, page: Pag
         "You may not have enough margin available to open this position.")
     page.get_by_test_id(deal_ticket_warning_margin).hover()
     expect(page.get_by_test_id("tooltip-content").nth(0)).to_have_text(
-        "1,661,888.12901 tDAI is currently required.You have only 999,991.49731.Deposit tDAI")
+        "1,661,896.6317 tDAI is currently required.You have only 1,000,000.00.Deposit tDAI")
     page.get_by_test_id(deal_ticket_deposit_dialog_button).nth(0).click()
     expect(page.get_by_test_id("sidebar-content")
            ).to_contain_text("DepositFrom")

apps/trading/e2e/tests/fees/test_fees.py

@@ -4,7 +4,7 @@ from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
 from wallet_config import MM_WALLET
-from conftest import init_vega, init_page, auth_setup, cleanup_container
+from conftest import init_vega, init_page, auth_setup
 from actions.utils import next_epoch, change_keys, forward_time
 from fixtures.market import market_exists, setup_continuous_market
 
@@ -82,36 +82,31 @@ def market_ids():
 @pytest.fixture(scope="module")
 def vega_volume_discount_tier_1(request):
     with init_vega(request) as vega_volume_discount_tier_1:
-            request.addfinalizer(lambda: cleanup_container(vega_volume_discount_tier_1))  # Register the cleanup function
-            yield vega_volume_discount_tier_1
+        yield vega_volume_discount_tier_1
 
 
 @pytest.fixture(scope="module")
 def vega_volume_discount_tier_2(request):
     with init_vega(request) as vega_volume_discount_tier_2:
-            request.addfinalizer(lambda: cleanup_container(vega_volume_discount_tier_2))  # Register the cleanup function
-            yield vega_volume_discount_tier_2
+        yield vega_volume_discount_tier_2
 
 
 @pytest.fixture(scope="module")
 def vega_referral_discount_tier_1(request):
     with init_vega(request) as vega_referral_discount_tier_1:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_discount_tier_1))  # Register the cleanup function
-            yield vega_referral_discount_tier_1
+        yield vega_referral_discount_tier_1
 
 
 @pytest.fixture(scope="module")
 def vega_referral_discount_tier_2(request):
     with init_vega(request) as vega_referral_discount_tier_2:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_discount_tier_2))  # Register the cleanup function
-            yield vega_referral_discount_tier_2
+        yield vega_referral_discount_tier_2
 
 
 @pytest.fixture(scope="module")
 def vega_referral_and_volume_discount(request):
     with init_vega(request) as vega_referral_and_volume_discount:
-            request.addfinalizer(lambda: cleanup_container(vega_referral_and_volume_discount))  # Register the cleanup function
-            yield vega_referral_and_volume_discount
+        yield vega_referral_and_volume_discount
 
 
 @pytest.fixture

apps/trading/e2e/tests/get_started/test_get_started.py

@@ -3,7 +3,7 @@ from playwright.sync_api import expect, Page
 import json
 from vega_sim.null_service import VegaServiceNull
 from fixtures.market import setup_simple_market
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from actions.vega import submit_order
 from wallet_config import MM_WALLET, TERMINATE_WALLET, wallets
 import logging
@@ -12,10 +12,9 @@ logger = logging.getLogger()
 
 
 @pytest.fixture(scope="class")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 @pytest.fixture(scope="class")

apps/trading/e2e/tests/iceberg_orders/test_iceberg_orders.py

@@ -2,6 +2,8 @@ import pytest
 from playwright.sync_api import expect, Page
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
+from conftest import init_vega
+from fixtures.market import setup_continuous_market
 from wallet_config import MM_WALLET2
 
 def hover_and_assert_tooltip(page: Page, element_text):
@@ -9,30 +11,39 @@ def hover_and_assert_tooltip(page: Page, element_text):
     element.hover()
     expect(page.get_by_role("tooltip")).to_be_visible()
 
+class TestIcebergOrdersValidations:
+    @pytest.fixture(scope="class")
+    def vega(self, request):
+        with init_vega(request) as vega:
+            yield vega
 
-@pytest.mark.usefixtures("auth", "risk_accepted")
-def test_iceberg_submit(continuous_market, vega: VegaServiceNull, page: Page):
-    page.goto(f"/#/markets/{continuous_market}")
-    page.get_by_test_id("iceberg").click()
-    page.get_by_test_id("order-peak-size").type("2")
-    page.get_by_test_id("order-minimum-size").type("1")
-    page.get_by_test_id("order-size").type("3")
-    page.get_by_test_id("order-price").type("107")
-    page.get_by_test_id("place-order").click()
+    @pytest.fixture(scope="class")
+    def continuous_market(self, vega):
+        return setup_continuous_market(vega)
 
-    expect(page.get_by_test_id("toast-content")).to_have_text(
-        "Awaiting confirmationPlease wait for your transaction to be confirmedView in block explorer"
-    )
+    @pytest.mark.usefixtures("auth", "risk_accepted")
+    def test_iceberg_submit(self, continuous_market, vega: VegaServiceNull, page: Page):
+        page.goto(f"/#/markets/{continuous_market}")
+        page.get_by_test_id("iceberg").click()
+        page.get_by_test_id("order-peak-size").type("2")
+        page.get_by_test_id("order-minimum-size").type("1")
+        page.get_by_test_id("order-size").type("3")
+        page.get_by_test_id("order-price").type("107")
+        page.get_by_test_id("place-order").click()
 
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    expect(page.get_by_test_id("toast-content")).to_have_text(
-        "Order filledYour transaction has been confirmedView in block explorerSubmit order - filledBTC:DAI_2023+3 @ 107.00 tDAI"
-    )
-    page.get_by_test_id("All").click()
-    expect(
-        (page.get_by_role("row").locator('[col-id="type"]')).nth(1)
-    ).to_have_text("Limit (Iceberg)")
+        expect(page.get_by_test_id("toast-content")).to_have_text(
+            "Awaiting confirmationPlease wait for your transaction to be confirmedView in block explorer"
+        )
+
+        vega.wait_fn(1)
+        vega.wait_for_total_catchup()
+        expect(page.get_by_test_id("toast-content")).to_have_text(
+            "Order filledYour transaction has been confirmedView in block explorerSubmit order - filledBTC:DAI_2023+3 @ 107.00 tDAI"
+        )
+        page.get_by_test_id("All").click()
+        expect(
+            (page.get_by_role("row").locator('[col-id="type"]')).nth(1)
+        ).to_have_text("Limit (Iceberg)")
 
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_iceberg_open_order(continuous_market, vega: VegaServiceNull, page: Page):

apps/trading/e2e/tests/liquidity_provision/test_liquidity_provision.py

@@ -1,16 +1,15 @@
 import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market
 from actions.utils import next_epoch, truncate_middle, change_keys
 
+
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/market/test_closed_markets.py

@@ -4,15 +4,14 @@ import vega_sim.api.governance as governance
 from vega_sim.null_service import VegaServiceNull
 from playwright.sync_api import Page, expect
 from fixtures.market import setup_continuous_market
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from actions.utils import next_epoch
 
 
 @pytest.fixture(scope="class")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 @pytest.fixture(scope="class")

apps/trading/e2e/tests/market/test_market_info.py

@@ -3,16 +3,15 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from fixtures.market import setup_continuous_market
-from conftest import init_page, init_vega, risk_accepted_setup, cleanup_container
+from conftest import init_page, init_vega, risk_accepted_setup
 
 market_title_test_id = "accordion-title"
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/market/test_markets_proposed.py

@@ -3,7 +3,7 @@ import vega_sim.api.governance as governance
 import re
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_simple_market
 from wallet_config import MM_WALLET
 
@@ -13,10 +13,8 @@ col_market_id = '[col-id="market"] [data-testid="stack-cell-primary"]'
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/market/test_monitoring_auction_price_volatility_market.py

@@ -3,7 +3,7 @@ from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
 from actions.vega import submit_order
 from fixtures.market import setup_simple_market
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from actions.utils import wait_for_toast_confirmation, change_keys
 from wallet_config import MM_WALLET, MM_WALLET2
 
@@ -15,10 +15,8 @@ COL_ID_FEE = ".ag-center-cols-container [col-id='fee'] .ag-cell-value"
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/market_lifecycle/test_market_lifecycle.py

@@ -37,7 +37,7 @@ def test_market_lifecycle(proposed_market, vega: VegaServiceNull, page: Page):
     # 6002-MDET-004
     expect(page.get_by_test_id("market-change")).to_have_text("Change (24h)0.00%0.00")
     # 6002-MDET-005
-    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)- (- BTC)")
+    expect(page.get_by_test_id("market-volume")).to_have_text("Volume (24h)-")
     # 6002-MDET-008
     expect(page.get_by_test_id("market-settlement-asset")).to_have_text(
         "Settlement assettDAI"

apps/trading/e2e/tests/navigation/test_navigation.py

@@ -1,14 +1,13 @@
 import pytest
 from playwright.sync_api import Page, expect, Locator
 
-from conftest import init_page, init_vega, cleanup_container
+from conftest import init_page, init_vega
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 # we can reuse single page instance in all tests

apps/trading/e2e/tests/order/test_order_status.py

@@ -2,7 +2,7 @@ import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.service import PeggedOrder
 from vega_sim.null_service import VegaServiceNull
-from conftest import auth_setup, init_page, init_vega, risk_accepted_setup, cleanup_container
+from conftest import auth_setup, init_page, init_vega, risk_accepted_setup
 from fixtures.market import setup_continuous_market, setup_simple_market
 from actions.utils import wait_for_toast_confirmation
 
@@ -11,9 +11,8 @@ order_tab = "tab-orders"
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module", autouse=True)

apps/trading/e2e/tests/orderbook/test_orderbook.py

@@ -2,16 +2,15 @@ import pytest
 from playwright.sync_api import Page, expect
 from typing import List
 from actions.vega import submit_order, submit_liquidity, submit_multiple_orders
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_simple_market
 from wallet_config import MM_WALLET, MM_WALLET2
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/positions/test_collateral.py

@@ -1,7 +1,7 @@
 import pytest
 from playwright.sync_api import Page, expect
 from vega_sim.null_service import VegaServiceNull
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market
 
 TOOLTIP_LABEL = "margin-health-tooltip-label"
@@ -11,10 +11,8 @@ COL_ID_USED = ".ag-center-cols-container [col-id='used'] .ag-cell-value"
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/referrals/test_referrals.py

@@ -1,7 +1,7 @@
 import pytest
 from playwright.sync_api import Page
 from vega_sim.null_service import VegaServiceNull
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 from fixtures.market import setup_continuous_market, setup_simple_market
 from actions.utils import change_keys, create_and_faucet_wallet, forward_time, selector_contains_text
 from actions.vega import submit_order, submit_liquidity
@@ -14,10 +14,8 @@ BUY_ORDERS = [[1, 106], [1, 107], [1, 108]]
 
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 
 @pytest.fixture(scope="module")

apps/trading/e2e/tests/rewards/test_filtered_cards.py

@@ -59,7 +59,7 @@ def test_filtered_cards(continuous_market, vega: VegaServiceNull, page: Page):
     next_epoch(vega=vega)
     
     page.reload()
-    expect(page.get_by_test_id("active-rewards-card")).to_be_visible(timeout=15000)
+    expect(page.locator(".from-vega-cdark-400")).to_be_visible(timeout=15000)
     governance.submit_oracle_data(
         wallet=vega.wallet,
         payload={"trading.terminated": "true"},
@@ -67,4 +67,4 @@ def test_filtered_cards(continuous_market, vega: VegaServiceNull, page: Page):
     )
     next_epoch(vega=vega)
     page.reload()
-    expect(page.get_by_test_id("active-rewards-card")).not_to_be_in_viewport()
+    expect(page.locator(".from-vega-cdark-400")).not_to_be_in_viewport()

apps/trading/e2e/tests/rewards/test_rewards.py

@@ -2,7 +2,7 @@ import pytest
 
 import vega_sim.proto.vega as vega_protos
 from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup, cleanup_container
+from conftest import init_vega, init_page, auth_setup
 from fixtures.market import setup_continuous_market, market_exists
 from actions.utils import next_epoch, change_keys
 from wallet_config import MM_WALLET, PARTY_A, PARTY_B, PARTY_C, PARTY_D
@@ -46,42 +46,36 @@ def market_ids():
 @pytest.fixture(scope="module")
 def vega_activity_tier_0(request):
     with init_vega(request) as vega_activity_tier_0:
-        request.addfinalizer(lambda: cleanup_container(vega_activity_tier_0))  # Register the cleanup function
         yield vega_activity_tier_0
 
 
 @pytest.fixture(scope="module")
 def vega_hoarder_tier_0(request):
     with init_vega(request) as vega_hoarder_tier_0:
-        request.addfinalizer(lambda: cleanup_container(vega_hoarder_tier_0))  # Register the cleanup function
         yield vega_hoarder_tier_0
 
 
 @pytest.fixture(scope="module")
 def vega_combo_tier_0(request):
     with init_vega(request) as vega_combo_tier_0:
-        request.addfinalizer(lambda: cleanup_container(vega_combo_tier_0))  # Register the cleanup function
         yield vega_combo_tier_0
 
 
 @pytest.fixture(scope="module")
 def vega_activity_tier_1(request):
     with init_vega(request) as vega_activity_tier_1:
-        request.addfinalizer(lambda: cleanup_container(vega_activity_tier_1))  # Register the cleanup function
         yield vega_activity_tier_1
 
 
 @pytest.fixture(scope="module")
 def vega_hoarder_tier_1(request):
     with init_vega(request) as vega_hoarder_tier_1:
-        request.addfinalizer(lambda: cleanup_container(vega_hoarder_tier_1))  # Register the cleanup function
         yield vega_hoarder_tier_1
 
 
 @pytest.fixture(scope="module")
 def vega_combo_tier_1(request):
     with init_vega(request) as vega_combo_tier_1:
-        request.addfinalizer(lambda: cleanup_container(vega_combo_tier_1))  # Register the cleanup function
         yield vega_combo_tier_1
 
 

apps/trading/e2e/tests/rewards/test_rewards_activity_tier_0.py

@@ -1,176 +0,0 @@
-import pytest
-import vega_sim.proto.vega as vega_protos
-from playwright.sync_api import Page, expect
-from conftest import init_vega, init_page, auth_setup, risk_accepted_setup, cleanup_container
-from fixtures.market import setup_continuous_market
-from actions.utils import next_epoch, change_keys, create_and_faucet_wallet
-from wallet_config import MM_WALLET, WalletConfig
-from vega_sim.null_service import VegaServiceNull
-
-# region Constants
-ACTIVITY = "activity"
-HOARDER = "hoarder"
-COMBO = "combo"
-
-REWARDS_URL = "/#/rewards"
-
-# test IDs
-COMBINED_MULTIPLIERS = "combined-multipliers"
-TOTAL_REWARDS = "total-rewards"
-PRICE_TAKING_COL_ID = '[col-id="priceTaking"]'
-TOTAL_COL_ID = '[col-id="total"]'
-ROW = "row"
-STREAK_REWARD_MULTIPLIER_VALUE = "streak-reward-multiplier-value"
-HOARDER_REWARD_MULTIPLIER_VALUE = "hoarder-reward-multiplier-value"
-HOARDER_BONUS_TOTAL_HOARDED = "hoarder-bonus-total-hoarded"
-EARNED_BY_ME_BUTTON = "earned-by-me-button"
-TRANSFER_AMOUNT = "transfer-amount"
-EPOCH_STREAK = "epoch-streak"
-
-# endregion
-
-# Keys
-PARTY_A = "PARTY_A"
-PARTY_B = "PARTY_B"
-PARTY_C = "PARTY_C"
-PARTY_D = "PARTY_D"
-
-
-@pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
-
-
-@pytest.fixture(scope="module")
-def page(vega, browser, request):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        page.goto(REWARDS_URL)
-        change_keys(page, vega, PARTY_B)
-        yield page
-
-
-@pytest.fixture(scope="module", autouse=True)
-def setup_market_with_reward_program(vega: VegaServiceNull):
-    tDAI_market = setup_continuous_market(vega)
-    PARTY_A, PARTY_B, PARTY_C, PARTY_D = keys(vega)
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_C.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_A.name, asset=tDAI_asset_id, amount=100000)
-    vega.mint(key_name=PARTY_D.name, asset=tDAI_asset_id, amount=100000)
-    next_epoch(vega=vega)
-
-    vega.update_network_parameter(
-        proposal_key=MM_WALLET.name,
-        parameter="rewards.activityStreak.benefitTiers",
-        new_value=ACTIVITY_STREAKS,
-    )
-    print("update_network_parameter activity done")
-    next_epoch(vega=vega)
-
-    tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
-    vega.update_network_parameter(
-        MM_WALLET.name, parameter="reward.asset", new_value=tDAI_asset_id
-    )
-
-    next_epoch(vega=vega)
-    vega.recurring_transfer(
-        from_key_name=PARTY_A.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        amount=100,
-        factor=1.0,
-    )
-    vega.submit_order(
-        trading_key=PARTY_B.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-    vega.submit_order(
-        trading_key=PARTY_A.name,
-        market_id=tDAI_market,
-        order_type="TYPE_MARKET",
-        time_in_force="TIME_IN_FORCE_IOC",
-        side="SIDE_BUY",
-        volume=1,
-    )
-
-    vega.wait_for_total_catchup()
-
-    next_epoch(vega=vega)
-    return tDAI_market, tDAI_asset_id
-
-
-ACTIVITY_STREAKS = """
-{
-    "tiers": [
-        {
-            "minimum_activity_streak": 2, 
-            "reward_multiplier": "2.0", 
-            "vesting_multiplier": "1.1"
-        }
-    ]
-}
-"""
-
-
-def keys(vega):
-    PARTY_A = WalletConfig("PARTY_A", "PARTY_A")
-    create_and_faucet_wallet(vega=vega, wallet=PARTY_A)
-    PARTY_B = WalletConfig("PARTY_B", "PARTY_B")
-    create_and_faucet_wallet(vega=vega, wallet=PARTY_B)
-    PARTY_C = WalletConfig("PARTY_C", "PARTY_C")
-    create_and_faucet_wallet(vega=vega, wallet=PARTY_C)
-    PARTY_D = WalletConfig("PARTY_D", "PARTY_D")
-    create_and_faucet_wallet(vega=vega, wallet=PARTY_D)
-    return PARTY_A, PARTY_B, PARTY_C, PARTY_D
-
-
-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
-def test_network_reward_pot(
-    page: Page,
-):
-    expect(page.get_by_test_id(TOTAL_REWARDS)).to_have_text("50.00 tDAI")
-
-
-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
-def test_reward_multiplier(
-    page: Page,
-):
-    expect(page.get_by_test_id(COMBINED_MULTIPLIERS)).to_have_text("1x")
-    expect(page.get_by_test_id(STREAK_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")
-    expect(page.get_by_test_id(HOARDER_REWARD_MULTIPLIER_VALUE)).to_have_text("1x")
-
-
-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
-def test_activity_streak(
-    page: Page,
-):
-    expect(page.get_by_test_id(EPOCH_STREAK)).to_have_text(
-        "Active trader: 1 epochs so far "
-    )
-
-
-@pytest.mark.xdist_group(name="test_rewards_activity_tier_0")
-def test_reward_history(
-    page: Page,
-):
-    page.locator('[name="fromEpoch"]').fill("1")
-    expect((page.get_by_role(ROW).locator(PRICE_TAKING_COL_ID)).nth(1)).to_have_text(
-        "100.00100.00%"
-    )
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text("100.00")
-    page.get_by_test_id(EARNED_BY_ME_BUTTON).click()
-    expect((page.get_by_role(ROW).locator(TOTAL_COL_ID)).nth(1)).to_have_text("50.00")

apps/trading/e2e/tests/settings/test_settings.py

@@ -1,13 +1,12 @@
 import pytest
 from playwright.sync_api import expect, Page
-from conftest import init_vega, cleanup_container
+from conftest import init_vega
 
 
 @pytest.fixture(scope="module")
-def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
+def vega():
+    with init_vega() as vega:
+        yield vega
 
 
 @pytest.mark.usefixtures("risk_accepted")

apps/trading/e2e/tests/teams/test_teams.py

@@ -2,18 +2,17 @@ import pytest
 from playwright.sync_api import expect, Page
 import vega_sim.proto.vega as vega_protos
 from vega_sim.null_service import VegaServiceNull
-from conftest import init_vega, cleanup_container
-from actions.utils import next_epoch, change_keys
+from conftest import init_vega
+from actions.utils import next_epoch
 from fixtures.market import setup_continuous_market
 from conftest import auth_setup, init_page, init_vega, risk_accepted_setup
 from wallet_config import PARTY_A, PARTY_B, PARTY_C, PARTY_D, MM_WALLET
 
+
 @pytest.fixture(scope="module")
 def vega(request):
-    with init_vega(request) as vega_instance:
-        request.addfinalizer(lambda: cleanup_container(vega_instance))  # Register the cleanup function
-        yield vega_instance
-
+    with init_vega(request) as vega:
+        yield vega
 
 @pytest.fixture(scope="module")
 def team_page(vega, browser, request, setup_teams_and_games):
@@ -24,20 +23,9 @@ def team_page(vega, browser, request, setup_teams_and_games):
         page.goto(f"/#/competitions/teams/{team_id}")
         yield page
 
-
-@pytest.fixture(scope="module")
-def competitions_page(vega, browser, request, setup_teams_and_games):
-    with init_page(vega, browser, request) as page:
-        risk_accepted_setup(page)
-        auth_setup(vega, page)
-        team_id = setup_teams_and_games["team_id"]
-        page.goto(f"/#/competitions/")
-        yield page
-
-
 @pytest.fixture(scope="module")
 def setup_teams_and_games(vega: VegaServiceNull):
-    tDAI_market = setup_continuous_market(vega, custom_quantum=100000)
+    tDAI_market = setup_continuous_market(vega)
     tDAI_asset_id = vega.find_asset_id(symbol="tDAI")
     vega.mint(key_name=PARTY_B.name, asset=tDAI_asset_id, amount=100000)
     vega.mint(key_name=PARTY_C.name, asset=tDAI_asset_id, amount=100000)
@@ -58,18 +46,6 @@ def setup_teams_and_games(vega: VegaServiceNull):
 
     # list_teams actually returns a dictionary {"team_id": Team}
     team_id = list(teams.keys())[0]
-    vega.create_referral_set(
-        key_name="market_maker",
-        name="test",
-        team_url="https://vega.xyz",
-        avatar_url="http://placekitten.com/200/200",
-        closed=False,
-    )
-    next_epoch(vega)
-    teams = vega.list_teams()
-
-    team_id_2 = list(teams.keys())[0]
-    vega.apply_referral_code("Key 1", team_id_2)
 
     vega.apply_referral_code(PARTY_B.name, team_id)
 
@@ -87,7 +63,7 @@ def setup_teams_and_games(vega: VegaServiceNull):
 
     current_epoch = vega.statistics().epoch_seq
     game_start = current_epoch + 1
-    game_end = current_epoch + 14
+    game_end = current_epoch + 11
 
     current_epoch = vega.statistics().epoch_seq
     print(f"[EPOCH: {current_epoch}] creating recurring transfer")
@@ -108,42 +84,9 @@ def setup_teams_and_games(vega: VegaServiceNull):
         factor=1.0,
         start_epoch=game_start,
         end_epoch=game_end,
-        window_length=15,
-    )
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    vega.recurring_transfer(
-        from_key_name=PARTY_B.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        entity_scope=vega_protos.vega.ENTITY_SCOPE_INDIVIDUALS,
-        individual_scope=vega_protos.vega.INDIVIDUAL_SCOPE_IN_TEAM,
-        n_top_performers=1,
-        amount=100,
-        factor=1.0,
-        window_length=15
-    )
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    vega.recurring_transfer(
-        from_key_name=PARTY_C.name,
-        from_account_type=vega_protos.vega.ACCOUNT_TYPE_GENERAL,
-        to_account_type=vega_protos.vega.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
-        asset=tDAI_asset_id,
-        reference="reward",
-        asset_for_metric=tDAI_asset_id,
-        metric=vega_protos.vega.DISPATCH_METRIC_MAKER_FEES_PAID,
-        entity_scope=vega_protos.vega.ENTITY_SCOPE_INDIVIDUALS,
-        individual_scope=vega_protos.vega.INDIVIDUAL_SCOPE_NOT_IN_TEAM,
-        n_top_performers=1,
-        amount=100,
-        factor=1.0,
-        window_length=15
+        window_length=10
     )
+
     next_epoch(vega)
     print(f"[EPOCH: {vega.statistics().epoch_seq}] starting order activity")
 
@@ -170,22 +113,6 @@ def setup_teams_and_games(vega: VegaServiceNull):
             side="SIDE_BUY",
             volume=1,
         )
-        vega.submit_order(
-            trading_key="Key 1",
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
-        vega.submit_order(
-            trading_key="market_maker",
-            market_id=tDAI_market,
-            order_type="TYPE_MARKET",
-            time_in_force="TIME_IN_FORCE_IOC",
-            side="SIDE_BUY",
-            volume=1,
-        )
         next_epoch(vega)
         print(f"[EPOCH: {vega.statistics().epoch_seq}] {i} epoch passed")
 
@@ -193,7 +120,6 @@ def setup_teams_and_games(vega: VegaServiceNull):
         "market_id": tDAI_market,
         "asset_id": tDAI_asset_id,
         "team_id": team_id,
-        "team_id_2": team_id_2,
         "team_name": team_name,
     }
 
@@ -210,109 +136,66 @@ def create_team(vega: VegaServiceNull):
 
     return team_name
 
-
 def test_team_page_games_table(team_page: Page):
+    team_page.pause()
     team_page.get_by_test_id("games-toggle").click()
     expect(team_page.get_by_test_id("games-toggle")).to_have_text("Games (1)")
-    expect(team_page.get_by_test_id("rank-0")).to_have_text("2")
-    expect(team_page.get_by_test_id("epoch-0")).to_have_text("19")
-    expect(team_page.get_by_test_id("type-0")
-           ).to_have_text("Price maker fees paid")
-    expect(team_page.get_by_test_id("amount-0")).to_have_text("74")
-    expect(team_page.get_by_test_id("participatingTeams-0")).to_have_text("2")
-    expect(team_page.get_by_test_id("participatingMembers-0")).to_have_text("4")
-
+    expect(team_page.get_by_test_id("rank-0")).to_have_text("1")
+    expect(team_page.get_by_test_id("epoch-0")).to_have_text("18")
+    expect(team_page.get_by_test_id("type-0")).to_have_text("Price maker fees paid")
+    expect(team_page.get_by_test_id("amount-0")).to_have_text("100,000,000")
+    expect(team_page.get_by_test_id("participatingTeams-0")).to_have_text(
+        "1"
+    )
+    expect(team_page.get_by_test_id("participatingMembers-0")).to_have_text(
+        "2"
+    )
 
 def test_team_page_members_table(team_page: Page):
     team_page.get_by_test_id("members-toggle").click()
-    expect(team_page.get_by_test_id("members-toggle")
-           ).to_have_text("Members (4)")
+    expect(team_page.get_by_test_id("members-toggle")).to_have_text("Members (4)")
     expect(team_page.get_by_test_id("referee-0")).to_be_visible()
     expect(team_page.get_by_test_id("joinedAt-0")).to_be_visible()
-    expect(team_page.get_by_test_id("joinedAtEpoch-0")).to_have_text("9")
+    expect(team_page.get_by_test_id("joinedAtEpoch-0")).to_have_text("8")
 
-
-def test_team_page_headline(team_page: Page, setup_teams_and_games):
+def test_team_page_headline(team_page: Page, setup_teams_and_games
+):
     team_name = setup_teams_and_games["team_name"]
     expect(team_page.get_by_test_id("team-name")).to_have_text(team_name)
     expect(team_page.get_by_test_id("members-count-stat")).to_have_text("4")
 
-    expect(team_page.get_by_test_id("total-games-stat")).to_have_text("1")
+    expect(team_page.get_by_test_id("total-games-stat")).to_have_text(
+        "1"
+    )
 
     # TODO this still seems wrong as its always 0
-    expect(team_page.get_by_test_id("total-volume-stat")).to_have_text("0")
+    expect(team_page.get_by_test_id("total-volume-stat")).to_have_text(
+        "0"
+    )
 
-    expect(team_page.get_by_test_id("rewards-paid-stat")).to_have_text("78")
-
-
-def test_switch_teams(team_page: Page, vega: VegaServiceNull):
-    team_page.get_by_test_id("switch-team-button").click()
-    team_page.get_by_test_id("confirm-switch-button").click()
-    expect(team_page.get_by_test_id("dialog-content").first).to_be_visible()
-    vega.wait_fn(1)
-    vega.wait_for_total_catchup()
-    next_epoch(vega=vega)
-    team_page.reload()
-    expect(team_page.get_by_test_id("members-count-stat")).to_have_text("5")
+    expect(team_page.get_by_test_id("rewards-paid-stat")).to_have_text(
+        "100m"
+    )
 
+@pytest.fixture(scope="module")
+def competitions_page(vega, browser, request):
+    with init_page(vega, browser, request) as page:
+        risk_accepted_setup(page)
+        auth_setup(vega, page)
+        yield page
 
 def test_leaderboard(competitions_page: Page, setup_teams_and_games):
     team_name = setup_teams_and_games["team_name"]
-    competitions_page.reload()
-    expect(
-        competitions_page.get_by_test_id("rank-0").locator(".text-yellow-300")
-    ).to_have_count(1)
-    expect(
-        competitions_page.get_by_test_id(
-            "rank-1").locator(".text-vega-clight-500")
-    ).to_have_count(1)
-    expect(competitions_page.get_by_test_id("team-1")).to_have_text(team_name)
-    expect(competitions_page.get_by_test_id("status-1")).to_have_text("Open")
+    competitions_page.goto(f"/#/competitions/")
+    expect(competitions_page.get_by_test_id("rank-0").locator(".text-yellow-300")).to_have_count(1)
+    expect(competitions_page.get_by_test_id("team-0")).to_have_text(team_name)
+    expect(competitions_page.get_by_test_id("status-0")).to_have_text("Open")
 
-    #  FIXME: the numbers are different we need to clarify this with the backend
-    # expect(competitions_page.get_by_test_id("earned-1")).to_have_text("160")
-    expect(competitions_page.get_by_test_id("games-1")).to_have_text("1")
+    expect(competitions_page.get_by_test_id("earned-0")).to_have_text("100,000,000")
+    expect(competitions_page.get_by_test_id("games-0")).to_have_text("1")
 
     # TODO  still odd that this is 0
     expect(competitions_page.get_by_test_id("volume-0")).to_have_text("-")
 
-
-def test_game_card(competitions_page: Page):
-    expect(competitions_page.get_by_test_id(
-        "active-rewards-card")).to_have_count(2)
-    game_1 = competitions_page.get_by_test_id("active-rewards-card").first
-    expect(game_1).to_be_visible()
-    expect(game_1.get_by_test_id("entity-scope")).to_have_text("Individual")
-    expect(game_1.get_by_test_id("locked-for")).to_have_text("1 epoch")
-    expect(game_1.get_by_test_id("reward-value")).to_have_text("100.00")
-    expect(game_1.get_by_test_id("distribution-strategy")
-           ).to_have_text("Pro rata")
-    expect(game_1.get_by_test_id("dispatch-metric-info")
-           ).to_have_text("Price maker fees paid • ")
-    expect(game_1.get_by_test_id("assessed-over")).to_have_text("15 epochs")
-    expect(game_1.get_by_test_id("scope")).to_have_text("In team")
-    expect(game_1.get_by_test_id("staking-requirement")).to_have_text("0.00")
-    expect(game_1.get_by_test_id("average-position")).to_have_text("0.00")
-
-
-def test_create_team(competitions_page: Page, vega: VegaServiceNull):
-    change_keys(competitions_page, vega, "market_maker_2")
-    competitions_page.get_by_test_id("create-public-team-button").click()
-    competitions_page.get_by_test_id("team-name-input").fill("e2e")
-    competitions_page.get_by_test_id("team-url-input").fill("https://vega.xyz")
-    competitions_page.get_by_test_id("avatar-url-input").fill(
-        "http://placekitten.com/200/200"
-    )
-    competitions_page.get_by_test_id("team-form-submit-button").click()
-    expect(competitions_page.get_by_test_id("team-form-submit-button")).to_have_text(
-        "Confirming transaction..."
-    )
-    vega.wait_fn(2)
-    vega.wait_for_total_catchup()
-    expect(
-        competitions_page.get_by_test_id("team-creation-success-message")
-    ).to_be_visible()
-    expect(competitions_page.get_by_test_id("team-id-display")).to_be_visible()
-    expect(competitions_page.get_by_test_id("team-id-display")).to_be_visible()
-    competitions_page.get_by_test_id("view-team-button").click()
-    expect(competitions_page.get_by_test_id("team-name")).to_have_text("e2e")
+#TODO def test_games(competitions_page: Page):
+#TODO currently no games appear which i think is a bug

apps/trading/lib/hooks/Teams.graphql

@@ -1,20 +1,15 @@
-fragment TeamsFields on Team {
-  teamId
-  referrer
-  name
-  teamUrl
-  avatarUrl
-  createdAt
-  createdAtEpoch
-  closed
-  totalMembers
-}
-
 query Teams($teamId: ID, $partyId: ID) {
   teams(teamId: $teamId, partyId: $partyId) {
     edges {
       node {
-        ...TeamsFields
+        teamId
+        referrer
+        name
+        teamUrl
+        avatarUrl
+        createdAt
+        createdAtEpoch
+        closed
       }
     }
   }

apps/trading/lib/hooks/__generated__/Teams.ts

@@ -3,40 +3,33 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type TeamsFieldsFragment = { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, totalMembers: number };
-
 export type TeamsQueryVariables = Types.Exact<{
   teamId?: Types.InputMaybe<Types.Scalars['ID']>;
   partyId?: Types.InputMaybe<Types.Scalars['ID']>;
 }>;
 
 
-export type TeamsQuery = { __typename?: 'Query', teams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean, totalMembers: number } }> } | null };
+export type TeamsQuery = { __typename?: 'Query', teams?: { __typename?: 'TeamConnection', edges: Array<{ __typename?: 'TeamEdge', node: { __typename?: 'Team', teamId: string, referrer: string, name: string, teamUrl: string, avatarUrl: string, createdAt: any, createdAtEpoch: number, closed: boolean } }> } | null };
+
 
-export const TeamsFieldsFragmentDoc = gql`
-    fragment TeamsFields on Team {
-  teamId
-  referrer
-  name
-  teamUrl
-  avatarUrl
-  createdAt
-  createdAtEpoch
-  closed
-  totalMembers
-}
-    `;
 export const TeamsDocument = gql`
     query Teams($teamId: ID, $partyId: ID) {
   teams(teamId: $teamId, partyId: $partyId) {
     edges {
       node {
-        ...TeamsFields
+        teamId
+        referrer
+        name
+        teamUrl
+        avatarUrl
+        createdAt
+        createdAtEpoch
+        closed
       }
     }
   }
 }
-    ${TeamsFieldsFragmentDoc}`;
+    `;
 
 /**
  * __useTeamsQuery__

apps/trading/lib/hooks/use-my-team.ts

@@ -1,25 +0,0 @@
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import compact from 'lodash/compact';
-import first from 'lodash/first';
-import { useTeamsQuery } from './__generated__/Teams';
-import { useTeam } from './use-team';
-import { useTeams } from './use-teams';
-
-export const useMyTeam = () => {
-  const { pubKey } = useVegaWallet();
-  const { data: teams } = useTeams();
-
-  const { data: maybeMyTeam } = useTeamsQuery({
-    variables: {
-      partyId: pubKey,
-    },
-    skip: !pubKey,
-    fetchPolicy: 'cache-and-network',
-  });
-
-  const team = first(compact(maybeMyTeam?.teams?.edges.map((n) => n.node)));
-  const rank = teams.findIndex((t) => t.teamId === team?.teamId) + 1;
-  const { games, stats } = useTeam(team?.teamId);
-
-  return { team, stats, games, rank };
-};

apps/trading/lib/hooks/use-teams.tsx

@@ -4,8 +4,7 @@ import { useTeamsQuery } from './__generated__/Teams';
 import { useTeamsStatisticsQuery } from './__generated__/TeamsStatistics';
 import compact from 'lodash/compact';
 
-// 192
-export const DEFAULT_AGGREGATION_EPOCHS = 192;
+export const DEFAULT_AGGREGATION_EPOCHS = 10;
 
 export const useTeams = (aggregationEpochs = DEFAULT_AGGREGATION_EPOCHS) => {
   const {

apps/trading/pages/_app.page.tsx

@@ -14,7 +14,7 @@ import './styles.css';
 import { usePageTitleStore } from '../stores';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
-import { HashRouter, useLocation } from 'react-router-dom';
+import { HashRouter, useLocation, Route, Routes } from 'react-router-dom';
 import { Bootstrapper } from '../components/bootstrapper';
 import { AnnouncementBanner } from '../components/banner';
 import { Navbar } from '../components/navbar';
@@ -25,7 +25,9 @@ import {
   ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingBanner } from '../components/viewing-banner';
+import { NavHeader } from '../components/navbar/nav-header';
 import { Telemetry } from '../components/telemetry';
+import { Routes as AppRoutes } from '../lib/links';
 import { SSRLoader } from './ssr-loader';
 import { PartyActiveOrdersHandler } from './party-active-orders-handler';
 import { MaybeConnectEagerly } from './maybe-connect-eagerly';
@@ -71,7 +73,16 @@ function AppBody({ Component }: AppProps) {
       <Title />
       <div className={gridClasses}>
         <AnnouncementBanner />
-        <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'} />
+        <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'}>
+          <Routes>
+            <Route
+              path={AppRoutes.MARKETS}
+              // render nothing for markets/all, otherwise markets/:marketId will match with markets/all
+              element={null}
+            />
+            <Route path={AppRoutes.MARKET} element={<NavHeader />} />
+          </Routes>
+        </Navbar>
         <div data-testid="banners">
           <ProtocolUpgradeProposalNotification
             mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}

apps/trading/pages/_document.page.tsx

@@ -24,14 +24,11 @@ export default function Document() {
 
         {/* scripts */}
         <script src="/theme-setter.js" type="text/javascript" async />
-
-        {/* manifest */}
-        <link rel="manifest" href="/apps/trading/public/manifest.json" />
       </Head>
       <Html>
         <body
-          // Next.js will set body to display none until js runs. Because the entire app is client rendered
-          // and delivered via IPFS we override this to show a server side render loading animation until the
+          // Nextjs will set body to display none until js runs. Because the entire app is client rendered
+          // and delivered via ipfs we override this to show a server side render loading animation until the
           // js is downloaded and react takes over rendering
           style={{ display: 'block' }}
           className="bg-white dark:bg-vega-cdark-900 text-default font-alpha"

apps/trading/pages/client-router.tsx

@@ -23,7 +23,7 @@ import { NotFound as ReferralNotFound } from '../client-pages/referrals/error-bo
 import { compact } from 'lodash';
 import { useFeatureFlags } from '@vegaprotocol/environment';
 import { LiquidityHeader } from '../components/liquidity-header';
-import { MarketHeader, MobileMarketHeader } from '../components/market-header';
+import { MarketHeader } from '../components/market-header';
 import { PortfolioSidebar } from '../client-pages/portfolio/portfolio-sidebar';
 import { LiquiditySidebar } from '../client-pages/liquidity/liquidity-sidebar';
 import { MarketsSidebar } from '../client-pages/markets/markets-sidebar';
@@ -33,7 +33,6 @@ import { CompetitionsTeams } from '../client-pages/competitions/competitions-tea
 import { CompetitionsTeam } from '../client-pages/competitions/competitions-team';
 import { CompetitionsCreateTeam } from '../client-pages/competitions/competitions-create-team';
 import { CompetitionsUpdateTeam } from '../client-pages/competitions/competitions-update-team';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 
 // These must remain dynamically imported as pennant cannot be compiled by nextjs due to ESM
 // Using dynamic imports is a workaround for this until pennant is published as ESM
@@ -51,9 +50,6 @@ const NotFound = () => {
 
 export const useRouterConfig = (): RouteObject[] => {
   const featureFlags = useFeatureFlags((state) => state.flags);
-  const { screenSize } = useScreenDimensions();
-  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
-  const marketHeader = largeScreen ? <MarketHeader /> : <MobileMarketHeader />;
   const routeConfig = compact([
     {
       index: true,
@@ -155,7 +151,10 @@ export const useRouterConfig = (): RouteObject[] => {
     {
       path: 'markets/*',
       element: (
-        <LayoutWithSidebar header={marketHeader} sidebar={<MarketsSidebar />} />
+        <LayoutWithSidebar
+          header={<MarketHeader />}
+          sidebar={<MarketsSidebar />}
+        />
       ),
       children: [
         {

apps/trading/public/manifest.json

@@ -1,22 +0,0 @@
-{
-  "name": "Vega Protocol - Trading",
-  "short_name": "Console",
-  "description": "Vega Protocol - Trading dApp",
-  "start_url": "/",
-  "display": "standalone",
-  "orientation": "portrait",
-  "theme_color": "#000000",
-  "background_color": "#ffffff",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "cover.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    }
-  ]
-}

libs/accounts/src/lib/transfer-form.spec.tsx

@@ -96,6 +96,11 @@ describe('TransferForm', () => {
   });
 
   it.each([
+    {
+      targetText: 'Include transfer fee',
+      tooltipText:
+        'The fee will be taken from the amount you are transferring.',
+    },
     {
       targetText: 'Transfer fee',
       tooltipText: /transfer\.fee\.factor/,
@@ -271,6 +276,9 @@ describe('TransferForm', () => {
 
     const amountInput = screen.getByLabelText('Amount');
 
+    const checkbox = screen.getByTestId('include-transfer-fee');
+    expect(checkbox).not.toBeChecked();
+
     await userEvent.clear(amountInput);
     await userEvent.type(amountInput, '50');
 
@@ -280,7 +288,10 @@ describe('TransferForm', () => {
     await userEvent.click(screen.getByRole('button', { name: 'Use max' }));
     expect(amountInput).toHaveValue('100.00');
 
-    // If transfering from a vested account  fees should be 0
+    // If transfering from a vested account 'include fees' checkbox should
+    // be disabled and fees should be 0
+    expect(checkbox).not.toBeChecked();
+    expect(checkbox).toBeDisabled();
     const expectedFee = '0';
     const total = new BigNumber(amount).plus(expectedFee).toFixed();
 
@@ -385,7 +396,78 @@ describe('TransferForm', () => {
       });
     });
   });
+
   describe('IncludeFeesCheckbox', () => {
+    it('validates fields and submits when checkbox is checked', async () => {
+      const mockSubmit = jest.fn();
+      renderComponent({ ...props, submitTransfer: mockSubmit });
+
+      // check current pubkey not shown
+      const keySelect = screen.getByLabelText<HTMLSelectElement>('To Vega key');
+      const pubKeyOptions = ['', pubKey, props.pubKeys[1]];
+      expect(keySelect.children).toHaveLength(pubKeyOptions.length);
+      expect(Array.from(keySelect.options).map((o) => o.value)).toEqual(
+        pubKeyOptions
+      );
+
+      await submit();
+      expect(await screen.findAllByText('Required')).toHaveLength(2); // pubkey set as default value
+
+      // Select a pubkey
+      await userEvent.selectOptions(
+        screen.getByLabelText('To Vega key'),
+        props.pubKeys[1]
+      );
+
+      // Select asset
+      await selectAsset(asset);
+
+      await userEvent.selectOptions(
+        screen.getByLabelText('From account'),
+        `${AccountType.ACCOUNT_TYPE_GENERAL}-${asset.id}`
+      );
+
+      const amountInput = screen.getByLabelText('Amount');
+      const checkbox = screen.getByTestId('include-transfer-fee');
+
+      // 1003-TRAN-022
+      expect(checkbox).not.toBeChecked();
+
+      await userEvent.clear(amountInput);
+      await userEvent.type(amountInput, amount);
+      await userEvent.click(checkbox);
+
+      expect(checkbox).toBeChecked();
+      const expectedFee = new BigNumber(amount)
+        .times(props.feeFactor)
+        .toFixed();
+      const expectedAmount = new BigNumber(amount).minus(expectedFee).toFixed();
+
+      // 1003-TRAN-020
+      expect(screen.getByTestId('transfer-fee')).toHaveTextContent(expectedFee);
+      expect(screen.getByTestId('transfer-amount')).toHaveTextContent(
+        expectedAmount
+      );
+      expect(screen.getByTestId('total-transfer-fee')).toHaveTextContent(
+        amount
+      );
+
+      await submit();
+
+      await waitFor(() => {
+        // 1003-TRAN-023
+        expect(mockSubmit).toHaveBeenCalledTimes(1);
+        expect(mockSubmit).toHaveBeenCalledWith({
+          fromAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+          toAccountType: AccountType.ACCOUNT_TYPE_GENERAL,
+          to: props.pubKeys[1],
+          asset: asset.id,
+          amount: removeDecimal(expectedAmount, asset.decimals),
+          oneOff: {},
+        });
+      });
+    });
+
     it('validates fields when checkbox is not checked', async () => {
       renderComponent(props);
 
@@ -415,8 +497,11 @@ describe('TransferForm', () => {
       );
 
       const amountInput = screen.getByLabelText('Amount');
+      const checkbox = screen.getByTestId('include-transfer-fee');
+      expect(checkbox).not.toBeChecked();
 
       await userEvent.type(amountInput, amount);
+      expect(checkbox).not.toBeChecked();
       const expectedFee = new BigNumber(amount)
         .times(props.feeFactor)
         .toFixed();

libs/accounts/src/lib/transfer-form.tsx

@@ -15,6 +15,7 @@ import {
   TradingRichSelect,
   TradingSelect,
   Tooltip,
+  TradingCheckbox,
   TradingButton,
 } from '@vegaprotocol/ui-toolkit';
 import type { Transfer } from '@vegaprotocol/wallet';
@@ -134,17 +135,32 @@ export const TransferForm = ({
   const accountBalance =
     account && addDecimal(account.balance, account.asset.decimals);
 
+  const [includeFee, setIncludeFee] = useState(false);
+
   // Max amount given selected asset and from account
   const max = accountBalance ? new BigNumber(accountBalance) : new BigNumber(0);
 
-  const fee = useMemo(
-    () => feeFactor && new BigNumber(feeFactor).times(amount).toString(),
-    [amount, feeFactor]
-  );
+  const transferAmount = useMemo(() => {
+    if (!amount) return undefined;
+    if (includeFee && feeFactor) {
+      return new BigNumber(1).minus(feeFactor).times(amount).toString();
+    }
+    return amount;
+  }, [amount, includeFee, feeFactor]);
+
+  const fee = useMemo(() => {
+    if (!transferAmount) return undefined;
+    if (includeFee) {
+      return new BigNumber(amount).minus(transferAmount).toString();
+    }
+    return (
+      feeFactor && new BigNumber(feeFactor).times(transferAmount).toString()
+    );
+  }, [amount, includeFee, transferAmount, feeFactor]);
 
   const onSubmit = useCallback(
     (fields: FormFields) => {
-      if (!amount) {
+      if (!transferAmount) {
         throw new Error('Submitted transfer with no amount selected');
       }
 
@@ -157,7 +173,7 @@ export const TransferForm = ({
 
       const transfer = normalizeTransfer(
         fields.toVegaKey,
-        amount,
+        transferAmount,
         type,
         AccountType.ACCOUNT_TYPE_GENERAL, // field is readonly in the form
         {
@@ -167,7 +183,7 @@ export const TransferForm = ({
       );
       submitTransfer(transfer);
     },
-    [submitTransfer, amount, assets]
+    [submitTransfer, transferAmount, assets]
   );
 
   // reset for placeholder workaround https://github.com/radix-ui/primitives/issues/1569
@@ -263,6 +279,7 @@ export const TransferForm = ({
                   ) {
                     setValue('toVegaKey', pubKey);
                     setToVegaKeyMode('select');
+                    setIncludeFee(false);
                   }
                 }}
               >
@@ -432,9 +449,27 @@ export const TransferForm = ({
           </TradingInputError>
         )}
       </TradingFormGroup>
-      {amount && fee && (
+      <div className="mb-4">
+        <Tooltip
+          description={t(
+            `The fee will be taken from the amount you are transferring.`
+          )}
+        >
+          <div>
+            <TradingCheckbox
+              name="include-transfer-fee"
+              disabled={!transferAmount || fromVested}
+              label={t('Include transfer fee')}
+              checked={includeFee}
+              onCheckedChange={() => setIncludeFee((x) => !x)}
+            />
+          </div>
+        </Tooltip>
+      </div>
+      {transferAmount && fee && (
         <TransferFee
-          amount={amount}
+          amount={transferAmount}
+          transferAmount={transferAmount}
           feeFactor={feeFactor}
           fee={fromVested ? '0' : fee}
           decimals={asset?.decimals}
@@ -449,22 +484,29 @@ export const TransferForm = ({
 
 export const TransferFee = ({
   amount,
+  transferAmount,
   feeFactor,
   fee,
   decimals,
 }: {
   amount: string;
+  transferAmount: string;
   feeFactor: string | null;
   fee?: string;
   decimals?: number;
 }) => {
   const t = useT();
-  if (!feeFactor || !amount || !fee) return null;
-  if (isNaN(Number(feeFactor)) || isNaN(Number(amount)) || isNaN(Number(fee))) {
+  if (!feeFactor || !amount || !transferAmount || !fee) return null;
+  if (
+    isNaN(Number(feeFactor)) ||
+    isNaN(Number(amount)) ||
+    isNaN(Number(transferAmount)) ||
+    isNaN(Number(fee))
+  ) {
     return null;
   }
 
-  const totalValue = new BigNumber(amount).plus(fee).toString();
+  const totalValue = new BigNumber(transferAmount).plus(fee).toString();
 
   return (
     <div className="mb-4 flex flex-col gap-2 text-xs">

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

@@ -3,13 +3,27 @@ import { getAsset, getQuoteName } from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { AccountBreakdownDialog } from '@vegaprotocol/accounts';
 import { formatRange, formatValue } from '@vegaprotocol/utils';
+import { marketMarginDataProvider } from '@vegaprotocol/accounts';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import * as AccordionPrimitive from '@radix-ui/react-accordion';
 import * as Schema from '@vegaprotocol/types';
 import {
+  MARGIN_DIFF_TOOLTIP_TEXT,
+  DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
+  TOTAL_MARGIN_AVAILABLE,
   LIQUIDATION_PRICE_ESTIMATE_TOOLTIP_TEXT,
+  EST_TOTAL_MARGIN_TOOLTIP_TEXT,
   MARGIN_ACCOUNT_TOOLTIP_TEXT,
 } from '../../constants';
 import { KeyValue } from './key-value';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
+import {
+  Accordion,
+  AccordionChevron,
+  AccordionPanel,
+  ExternalLink,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+import classNames from 'classnames';
 import { useT, ns } from '../../use-t';
 import { Trans } from 'react-i18next';
 import type { Market } from '@vegaprotocol/markets';
@@ -17,9 +31,9 @@ import { emptyValue } from './deal-ticket-fee-details';
 import type { EstimatePositionQuery } from '@vegaprotocol/positions';
 
 export interface DealTicketMarginDetailsProps {
-  generalAccountBalance: string;
-  marginAccountBalance: string;
-  orderMarginAccountBalance: string;
+  generalAccountBalance?: string;
+  marginAccountBalance?: string;
+  orderMarginAccountBalance?: string;
   market: Market;
   onMarketClick?: (marketId: string, metaKey?: boolean) => void;
   assetSymbol: string;
@@ -40,20 +54,118 @@ export const DealTicketMarginDetails = ({
   const t = useT();
   const [breakdownDialog, setBreakdownDialog] = useState(false);
   const { pubKey: partyId } = useVegaWallet();
+  const { data: currentMargins } = useDataProvider({
+    dataProvider: marketMarginDataProvider,
+    variables: { marketId: market.id, partyId: partyId || '' },
+    skip: !partyId,
+  });
   const liquidationEstimate = positionEstimate?.liquidation;
+  const marginEstimate = positionEstimate?.margin;
   const totalMarginAccountBalance =
     BigInt(marginAccountBalance || '0') +
     BigInt(orderMarginAccountBalance || '0');
-
+  const totalBalance =
+    BigInt(generalAccountBalance || '0') + totalMarginAccountBalance;
   const asset = getAsset(market);
   const { decimals: assetDecimals, quantum } = asset;
+  let marginRequiredBestCase: string | undefined = undefined;
+  let marginRequiredWorstCase: string | undefined = undefined;
+  const marginEstimateBestCase =
+    BigInt(marginEstimate?.bestCase.initialLevel ?? 0) +
+    BigInt(marginEstimate?.bestCase.orderMarginLevel ?? 0);
+  const marginEstimateWorstCase =
+    BigInt(marginEstimate?.worstCase.initialLevel ?? 0) +
+    BigInt(marginEstimate?.worstCase.orderMarginLevel ?? 0);
+  if (marginEstimate) {
+    if (currentMargins) {
+      const currentMargin =
+        BigInt(currentMargins.initialLevel) +
+        BigInt(currentMargins.orderMarginLevel);
 
-  const collateralIncreaseEstimateBestCase = BigInt(
-    positionEstimate?.collateralIncreaseEstimate.bestCase ?? '0'
-  );
-  const collateralIncreaseEstimateWorstCase = BigInt(
-    positionEstimate?.collateralIncreaseEstimate.worstCase ?? '0'
-  );
+      marginRequiredBestCase = (
+        marginEstimateBestCase - currentMargin
+      ).toString();
+      if (marginRequiredBestCase.startsWith('-')) {
+        marginRequiredBestCase = '0';
+      }
+
+      marginRequiredWorstCase = (
+        marginEstimateWorstCase - currentMargin
+      ).toString();
+
+      if (marginRequiredWorstCase.startsWith('-')) {
+        marginRequiredWorstCase = '0';
+      }
+    } else {
+      marginRequiredBestCase = marginEstimateBestCase.toString();
+      marginRequiredWorstCase = marginEstimateWorstCase.toString();
+    }
+  }
+
+  const totalMarginAvailable = (
+    currentMargins
+      ? totalBalance - BigInt(currentMargins.maintenanceLevel)
+      : totalBalance
+  ).toString();
+
+  let deductionFromCollateral = null;
+  let projectedMargin = null;
+  if (totalMarginAccountBalance) {
+    const deductionFromCollateralBestCase =
+      marginEstimateBestCase - totalMarginAccountBalance;
+
+    const deductionFromCollateralWorstCase =
+      marginEstimateWorstCase - totalMarginAccountBalance;
+
+    deductionFromCollateral = (
+      <KeyValue
+        indent
+        label={t('Deduction from collateral')}
+        value={formatRange(
+          deductionFromCollateralBestCase > 0
+            ? deductionFromCollateralBestCase.toString()
+            : '0',
+          deductionFromCollateralWorstCase > 0
+            ? deductionFromCollateralWorstCase.toString()
+            : '0',
+          assetDecimals
+        )}
+        formattedValue={formatValue(
+          deductionFromCollateralWorstCase > 0
+            ? deductionFromCollateralWorstCase.toString()
+            : '0',
+          assetDecimals,
+          quantum
+        )}
+        symbol={assetSymbol}
+        labelDescription={t(
+          'DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT',
+          DEDUCTION_FROM_COLLATERAL_TOOLTIP_TEXT,
+          { assetSymbol }
+        )}
+      />
+    );
+    projectedMargin = (
+      <KeyValue
+        label={t('Projected margin')}
+        value={formatRange(
+          marginEstimateBestCase.toString(),
+          marginEstimateWorstCase.toString(),
+          assetDecimals
+        )}
+        formattedValue={formatValue(
+          marginEstimateWorstCase.toString(),
+          assetDecimals,
+          quantum
+        )}
+        symbol={assetSymbol}
+        labelDescription={t(
+          'EST_TOTAL_MARGIN_TOOLTIP_TEXT',
+          EST_TOTAL_MARGIN_TOOLTIP_TEXT
+        )}
+      />
+    );
+  }
 
   let liquidationPriceEstimate = emptyValue;
   let liquidationPriceEstimateRange = emptyValue;
@@ -110,50 +222,128 @@ export const DealTicketMarginDetails = ({
   const quoteName = getQuoteName(market);
 
   return (
-    <div className="flex flex-col w-full gap-2 mt-2">
+    <div className="flex flex-col w-full gap-2">
+      <Accordion>
+        <AccordionPanel
+          itemId="margin"
+          trigger={
+            <AccordionPrimitive.Trigger
+              data-testid="accordion-toggle"
+              className={classNames(
+                'w-full pt-2',
+                'flex items-center gap-2 text-xs',
+                'group'
+              )}
+            >
+              <div
+                data-testid={`deal-ticket-fee-margin-required`}
+                key={'value-dropdown'}
+                className="flex items-center justify-between w-full gap-2"
+              >
+                <div className="flex items-center text-left gap-1">
+                  <Tooltip
+                    description={t(
+                      'MARGIN_DIFF_TOOLTIP_TEXT',
+                      MARGIN_DIFF_TOOLTIP_TEXT,
+                      { assetSymbol }
+                    )}
+                  >
+                    <span className="text-muted">{t('Margin required')}</span>
+                  </Tooltip>
+
+                  <AccordionChevron size={10} />
+                </div>
+                <Tooltip
+                  description={
+                    formatRange(
+                      marginRequiredBestCase,
+                      marginRequiredWorstCase,
+                      assetDecimals
+                    ) ?? '-'
+                  }
+                >
+                  <div className="font-mono text-right">
+                    {formatValue(
+                      marginRequiredWorstCase,
+                      assetDecimals,
+                      quantum
+                    )}{' '}
+                    {assetSymbol || ''}
+                  </div>
+                </Tooltip>
+              </div>
+            </AccordionPrimitive.Trigger>
+          }
+        >
+          <div className="flex flex-col w-full gap-2">
+            <KeyValue
+              label={t('Total margin available')}
+              indent
+              value={formatValue(totalMarginAvailable, assetDecimals)}
+              formattedValue={formatValue(
+                totalMarginAvailable,
+                assetDecimals,
+                quantum
+              )}
+              symbol={assetSymbol}
+              labelDescription={t(
+                'TOTAL_MARGIN_AVAILABLE',
+                TOTAL_MARGIN_AVAILABLE,
+                {
+                  generalAccountBalance: formatValue(
+                    generalAccountBalance,
+                    assetDecimals,
+                    quantum
+                  ),
+                  marginAccountBalance: formatValue(
+                    marginAccountBalance,
+                    assetDecimals,
+                    quantum
+                  ),
+                  orderMarginAccountBalance: formatValue(
+                    orderMarginAccountBalance,
+                    assetDecimals,
+                    quantum
+                  ),
+                  marginMaintenance: formatValue(
+                    currentMargins?.maintenanceLevel,
+                    assetDecimals,
+                    quantum
+                  ),
+                  assetSymbol,
+                }
+              )}
+            />
+            {deductionFromCollateral}
+            <KeyValue
+              label={t('Current margin allocation')}
+              indent
+              onClick={
+                generalAccountBalance
+                  ? () => setBreakdownDialog(true)
+                  : undefined
+              }
+              value={formatValue(
+                totalMarginAccountBalance.toString(),
+                assetDecimals
+              )}
+              symbol={assetSymbol}
+              labelDescription={t(
+                'MARGIN_ACCOUNT_TOOLTIP_TEXT',
+                MARGIN_ACCOUNT_TOOLTIP_TEXT
+              )}
+              formattedValue={formatValue(
+                totalMarginAccountBalance.toString(),
+                assetDecimals,
+                quantum
+              )}
+            />
+          </div>
+        </AccordionPanel>
+      </Accordion>
+      {projectedMargin}
       <KeyValue
-        label={t('Current margin')}
-        onClick={
-          generalAccountBalance ? () => setBreakdownDialog(true) : undefined
-        }
-        value={formatValue(totalMarginAccountBalance.toString(), assetDecimals)}
-        symbol={assetSymbol}
-        labelDescription={t(
-          'MARGIN_ACCOUNT_TOOLTIP_TEXT',
-          MARGIN_ACCOUNT_TOOLTIP_TEXT
-        )}
-        formattedValue={formatValue(
-          totalMarginAccountBalance.toString(),
-          assetDecimals,
-          quantum
-        )}
-      />
-      <KeyValue
-        label={t('Available collateral')}
-        value={formatValue(generalAccountBalance, assetDecimals)}
-        formattedValue={formatValue(
-          generalAccountBalance.toString(),
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-      />
-      <KeyValue
-        label={t('Additional margin required')}
-        value={formatRange(
-          collateralIncreaseEstimateBestCase.toString(),
-          collateralIncreaseEstimateWorstCase.toString(),
-          assetDecimals
-        )}
-        formattedValue={formatValue(
-          collateralIncreaseEstimateBestCase.toString(),
-          assetDecimals,
-          quantum
-        )}
-        symbol={assetSymbol}
-      />
-      <KeyValue
-        label={t('Liquidation estimate')}
+        label={t('Liquidation')}
         value={liquidationPriceEstimateRange}
         formattedValue={liquidationPriceEstimate}
         symbol={quoteName}

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

@@ -73,7 +73,7 @@ import {
 } from '../../hooks';
 import { DealTicketSizeIceberg } from './deal-ticket-size-iceberg';
 import noop from 'lodash/noop';
-import { isNonPersistentOrder } from '../../utils/time-in-force-persistence';
+import { isNonPersistentOrder } from '../../utils/time-in-force-persistance';
 import { KeyValue } from './key-value';
 import { DocsLinks } from '@vegaprotocol/environment';
 import { useT } from '../../use-t';
@@ -177,6 +177,12 @@ export const DealTicket = ({
     loading: loadingGeneralAccountBalance,
   } = useAccountBalance(asset.id);
 
+  const balance = (
+    BigInt(marginAccountBalance) +
+    BigInt(generalAccountBalance) +
+    BigInt(orderMarginAccountBalance)
+  ).toString();
+
   const { marketState, marketTradingMode } = marketData;
   const timeInForce = watch('timeInForce');
 
@@ -723,11 +729,17 @@ export const DealTicket = ({
         error={summaryError}
         asset={asset}
         marketTradingMode={marketData.marketTradingMode}
-        balance={generalAccountBalance}
-        margin={
-          positionEstimate?.estimatePosition?.collateralIncreaseEstimate
-            .bestCase || '0'
-        }
+        balance={balance}
+        margin={(
+          BigInt(
+            positionEstimate?.estimatePosition?.margin.bestCase.initialLevel ||
+              '0'
+          ) +
+          BigInt(
+            positionEstimate?.estimatePosition?.margin.bestCase
+              .orderMarginLevel || '0'
+          )
+        ).toString()}
         isReadOnly={isReadOnly}
         pubKey={pubKey}
         onDeposit={onDeposit}

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

@@ -1,4 +1,5 @@
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import classnames from 'classnames';
 import type { ReactNode } from 'react';
 
 export interface KeyValuePros {
@@ -18,6 +19,7 @@ export const KeyValue = ({
   value,
   labelDescription,
   symbol,
+  indent,
   onClick,
   formattedValue,
 }: KeyValuePros) => {
@@ -41,7 +43,10 @@ export const KeyValue = ({
           : id
       }`}
       key={typeof label === 'string' ? label : 'value-dropdown'}
-      className="text-xs flex justify-between items-center gap-4 flex-wrap text-right"
+      className={classnames(
+        'text-xs flex justify-between items-center gap-4 flex-wrap text-right',
+        { 'ml-2': indent }
+      )}
     >
       <Tooltip description={labelDescription}>
         <div className="text-muted text-left">{label}</div>

libs/deal-ticket/src/components/deal-ticket/margin-mode-selector.tsx

@@ -29,7 +29,6 @@ import { usePositionEstimate } from '../../hooks/use-position-estimate';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { getAsset, useMarket } from '@vegaprotocol/markets';
 import { NoWalletWarning } from './deal-ticket';
-import { DealTicketMarginDetails } from './deal-ticket-margin-details';
 
 const defaultLeverage = 10;
 
@@ -94,78 +93,66 @@ export const MarginChange = ({
     },
     skip
   );
-  if (!asset || !estimateMargin?.estimatePosition) {
+  if (
+    !asset ||
+    !estimateMargin?.estimatePosition?.collateralIncreaseEstimate.worstCase ||
+    estimateMargin.estimatePosition.collateralIncreaseEstimate.worstCase === '0'
+  ) {
     return null;
   }
   const collateralIncreaseEstimate = BigInt(
     estimateMargin.estimatePosition.collateralIncreaseEstimate.worstCase
   );
-
+  if (!collateralIncreaseEstimate) {
+    return null;
+  }
   let positionWarning = '';
+  if (orders?.length && openVolume !== '0') {
+    positionWarning = t(
+      'youHaveOpenPositionAndOrders',
+      'You have an existing position and open orders on this market.',
+      {
+        count: orders.length,
+      }
+    );
+  } else if (!orders?.length) {
+    positionWarning = t('You have an existing position on this market.');
+  } else {
+    positionWarning = t(
+      'youHaveOpenOrders',
+      'You have open orders on this market.',
+      {
+        count: orders.length,
+      }
+    );
+  }
   let marginChangeWarning = '';
-  if (collateralIncreaseEstimate) {
-    if (orders?.length && openVolume !== '0') {
-      positionWarning = t(
-        'youHaveOpenPositionAndOrders',
-        'You have an existing position and open orders on this market.',
-        {
-          count: orders.length,
-        }
-      );
-    } else if (!orders?.length) {
-      positionWarning = t('You have an existing position on this market.');
-    } else {
-      positionWarning = t(
-        'youHaveOpenOrders',
-        'You have open orders on this market.',
-        {
-          count: orders.length,
-        }
-      );
-    }
-
-    const amount = addDecimalsFormatNumber(
-      collateralIncreaseEstimate.toString(),
-      asset?.decimals
+  const amount = addDecimalsFormatNumber(
+    collateralIncreaseEstimate.toString(),
+    asset?.decimals
+  );
+  const { symbol } = asset;
+  const interpolation = { amount, symbol };
+  if (marginMode === Schema.MarginMode.MARGIN_MODE_CROSS_MARGIN) {
+    marginChangeWarning = t(
+      'Changing the margin mode will move {{amount}} {{symbol}} from your general account to fund the position.',
+      interpolation
+    );
+  } else {
+    marginChangeWarning = t(
+      'Changing the margin mode and leverage will move {{amount}} {{symbol}} from your general account to fund the position.',
+      interpolation
     );
-    const { symbol } = asset;
-    const interpolation = { amount, symbol };
-    if (marginMode === Schema.MarginMode.MARGIN_MODE_CROSS_MARGIN) {
-      marginChangeWarning = t(
-        'Changing the margin mode will move {{amount}} {{symbol}} from your general account to fund the position.',
-        interpolation
-      );
-    } else {
-      marginChangeWarning = t(
-        'Changing the margin mode and leverage will move {{amount}} {{symbol}} from your general account to fund the position.',
-        interpolation
-      );
-    }
   }
   return (
     <div className="mb-2">
-      {positionWarning && marginChangeWarning && (
-        <Notification
-          intent={Intent.Warning}
-          message={
-            <>
-              <p>{positionWarning}</p>
-              <p>{marginChangeWarning}</p>
-            </>
-          }
-        />
-      )}
-      <DealTicketMarginDetails
-        marginAccountBalance={marginAccountBalance}
-        generalAccountBalance={generalAccountBalance}
-        orderMarginAccountBalance={orderMarginAccountBalance}
-        assetSymbol={asset.symbol}
-        market={market}
-        positionEstimate={estimateMargin.estimatePosition}
-        side={
-          openVolume.startsWith('-')
-            ? Schema.Side.SIDE_SELL
-            : Schema.Side.SIDE_BUY
+      <Notification
+        intent={Intent.Warning}
+        message={
+          <>
+            <p>{positionWarning}</p>
+            <p>{marginChangeWarning}</p>
+          </>
         }
       />
     </div>

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

@@ -9,7 +9,7 @@ import type {
 } from '../hooks/use-form-values';
 import * as Schema from '@vegaprotocol/types';
 import { removeDecimal, toNanoSeconds } from '@vegaprotocol/utils';
-import { isPersistentOrder } from './time-in-force-persistence';
+import { isPersistentOrder } from './time-in-force-persistance';
 
 export const mapFormValuesToOrderSubmission = (
   order: OrderFormValues,

libs/deal-ticket/src/utils/time-in-force-persistance.spec.ts

@@ -2,9 +2,9 @@ import { OrderTimeInForce } from '@vegaprotocol/types';
 import {
   isNonPersistentOrder,
   isPersistentOrder,
-} from './time-in-force-persistence';
+} from './time-in-force-persistance';
 
-it('isNonPersistentOrder', () => {
+it('isNonPeristentOrder', () => {
   expect(isNonPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_FOK)).toBe(true);
   expect(isNonPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_IOC)).toBe(true);
   expect(isNonPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_GTC)).toBe(false);
@@ -13,7 +13,7 @@ it('isNonPersistentOrder', () => {
   expect(isNonPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_GFN)).toBe(false);
 });
 
-it('isPersistentOrder', () => {
+it('isPeristentOrder', () => {
   expect(isPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_FOK)).toBe(false);
   expect(isPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_IOC)).toBe(false);
   expect(isPersistentOrder(OrderTimeInForce.TIME_IN_FORCE_GTC)).toBe(true);

libs/environment/src/components/node-switcher/row-data.spec.tsx

@@ -23,6 +23,7 @@ import {
   SUBSCRIPTION_TIMEOUT,
   useNodeBasicStatus,
   useNodeSubscriptionStatus,
+  useResponseTime,
 } from './row-data';
 import { BLOCK_THRESHOLD, RowData } from './row-data';
 import { CUSTOM_NODE_KEY } from '../../types';
@@ -161,6 +162,19 @@ describe('useNodeBasicStatus', () => {
   });
 });
 
+describe('useResponseTime', () => {
+  it('returns response time when url is valid', () => {
+    const { result } = renderHook(() =>
+      useResponseTime('https://localhost:1234')
+    );
+    expect(result.current.responseTime).toBe(50);
+  });
+  it('does not return response time when url is invalid', () => {
+    const { result } = renderHook(() => useResponseTime('nope'));
+    expect(result.current.responseTime).toBeUndefined();
+  });
+});
+
 describe('RowData', () => {
   const props = {
     id: '0',

libs/environment/src/components/node-switcher/row-data.tsx

@@ -1,3 +1,4 @@
+import { isValidUrl } from '@vegaprotocol/utils';
 import { TradingRadio } from '@vegaprotocol/ui-toolkit';
 import { useEffect, useState } from 'react';
 import { CUSTOM_NODE_KEY } from '../../types';
@@ -7,7 +8,6 @@ import {
 } from '../../utils/__generated__/NodeCheck';
 import { LayoutCell } from './layout-cell';
 import { useT } from '../../use-t';
-import { useResponseTime } from '../../utils/time';
 
 export const POLL_INTERVAL = 1000;
 export const SUBSCRIPTION_TIMEOUT = 3000;
@@ -108,6 +108,20 @@ export const useNodeBasicStatus = () => {
   };
 };
 
+export const useResponseTime = (url: string, trigger?: unknown) => {
+  const [responseTime, setResponseTime] = useState<number>();
+  useEffect(() => {
+    if (!isValidUrl(url)) return;
+    if (typeof window.performance.getEntriesByName !== 'function') return; // protection for test environment
+    const requestUrl = new URL(url);
+    const requests = window.performance.getEntriesByName(requestUrl.href);
+    const { duration } =
+      (requests.length && requests[requests.length - 1]) || {};
+    setResponseTime(duration);
+  }, [url, trigger]);
+  return { responseTime };
+};
+
 export const RowData = ({
   id,
   url,

libs/environment/src/hooks/use-environment.spec.ts

@@ -10,7 +10,6 @@ import {
   getUserEnabledFeatureFlags,
   setUserEnabledFeatureFlag,
 } from './use-environment';
-import { canMeasureResponseTime, measureResponseTime } from '../utils/time';
 
 const noop = () => {
   /* no op*/
@@ -18,10 +17,6 @@ const noop = () => {
 
 jest.mock('@vegaprotocol/apollo-client');
 jest.mock('zustand');
-jest.mock('../utils/time');
-
-const mockCanMeasureResponseTime = canMeasureResponseTime as jest.Mock;
-const mockMeasureResponseTime = measureResponseTime as jest.Mock;
 
 const mockCreateClient = createClient as jest.Mock;
 const createDefaultMockClient = () => {
@@ -160,14 +155,6 @@ describe('useEnvironment', () => {
     const fastNode = 'https://api.n01.foo.vega.xyz';
     const fastWait = 1000;
     const nodes = [slowNode, fastNode];
-
-    mockCanMeasureResponseTime.mockImplementation(() => true);
-    mockMeasureResponseTime.mockImplementation((url: string) => {
-      if (url === slowNode) return slowWait;
-      if (url === fastNode) return fastWait;
-      return Infinity;
-    });
-
     // @ts-ignore: typscript doesn't recognise the mock implementation
     global.fetch.mockImplementation(setupFetch({ hosts: nodes }));
 
@@ -181,7 +168,7 @@ describe('useEnvironment', () => {
                 statistics: {
                   chainId: 'chain-id',
                   blockHeight: '100',
-                  vegaTime: new Date(1).toISOString(),
+                  vegaTime: new Date().toISOString(),
                 },
               },
             });
@@ -209,8 +196,7 @@ describe('useEnvironment', () => {
       expect(result.current.nodes).toEqual(nodes);
     });
 
-    jest.advanceTimersByTime(2000);
-    // jest.runAllTimers();
+    jest.runAllTimers();
 
     await waitFor(() => {
       expect(result.current.status).toEqual('success');

libs/environment/src/hooks/use-environment.ts

@@ -19,9 +19,6 @@ import { compileErrors } from '../utils/compile-errors';
 import { envSchema } from '../utils/validate-environment';
 import { tomlConfigSchema } from '../utils/validate-configuration';
 import uniq from 'lodash/uniq';
-import orderBy from 'lodash/orderBy';
-import first from 'lodash/first';
-import { canMeasureResponseTime, measureResponseTime } from '../utils/time';
 
 type Client = ReturnType<typeof createClient>;
 type ClientCollection = {
@@ -41,17 +38,8 @@ export type EnvStore = Env & Actions;
 
 const VERSION = 1;
 export const STORAGE_KEY = `vega_url_${VERSION}`;
-
-const QUERY_TIMEOUT = 3000;
 const SUBSCRIPTION_TIMEOUT = 3000;
 
-const raceAgainst = (timeout: number): Promise<false> =>
-  new Promise((resolve) => {
-    setTimeout(() => {
-      resolve(false);
-    }, timeout);
-  });
-
 /**
  * Fetch and validate a vega node configuration
  */
@@ -76,88 +64,53 @@ const fetchConfig = async (url?: string) => {
 const findNode = async (clients: ClientCollection): Promise<string | null> => {
   const tests = Object.entries(clients).map((args) => testNode(...args));
   try {
-    const nodes = await Promise.all(tests);
-    const responsiveNodes = nodes
-      .filter(([, q, s]) => q && s)
-      .map(([url, q]) => {
-        return {
-          url,
-          ...q,
-        };
-      });
-
-    // more recent and faster at the top
-    const ordered = orderBy(
-      responsiveNodes,
-      [(n) => n.blockHeight, (n) => n.vegaTime, (n) => n.responseTime],
-      ['desc', 'desc', 'asc']
-    );
-
-    const best = first(ordered);
-    return best ? best.url : null;
-  } catch (err) {
+    const url = await Promise.any(tests);
+    return url;
+  } catch {
     // All tests rejected, no suitable node found
     return null;
   }
 };
 
-type Maybe<T> = T | false;
-type QueryTestResult = {
-  blockHeight: number;
-  vegaTime: Date;
-  responseTime: number;
-};
-type SubscriptionTestResult = true;
-type NodeTestResult = [
-  /** url */
-  string,
-  Maybe<QueryTestResult>,
-  Maybe<SubscriptionTestResult>
-];
 /**
  * Test a node for suitability for connection
  */
 const testNode = async (
   url: string,
   client: Client
-): Promise<NodeTestResult> => {
+): Promise<string | null> => {
   const results = await Promise.all([
-    testQuery(client, url),
+    // these promises will only resolve with true/false
+    testQuery(client),
     testSubscription(client),
   ]);
-  return [url, ...results];
+  if (results[0] && results[1]) {
+    return url;
+  }
+
+  const message = `Tests failed for node: ${url}`;
+  console.warn(message);
+
+  // throwing here will mean this tests is ignored and a different
+  // node that hopefully does resolve will fulfill the Promise.any
+  throw new Error(message);
 };
 
 /**
  * Run a test query on a client
  */
-const testQuery = (
-  client: Client,
-  url: string
-): Promise<Maybe<QueryTestResult>> => {
-  const test: Promise<Maybe<QueryTestResult>> = new Promise((resolve) =>
-    client
-      .query<NodeCheckQuery>({
-        query: NodeCheckDocument,
-      })
-      .then((result) => {
-        if (result && !result.error) {
-          const res = {
-            blockHeight: Number(result.data.statistics.blockHeight),
-            vegaTime: new Date(result.data.statistics.vegaTime),
-            // only after a request has been sent we can retrieve the response time
-            responseTime: canMeasureResponseTime(url)
-              ? measureResponseTime(url) || Infinity
-              : Infinity,
-          } as QueryTestResult;
-          resolve(res);
-        } else {
-          resolve(false);
-        }
-      })
-      .catch(() => resolve(false))
-  );
-  return Promise.race([test, raceAgainst(QUERY_TIMEOUT)]);
+const testQuery = async (client: Client) => {
+  try {
+    const result = await client.query<NodeCheckQuery>({
+      query: NodeCheckDocument,
+    });
+    if (!result || result.error) {
+      return false;
+    }
+    return true;
+  } catch (err) {
+    return false;
+  }
 };
 
 /**
@@ -165,9 +118,7 @@ const testQuery = (
  * that takes longer than SUBSCRIPTION_TIMEOUT ms to respond
  * is deemed a failure
  */
-const testSubscription = (
-  client: Client
-): Promise<Maybe<SubscriptionTestResult>> => {
+const testSubscription = (client: Client) => {
   return new Promise((resolve) => {
     const sub = client
       .subscribe<NodeCheckTimeUpdateSubscription>({

libs/environment/src/utils/time.spec.ts

@@ -1,22 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import { useResponseTime } from './time';
-
-const mockResponseTime = 50;
-global.performance.getEntriesByName = jest.fn().mockReturnValue([
-  {
-    duration: mockResponseTime,
-  },
-]);
-
-describe('useResponseTime', () => {
-  it('returns response time when url is valid', () => {
-    const { result } = renderHook(() =>
-      useResponseTime('https://localhost:1234')
-    );
-    expect(result.current.responseTime).toBe(50);
-  });
-  it('does not return response time when url is invalid', () => {
-    const { result } = renderHook(() => useResponseTime('nope'));
-    expect(result.current.responseTime).toBeUndefined();
-  });
-});

libs/environment/src/utils/time.ts

@@ -1,25 +0,0 @@
-import { isValidUrl } from '@vegaprotocol/utils';
-import { useEffect, useState } from 'react';
-
-export const useResponseTime = (url: string, trigger?: unknown) => {
-  const [responseTime, setResponseTime] = useState<number>();
-  useEffect(() => {
-    if (!canMeasureResponseTime(url)) return;
-    const duration = measureResponseTime(url);
-    setResponseTime(duration);
-  }, [url, trigger]);
-  return { responseTime };
-};
-
-export const canMeasureResponseTime = (url: string) => {
-  if (!isValidUrl(url)) return false;
-  if (typeof window.performance.getEntriesByName !== 'function') return false;
-  return true;
-};
-
-export const measureResponseTime = (url: string) => {
-  const requestUrl = new URL(url);
-  const requests = window.performance.getEntriesByName(requestUrl.href);
-  const { duration } = (requests.length && requests[requests.length - 1]) || {};
-  return duration;
-};

libs/i18n/src/locales/en/accounts.json

@@ -21,6 +21,7 @@
   "Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.": "Deposited on the network, but not allocated to a market. Free to use for placing orders or providing liquidity.",
   "Enter manually": "Enter manually",
   "From account": "From account",
+  "Include transfer fee": "Include transfer fee",
   "initial level": "initial level",
   "maintenance level": "maintenance level",
   "Margin health": "Margin health",
@@ -32,6 +33,7 @@
   "release level": "release level",
   "search level": "search level",
   "Select from wallet": "Select from wallet",
+  "The fee will be taken from the amount you are transferring.": "The fee will be taken from the amount you are transferring.",
   "The total amount of each asset on this key. Includes used and available collateral.": "The total amount of each asset on this key. Includes used and available collateral.",
   "The total amount taken from your account. The amount to be transferred plus the fee.": "The total amount taken from your account. The amount to be transferred plus the fee.",
   "The total amount to be transferred (without the fee)": "The total amount to be transferred (without the fee)",

libs/i18n/src/locales/en/trading.json

@@ -417,7 +417,6 @@
   "myVolume_other": "My volume (last {{count}} epochs)",
   "numberEpochs": "{{count}} epochs",
   "numberEpochs_one": "{{count}} epoch",
-  "Rewards earned": "Rewards earned",
   "Rewards paid out": "Rewards paid out",
   "{{reward}}x": "{{reward}}x",
   "userActive": "{{active}} trader: {{count}} epochs so far",
@@ -432,19 +431,5 @@
   "{{assetSymbol}} Reward pot": "{{assetSymbol}} Reward pot",
   "{{checkedAssets}} Assets": "{{checkedAssets}} Assets",
   "{{distance}} ago": "{{distance}} ago",
-  "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision",
-  "My team": "My team",
-  "Profile": "Profile",
-  "Last {{games}} games result_one": "Last game result",
-  "Last {{games}} games result_other": "Last {{games}} games result",
-  "Leaderboard": "Leaderboard",
-  "View all teams": "View all teams",
-  "Competitions": "Competitions",
-  "Be a team player! Participate in games and work together to rake in as much profit to win.": "Be a team player! Participate in games and work together to rake in as much profit to win.",
-  "Create a public team": "Create a public team",
-  "Create a private team": "Create a private team",
-  "Choose a team": "Choose a team",
-  "Join a team": "Join a team",
-  "Solo team / lone wolf": "Solo team / lone wolf",
-  "Choose a team to get involved": "Choose a team to get involved"
+  "{{instrumentCode}} liquidity provision": "{{instrumentCode}} liquidity provision"
 }

libs/markets/src/lib/components/last-24h-price-change/last-24h-price-change.tsx

@@ -18,15 +18,12 @@ interface Props {
   initialValue?: string[];
   isHeader?: boolean;
   noUpdate?: boolean;
-  // render prop for no price change
-  fallback?: React.ReactNode;
 }
 
 export const Last24hPriceChange = ({
   marketId,
   decimalPlaces,
   initialValue,
-  fallback,
 }: Props) => {
   const t = useT();
   const { oneDayCandles, error, fiveDaysCandles } = useCandles({
@@ -51,13 +48,13 @@ export const Last24hPriceChange = ({
           </span>
         }
       >
-        <span>{fallback}</span>
+        <span>-</span>
       </Tooltip>
     );
   }
 
   if (error || !isNumeric(decimalPlaces)) {
-    return <span>{fallback}</span>;
+    return <span>-</span>;
   }
 
   const candles = oneDayCandles?.map((c) => c.close) || initialValue || [];

libs/markets/src/lib/components/last-24h-volume/last-24h-volume.tsx

@@ -1,9 +1,5 @@
-import { calcCandleVolume, calcCandleVolumePrice } from '../../market-utils';
-import {
-  addDecimalsFormatNumber,
-  formatNumber,
-  isNumeric,
-} from '@vegaprotocol/utils';
+import { calcCandleVolume } from '../../market-utils';
+import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import { useCandles } from '../../hooks';
 import { useT } from '../../use-t';
@@ -13,17 +9,13 @@ interface Props {
   positionDecimalPlaces?: number;
   formatDecimals?: number;
   initialValue?: string;
-  marketDecimals?: number;
-  quoteUnit?: string;
 }
 
 export const Last24hVolume = ({
   marketId,
-  marketDecimals,
   positionDecimalPlaces,
   formatDecimals,
   initialValue,
-  quoteUnit,
 }: Props) => {
   const t = useT();
   const { oneDayCandles, fiveDaysCandles } = useCandles({
@@ -36,11 +28,6 @@ export const Last24hVolume = ({
     (!oneDayCandles || oneDayCandles?.length === 0)
   ) {
     const candleVolume = calcCandleVolume(fiveDaysCandles);
-    const candleVolumePrice = calcCandleVolumePrice(
-      fiveDaysCandles,
-      marketDecimals,
-      positionDecimalPlaces
-    );
     const candleVolumeValue =
       candleVolume && isNumeric(positionDecimalPlaces)
         ? addDecimalsFormatNumber(
@@ -55,8 +42,8 @@ export const Last24hVolume = ({
           <div>
             <span className="flex flex-col">
               {t(
-                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}} ({{candleVolumePrice}} {{quoteUnit}})',
-                { candleVolumeValue, candleVolumePrice, quoteUnit }
+                '24 hour change is unavailable at this time. The volume change in the last 120 hours is {{candleVolumeValue}}',
+                { candleVolumeValue }
               )}
             </span>
           </div>
@@ -70,18 +57,10 @@ export const Last24hVolume = ({
     ? calcCandleVolume(oneDayCandles)
     : initialValue;
 
-  const candleVolumePrice = oneDayCandles
-    ? calcCandleVolumePrice(
-        oneDayCandles,
-        marketDecimals,
-        positionDecimalPlaces
-      )
-    : initialValue;
-
   return (
     <Tooltip
       description={t(
-        'The total number of contracts traded in the last 24 hours. (Total value of contracts traded in the last 24 hours)'
+        'The total number of contracts traded in the last 24 hours.'
       )}
     >
       <span>
@@ -91,12 +70,7 @@ export const Last24hVolume = ({
               positionDecimalPlaces,
               formatDecimals
             )
-          : '-'}{' '}
-        (
-        {candleVolumePrice && isNumeric(positionDecimalPlaces)
-          ? formatNumber(candleVolumePrice, formatDecimals)
-          : '-'}{' '}
-        {quoteUnit})
+          : '-'}
       </span>
     </Tooltip>
   );

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

@@ -155,7 +155,6 @@ export const MarketVolumeInfoPanel = ({ market }: MarketInfoProps) => {
           <Last24hVolume
             marketId={market.id}
             positionDecimalPlaces={market.positionDecimalPlaces}
-            marketDecimals={market.decimalPlaces}
           />
         ),
         openInterest: dash(data?.openInterest),

libs/markets/src/lib/market-utils.spec.tsx

@@ -1,7 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import type { Market, MarketMaybeWithDataAndCandles } from './markets-provider';
 import {
-  calcCandleVolumePrice,
   calcTradedFactor,
   filterAndSortMarkets,
   sumFeesFactors,
@@ -146,31 +145,3 @@ describe('sumFeesFactors', () => {
     ).toEqual(0.6);
   });
 });
-
-describe('calcCandleVolumePrice', () => {
-  it('calculates the volume price', () => {
-    const candles = [
-      {
-        volume: '1000',
-        high: '100',
-        low: '10',
-        open: '15',
-        close: '90',
-        periodStart: '2022-05-18T13:08:27.693537312Z',
-      },
-      {
-        volume: '1000',
-        high: '100',
-        low: '10',
-        open: '15',
-        close: '90',
-        periodStart: '2022-05-18T14:08:27.693537312Z',
-      },
-    ];
-    const marketDecimals = 3;
-    const positionDecimalPlaces = 2;
-    expect(
-      calcCandleVolumePrice(candles, marketDecimals, positionDecimalPlaces)
-    ).toEqual('2');
-  });
-});

libs/markets/src/lib/market-utils.ts

@@ -1,8 +1,4 @@
-import {
-  addDecimal,
-  formatNumberPercentage,
-  toBigNum,
-} from '@vegaprotocol/utils';
+import { formatNumberPercentage, toBigNum } from '@vegaprotocol/utils';
 import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import orderBy from 'lodash/orderBy';
@@ -151,51 +147,10 @@ export const calcCandleHigh = (candles: Candle[]): string | undefined => {
     .toString();
 };
 
-/**
- * The total number of contracts traded in the last 24 hours.
- *
- * @param candles
- * @returns the volume of a given set of candles
- */
 export const calcCandleVolume = (candles: Candle[]): string | undefined =>
   candles &&
   candles.reduce((acc, c) => new BigNumber(acc).plus(c.volume).toString(), '0');
 
-/**
- * The total number of contracts traded in the last 24 hours. (Total value of contracts traded in the last 24 hours)
- * The volume is calculated as the sum of the product of the volume and the high price of each candle.
- * The result is formatted using positionDecimalPlaces to account for the position size.
- * The result is formatted using marketDecimals to account for the market precision.
- *
- * @param candles
- * @param marketDecimals
- * @param positionDecimalPlaces
- * @returns the volume (in quote price) of a given set of candles
- */
-export const calcCandleVolumePrice = (
-  candles: Candle[],
-  marketDecimals: number = 1,
-  positionDecimalPlaces: number = 1
-): string | undefined =>
-  candles &&
-  candles.reduce(
-    (acc, c) =>
-      new BigNumber(acc)
-        .plus(
-          BigNumber(addDecimal(c.volume, positionDecimalPlaces)).times(
-            addDecimal(c.high, marketDecimals)
-          )
-        )
-        .toString(),
-    '0'
-  );
-
-/**
- * Calculates the traded factor of a given market.
- *
- * @param m
- * @returns
- */
 export const calcTradedFactor = (m: MarketMaybeWithDataAndCandles) => {
   const volume = Number(calcCandleVolume(m.candles || []) || 0);
   const price = m.data?.markPrice ? Number(m.data.markPrice) : 0;

libs/positions/src/lib/Positions.graphql

@@ -67,6 +67,26 @@ query EstimatePosition(
     # we can set this variable to true so that we can format with market.decimalPlaces
     scaleLiquidationPriceToMarketDecimals: true
   ) {
+    margin {
+      worstCase {
+        maintenanceLevel
+        searchLevel
+        initialLevel
+        collateralReleaseLevel
+        marginMode
+        marginFactor
+        orderMarginLevel
+      }
+      bestCase {
+        maintenanceLevel
+        searchLevel
+        initialLevel
+        collateralReleaseLevel
+        marginMode
+        marginFactor
+        orderMarginLevel
+      }
+    }
     collateralIncreaseEstimate {
       worstCase
       bestCase

libs/positions/src/lib/__generated__/Positions.ts

@@ -33,7 +33,7 @@ export type EstimatePositionQueryVariables = Types.Exact<{
 }>;
 
 
-export type EstimatePositionQuery = { __typename?: 'Query', estimatePosition?: { __typename?: 'PositionEstimate', collateralIncreaseEstimate: { __typename?: 'CollateralIncreaseEstimate', worstCase: string, bestCase: string }, liquidation?: { __typename?: 'LiquidationEstimate', worstCase: { __typename?: 'LiquidationPrice', open_volume_only: string, including_buy_orders: string, including_sell_orders: string }, bestCase: { __typename?: 'LiquidationPrice', open_volume_only: string, including_buy_orders: string, including_sell_orders: string } } | null } | null };
+export type EstimatePositionQuery = { __typename?: 'Query', estimatePosition?: { __typename?: 'PositionEstimate', margin: { __typename?: 'MarginEstimate', worstCase: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, marginMode: Types.MarginMode, marginFactor: string, orderMarginLevel: string }, bestCase: { __typename?: 'MarginLevels', maintenanceLevel: string, searchLevel: string, initialLevel: string, collateralReleaseLevel: string, marginMode: Types.MarginMode, marginFactor: string, orderMarginLevel: string } }, collateralIncreaseEstimate: { __typename?: 'CollateralIncreaseEstimate', worstCase: string, bestCase: string }, liquidation?: { __typename?: 'LiquidationEstimate', worstCase: { __typename?: 'LiquidationPrice', open_volume_only: string, including_buy_orders: string, including_sell_orders: string }, bestCase: { __typename?: 'LiquidationPrice', open_volume_only: string, including_buy_orders: string, including_sell_orders: string } } | null } | null };
 
 export const PositionFieldsFragmentDoc = gql`
     fragment PositionFields on Position {
@@ -144,6 +144,26 @@ export const EstimatePositionDocument = gql`
     includeCollateralIncreaseInAvailableCollateral: $includeCollateralIncreaseInAvailableCollateral
     scaleLiquidationPriceToMarketDecimals: true
   ) {
+    margin {
+      worstCase {
+        maintenanceLevel
+        searchLevel
+        initialLevel
+        collateralReleaseLevel
+        marginMode
+        marginFactor
+        orderMarginLevel
+      }
+      bestCase {
+        maintenanceLevel
+        searchLevel
+        initialLevel
+        collateralReleaseLevel
+        marginMode
+        marginFactor
+        orderMarginLevel
+      }
+    }
     collateralIncreaseEstimate {
       worstCase
       bestCase

libs/positions/src/lib/estimate-position.mock.ts

@@ -1,6 +1,7 @@
 import type { PartialDeep } from 'type-fest';
 import merge from 'lodash/merge';
 import type { EstimatePositionQuery } from './__generated__/Positions';
+import { MarginMode } from '@vegaprotocol/types';
 
 export const estimatePositionQuery = (
   override?: PartialDeep<EstimatePositionQuery>
@@ -8,6 +9,26 @@ export const estimatePositionQuery = (
   const defaultResult: EstimatePositionQuery = {
     estimatePosition: {
       __typename: 'PositionEstimate',
+      margin: {
+        bestCase: {
+          collateralReleaseLevel: '1000000',
+          initialLevel: '500000',
+          maintenanceLevel: '200000',
+          searchLevel: '300000',
+          marginFactor: '1',
+          orderMarginLevel: '0',
+          marginMode: MarginMode.MARGIN_MODE_CROSS_MARGIN,
+        },
+        worstCase: {
+          collateralReleaseLevel: '1100000',
+          initialLevel: '600000',
+          maintenanceLevel: '300000',
+          searchLevel: '400000',
+          marginFactor: '1',
+          orderMarginLevel: '0',
+          marginMode: MarginMode.MARGIN_MODE_CROSS_MARGIN,
+        },
+      },
       collateralIncreaseEstimate: {
         bestCase: '0',
         worstCase: '0',

libs/positions/src/lib/liquidation-price.spec.tsx

@@ -30,6 +30,26 @@ describe('LiquidationPrice', () => {
     result: {
       data: {
         estimatePosition: {
+          margin: {
+            worstCase: {
+              maintenanceLevel: '100',
+              searchLevel: '100',
+              initialLevel: '100',
+              collateralReleaseLevel: '100',
+              orderMarginLevel: '0',
+              marginFactor: '0',
+              marginMode: MarginMode.MARGIN_MODE_CROSS_MARGIN,
+            },
+            bestCase: {
+              maintenanceLevel: '100',
+              searchLevel: '100',
+              initialLevel: '100',
+              collateralReleaseLevel: '100',
+              orderMarginLevel: '0',
+              marginFactor: '0',
+              marginMode: MarginMode.MARGIN_MODE_CROSS_MARGIN,
+            },
+          },
           collateralIncreaseEstimate: {
             bestCase: '0',
             worstCase: '0',

libs/trading-view/src/lib/trading-view.tsx

@@ -41,17 +41,16 @@ export const TradingView = ({
   const chartContainerRef = useRef<HTMLDivElement>(null);
   const widgetRef = useRef<IChartingLibraryWidget>();
 
+  const datafeed = useDatafeed();
+
   const prevMarketId = usePrevious(marketId);
   const prevTheme = usePrevious(theme);
 
-  const datafeed = useDatafeed(marketId);
-
   useEffect(() => {
     // Widget already created
     if (widgetRef.current !== undefined) {
       // Update the symbol if changed
       if (marketId !== prevMarketId) {
-        datafeed.setSymbol(marketId);
         widgetRef.current.setSymbol(
           marketId,
           (interval ? interval : '15') as TVResolutionString,