feat(trading): competition update team

feat(trading): competitions

.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 -s --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/.env

@@ -1,4 +1,5 @@
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.rocks
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
@@ -8,6 +9,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.capsule

@@ -1,5 +1,6 @@
 # App configuration variables
 NX_VEGA_ENV=CUSTOM
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/explorer/.env.devnet

@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml

apps/explorer/.env.mainnet

@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.vega.community/rest
+NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/

apps/explorer/.env.mainnet-mirror

@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
 NX_VEGA_ENV=MAINNET_MIRROR
 NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/

apps/explorer/.env.testnet

@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf

apps/explorer/.env.validators-testnet

@@ -4,6 +4,7 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/maste
 NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest

apps/explorer/.env.vegacapsule

@@ -3,6 +3,7 @@ NX_TENDERMINT_URL=http://localhost:26607/
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

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

@@ -0,0 +1,34 @@
+import React from 'react';
+
+import { DATA_SOURCES } from '../../../config';
+import Hash from '../hash';
+
+export enum EthExplorerLinkTypes {
+  block = 'block',
+  address = 'address',
+  tx = 'tx',
+}
+
+export type EthExplorerLinkProps = Partial<typeof HTMLAnchorElement> & {
+  id: string;
+  type: EthExplorerLinkTypes;
+};
+
+export const EthExplorerLink = ({
+  id,
+  type,
+  ...props
+}: EthExplorerLinkProps) => {
+  const link = `${DATA_SOURCES.ethExplorerUrl}/${type}/${id}`;
+  return (
+    <a
+      className="underline external font-mono"
+      target="_blank"
+      rel="noopener noreferrer"
+      {...props}
+      href={link}
+    >
+      <Hash text={id} />
+    </a>
+  );
+};

apps/explorer/src/app/components/links/external-explorer-link/external-chain-icon.tsx

@@ -1,34 +0,0 @@
-import type { ChainIdMapping } from './external-chain';
-import { SUPPORTED_CHAIN_IDS, SUPPORTED_CHAIN_LABELS } from './external-chain';
-
-export const SUPPORTED_CHAIN_ICON_URLS: ChainIdMapping = {
-  '1': '/assets/chain-eth-logo.svg',
-  '100': '/assets/chain-gno-logo.svg',
-  '42161': '/assets/chain-arb-logo.svg',
-  '11155111': '/assets/chain-eth-logo.svg',
-};
-
-export type ExternalChainIconProps = {
-  chainId?: string;
-};
-
-export const ExternalChainIcon = ({
-  // If chainID is not provided, default to a non-existent chain
-  chainId = '-1',
-}: ExternalChainIconProps) => {
-  if (SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    const url = SUPPORTED_CHAIN_ICON_URLS[chainId];
-    const alt = SUPPORTED_CHAIN_LABELS[chainId];
-
-    return (
-      <img
-        src={url}
-        className="inline-block w-4 h-4 mr-1 dark:invert"
-        alt={alt}
-        title={alt}
-      />
-    );
-  } else {
-    return null;
-  }
-};

apps/explorer/src/app/components/links/external-explorer-link/external-chain.ts

@@ -1,38 +0,0 @@
-export type ChainIdMapping = {
-  [K in typeof SUPPORTED_CHAIN_IDS[number]]: string;
-};
-export const SUPPORTED_CHAIN_IDS: string[] = ['1', '100', '42161', '11155111'];
-
-export const SUPPORTED_CHAIN_LABELS: ChainIdMapping = {
-  '1': 'Ethereum',
-  '100': 'Gnosis',
-  '42161': 'Arbitrum',
-  '11155111': 'Sepolia',
-};
-
-export function getExternalExplorerLink(chainId: string, type: string) {
-  if (SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    switch (chainId) {
-      case '1':
-        return 'https://etherscan.io';
-      case '100':
-        return 'https://gnosisscan.io';
-      case '42161':
-        return 'https://arbiscan.io';
-      case '11155111':
-        return 'https://sepolia.etherscan.io';
-      default:
-        return '#';
-    }
-  } else {
-    return '#';
-  }
-}
-
-export function getExternalChainLabel(chainId?: string) {
-  if (chainId && SUPPORTED_CHAIN_IDS.includes(chainId)) {
-    return SUPPORTED_CHAIN_LABELS[chainId];
-  } else {
-    return 'Custom Chain';
-  }
-}

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

@@ -1,41 +0,0 @@
-import Hash from '../hash';
-import { getExternalExplorerLink } from './external-chain';
-import { ExternalChainIcon } from './external-chain-icon';
-
-export enum EthExplorerLinkTypes {
-  block = 'block',
-  address = 'address',
-  tx = 'tx',
-}
-
-export type ExternalExplorerLinkProps = Partial<typeof HTMLAnchorElement> & {
-  id: string;
-  type: EthExplorerLinkTypes;
-  // Defaults to Ethereum Mainnet, as chain support was added late
-  chain?: string;
-  code?: boolean;
-};
-
-export const ExternalExplorerLink = ({
-  id,
-  type,
-  chain = '1',
-  code = false,
-  ...props
-}: ExternalExplorerLinkProps) => {
-  const link = `${getExternalExplorerLink(chain, type)}/${type}/${id}${
-    code ? '#code' : ''
-  }`;
-  return (
-    <a
-      className="underline external font-mono"
-      target="_blank"
-      rel="noopener noreferrer"
-      {...props}
-      href={link}
-    >
-      <ExternalChainIcon chainId={chain} />
-      <Hash text={id} />
-    </a>
-  );
-};

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/markets/market-details.tsx

@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
-  LiquidationStrategyInfoPanel,
   LiquidityPriceRangeInfoPanel,
   LiquiditySLAParametersInfoPanel,
   MarginScalingFactorsPanel,
@@ -95,8 +94,6 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
           </>
         )
       )}
-      <h2 className={headerClassName}>{t('Liquidation strategy')}</h2>
-      <LiquidationStrategyInfoPanel market={market} />
       <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
       <LiquidityMonitoringParametersInfoPanel market={market} />
       <h2 className={headerClassName}>{t('Liquidity price range')}</h2>

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/chain-events/tx-contract-call.tsx

@@ -1,10 +1,9 @@
 import { TableCell, TableRow } from '../../../table';
 import { t } from '@vegaprotocol/i18n';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '../../../links/external-explorer-link/external-chain';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 import type { components } from '../../../../../types/explorer';
 import { defaultAbiCoder, base64 } from 'ethers/lib/utils';
 import { BigNumber } from 'ethers';
@@ -45,10 +44,10 @@ export const TxDetailsContractCall = ({
     },
   });
 
-  if (!contractCall) {
+  if (!contractCall || !contractCall.result) {
     return null;
   }
-  const chainLabel = getExternalChainLabel(contractCall.sourceChainId);
+
   return (
     <>
       {contractCall.specId && (
@@ -65,12 +64,9 @@ export const TxDetailsContractCall = ({
       )}
       {contractCall.blockHeight && (
         <TableRow modifier="bordered">
+          <TableCell>{t('ETH block')}</TableCell>
           <TableCell>
-            {chainLabel} {t('block')}
-          </TableCell>
-          <TableCell>
-            <ExternalExplorerLink
-              chain={contractCall.sourceChainId}
+            <EthExplorerLink
               id={contractCall.blockHeight}
               type={EthExplorerLinkTypes.block}
             />
@@ -79,24 +75,14 @@ export const TxDetailsContractCall = ({
       )}
       {data?.oracleSpec?.dataSourceSpec && (
         <OracleEthSource
-          chain={contractCall.sourceChainId}
           sourceType={data.oracleSpec.dataSourceSpec.spec.data.sourceType}
         />
       )}
 
-      {contractCall.error && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Call error')}</TableCell>
-          <TableCell>{contractCall.error}</TableCell>
-        </TableRow>
-      )}
-
-      {contractCall.result && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Result')}</TableCell>
-          <TableCell>{decodeEthCallResult(contractCall.result)}</TableCell>
-        </TableRow>
-      )}
+      <TableRow modifier="bordered">
+        <TableCell>{t('Result')}</TableCell>
+        <TableCell>{decodeEthCallResult(contractCall.result)}</TableCell>
+      </TableRow>
     </>
   );
 };

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-limits-updated.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventErc20AssetLimitsUpdatedProps {
   assetLimitsUpdated: components['schemas']['vegaERC20AssetLimitsUpdated'];
@@ -42,7 +42,7 @@ export const TxDetailsChainEventErc20AssetLimitsUpdated = ({
       <TableRow modifier="bordered">
         <TableCell>{t('ERC20 asset')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={assetLimitsUpdated.sourceEthereumAddress}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-asset-list.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventErc20AssetListProps {
   assetList: components['schemas']['vegaERC20AssetList'];
@@ -32,7 +32,7 @@ export const TxDetailsChainEventErc20AssetList = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Source')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={assetList.assetSource}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-deposit.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink, PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventProps {
   deposit: components['schemas']['vegaERC20Deposit'];
@@ -36,7 +36,7 @@ export const TxDetailsChainEventDeposit = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Source')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={deposit.sourceEthereumAddress}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-erc20-withdrawal.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { AssetLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventWithdrawalProps {
   withdrawal: components['schemas']['vegaERC20Withdrawal'];
@@ -35,7 +35,7 @@ export const TxDetailsChainEventWithdrawal = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Recipient')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={withdrawal.targetEthereumAddress}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-deposit.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventStakeDepositProps {
   deposit: components['schemas']['vegaStakeDeposited'];
@@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeDeposit = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Source')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={deposit.ethereumAddress}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-remove.tsx

@@ -3,9 +3,9 @@ import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import { PartyLink } from '../../../links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventStakeRemoveProps {
   remove: components['schemas']['vegaStakeRemoved'];
@@ -39,7 +39,7 @@ export const TxDetailsChainEventStakeRemove = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Source')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={remove.ethereumAddress}
             type={EthExplorerLinkTypes.address}
           />

apps/explorer/src/app/components/txs/details/chain-events/tx-stake-totalsupply.tsx

@@ -3,9 +3,9 @@ import { t } from '@vegaprotocol/i18n';
 import { TableRow, TableCell } from '../../../table';
 import type { components } from '../../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../links/external-explorer-link/external-explorer-link';
+} from '../../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsChainEventStakeTotalSupplyProps {
   update: components['schemas']['vegaStakeTotalSupply'];
@@ -38,7 +38,7 @@ export const TxDetailsChainEventStakeTotalSupply = ({
       <TableRow modifier="bordered">
         <TableCell>{t('Source')}</TableCell>
         <TableCell>
-          <ExternalExplorerLink
+          <EthExplorerLink
             id={update.tokenAddress}
             type={EthExplorerLinkTypes.address}
           />

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/proposal/tx-update-party-profile.tsx

@@ -1,46 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { TxDetailsShared } from '../shared/tx-details-shared';
-import { TableWithTbody } from '../../../table';
-import type { components } from '../../../../../types/explorer';
-
-import type { BlockExplorerTransactionResult } from '../../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../../routes/blocks/tendermint-blocks-response';
-import { TableCell, TableRow } from '../../../table';
-
-type Update = components['schemas']['v1UpdatePartyProfile'];
-
-interface TxDetailsUpdatePartyProfileProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Party profiles can be an alias and arbitrary key/values pairs.
- * This component displays the alias, if any, but not the metadata. When there is
- * some wider usage, we can decide how to render it. For now, it's available in the
- * full TX details.
- */
-export const TxDetailsUpdatePartyProfile = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsUpdatePartyProfileProps) => {
-  if (!txData?.command.updatePartyProfile) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const update: Update = txData.command.updatePartyProfile;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {update.alias && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New alias')}</TableCell>
-          <TableCell>{update.alias}</TableCell>
-        </TableRow>
-      )}
-    </TableWithTbody>
-  );
-};

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx

@@ -41,7 +41,6 @@ const AccountType: Record<AccountTypes, string> = {
   ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY: 'Reward Return Volatility',
   ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING: 'Reward Validator Ranking',
   ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD: 'Pending Fee Referral Reward',
-  ACCOUNT_TYPE_ORDER_MARGIN: 'Order Margin',
 };
 
 interface TransferParticipantsProps {

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

@@ -32,9 +32,6 @@ import { TxDetailsCreateReferralSet } from './tx-create-referral-set';
 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';
-import { TxDetailsUpdatePartyProfile } from './proposal/tx-update-party-profile';
 
 interface TxDetailsWrapperProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -136,12 +133,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
       return TxDetailsApplyReferralCode;
     case 'Join Team':
       return TxDetailsJoinTeam;
-    case 'Update Margin Mode':
-      return TxDetailsUpdateMarginMode;
-    case 'Batch Proposal':
-      return TxBatchProposal;
-    case 'Update Party Profile':
-      return TxDetailsUpdatePartyProfile;
     default:
       return TxDetailsGeneric;
   }

apps/explorer/src/app/components/txs/details/tx-eth-key-rotate.tsx

@@ -5,9 +5,9 @@ import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { BlockLink } from '../../links';
 
 type EthKeyRotate = components['schemas']['v1EthereumKeyRotateSubmission'];
@@ -46,7 +46,7 @@ export const TxDetailsEthKeyRotate = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Old Address')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               type={EthExplorerLinkTypes.address}
               id={k.currentAddress}
             />
@@ -57,7 +57,7 @@ export const TxDetailsEthKeyRotate = ({
         <TableRow modifier="bordered">
           <TableCell>{t('New Address')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               type={EthExplorerLinkTypes.address}
               id={k.newAddress}
             />
@@ -68,7 +68,7 @@ export const TxDetailsEthKeyRotate = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Submitter address')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               type={EthExplorerLinkTypes.address}
               id={k.submitterAddress}
             />

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

@@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table';
 
 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { NodeLink } from '../../links';
 
 type Command = components['schemas']['v1IssueSignatures'];
@@ -57,7 +57,7 @@ export const TxDetailsIssueSignatures = ({
         <TableRow modifier="bordered">
           <TableCell>{t('ETH key')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               id={cmd.submitter}
               type={EthExplorerLinkTypes.address}
             />

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

@@ -6,9 +6,9 @@ import { TableRow, TableCell, TableWithTbody } from '../../table';
 
 import type { components } from '../../../../types/explorer';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { PartyLink } from '../../links';
 import Hash from '../../links/hash';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
@@ -72,7 +72,7 @@ export const TxDetailsNodeAnnounce = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Ethereum Address')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               type={EthExplorerLinkTypes.address}
               id={cmd.ethereumAddress}
             />

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

@@ -8,9 +8,9 @@ import { useExplorerNodeVoteQuery } from './__generated__/Node-vote';
 import { PartyLink } from '../../links';
 import { Time } from '../../time';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 
 interface TxDetailsNodeVoteProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -143,7 +143,7 @@ export function TxHash({ hash }: TxDetailsEthTxHashProps) {
     <TableRow modifier="bordered">
       <TableCell>Ethereum TX:</TableCell>
       <TableCell>
-        <ExternalExplorerLink id={hash} type={EthExplorerLinkTypes.tx} />
+        <EthExplorerLink id={hash} type={EthExplorerLinkTypes.tx} />
       </TableCell>
     </TableRow>
   );

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

@@ -8,7 +8,7 @@ import GovernanceAssetBalance from '../../asset-balance/governance-asset-balance
 import type { components } from '../../../../types/explorer';
 
 export const methodText: Record<
-  components['schemas']['v1UndelegateSubmissionMethod'],
+  components['schemas']['UndelegateSubmissionMethod'],
   string
 > = {
   METHOD_NOW: 'Immediate',

apps/explorer/src/app/components/txs/details/tx-update-margin-mode.tsx

@@ -1,60 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import type { components } from '../../../../types/explorer';
-import { MarketLink } from '../../links';
-
-interface TxDetailsUpdateMarginModeProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-type Mode = components['schemas']['UpdateMarginModeMode'];
-
-const MarginModeLabels: Record<Mode, string> = {
-  MODE_CROSS_MARGIN: t('Cross margin'),
-  MODE_ISOLATED_MARGIN: t('Isolated margin'),
-  MODE_UNSPECIFIED: t('Unspecified'),
-};
-
-export const TxDetailsUpdateMarginMode = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsUpdateMarginModeProps) => {
-  if (!txData || !txData.command.updateMarginMode) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const u: components['schemas']['v1UpdateMarginMode'] =
-    txData.command.updateMarginMode;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      {u.marketId && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market ID')}</TableCell>
-          <TableCell>
-            <MarketLink id={u.marketId} />
-          </TableCell>
-        </TableRow>
-      )}
-      {u.mode && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('New margin mode')}</TableCell>
-          <TableCell>{MarginModeLabels[u.mode]}</TableCell>
-        </TableRow>
-      )}
-      {u.marginFactor && (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Margin factor')}</TableCell>
-          <TableCell>{u.marginFactor}</TableCell>
-        </TableRow>
-      )}
-    </TableWithTbody>
-  );
-};

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

@@ -4,9 +4,9 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../links/external-explorer-link/external-explorer-link';
+} from '../../links/eth-explorer-link/eth-explorer-link';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import AssetBalance from '../../asset-balance/asset-balance';
 import { useScrollToLocation } from '../../../hooks/scroll-to-location';
@@ -57,7 +57,7 @@ export const TxDetailsWithdrawSubmission = ({
         <TableRow modifier="bordered">
           <TableCell>{t('Recipient')}</TableCell>
           <TableCell>
-            <ExternalExplorerLink
+            <EthExplorerLink
               id={w.ext.erc20.receiverAddress}
               type={EthExplorerLinkTypes.address}
             />

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'
@@ -44,9 +43,7 @@ export type FilterOption =
   | 'Submit Order'
   | 'Transfer Funds'
   | 'Undelegate'
-  | 'Update Party Profile'
   | 'Update Referral Set'
-  | 'Update Margin Mode'
   | 'Validator Heartbeat'
   | 'Vote on Proposal'
   | 'Withdraw';
@@ -62,25 +59,17 @@ export const filterOptions: Record<string, FilterOption[]> = {
     'Stop Orders Submission',
     'Stop Orders Cancellation',
     'Submit Order',
-    'Update Margin Mode',
   ],
   'Transfers and Withdrawals': [
     'Transfer Funds',
     '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',
     'Join Team',
-    'Update Party Profile',
     'Update Referral Set',
   ],
   'External Data': ['Chain Event', 'Submit Oracle Data'],

apps/explorer/src/app/components/txs/tx-order-type.tsx

@@ -1,7 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
 import { VoteIcon } from '../vote-icon/vote-icon';
-import { ExternalChainIcon } from '../links/external-explorer-link/external-chain-icon';
 
 interface TxOrderTypeProps {
   orderType: string;
@@ -189,9 +188,6 @@ export function getLabelForChainEvent(
     }
     return t('Multisig update');
   } else if (chainEvent.contractCall) {
-    if (chainEvent.contractCall.error) {
-      return t('Call error');
-    }
     return t('Contract call');
   }
   return t('Chain Event');
@@ -261,11 +257,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
       data-testid="tx-type"
       className={`text-sm rounded-md leading-tight px-2 inline-block whitespace-nowrap ${colours}`}
     >
-      {command?.chainEvent && (
-        <ExternalChainIcon
-          chainId={command?.chainEvent?.contractCall?.sourceChainId}
-        />
-      )}
       {type}
     </div>
   );

apps/explorer/src/app/config/env.ts

@@ -14,6 +14,7 @@ export const ENV = {
     blockExplorerUrl: windowOrDefault('NX_BLOCK_EXPLORER'),
     tendermintUrl: windowOrDefault('NX_TENDERMINT_URL'),
     tendermintWebsocketUrl: windowOrDefault('NX_TENDERMINT_WEBSOCKET_URL'),
+    ethExplorerUrl: windowOrDefault('NX_ETHERSCAN_URL'),
     governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'),
     vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'),
   },

apps/explorer/src/app/routes/oracles/Oracles.graphql

@@ -78,7 +78,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                     }
                   }
                 }
-                sourceChainId
                 filters {
                   key {
                     name
@@ -119,7 +118,6 @@ fragment ExplorerOracleDataSource on OracleSpec {
                 address
                 requiredConfirmations
                 method
-                sourceChainId
                 filters {
                   key {
                     type

apps/explorer/src/app/routes/oracles/OraclesForMarkets.graphql

@@ -67,7 +67,6 @@ fragment ExplorerOracleDataSourceSpec on ExternalDataSourceSpec {
           sourceType {
             ... on EthCallSpec {
               address
-              sourceChainId
             }
             ... on DataSourceSpecConfiguration {
               signers {

apps/explorer/src/app/routes/oracles/__generated__/Oracles.ts

@@ -5,19 +5,19 @@ import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
 export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
 
-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
 
 export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
 
 export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{
   id: Types.Scalars['ID'];
 }>;
 
 
-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, sourceChainId: number, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
 
 export const ExplorerOracleDataConnectionFragmentDoc = gql`
     fragment ExplorerOracleDataConnection on OracleSpec {
@@ -101,7 +101,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                     }
                   }
                 }
-                sourceChainId
                 filters {
                   key {
                     name
@@ -142,7 +141,6 @@ export const ExplorerOracleDataSourceFragmentDoc = gql`
                 address
                 requiredConfirmations
                 method
-                sourceChainId
                 filters {
                   key {
                     type

apps/explorer/src/app/routes/oracles/__generated__/OraclesForMarkets.ts

@@ -9,12 +9,12 @@ export type ExplorerOracleFutureFragment = { __typename?: 'Future', dataSourceSp
 
 export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } };
 
-export type ExplorerOracleDataSourceSpecFragment = { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } };
+export type ExplorerOracleDataSourceSpecFragment = { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } };
 
 export type ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string, sourceChainId: number } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus } } | { __typename?: 'Spot' } } } } }> } | null, oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } | { __typename?: 'EthCallSpec', address: string } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null>, triggers: Array<{ __typename?: 'InternalTimeTrigger', initial?: number | null, every?: number | null } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
 
 export const ExplorerOracleFutureFragmentDoc = gql`
     fragment ExplorerOracleFuture on Future {
@@ -90,7 +90,6 @@ export const ExplorerOracleDataSourceSpecFragmentDoc = gql`
           sourceType {
             ... on EthCallSpec {
               address
-              sourceChainId
             }
             ... on DataSourceSpecConfiguration {
               signers {

apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx

@@ -28,7 +28,7 @@ export function isInternalSourceType(s: SourceType) {
 
 export function getExternalType(s: SourceType) {
   if (s.sourceType.__typename === 'EthCallSpec') {
-    return 'Contract Call';
+    return 'Ethereum Contract Call';
   } else {
     return 'External Data';
   }

apps/explorer/src/app/routes/oracles/components/oracle-eth-source.tsx

@@ -1,24 +1,18 @@
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import type { SourceType } from './oracle';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../components/links/external-explorer-link/external-explorer-link';
-import { getExternalChainLabel } from '../../../components/links/external-explorer-link/external-chain';
-import { t } from 'i18next';
+} from '../../../components/links/eth-explorer-link/eth-explorer-link';
 
 interface OracleDetailsEthSourceProps {
   sourceType: SourceType;
-  chain?: string;
 }
 /**
  * Given an Oracle that sources data from Ethereum, this component will render
  * a link to the smart contract and some basic details
  */
-export function OracleEthSource({
-  sourceType,
-  chain = '1',
-}: OracleDetailsEthSourceProps) {
+export function OracleEthSource({ sourceType }: OracleDetailsEthSourceProps) {
   if (
     sourceType.__typename !== 'DataSourceDefinitionExternal' ||
     sourceType.sourceType.__typename !== 'EthCallSpec'
@@ -32,20 +26,11 @@ export function OracleEthSource({
     return null;
   }
 
-  const chainLabel = getExternalChainLabel(chain);
-
   return (
     <TableRow modifier="bordered">
-      <TableHeader scope="row">
-        {chainLabel} {t('Contract')}
-      </TableHeader>
+      <TableHeader scope="row">Ethereum Contract</TableHeader>
       <TableCell modifier="bordered">
-        <ExternalExplorerLink
-          chain={chain}
-          id={address}
-          type={EthExplorerLinkTypes.address}
-          code={true}
-        />
+        <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />
         <span className="mx-3">&rArr;</span>
         <code>{sourceType.sourceType.method}</code>
       </TableCell>

apps/explorer/src/app/routes/oracles/components/oracle-signers.tsx

@@ -1,8 +1,8 @@
 import { PartyLink } from '../../../components/links';
 import {
-  ExternalExplorerLink,
+  EthExplorerLink,
   EthExplorerLinkTypes,
-} from '../../../components/links/external-explorer-link/external-explorer-link';
+} from '../../../components/links/eth-explorer-link/eth-explorer-link';
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import { remove0x } from '@vegaprotocol/utils';
 
@@ -37,15 +37,13 @@ export function getAddressLink(signer: Signer) {
   }
 
   if (signer.__typename === 'ETHAddress') {
-    return (
-      <ExternalExplorerLink id={address} type={EthExplorerLinkTypes.address} />
-    );
+    return <EthExplorerLink id={address} type={EthExplorerLinkTypes.address} />;
   } else if (signer.__typename === 'PubKey' && address.length !== 64) {
     // This is a hack: some older oracles were submitted before proper checks stopped
     // ETH addresses being returned as Vega addresses
     // Hacky 0x prefixing as a bonus
     return (
-      <ExternalExplorerLink
+      <EthExplorerLink
         id={`0x${remove0x(address)}`}
         type={EthExplorerLinkTypes.address}
       />
@@ -63,10 +61,7 @@ interface OracleDetailsSignersProps {
 
 /**
  * Given an Oracle, this component will render either a link to Ethereum
- * or the Vega party depending on which type is specified.
- *
- * Note that this won't be shown for external contract calls as they do not
- * have a signer in the same way.
+ * or the Vega party depending on which type is specified
  */
 export function OracleSigners({ sourceType }: OracleDetailsSignersProps) {
   if (sourceType.__typename !== 'DataSourceDefinitionExternal') {

apps/explorer/src/app/routes/oracles/components/oracle.tsx

@@ -42,11 +42,6 @@ export const OracleDetails = ({
   dataConnection,
 }: OracleDetailsProps) => {
   const sourceType = dataSource.dataSourceSpec.spec.data.sourceType;
-  const chain =
-    dataSource.dataSourceSpec.spec.data.sourceType.sourceType.__typename ===
-    'EthCallSpec'
-      ? dataSource.dataSourceSpec.spec.data.sourceType.sourceType.sourceChainId.toString()
-      : undefined;
 
   return (
     <div>
@@ -65,7 +60,7 @@ export const OracleDetails = ({
           </TableCell>
         </TableRow>
         <OracleSigners sourceType={sourceType} />
-        <OracleEthSource sourceType={sourceType} chain={chain} />
+        <OracleEthSource sourceType={sourceType} />
         <OracleMarkets id={id} />
         <TableRow modifier="bordered">
           <TableHeader scope="row">{t('Filter')}</TableHeader>

apps/explorer/src/assets/chain-arb-logo.svg

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-	.st1{fill:#213147;}
-	.st2{fill:#12AAFF;}
-	.st3{fill:#9DCCED;}
-	.st4{fill:#FFFFFF;}
-</style>
-<g id="Layer_x0020_1">
-	<g id="_2405588477232">
-		<rect class="st0" width="2500" height="2500"></rect>
-		<g>
-			<g>
-				<path class="st1" d="M226,760v980c0,63,33,120,88,152l849,490c54,31,121,31,175,0l849-490c54-31,88-89,88-152V760      c0-63-33-120-88-152l-849-490c-54-31-121-31-175,0L314,608c-54,31-87,89-87,152H226z"></path>
-				<g>
-					<g>
-						<g>
-							<path class="st2" d="M1435,1440l-121,332c-3,9-3,19,0,29l208,571l241-139l-289-793C1467,1422,1442,1422,1435,1440z"></path>
-						</g>
-						<g>
-							<path class="st2" d="M1678,882c-7-18-32-18-39,0l-121,332c-3,9-3,19,0,29l341,935l241-139L1678,883V882z"></path>
-						</g>
-					</g>
-				</g>
-				<g>
-					<path class="st3" d="M1250,155c6,0,12,2,17,5l918,530c11,6,17,18,17,30v1060c0,12-7,24-17,30l-918,530c-5,3-11,5-17,5       s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12,7-24,17-30l918-530c5-3,11-5,17-5l0,0V155z M1250,0c-33,0-65,8-95,25L237,555       c-59,34-95,96-95,164v1060c0,68,36,130,95,164l918,530c29,17,62,25,95,25s65-8,95-25l918-530c59-34,95-96,95-164V719       c0-68-36-130-95-164L1344,25c-29-17-62-25-95-25l0,0H1250z"></path>
-				</g>
-				<polygon class="st1" points="642,2179 727,1947 897,2088 738,2234     "></polygon>
-				<g>
-					<path class="st4" d="M1172,644H939c-17,0-33,11-39,27L401,2039l241,139l550-1507c5-14-5-28-19-28L1172,644z"></path>
-					<path class="st4" d="M1580,644h-233c-17,0-33,11-39,27L738,2233l241,139l620-1701c5-14-5-28-19-28V644z"></path>
-				</g>
-			</g>
-		</g>
-	</g>
-</g>
-</svg>

apps/explorer/src/assets/chain-dcn-logo.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><g fill="none" fill-rule="evenodd"><circle cx="16" cy="16" r="16" fill="#136485"/><path fill="#FFF" d="M10.436 31.006a16.008 16.008 0 0 1-5.604-3.548l.147-.257c2.388-3.773 4.533-7.678 6.148-11.85 1.713-4.425 3.084-8.967 4.39-13.527.117-.407.256-.807.384-1.21.138.158.188.305.23.454.82 2.926 1.613 5.86 2.464 8.776 1.55 5.313 3.73 10.353 6.617 15.077.337.55.91 1.472 1.72 2.762a15.988 15.988 0 0 1-6.035 3.554 4320.193 4320.193 0 0 0-5.002-15.17l-.154-.002c-1.166 3.277-2.934 8.257-5.305 14.941zM16.075.049h-.124L16 0l.075.049z"/></g></svg>

apps/explorer/src/assets/chain-eth-logo.svg

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Creator: CorelDRAW 2019 (64-Bit) -->
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="100%" height="100%" version="1.1" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"
-viewBox="0 0 784.37 1277.39"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
- <g id="Layer_x0020_1">
-  <metadata id="CorelCorpID_0Corel-Layer"/>
-  <g id="_1421394342400">
-   <g>
-    <polygon fill="#343434" fill-rule="nonzero" points="392.07,0 383.5,29.11 383.5,873.74 392.07,882.29 784.13,650.54 "/>
-    <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,0 -0,650.54 392.07,882.29 392.07,472.33 "/>
-    <polygon fill="#3C3C3B" fill-rule="nonzero" points="392.07,956.52 387.24,962.41 387.24,1263.28 392.07,1277.38 784.37,724.89 "/>
-    <polygon fill="#8C8C8C" fill-rule="nonzero" points="392.07,1277.38 392.07,956.52 -0,724.89 "/>
-    <polygon fill="#141414" fill-rule="nonzero" points="392.07,882.29 784.13,650.54 392.07,472.33 "/>
-    <polygon fill="#393939" fill-rule="nonzero" points="0,650.54 392.07,882.29 392.07,472.33 "/>
-   </g>
-  </g>
- </g>
-</svg>

apps/explorer/src/assets/chain-gno-logo.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 26.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 428 428" style="enable-background:new 0 0 428 428;" xml:space="preserve">
-<path style="fill:#00193C;" d="M125.8,243.7c12.3,0,24.3-4.1,34-11.6l-78-78c-18.8,24.3-14.3,59.3,10,78.1
-	C101.6,239.6,113.5,243.7,125.8,243.7L125.8,243.7z"/>
-<path style="fill:#00193C;" d="M357.8,188c0-12.3-4.1-24.3-11.6-34l-78,78c24.3,18.8,59.2,14.3,78-10
-	C353.7,212.3,357.8,200.3,357.8,188z"/>
-<path style="fill:#00193C;" d="M397.1,103.1l-34.5,34.5c27.8,33.3,23.4,82.9-9.9,110.7c-29.2,24.4-71.6,24.4-100.8,0L214,286.2
-	l-37.8-37.8c-33.3,27.8-82.9,23.4-110.7-9.9c-24.4-29.2-24.4-71.6,0-100.8L47.8,120L31,103.1C10.7,136.5,0,174.9,0,214
-	c0,118.2,95.8,214,214,214s214-95.8,214-214C428.1,174.9,417.3,136.5,397.1,103.1z"/>
-<path style="fill:#00193C;" d="M368.8,66.3c-81.5-85.5-216.9-88.7-302.4-7.2c-2.5,2.4-4.9,4.8-7.2,7.2c-5.3,5.6-10.3,11.4-15,17.5
-	L214,253.7L383.8,83.8C379.2,77.7,374.1,71.9,368.8,66.3z M214,28c50,0,96.6,19.3,131.6,54.5L214,214.1L82.4,82.5
-	C117.4,47.3,164,28,214,28z"/>
-</svg>

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/explorer/src/types/explorer.d.ts

@@ -28,7 +28,7 @@ export interface paths {
   '/transactions': {
     /**
      * List transactions
-     * @description List transactions from the Vega blockchain from the newest to the oldest transactions.
+     * @description List transactions from the Vega blockchain
      */
     get: operations['BlockExplorer_ListTransactions'];
   };
@@ -117,31 +117,15 @@ export interface components {
       | 'EXPIRY_STRATEGY_CANCELS'
       | 'EXPIRY_STRATEGY_SUBMIT';
     /**
-     * - SIZE_OVERRIDE_SETTING_UNSPECIFIED: Never valid
-     *  - SIZE_OVERRIDE_SETTING_NONE: No override, the size within the contained normal order submission will be used
-     *  - SIZE_OVERRIDE_SETTING_POSITION: Use the total position of the trader
-     * @default SIZE_OVERRIDE_SETTING_UNSPECIFIED
+     * @description  - METHOD_NOW: Undelegate straight away, losing all rewards for the current epoch.
+     *  - METHOD_AT_END_OF_EPOCH: Undelegate at the end of an epoch, retaining all rewards for the current epoch.
+     * @default METHOD_UNSPECIFIED
      * @enum {string}
      */
-    readonly StopOrderSizeOverrideSetting:
-      | 'SIZE_OVERRIDE_SETTING_UNSPECIFIED'
-      | 'SIZE_OVERRIDE_SETTING_NONE'
-      | 'SIZE_OVERRIDE_SETTING_POSITION';
-    readonly StopOrderSizeOverrideValue: {
-      /** Scaling percentage of the current position’s size */
-      readonly percentage?: string;
-    };
-    /**
-     * - MODE_UNSPECIFIED: Never valid.
-     *  - MODE_CROSS_MARGIN: Cross margin mode - margin is dynamically acquired and released as a position is marked to market
-     *  - MODE_ISOLATED_MARGIN: Isolated margin mode - margin for any newly opened position volume is transferred to the margin account when the trade is executed
-     * @default MODE_UNSPECIFIED
-     * @enum {string}
-     */
-    readonly UpdateMarginModeMode:
-      | 'MODE_UNSPECIFIED'
-      | 'MODE_CROSS_MARGIN'
-      | 'MODE_ISOLATED_MARGIN';
+    readonly UndelegateSubmissionMethod:
+      | 'METHOD_UNSPECIFIED'
+      | 'METHOD_NOW'
+      | 'METHOD_AT_END_OF_EPOCH';
     readonly blockexplorerapiv1Transaction: {
       /**
        * Height of the block the transaction was found in
@@ -323,30 +307,6 @@ export interface components {
       readonly stopOrdersSubmission?: readonly components['schemas']['v1StopOrdersSubmission'][];
       /** @description List of order submissions to be processed sequentially. */
       readonly submissions?: readonly components['schemas']['v1OrderSubmission'][];
-      /** Update margin mode instruction */
-      readonly updateMarginMode?: readonly components['schemas']['v1UpdateMarginMode'][];
-    };
-    /**
-     * @description Command that allows a token holder to submit a batch governance proposal that can be voted on by any other token holders, and eventually enacted on the Vega network.
-     * For example this command can be used to propose a new market and a network parameter change with it.
-     */
-    readonly v1BatchProposalSubmission: {
-      /** @description Rationale behind a proposal. */
-      readonly rationale?: components['schemas']['vegaProposalRationale'];
-      /** @description Arbitrary human-readable reference identifying the proposal. */
-      readonly reference?: string;
-      /** @description Proposal terms containing the type and details of the proposal, as well as time spans for voting and enactment. */
-      readonly terms?: components['schemas']['v1BatchProposalSubmissionTerms'];
-    };
-    /** Terms for a batch governance proposal submission */
-    readonly v1BatchProposalSubmissionTerms: {
-      /** @description List of individual changes included in the batch proposal. */
-      readonly changes?: readonly components['schemas']['vegaBatchProposalTermsChange'][];
-      /**
-       * Format: int64
-       * @description Closing timestamp in Unix time; adheres to `minClose` and `maxClose` limits.
-       */
-      readonly closingTimestamp?: string;
     };
     /** @description A validator command sent automatically that provides information of events that have happened on foreign chains. */
     readonly v1ChainEvent: {
@@ -387,12 +347,6 @@ export interface components {
       readonly team?: components['schemas']['v1CreateReferralSetTeam'];
     };
     readonly v1CreateReferralSetTeam: {
-      /**
-       * @description List of public keys that are allowed to join the team.
-       * Only applicable to closed teams. Removing a party from the allow list does not remove
-       * the party from the team.
-       */
-      readonly allowList?: readonly string[];
       /** @description External link to an avatar for the team. */
       readonly avatarUrl?: string;
       /** @description Whether or not the team is closed to new party members. */
@@ -478,8 +432,6 @@ export interface components {
       readonly applyReferralCode?: components['schemas']['v1ApplyReferralCode'];
       /** @description Command to submit a batch of order instructions. */
       readonly batchMarketInstructions?: components['schemas']['v1BatchMarketInstructions'];
-      /** @description Command to submit a batch governance proposal. */
-      readonly batchProposalSubmission?: components['schemas']['v1BatchProposalSubmission'];
       /**
        * Format: uint64
        * @description Block height which has been used to calculate the transaction proof-of-work.
@@ -497,8 +449,6 @@ export interface components {
       readonly ethereumKeyRotateSubmission?: components['schemas']['v1EthereumKeyRotateSubmission'];
       /** @description Command to request signatures to amend the multisig-control contract. */
       readonly issueSignatures?: components['schemas']['v1IssueSignatures'];
-      /** @description Command to join a team. */
-      readonly joinTeam?: components['schemas']['v1JoinTeam'];
       /** @description Validator command sent manually by a node operator to rotate their node's Vega keys. */
       readonly keyRotateSubmission?: components['schemas']['v1KeyRotateSubmission'];
       /** @description Command to amend a liquidity commitment. */
@@ -539,10 +489,6 @@ export interface components {
       readonly transfer?: components['schemas']['commandsv1Transfer'];
       /** @description Command to remove tokens delegated to a validator. */
       readonly undelegateSubmission?: components['schemas']['v1UndelegateSubmission'];
-      /** @description Command to update the margin mode of a party in a market. */
-      readonly updateMarginMode?: components['schemas']['v1UpdateMarginMode'];
-      /** @description Command to update a party's profile. */
-      readonly updatePartyProfile?: components['schemas']['v1UpdatePartyProfile'];
       /** @description Command to update a referral set. */
       readonly updateReferralSet?: components['schemas']['v1UpdateReferralSet'];
       /** @description Validator command sent automatically to signal regular participation in the network. */
@@ -579,11 +525,6 @@ export interface components {
       /** @description Node ID of the validator node that will be signed in or out of the smart contract. */
       readonly validatorNodeId?: string;
     };
-    /** @description Command that allows the submitter to join a team or change teams if they are already a member of a team. */
-    readonly v1JoinTeam: {
-      /** @description ID of the team to join, this is the same as the referral code used to generate the team. */
-      readonly id?: string;
-    };
     /** @description A validator command sent manually that allows a node operator to indicate to the network that their node's Vega key will be rotated. */
     readonly v1KeyRotateSubmission: {
       /** @description Hash of the node's current Vega public key. */
@@ -745,17 +686,6 @@ export interface components {
       readonly peggedReference?: components['schemas']['vegaPeggedReference'];
       /** @description New price for the order. This field is an unsigned integer scaled to the market's decimal places. */
       readonly price?: string;
-      /**
-       * Format: uint64
-       * @description New size for the order.
-       * Amending the size causes the size and remaining part of the order to be changed by the difference between the original and amended size.
-       * - Specifying a size smaller than the current size leaves the order at its current order book position.
-       * - Specifying a size larger than the current size removes and reinserts the order at the back of the price level.
-       * - Specifying a size that results in the remaining part of the order being reduced to zero cancels the order.
-       * This field is an unsigned integer scaled to the market's decimal places.
-       * If specified, size_delta must be set to 0.
-       */
-      readonly size?: string;
       /**
        * Format: int64
        * @description Amend the size for the order by the delta specified:
@@ -763,7 +693,6 @@ export interface components {
        * - To increase the size from the current value, set a positive integer value
        * - To leave the size unchanged set a value of zero
        * This field needs to be scaled using the market's position decimal places.
-       * If specified, size must not be set.
        */
       readonly sizeDelta?: string;
       /** @description New time in force for the order. */
@@ -934,10 +863,6 @@ export interface components {
       readonly orderSubmission?: components['schemas']['v1OrderSubmission'];
       /** @description Order will be submitted if the last traded price on the market breaches the given price. */
       readonly price?: string;
-      /** Indicates if this order is linked to an order or position to derive the order size */
-      readonly sizeOverrideSetting?: components['schemas']['StopOrderSizeOverrideSetting'];
-      /** If this order is linked to a position, provide an optional scaling factor */
-      readonly sizeOverrideValue?: components['schemas']['StopOrderSizeOverrideValue'];
       /** @description Order will be submitted if the last traded price has moved the given percent from the highest/lowest mark price since the stop order was submitted. */
       readonly trailingPercentOffset?: string;
     };
@@ -984,42 +909,10 @@ export interface components {
        */
       readonly amount?: string;
       /** @description Method of delegation. */
-      readonly method?: components['schemas']['v1UndelegateSubmissionMethod'];
+      readonly method?: components['schemas']['UndelegateSubmissionMethod'];
       /** @description Node ID to undelegate stake from. */
       readonly nodeId?: string;
     };
-    /**
-     * @description  - METHOD_NOW: Undelegate straight away, losing all rewards for the current epoch.
-     *  - METHOD_AT_END_OF_EPOCH: Undelegate at the end of an epoch, retaining all rewards for the current epoch.
-     * @default METHOD_UNSPECIFIED
-     * @enum {string}
-     */
-    readonly v1UndelegateSubmissionMethod:
-      | 'METHOD_UNSPECIFIED'
-      | 'METHOD_NOW'
-      | 'METHOD_AT_END_OF_EPOCH';
-    readonly v1UpdateMarginMode: {
-      /** Margin factor to use for margin in isolated mode. It is a multiplier that defines how much margin needs to be set aside */
-      readonly marginFactor?: string;
-      /** @description Market to change margin mode for. */
-      readonly marketId?: string;
-      /** @description Margin mode to use. */
-      readonly mode?: components['schemas']['UpdateMarginModeMode'];
-    };
-    /**
-     * @description Command to associate metadata to a public key, known as a party ID.
-     * Partial update is not supported, meaning previous values must be included in
-     * the update, otherwise they are removed.
-     */
-    readonly v1UpdatePartyProfile: {
-      /** @description Alias given to the party. It must be unique network-wide. */
-      readonly alias?: string;
-      /**
-       * @description Freeform data to associate to the party.
-       * Support a maximum of 10 entries.
-       */
-      readonly metadata?: readonly components['schemas']['vegaMetadata'][];
-    };
     /**
      * @description A command that allows the referrer of a referral set to update team details for a referral set.
      * Any field that is left unset or has a default value indicates that this field on the original referral set will be left unchanged.
@@ -1033,18 +926,9 @@ export interface components {
       readonly team?: components['schemas']['v1UpdateReferralSetTeam'];
     };
     readonly v1UpdateReferralSetTeam: {
-      /**
-       * @description List of public keys that are allowed to join the team.
-       * Only applicable to closed teams. Removing a party from the allow list does not remove
-       * the party from the team.
-       */
-      readonly allowList?: readonly string[];
       /** @description New link to an avatar for the team. */
       readonly avatarUrl?: string;
-      /**
-       * @description Whether or not the team is closed to new party members. When closed, only parties specified in the allow list can
-       * join the team.
-       */
+      /** @description Whether or not the team is closed to new party members. */
       readonly closed?: boolean;
       /** @description New name of the team. */
       readonly name?: string;
@@ -1130,7 +1014,6 @@ export interface components {
      *  - ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY: Per asset market reward account given for return volatility
      *  - ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING: Per asset market reward account given to validators by their ranking
      *  - ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD: Per asset account for pending fee referral reward payouts
-     *  - ACCOUNT_TYPE_ORDER_MARGIN: Per asset market account for party in isolated margin mode
      * @default ACCOUNT_TYPE_UNSPECIFIED
      * @enum {string}
      */
@@ -1162,8 +1045,7 @@ export interface components {
       | 'ACCOUNT_TYPE_REWARD_RELATIVE_RETURN'
       | 'ACCOUNT_TYPE_REWARD_RETURN_VOLATILITY'
       | 'ACCOUNT_TYPE_REWARD_VALIDATOR_RANKING'
-      | 'ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD'
-      | 'ACCOUNT_TYPE_ORDER_MARGIN';
+      | 'ACCOUNT_TYPE_PENDING_FEE_REFERRAL_REWARD';
     /** Vega representation of an external asset */
     readonly vegaAssetDetails: {
       /** @description Vega built-in asset. */
@@ -1189,42 +1071,6 @@ export interface components {
       /** @description Minimum economically meaningful amount in the asset. */
       readonly quantum?: string;
     };
-    /** Terms change for a batch governance proposal */
-    readonly vegaBatchProposalTermsChange: {
-      /** @description Proposal change to cancel a governance initiated transfe. */
-      readonly cancelTransfer?: components['schemas']['vegaCancelTransfer'];
-      /**
-       * Format: int64
-       * @description Timestamp as Unix time in seconds when proposal terms gets enacted if proposal passed the vote,
-       * constrained by `minEnact` and `maxEnact` network parameters.
-       */
-      readonly enactmentTimestamp?: string;
-      /**
-       * @description Proposal change for a freeform request, which can be voted on but does not change the behaviour of the system,
-       * and can be used to gauge community sentiment.
-       */
-      readonly newFreeform?: components['schemas']['vegaNewFreeform'];
-      /** @description Proposal change for creating new futures market. */
-      readonly newMarket?: components['schemas']['vegaNewMarket'];
-      /** @description Proposal change for creating new spot market. */
-      readonly newSpotMarket?: components['schemas']['vegaNewSpotMarket'];
-      /** @description Proposal change for a governance initiated transfer. */
-      readonly newTransfer?: components['schemas']['vegaNewTransfer'];
-      /** @description Proposal change for updating an asset. */
-      readonly updateAsset?: components['schemas']['vegaUpdateAsset'];
-      /** @description Proposal change for modifying an existing futures market. */
-      readonly updateMarket?: components['schemas']['vegaUpdateMarket'];
-      /** @description Proposal change for updating the state of a market. */
-      readonly updateMarketState?: components['schemas']['vegaUpdateMarketState'];
-      /** @description Proposal change for updating Vega network parameters. */
-      readonly updateNetworkParameter?: components['schemas']['vegaUpdateNetworkParameter'];
-      /** @description Proposal change for updating the referral program. */
-      readonly updateReferralProgram?: components['schemas']['vegaUpdateReferralProgram'];
-      /** @description Proposal change for modifying an existing spot market. */
-      readonly updateSpotMarket?: components['schemas']['vegaUpdateSpotMarket'];
-      /** @description Proposal change for updating the volume discount program. */
-      readonly updateVolumeDiscountProgram?: components['schemas']['vegaUpdateVolumeDiscountProgram'];
-    };
     readonly vegaBenefitTier: {
       /**
        * @description Required number of epochs a party must have been in a referral set to
@@ -1279,44 +1125,6 @@ export interface components {
       /** @description ID of the governance transfer proposal. */
       readonly transferId?: string;
     };
-    /** @description Mark price configuration parameters. */
-    readonly vegaCompositePriceConfiguration: {
-      /** @description Cash amount, in asset decimals, used for the calculation of the mark price from the order book. */
-      readonly cashAmount?: string;
-      /** @description Which method is used for the calculation of the composite price for the market. */
-      readonly compositePriceType?: components['schemas']['vegaCompositePriceType'];
-      /** @description Additional price sources to be used for index price calculation. */
-      readonly dataSourcesSpec?: readonly components['schemas']['vegaDataSourceDefinition'][];
-      /** List of each price source and its corresponding binding */
-      readonly dataSourcesSpecBinding?: readonly components['schemas']['vegaSpecBindingForCompositePrice'][];
-      /**
-       * Format: uint64
-       * @description Decay power used for the calculation of mark price.
-       */
-      readonly decayPower?: string;
-      /** @description Decay weight used for calculation of mark price. */
-      readonly decayWeight?: string;
-      /**
-       * @description For how long a price source is considered valid. One entry for each data source
-       * such that the first is for the trade based mark price, the second is for the book based price
-       * the third is for the first oracle, followed by more oracle data source staleness tolerance.
-       */
-      readonly sourceStalenessTolerance?: readonly string[];
-      /** @description Weights for each composite price data source. */
-      readonly sourceWeights?: readonly string[];
-    };
-    /**
-     * @description  - COMPOSITE_PRICE_TYPE_WEIGHTED: Composite price is calculated as a weighted average of the underlying mark prices.
-     *  - COMPOSITE_PRICE_TYPE_MEDIAN: Composite price is calculated as a median of the underlying mark prices.
-     *  - COMPOSITE_PRICE_TYPE_LAST_TRADE: Composite price is calculated as the last trade price.
-     * @default COMPOSITE_PRICE_TYPE_UNSPECIFIED
-     * @enum {string}
-     */
-    readonly vegaCompositePriceType:
-      | 'COMPOSITE_PRICE_TYPE_UNSPECIFIED'
-      | 'COMPOSITE_PRICE_TYPE_WEIGHTED'
-      | 'COMPOSITE_PRICE_TYPE_MEDIAN'
-      | 'COMPOSITE_PRICE_TYPE_LAST_TRADE';
     /**
      * @description Represents the top level object that handles data sources.
      * Data source definition can be external or internal, with whatever
@@ -1389,17 +1197,21 @@ export interface components {
       readonly tradingTerminationProperty?: string;
     };
     /**
-     * @description Describes which properties of the data source data is to be
-     * used for settlement.
+     * Describes which property of the data source data is to be
+     * used as settlement data and which to use as the trading terminated trigger
      */
     readonly vegaDataSourceSpecToPerpetualBinding: {
       /**
-       * @description Name of the property in the source data that should be used for settlement data.
-       * If it is set to "prices.BTC.value" for example, then the perpetual market will use the value of
-       * this property to get settlement data.
+       * @description Name of the property in the source data that should be used as settlement data.
+       * If it is set to "prices.BTC.value", then the perpetual market will use the value of
+       * this property as settlement data.
        */
       readonly settlementDataProperty?: string;
-      /** @description Name of the property in the source data that should be used to determine the perpetual's settlement schedule. */
+      /**
+       * @description Name of the property in the source data that should be used as settlement data.
+       * If it is set to "prices.BTC.value", then the perpetual market will use the value of
+       * this property as settlement data.
+       */
       readonly settlementScheduleProperty?: string;
     };
     /**
@@ -1681,11 +1493,6 @@ export interface components {
        * Format: uint64
        */
       readonly requiredConfirmations?: string;
-      /**
-       * Format: uint64
-       * @description The ID of the EVM based chain which is to be used to source the oracle data.
-       */
-      readonly sourceChainId?: string;
       /** @description Conditions for determining when to call the contract method. */
       readonly trigger?: components['schemas']['vegaEthCallTrigger'];
     };
@@ -1712,11 +1519,6 @@ export interface components {
        * @description Result of contract call, packed according to the ABI stored in the associated data source spec.
        */
       readonly result?: string;
-      /**
-       * Format: uint64
-       * @description Source chain for this chain event.
-       */
-      readonly sourceChainId?: string;
       /** @description ID of the data source spec that triggered this contract call. */
       readonly specId?: string;
     };
@@ -1795,42 +1597,6 @@ export interface components {
       readonly tolerance?: string;
       readonly value?: components['schemas']['vegaStateVarValue'];
     };
-    /** @description Liquidation strategy used when the network holds a position resulting from position resolution. */
-    readonly vegaLiquidationStrategy: {
-      /** @description Fraction of the open position the market will try to close in a single attempt; range 0 through 1. */
-      readonly disposalFraction?: string;
-      /**
-       * Format: int64
-       * @description Interval, in seconds, at which the network will attempt to close its position.
-       */
-      readonly disposalTimeStep?: string;
-      /**
-       * Format: uint64
-       * @description Size of the position that the network will try to close in a single attempt.
-       */
-      readonly fullDisposalSize?: string;
-      /** @description Max fraction of the total volume of the orderbook, within liquidity bounds, that the network can use to close its position; range 0 through 1. */
-      readonly maxFractionConsumed?: string;
-    };
-    /** @description Market settings that describe how the liquidity fee is calculated. */
-    readonly vegaLiquidityFeeSettings: {
-      /** @description Constant liquidity fee used when using the constant fee method. */
-      readonly feeConstant?: string;
-      /** @description Method used to calculate the market's liquidity fee. */
-      readonly method?: components['schemas']['vegaLiquidityFeeSettingsMethod'];
-    };
-    /**
-     * @description  - METHOD_MARGINAL_COST: Fee is the smallest value of all bids, such that liquidity providers with nominated fees less than or equal to this value still have sufficient commitment to fulfil the market's target stake.
-     *  - METHOD_WEIGHTED_AVERAGE: Fee is the weighted average of all liquidity providers' nominated fees, weighted by their committment.
-     *  - METHOD_CONSTANT: Fee is set by the market to a constant value irrespective of any liquidity provider's nominated fee.
-     * @default METHOD_UNSPECIFIED
-     * @enum {string}
-     */
-    readonly vegaLiquidityFeeSettingsMethod:
-      | 'METHOD_UNSPECIFIED'
-      | 'METHOD_MARGINAL_COST'
-      | 'METHOD_WEIGHTED_AVERAGE'
-      | 'METHOD_CONSTANT';
     /** LiquidityMonitoringParameters contains settings used for liquidity monitoring */
     readonly vegaLiquidityMonitoringParameters: {
       /**
@@ -1908,13 +1674,6 @@ export interface components {
     readonly vegaMatrixValue: {
       readonly value?: readonly components['schemas']['vegaVectorValue'][];
     };
-    /** @description Generic structure holding a key/value pair. */
-    readonly vegaMetadata: {
-      /** @description Key of the metadata. */
-      readonly key?: string;
-      /** @description Value of the metadata. */
-      readonly value?: string;
-    };
     /** Represents a network parameter on Vega */
     readonly vegaNetworkParameter: {
       /** @description Unique key of the network parameter. */
@@ -1949,10 +1708,6 @@ export interface components {
       readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
       /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
       readonly linearSlippageFactor?: string;
-      /** @description Liquidation strategy for this market. */
-      readonly liquidationStrategy?: components['schemas']['vegaLiquidationStrategy'];
-      /** @description Specifies how the liquidity fee for the market will be calculated. */
-      readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings'];
       /** @description Liquidity monitoring parameters. */
       readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters'];
       /** Liquidity SLA parameters */
@@ -1965,8 +1720,6 @@ export interface components {
        * price levels over which automated liquidity provisions will be deployed.
        */
       readonly lpPriceRange?: string;
-      /** @description Mark price configuration. */
-      readonly markPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration'];
       /** @description Optional new futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /**
@@ -1997,8 +1750,6 @@ export interface components {
       readonly decimalPlaces?: string;
       /** @description New spot market instrument configuration. */
       readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
-      /** @description Specifies how the liquidity fee for the market will be calculated. */
-      readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings'];
       /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
       readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
       /** @description Optional new spot market metadata, tags. */
@@ -2114,14 +1865,6 @@ export interface components {
       readonly dataSourceSpecForSettlementData?: components['schemas']['vegaDataSourceDefinition'];
       /** @description Data source spec describing the data source for settlement schedule. */
       readonly dataSourceSpecForSettlementSchedule?: components['schemas']['vegaDataSourceDefinition'];
-      /** @description Lower bound for the funding-rate such that the funding-rate will never be lower than this value. */
-      readonly fundingRateLowerBound?: string;
-      /** @description Factor applied to funding-rates. This scales the impact that spot price deviations have on funding payments. */
-      readonly fundingRateScalingFactor?: string;
-      /** @description Upper bound for the funding-rate such that the funding-rate will never be higher than this value. */
-      readonly fundingRateUpperBound?: string;
-      /** @description Composite price configuration to drive the calculation of the index price used for funding payments. If undefined the default mark price of the market is used. */
-      readonly indexPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration'];
       /** @description Continuously compounded interest rate used in funding rate calculation, in the range [-1, 1]. */
       readonly interestRate?: string;
       /** @description Controls how much the upcoming funding payment liability contributes to party's margin, in the range [0, 1]. */
@@ -2299,14 +2042,6 @@ export interface components {
        */
       readonly probabilityOfTrading?: number;
     };
-    /**
-     * @description Describes which property of the data source data is to be
-     * used for price source.
-     */
-    readonly vegaSpecBindingForCompositePrice: {
-      /** @description The property name of price. */
-      readonly priceSourceProperty?: string;
-    };
     /** Spot product configuration */
     readonly vegaSpotProduct: {
       /** @description Base asset ID. */
@@ -2437,8 +2172,6 @@ export interface components {
       readonly code?: string;
       /** @description Future. */
       readonly future?: components['schemas']['vegaUpdateFutureProduct'];
-      /** Instrument name */
-      readonly name?: string;
       /** @description Perpetual. */
       readonly perpetual?: components['schemas']['vegaUpdatePerpetualProduct'];
     };
@@ -2455,10 +2188,6 @@ export interface components {
       readonly instrument?: components['schemas']['vegaUpdateInstrumentConfiguration'];
       /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
       readonly linearSlippageFactor?: string;
-      /** Liquidation strategy parameters */
-      readonly liquidationStrategy?: components['schemas']['vegaLiquidationStrategy'];
-      /** @description Specifies how the liquidity fee for the market will be calculated. */
-      readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings'];
       /** @description Liquidity monitoring parameters. */
       readonly liquidityMonitoringParameters?: components['schemas']['vegaLiquidityMonitoringParameters'];
       /** Liquidity SLA parameters */
@@ -2471,8 +2200,6 @@ export interface components {
        * price levels over which automated liquidity provisions will be deployed.
        */
       readonly lpPriceRange?: string;
-      /** @description Mark price configuration. */
-      readonly markPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration'];
       /** @description Optional futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /** @description Price monitoring parameters. */
@@ -2511,14 +2238,6 @@ export interface components {
       readonly dataSourceSpecForSettlementData?: components['schemas']['vegaDataSourceDefinition'];
       /** @description Data source spec describing the data source for settlement schedule. */
       readonly dataSourceSpecForSettlementSchedule?: components['schemas']['vegaDataSourceDefinition'];
-      /** @description Lower bound for the funding-rate such that the funding-rate will never be lower than this value. */
-      readonly fundingRateLowerBound?: string;
-      /** @description Factor applied to funding-rates. This scales the impact that spot price deviations have on funding payments. */
-      readonly fundingRateScalingFactor?: string;
-      /** @description Upper bound for the funding-rate such that the funding-rate will never be higher than this value. */
-      readonly fundingRateUpperBound?: string;
-      /** @description Configuration for the index price used in funding payment calculation. */
-      readonly indexPriceConfiguration?: components['schemas']['vegaCompositePriceConfiguration'];
       /** @description Continuously compounded interest rate used in funding rate calculation, in the range [-1, 1]. */
       readonly interestRate?: string;
       /** @description Controls how much the upcoming funding payment liability contributes to party's margin, in the range [0, 1]. */
@@ -2539,8 +2258,6 @@ export interface components {
     };
     /** Configuration to update a spot market on Vega */
     readonly vegaUpdateSpotMarketConfiguration: {
-      /** @description Specifies how the liquidity fee for the market will be calculated. */
-      readonly liquidityFeeSettings?: components['schemas']['vegaLiquidityFeeSettings'];
       /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
       readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
       /** @description Optional spot market metadata, tags. */
@@ -2639,14 +2356,19 @@ export interface operations {
   };
   /**
    * List transactions
-   * @description List transactions from the Vega blockchain from the newest to the oldest transactions.
+   * @description List transactions from the Vega blockchain
    */
   BlockExplorer_ListTransactions: {
     parameters: {
       query?: {
-        /** @description Cursor to paginate the request. It can be used in conjunction with the `after` cursor. */
+        /**
+         * @description Number of transactions to be returned from the blockchain.
+         * This is deprecated, use first and last instead.
+         */
+        limit?: number;
+        /** @description Optional cursor to paginate the request. */
         before?: string;
-        /** @description Cursor to paginate the request. It can be used in conjunction with the `before` cursor. */
+        /** @description Optional cursor to paginate the request. */
         after?: string;
         /** @description Transaction command types filter, for listing transactions with specified command types. */
         cmdTypes?: readonly string[];
@@ -2655,19 +2377,13 @@ export interface operations {
         /** @description Party IDs filter, can be sender or receiver. */
         parties?: readonly string[];
         /**
-         * @description Number of transactions to be returned from the blockchain.
-         * Use in conjunction with the `after` cursor to paginate forwards. Paginating forwards means toward the most recent
-         * transactions.
-         * It cannot be used in conjunction with the `before` cursor.
-         * On its own, this will return the `first` most recent transactions.
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `after` cursor to paginate forwards.
+         * On its own, this will return the first `first` transactions.
          */
         first?: number;
         /**
-         * @description Number of transactions to be returned from the blockchain.
-         * Use in conjunction with the `before` cursor to paginate backwards. Paginating forwards means toward the least recent
-         * transactions.
-         * It cannot be used in conjunction with the `after` cursor.
-         * On its own, this will return the `last` oldest transactions.
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `before` cursor to paginate backwards.
+         * On its own, this will return the last `last` transactions.
          */
         last?: number;
       };

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

@@ -215,7 +215,7 @@ context(
     });
 
     // 3003-PMAN-001
-    it.skip(
+    it(
       'Able to submit valid new market proposal',
       // @ts-ignore clash between jest and cypress
       { tags: '@smoke' },

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/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -266,6 +266,7 @@ export const ProposalMarketData = ({
                 />
               </>
             ))}
+
             <h2 className={marketDataHeaderStyles}>
               {t('Liquidity monitoring parameters')}
             </h2>

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/.env

@@ -26,7 +26,6 @@ NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
 # NX_DISABLE_CLOSE_POSITION=false
-NX_TEAM_COMPETITION=true
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/trading/.env.devnet

@@ -28,8 +28,3 @@ NX_REFERRALS=true
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
-
-NX_TEAM_COMPETITION=true
-
-NX_CHARTING_LIBRARY_PATH=https://assets.vega.community/trading-view-bundle/v0.0.1/
-NX_CHARTING_LIBRARY_HASH=PDjWaqPFndDp+LCvqbKvntWriaqNzNpZ5i9R/BULzCg=

apps/trading/.env.mainnet

@@ -1,4 +1,4 @@
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.rpc.grove.city/v1/af6a2d529a11f8158bc8ca2a
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613

apps/trading/.env.testnet

@@ -26,7 +26,6 @@ NX_ISOLATED_MARGIN=true
 NX_ICEBERG_ORDERS=true
 NX_METAMASK_SNAPS=true
 NX_REFERRALS=true
-NX_TEAM_COMPETITION=true
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

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

@@ -1,10 +1,5 @@
-import { Link, useSearchParams } from 'react-router-dom';
-import {
-  Intent,
-  TradingAnchorButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { useSearchParams } from 'react-router-dom';
+import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
@@ -35,21 +30,8 @@ export const CompetitionsCreateTeam = () => {
       <LayoutWithGradient>
         <div className="mx-auto md:w-2/3 max-w-xl">
           <Box className="flex flex-col gap-4">
-            <Link
-              to={Links.COMPETITIONS()}
-              className="text-xs inline-flex items-center gap-1 group"
-            >
-              <VegaIcon
-                name={VegaIconNames.CHEVRON_LEFT}
-                size={12}
-                className="text-vega-clight-100 dark:text-vega-cdark-100"
-              />{' '}
-              <span className="group-hover:underline">
-                {t('Go back to the competitions')}
-              </span>
-            </Link>
             <h1 className="calt text-2xl lg:text-3xl xl:text-4xl">
-              {isSolo ? t('Create solo team') : t('Create a team')}
+              {t('Create a team')}
             </h1>
             {pubKey && !isReadOnly ? (
               <CreateTeamFormContainer isSolo={isSolo} />
@@ -89,29 +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 && (
           <>
-            <dl>
-              <dt className="text-sm">{t('Your team ID:')}</dt>
-              <dl>
-                <span
-                  className="font-mono break-all bg-rainbow bg-clip-text text-transparent text-2xl"
-                  data-testid="team-id-display"
-                >
-                  {code}
-                </span>
-              </dl>
-            </dl>
+            <p className="text-sm">
+              Your team ID is:{' '}
+              <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>
@@ -154,7 +125,7 @@ const CreateTeamFormContainer = ({ isSolo }: { isSolo: boolean }) => {
       onSubmit={onSubmit}
       status={status}
       err={err}
-      isCreatingSoloTeam={isSolo}
+      isSolo={isSolo}
     />
   );
 };

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();
@@ -33,14 +31,10 @@ export const CompetitionsHome = () => {
     currentEpoch,
   });
 
-  const { data: teamsData, loading: teamsLoading } = useTeams();
-
-  const {
-    team: myTeam,
-    stats: myTeamStats,
-    games: myTeamGames,
-    rank: myTeamRank,
-  } = useMyTeam();
+  const { data: teamsData, loading: teamsLoading } = useTeams({
+    sortByField: ['totalQuantumRewards'],
+    order: 'desc',
+  });
 
   return (
     <ErrorBoundary>
@@ -52,83 +46,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/competitions-team.tsx

@@ -38,11 +38,12 @@ export const CompetitionsTeam = () => {
 const TeamPageContainer = ({ teamId }: { teamId: string | undefined }) => {
   const t = useT();
   const { pubKey } = useVegaWallet();
-  const { data, team, partyTeam, stats, members, games, loading, refetch } =
-    useTeam(teamId, pubKey || undefined);
+  const { team, partyTeam, stats, members, games, loading, refetch } = useTeam(
+    teamId,
+    pubKey || undefined
+  );
 
-  // only show spinner on first load so when users join teams its smoother
-  if (!data && loading) {
+  if (loading) {
     return (
       <Splash>
         <Loader />
@@ -93,33 +94,18 @@ const TeamPage = ({
       <header className="flex gap-3 lg:gap-4 pt-5 lg:pt-10">
         <TeamAvatar teamId={team.teamId} imgUrl={team.avatarUrl} />
         <div className="flex flex-col items-start gap-1 lg:gap-3">
-          <h1
-            className="calt text-2xl lg:text-3xl xl:text-5xl"
-            data-testid="team-name"
-          >
-            {team.name}
-          </h1>
-          <div className="flex gap-2">
-            <JoinTeam team={team} partyTeam={partyTeam} refetch={refetch} />
-            <UpdateTeamButton team={team} />
-          </div>
+          <h1 className="calt text-2xl lg:text-3xl xl:text-5xl">{team.name}</h1>
+          <JoinTeam team={team} partyTeam={partyTeam} refetch={refetch} />
+          <UpdateTeamButton team={team} />
         </div>
       </header>
       <TeamStats stats={stats} members={members} games={games} />
       <section>
         <div className="flex gap-4 lg:gap-8 mb-4 border-b border-default">
-          <ToggleButton
-            active={showGames}
-            onClick={() => setShowGames(true)}
-            data-testid="games-toggle"
-          >
+          <ToggleButton active={showGames} onClick={() => setShowGames(true)}>
             {t('Games ({{count}})', { count: games ? games.length : 0 })}
           </ToggleButton>
-          <ToggleButton
-            active={!showGames}
-            onClick={() => setShowGames(false)}
-            data-testid="members-toggle"
-          >
+          <ToggleButton active={!showGames} onClick={() => setShowGames(false)}>
             {t('Members ({{count}})', {
               count: members ? members.length : 0,
             })}
@@ -145,22 +131,16 @@ const Games = ({ games }: { games?: TeamGame[] }) => {
         {
           name: 'epoch',
           displayName: t('Epoch'),
-          headerClassName: 'hidden md:table-cell',
-          className: 'hidden md:table-cell',
+          headerClassName: 'hidden md:block',
+          className: 'hidden md:block',
         },
         { name: 'type', displayName: t('Type') },
         { name: 'amount', displayName: t('Amount earned') },
         {
-          name: 'participatingTeams',
+          name: 'teams',
           displayName: t('No. of participating teams'),
-          headerClassName: 'hidden md:table-cell',
-          className: 'hidden md:table-cell',
-        },
-        {
-          name: 'participatingMembers',
-          displayName: t('No. of participating members'),
-          headerClassName: 'hidden md:table-cell',
-          className: 'hidden md:table-cell',
+          headerClassName: 'hidden md:block',
+          className: 'hidden md:block',
         },
       ]}
       data={games.map((game) => ({
@@ -168,8 +148,7 @@ const Games = ({ games }: { games?: TeamGame[] }) => {
         epoch: game.epoch,
         type: DispatchMetricLabels[game.team.rewardMetric as DispatchMetric],
         amount: formatNumber(game.team.totalRewardsEarned),
-        participatingTeams: game.entities.length,
-        participatingMembers: game.numberOfParticipants,
+        teams: game.numberOfParticipants,
       }))}
       noCollapse={true}
     />
@@ -185,10 +164,7 @@ const Members = ({ members }: { members?: Member[] }) => {
 
   const data = orderBy(
     members.map((m) => ({
-      referee: <RefereeLink pubkey={m.referee} isCreator={m.isCreator} />,
-      rewards: formatNumber(m.totalQuantumRewards),
-      volume: formatNumber(m.totalQuantumVolume),
-      gamesPlayed: formatNumber(m.totalGamesPlayed),
+      referee: <RefereeLink pubkey={m.referee} />,
       joinedAt: getDateTimeFormat().format(new Date(m.joinedAt)),
       joinedAtEpoch: Number(m.joinedAtEpoch),
     })),
@@ -199,10 +175,7 @@ const Members = ({ members }: { members?: Member[] }) => {
   return (
     <Table
       columns={[
-        { name: 'referee', displayName: t('Member ID') },
-        { name: 'rewards', displayName: t('Rewards earned') },
-        { name: 'volume', displayName: t('Total volume') },
-        { name: 'gamesPlayed', displayName: t('Games played') },
+        { name: 'referee', displayName: t('Referee') },
         {
           name: 'joinedAt',
           displayName: t('Joined at'),
@@ -218,24 +191,14 @@ const Members = ({ members }: { members?: Member[] }) => {
   );
 };
 
-const RefereeLink = ({
-  pubkey,
-  isCreator,
-}: {
-  pubkey: string;
-  isCreator: boolean;
-}) => {
-  const t = useT();
+const RefereeLink = ({ pubkey }: { pubkey: string }) => {
   const linkCreator = useLinks(DApp.Explorer);
   const link = linkCreator(EXPLORER_PARTIES.replace(':id', pubkey));
 
   return (
-    <>
-      <Link to={link} target="_blank" className="underline underline-offset-4">
-        {truncateMiddle(pubkey)}
-      </Link>{' '}
-      <span className="text-muted text-xs">{isCreator ? t('Owner') : ''}</span>
-    </>
+    <Link to={link} target="_blank" className="underline underline-offset-4">
+      {truncateMiddle(pubkey)}
+    </Link>
   );
 };
 

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

@@ -17,7 +17,10 @@ export const CompetitionsTeams = () => {
 
   usePageTitle([t('Competitions'), t('Teams')]);
 
-  const { data: teamsData, loading: teamsLoading } = useTeams();
+  const { data: teamsData, loading: teamsLoading } = useTeams({
+    sortByField: ['totalQuantumRewards'],
+    order: 'desc',
+  });
 
   const inputRef = useRef<HTMLInputElement>(null);
   const [filter, setFilter] = useState<string | null | undefined>(undefined);

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

@@ -3,14 +3,7 @@ import { usePageTitle } from '../../lib/hooks/use-page-title';
 import { Box } from '../../components/competitions/box';
 import { useT } from '../../lib/use-t';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import {
-  Intent,
-  Loader,
-  Splash,
-  TradingAnchorButton,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { RainbowButton } from '../../components/rainbow-button';
 import { Link, Navigate, useParams } from 'react-router-dom';
 import { Links } from '../../lib/links';
@@ -18,7 +11,6 @@ import { useReferralSetTransaction } from '../../lib/hooks/use-referral-set-tran
 import { type FormFields, TeamForm, TransactionType } from './team-form';
 import { useTeam } from '../../lib/hooks/use-team';
 import { LayoutWithGradient } from '../../components/layouts-inner';
-import { useEffect, useState } from 'react';
 
 export const CompetitionsUpdateTeam = () => {
   const t = useT();
@@ -37,19 +29,6 @@ export const CompetitionsUpdateTeam = () => {
       <LayoutWithGradient>
         <div className="mx-auto md:w-2/3 max-w-xl">
           <Box className="flex flex-col gap-4">
-            <Link
-              to={Links.COMPETITIONS_TEAM(teamId)}
-              className="text-xs inline-flex items-center gap-1 group"
-            >
-              <VegaIcon
-                name={VegaIconNames.CHEVRON_LEFT}
-                size={12}
-                className="text-vega-clight-100 dark:text-vega-cdark-100"
-              />{' '}
-              <span className="group-hover:underline">
-                {t('Go back to the team profile')}
-              </span>
-            </Link>
             <h1 className="calt text-2xl lg:text-3xl xl:text-5xl">
               {t('Update a team')}
             </h1>
@@ -78,8 +57,7 @@ const UpdateTeamFormContainer = ({
   pubKey: string;
 }) => {
   const t = useT();
-  const [refetching, setRefetching] = useState<boolean>(false);
-  const { team, loading, error, refetch } = useTeam(teamId, pubKey);
+  const { team, loading, error } = useTeam(teamId, pubKey);
 
   const { err, status, onSubmit } = useReferralSetTransaction({
     onSuccess: () => {
@@ -87,15 +65,7 @@ const UpdateTeamFormContainer = ({
     },
   });
 
-  // refetch when saved
-  useEffect(() => {
-    if (refetch && status === 'confirmed') {
-      refetch();
-      setRefetching(true);
-    }
-  }, [refetch, status]);
-
-  if (loading && !refetching) {
+  if (loading) {
     return <Loader size="small" />;
   }
   if (error) {
@@ -114,33 +84,6 @@ const UpdateTeamFormContainer = ({
     return <Navigate to={Links.COMPETITIONS_TEAM(teamId)} />;
   }
 
-  if (status === 'confirmed') {
-    return (
-      <div
-        className="flex flex-col items-start gap-2"
-        data-testid="team-creation-success-message"
-      >
-        <p className="text-sm">
-          <VegaIcon
-            name={VegaIconNames.TICK}
-            size={18}
-            className="text-vega-green-500"
-          />{' '}
-          {t('Changes successfully saved to your team.')}
-        </p>
-
-        <TradingAnchorButton
-          href={Links.COMPETITIONS_TEAM(teamId)}
-          intent={Intent.Info}
-          size="small"
-          data-testid="view-team-button"
-        >
-          {t('View team')}
-        </TradingAnchorButton>
-      </div>
-    );
-  }
-
   const defaultValues: FormFields = {
     id: team.teamId,
     name: team.name,
@@ -155,7 +98,7 @@ const UpdateTeamFormContainer = ({
       type={TransactionType.UpdateReferralSet}
       status={status}
       err={err}
-      isCreatingSoloTeam={team.closed}
+      isSolo={team.closed}
       onSubmit={onSubmit}
       defaultValues={defaultValues}
     />

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

@@ -6,7 +6,11 @@ import {
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
-import { useSimpleTransaction, useVegaWallet } from '@vegaprotocol/wallet';
+import {
+  useSimpleTransaction,
+  useVegaWallet,
+  type Status,
+} from '@vegaprotocol/wallet';
 import { useT } from '../../lib/use-t';
 import { type Team } from '../../lib/hooks/use-team';
 import { useState } from 'react';
@@ -23,8 +27,19 @@ export const JoinTeam = ({
   refetch: () => void;
 }) => {
   const { pubKey, isReadOnly } = useVegaWallet();
+  const { send, status } = useSimpleTransaction({
+    onSuccess: refetch,
+  });
   const [confirmDialog, setConfirmDialog] = useState<JoinType>();
 
+  const joinTeam = () => {
+    send({
+      joinTeam: {
+        id: team.teamId,
+      },
+    });
+  };
+
   return (
     <>
       <JoinButton
@@ -41,10 +56,11 @@ export const JoinTeam = ({
         {confirmDialog !== undefined && (
           <DialogContent
             type={confirmDialog}
+            status={status}
             team={team}
             partyTeam={partyTeam}
+            onConfirm={joinTeam}
             onCancel={() => setConfirmDialog(undefined)}
-            refetch={refetch}
           />
         )}
       </Dialog>
@@ -94,7 +110,7 @@ export const JoinButton = ({
       // Not creator of the team, but still can't switch because
       // creators cannot leave their own team
       return (
-        <Tooltip description={t('As a team creator, you cannot switch teams')}>
+        <Tooltip description="As a team creator, you cannot switch teams">
           <Button intent={Intent.Primary} disabled={true}>
             {t('Switch team')}{' '}
           </Button>
@@ -105,11 +121,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>
     );
@@ -137,39 +149,21 @@ export const JoinButton = ({
 
 const DialogContent = ({
   type,
+  status,
   team,
   partyTeam,
+  onConfirm,
   onCancel,
-  refetch,
 }: {
   type: JoinType;
+  status: Status;
   team: Team;
   partyTeam?: Team;
+  onConfirm: () => void;
   onCancel: () => void;
-  refetch: () => void;
 }) => {
   const t = useT();
 
-  const { send, status, error } = useSimpleTransaction({
-    onSuccess: refetch,
-  });
-
-  const joinTeam = () => {
-    send({
-      joinTeam: {
-        id: team.teamId,
-      },
-    });
-  };
-
-  if (error) {
-    return (
-      <p className="text-vega-red break-words first-letter:capitalize">
-        {error}
-      </p>
-    );
-  }
-
   if (status === 'requested') {
     return <p>{t('Confirm in wallet...')}</p>;
   }
@@ -219,11 +213,7 @@ const DialogContent = ({
         </>
       )}
       <div className="flex justify-between gap-2">
-        <Button
-          onClick={joinTeam}
-          intent={Intent.Success}
-          data-testid="confirm-switch-button"
-        >
+        <Button onClick={onConfirm} 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;
@@ -32,8 +28,8 @@ export type FormFields = {
 };
 
 export enum TransactionType {
-  CreateReferralSet = 'CreateReferralSet',
-  UpdateReferralSet = 'UpdateReferralSet',
+  CreateReferralSet,
+  UpdateReferralSet,
 }
 
 const prepareTransaction = (
@@ -79,14 +75,14 @@ export const TeamForm = ({
   type,
   status,
   err,
-  isCreatingSoloTeam,
+  isSolo,
   onSubmit,
   defaultValues,
 }: {
   type: TransactionType;
   status: ReturnType<typeof useReferralSetTransaction>['status'];
   err: ReturnType<typeof useReferralSetTransaction>['err'];
-  isCreatingSoloTeam: boolean;
+  isSolo: boolean;
   onSubmit: ReturnType<typeof useReferralSetTransaction>['onSubmit'];
   defaultValues?: FormFields;
 }) => {
@@ -100,7 +96,7 @@ export const TeamForm = ({
     formState: { errors },
   } = useForm<FormFields>({
     defaultValues: {
-      private: isCreatingSoloTeam,
+      private: isSolo,
       ...defaultValues,
     },
   });
@@ -113,14 +109,16 @@ export const TeamForm = ({
 
   return (
     <form onSubmit={handleSubmit(sendTransaction)}>
-      <input type="hidden" {...register('id')} />
+      <input
+        type="hidden"
+        {...register('id', {
+          disabled: true,
+        })}
+      />
       <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 +134,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,86 +153,66 @@ 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>
         )}
       </TradingFormGroup>
-      {
-        // allow changing to private/public if editing, but don't show these options if making a solo team
-        (type === TransactionType.UpdateReferralSet || !isCreatingSoloTeam) && (
-          <>
-            <TradingFormGroup
-              label={t('Make team private')}
-              labelFor="private"
-              hideLabel={true}
-            >
-              <Controller
-                name="private"
-                control={control}
-                render={({ field }) => {
-                  return (
-                    <TradingCheckbox
-                      label={t('Make team private')}
-                      checked={field.value}
-                      onCheckedChange={(value) => {
-                        field.onChange(value);
-                      }}
-                      data-testid="team-private-checkbox"
-                    />
-                  );
+      <TradingFormGroup
+        label={t('Make team private')}
+        labelFor="private"
+        hideLabel={true}
+      >
+        <Controller
+          name="private"
+          control={control}
+          render={({ field }) => {
+            return (
+              <TradingCheckbox
+                label={t('Make team private')}
+                checked={field.value}
+                onCheckedChange={(value) => {
+                  field.onChange(value);
                 }}
+                disabled={isSolo}
               />
-            </TradingFormGroup>
-            {isPrivate && (
-              <TradingFormGroup
-                label={t('Public key allow list')}
-                labelFor="allowList"
-                labelDescription={t(
-                  'Use a comma separated list to allow only specific public keys to join the team'
-                )}
-              >
-                <TextArea
-                  {...register('allowList', {
-                    required: t('Required'),
-                    validate: {
-                      allowList: (value) => {
-                        const publicKeys = parseAllowListText(value);
-                        if (
-                          publicKeys.every((pk) => isValidVegaPublicKey(pk))
-                        ) {
-                          return true;
-                        }
-                        return t('Invalid public key found in allow list');
-                      },
-                    },
-                  })}
-                  data-testid="team-allow-list-textarea"
-                />
-                {errors.allowList?.message && (
-                  <TradingInputError
-                    forInput="avatarUrl"
-                    data-testid="team-allow-list-error"
-                  >
-                    {errors.allowList.message}
-                  </TradingInputError>
-                )}
-              </TradingFormGroup>
-            )}
-          </>
-        )
-      }
-      {err && (
-        <p className="text-danger text-xs mb-4 first-letter:capitalize">
-          {err}
-        </p>
+            );
+          }}
+        />
+      </TradingFormGroup>
+      {isPrivate && (
+        <TradingFormGroup
+          label={t('Public key allow list')}
+          labelFor="allowList"
+          labelDescription={t(
+            'Use a comma separated list to allow only specific public keys to join the team'
+          )}
+        >
+          <TextArea
+            {...register('allowList', {
+              required: t('Required'),
+              disabled: isSolo,
+              validate: {
+                allowList: (value) => {
+                  const publicKeys = parseAllowListText(value);
+                  if (publicKeys.every((pk) => isValidVegaPublicKey(pk))) {
+                    return true;
+                  }
+                  return t('Invalid public key found in allow list');
+                },
+              },
+            })}
+          />
+          {errors.allowList?.message && (
+            <TradingInputError forInput="avatarUrl">
+              {errors.allowList.message}
+            </TradingInputError>
+          )}
+        </TradingFormGroup>
       )}
+      {err && <p className="text-danger text-xs mb-4 capitalize">{err}</p>}
       <SubmitButton type={type} status={status} />
     </form>
   );
@@ -256,61 +233,20 @@ 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>
   );
 };
 
-const parseAllowListText = (str: string = '') => {
+const parseAllowListText = (str: string) => {
   return str
     .split(',')
     .map((v) => v.trim())

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

@@ -1,30 +1,18 @@
-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'];
-}) => {
-  const t = useT();
+export const UpdateTeamButton = ({ team }: { team: Team }) => {
   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}
-      >
-        {t('Update team')}
-      </TradingAnchorButton>
+      />
     );
   }
 

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

@@ -1,20 +1,27 @@
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';
+import { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { FeesContainer } from '../../components/fees-container';
 import { useT } from '../../lib/use-t';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
+import { usePageTitleStore } from '../../stores';
 
 export const Fees = () => {
   const t = useT();
   const title = t('Fees');
-  usePageTitle(title);
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
+  useEffect(() => {
+    updateTitle(titlefy([title]));
+  }, [updateTitle, title]);
 
   return (
     <ErrorBoundary feature="fees">
-      <TinyScroll className="p-4 max-h-full overflow-auto">
-        <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
+      <div className="container p-4 mx-auto">
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
         <FeesContainer />
-      </TinyScroll>
+      </div>
     </ErrorBoundary>
   );
 };

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/markets-page.tsx

@@ -1,3 +1,5 @@
+import React, { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import {
   LocalStoragePersistTabs as Tabs,
   Tab,
@@ -5,6 +7,7 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { OpenMarkets } from './open-markets';
 import { Proposed } from './proposed';
+import { usePageTitleStore } from '../../stores';
 import { Closed } from './closed';
 import {
   DApp,
@@ -14,14 +17,19 @@ import {
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
 import { MarketsSettings } from './markets-settings';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
 
 export const MarketsPage = () => {
   const t = useT();
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
   const governanceLink = useLinks(DApp.Governance);
   const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
 
-  usePageTitle(t('Markets'));
+  useEffect(() => {
+    updateTitle(titlefy([t('Markets')]));
+  }, [updateTitle, t]);
 
   return (
     <div className="h-full pt-0.5 pb-3 px-1.5">

apps/trading/client-pages/markets/mobile-buttons.tsx

@@ -1,235 +0,0 @@
-import { Route, Routes } from 'react-router-dom';
-import {
-  Intent,
-  MobileActionsDropdown,
-  Tooltip,
-  TradingButton,
-  TradingDropdownItem,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { type BarView, ViewType, useSidebar } from '../../components/sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { useT } from '../../lib/use-t';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useEffect } from 'react';
-import classNames from 'classnames';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-
-const ViewInitializer = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
-  const { screenSize } = useScreenDimensions();
-  const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
-  useEffect(() => {
-    if (largeScreen && view === undefined) {
-      setViews({ type: ViewType.Order }, currentRouteId);
-    }
-  }, [setViews, view, currentRouteId, largeScreen]);
-  return null;
-};
-
-export const MarketsMobileSidebar = () => {
-  const t = useT();
-  const currentRouteId = useGetCurrentRouteId();
-  const { pubKeys, isReadOnly } = useVegaWallet();
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
-
-  return (
-    <Routes>
-      <Route
-        path=":marketId"
-        element={
-          <>
-            <ViewInitializer />
-            <div className="grid grid-cols-3 grow md:grow-0 md:flex lg:flex-col items-center gap-2 lg:gap-4 p-1">
-              {!pubKeys || isReadOnly ? (
-                <>
-                  <TradingButton
-                    intent={Intent.Primary}
-                    size="medium"
-                    onClick={() => {
-                      openVegaWalletDialog();
-                    }}
-                  >
-                    {t('Connect')}
-                  </TradingButton>
-                  <MobileButton
-                    view={ViewType.Order}
-                    tooltip={t('Trade')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileBarActionsDropdown currentRouteId={currentRouteId} />
-                </>
-              ) : (
-                <>
-                  <MobileButton
-                    view={ViewType.Order}
-                    tooltip={t('Trade')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileButton
-                    view={ViewType.Deposit}
-                    tooltip={t('Deposit')}
-                    routeId={currentRouteId}
-                  />
-                  <MobileBarActionsDropdown currentRouteId={currentRouteId} />
-                </>
-              )}
-            </div>
-          </>
-        }
-      />
-    </Routes>
-  );
-};
-
-export const MobileButton = ({
-  view,
-  tooltip: label,
-  disabled = false,
-  onClick,
-  routeId,
-}: {
-  view?: ViewType;
-  tooltip: string;
-  disabled?: boolean;
-  onClick?: () => void;
-  routeId: string;
-}) => {
-  const { setViews, getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
-  }));
-  const currView = getView(routeId);
-  const onSelect = (view: BarView['type']) => {
-    if (view === currView?.type) {
-      setViews(null, routeId);
-    } else {
-      setViews({ type: view }, routeId);
-    }
-  };
-
-  const buttonClasses = classNames(
-    'flex items-center p-1 rounded',
-    'disabled:cursor-not-allowed disabled:text-vega-clight-500 dark:disabled:text-vega-cdark-500',
-    {
-      'text-vega-clight-200 dark:text-vega-cdark-200 enabled:hover:bg-vega-clight-500 dark:enabled:hover:bg-vega-cdark-500':
-        !view || view !== currView?.type,
-      'bg-vega-yellow enabled:hover:bg-vega-yellow-550 text-black':
-        view && view === currView?.type,
-    }
-  );
-
-  return (
-    <Tooltip description={label} align="center" side="right" sideOffset={10}>
-      <TradingButton
-        className={buttonClasses}
-        data-testid={view}
-        onClick={onClick || (() => onSelect(view as BarView['type']))}
-        disabled={disabled}
-      >
-        {label}
-      </TradingButton>
-    </Tooltip>
-  );
-};
-
-export const MobileDropdownItem = ({
-  view,
-  icon,
-  tooltip,
-  disabled = false,
-  onClick,
-  routeId,
-}: {
-  view?: ViewType;
-  icon: VegaIconNames;
-  tooltip: string;
-  disabled?: boolean;
-  onClick?: () => void;
-  routeId: string;
-}) => {
-  const { setViews, getView } = useSidebar((store) => ({
-    setViews: store.setViews,
-    getView: store.getView,
-  }));
-  const currView = getView(routeId);
-  const onSelect = (view: BarView['type']) => {
-    if (view === currView?.type) {
-      setViews(null, routeId);
-    } else {
-      setViews({ type: view }, routeId);
-    }
-  };
-
-  const buttonClasses = classNames(
-    'flex items-center p-1 rounded',
-    'disabled:cursor-not-allowed disabled:text-vega-clight-500 dark:disabled:text-vega-cdark-500',
-    {
-      'text-vega-clight-200 dark:text-vega-cdark-200 enabled:hover:bg-vega-clight-500 dark:enabled:hover:bg-vega-cdark-500':
-        !view || view !== currView?.type,
-      'bg-vega-yellow enabled:hover:bg-vega-yellow-550 text-black':
-        view && view === currView?.type,
-    }
-  );
-
-  return (
-    <Tooltip description={tooltip} align="center" side="right" sideOffset={10}>
-      <TradingDropdownItem
-        className={buttonClasses}
-        data-testid={view}
-        onClick={onClick || (() => onSelect(view as BarView['type']))}
-        disabled={disabled}
-      >
-        <VegaIcon name={icon} size={20} />
-        {tooltip}
-      </TradingDropdownItem>
-    </Tooltip>
-  );
-};
-
-export const MobileBarActionsDropdown = ({
-  currentRouteId,
-}: {
-  currentRouteId: string;
-}) => {
-  const t = useT();
-  return (
-    <MobileActionsDropdown>
-      <MobileDropdownItem
-        view={ViewType.Deposit}
-        icon={VegaIconNames.DEPOSIT}
-        tooltip={t('Deposit')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Withdraw}
-        icon={VegaIconNames.WITHDRAW}
-        tooltip={t('Withdraw')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Transfer}
-        icon={VegaIconNames.TRANSFER}
-        tooltip={t('Transfer')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Info}
-        icon={VegaIconNames.BREAKDOWN}
-        tooltip={t('Market specification')}
-        routeId={currentRouteId}
-      />
-      <MobileDropdownItem
-        view={ViewType.Settings}
-        icon={VegaIconNames.COG}
-        tooltip={t('Settings')}
-        routeId={currentRouteId}
-      />
-    </MobileActionsDropdown>
-  );
-};

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/client-pages/portfolio/portfolio-sidebar.tsx

@@ -2,7 +2,6 @@ import { VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { SidebarButton, ViewType } from '../../components/sidebar';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
-import { MobileButton } from '../markets/mobile-buttons';
 
 export const PortfolioSidebar = () => {
   const t = useT();
@@ -31,28 +30,3 @@ export const PortfolioSidebar = () => {
     </>
   );
 };
-
-export const PortfolioMobileSidebar = () => {
-  const t = useT();
-  const currentRouteId = useGetCurrentRouteId();
-
-  return (
-    <div className="grid grid-cols-3 grow md:grow-0 md:flex lg:flex-col items-center gap-2 lg:gap-4 p-1">
-      <MobileButton
-        view={ViewType.Deposit}
-        tooltip={t('Deposit')}
-        routeId={currentRouteId}
-      />
-      <MobileButton
-        view={ViewType.Withdraw}
-        tooltip={t('Withdraw')}
-        routeId={currentRouteId}
-      />
-      <MobileButton
-        view={ViewType.Transfer}
-        tooltip={t('Transfer')}
-        routeId={currentRouteId}
-      />
-    </div>
-  );
-};

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

@@ -1,8 +1,10 @@
 import { useEffect } from 'react';
 import type { ReactNode } from 'react';
 import { LayoutPriority } from 'allotment';
+import { titlefy } from '@vegaprotocol/utils';
 import { useIncompleteWithdrawals } from '@vegaprotocol/withdraws';
 import { Tab, LocalStoragePersistTabs as Tabs } from '@vegaprotocol/ui-toolkit';
+import { usePageTitleStore } from '../../stores';
 import {
   AccountsContainer,
   AccountsSettings,
@@ -39,7 +41,6 @@ import { WithdrawalsMenu } from '../../components/withdrawals-menu';
 import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 import { useT } from '../../lib/use-t';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
 
 const WithdrawalsIndicator = () => {
   const { ready } = useIncompleteWithdrawals();
@@ -68,7 +69,14 @@ const SidebarViewInitializer = () => {
 
 export const Portfolio = () => {
   const t = useT();
-  usePageTitle(t('Portfolio'));
+
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+
+  useEffect(() => {
+    updateTitle(titlefy([t('Portfolio')]));
+  }, [updateTitle, t]);
 
   const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';

apps/trading/client-pages/referrals/hooks/use-referral-program.ts

@@ -1,4 +1,4 @@
-import { formatNumber } from '@vegaprotocol/utils';
+import { getNumberFormat } from '@vegaprotocol/utils';
 import sortBy from 'lodash/sortBy';
 import omit from 'lodash/omit';
 import { useReferralProgramQuery } from './__generated__/CurrentReferralProgram';
@@ -107,7 +107,9 @@ export const useReferralProgram = () => {
       discountFactor: Number(t.referralDiscountFactor),
       discount: BigNumber(t.referralDiscountFactor).times(100).toFixed(2) + '%',
       minimumVolume: Number(t.minimumRunningNotionalTakerVolume),
-      volume: formatNumber(t.minimumRunningNotionalTakerVolume, 0),
+      volume: getNumberFormat(0).format(
+        Number(t.minimumRunningNotionalTakerVolume)
+      ),
       epochs: Number(t.minimumEpochs),
     };
   });

apps/trading/client-pages/referrals/referral-statistics.tsx

@@ -14,9 +14,9 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import {
   addDecimalsFormatNumber,
-  formatNumber,
   getDateFormat,
   getDateTimeFormat,
+  getNumberFormat,
   getUserLocale,
   removePaginationWrapper,
 } from '@vegaprotocol/utils';
@@ -323,7 +323,7 @@ export const Statistics = ({
       }
       description={<QUSDTooltip />}
     >
-      {formatNumber(totalCommissionValue, 0)}
+      {getNumberFormat(0).format(Number(totalCommissionValue))}
     </StatTile>
   );
 
@@ -563,8 +563,8 @@ export const RefereesTable = ({
               )
                 .map((r) => ({
                   ...r,
-                  volume: formatNumber(r.volume, 0),
-                  commission: formatNumber(r.commission, 0),
+                  volume: getNumberFormat(0).format(r.volume),
+                  commission: getNumberFormat(0).format(r.commission),
                 }))
                 .reverse()}
             />

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

@@ -1,18 +1,24 @@
-import { TinyScroll } from '@vegaprotocol/ui-toolkit';
+import { useEffect } from 'react';
+import { titlefy } from '@vegaprotocol/utils';
 import { useT } from '../../lib/use-t';
 import { RewardsContainer } from '../../components/rewards-container';
+import { usePageTitleStore } from '../../stores';
 import { ErrorBoundary } from '../../components/error-boundary';
-import { usePageTitle } from '../../lib/hooks/use-page-title';
+import { TinyScroll } from '@vegaprotocol/ui-toolkit';
 
 export const Rewards = () => {
   const t = useT();
   const title = t('Rewards');
-  usePageTitle(title);
-
+  const { updateTitle } = usePageTitleStore((store) => ({
+    updateTitle: store.updateTitle,
+  }));
+  useEffect(() => {
+    updateTitle(titlefy([title]));
+  }, [updateTitle, title]);
   return (
     <ErrorBoundary feature="rewards">
       <TinyScroll className="p-4 max-h-full overflow-auto">
-        <h1 className="md:px-4 pb-4 text-2xl">{title}</h1>
+        <h1 className="px-4 pb-4 text-2xl">{title}</h1>
         <RewardsContainer />
       </TinyScroll>
     </ErrorBoundary>

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/competitions-leaderboard.tsx

@@ -1,6 +1,6 @@
 import { Link } from 'react-router-dom';
 import { Splash } from '@vegaprotocol/ui-toolkit';
-import { formatNumber } from '@vegaprotocol/utils';
+import { getNumberFormat } from '@vegaprotocol/utils';
 import { type useTeams } from '../../lib/hooks/use-teams';
 import { useT } from '../../lib/use-t';
 import { Table } from '../table';
@@ -15,7 +15,8 @@ export const CompetitionsLeaderboard = ({
 }) => {
   const t = useT();
 
-  const num = (n?: number | string) => (!n ? '-' : formatNumber(n, 0));
+  const num = (n?: number | string) =>
+    !n ? '-' : getNumberFormat(0).format(Number(n));
 
   if (!data || data.length === 0) {
     return <Splash>{t('Could not find any teams')}</Splash>;
@@ -32,9 +33,9 @@ export const CompetitionsLeaderboard = ({
         { name: 'status', displayName: t('Status') },
         { name: 'volume', displayName: t('Volume') },
       ]}
-      data={data.map((td) => {
+      data={data.map((td, i) => {
         // leaderboard place or medal
-        let rank: number | React.ReactNode = td.rank;
+        let rank: number | React.ReactNode = i + 1;
         if (rank === 1) rank = <Rank variant="gold" />;
         if (rank === 2) rank = <Rank variant="silver" />;
         if (rank === 3) rank = <Rank variant="bronze" />;

apps/trading/components/competitions/games-container.tsx

@@ -1,11 +1,6 @@
 import { type TransferNode } from '@vegaprotocol/types';
-import {
-  ActiveRewardCard,
-  isActiveReward,
-} from '../rewards-container/active-rewards';
+import { ActiveRewardCard } from '../rewards-container/active-rewards';
 import { useT } from '../../lib/use-t';
-import { useAssetsMapProvider } from '@vegaprotocol/assets';
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
 
 export const GamesContainer = ({
   data,
@@ -15,35 +10,8 @@ export const GamesContainer = ({
   currentEpoch: number;
 }) => {
   const t = useT();
-  // Re-load markets and assets in the games container to ensure that the
-  // the cards are updated (not grayed out) when the user navigates to the games page
-  const { data: assets } = useAssetsMapProvider();
-  const { data: markets } = useMarketsMapProvider();
 
-  const enrichedTransfers = data
-    .filter((node) => isActiveReward(node, currentEpoch))
-    .map((node) => {
-      if (node.transfer.kind.__typename !== 'RecurringTransfer') {
-        return node;
-      }
-
-      const asset =
-        assets &&
-        assets[
-          node.transfer.kind.dispatchStrategy?.dispatchMetricAssetId || ''
-        ];
-
-      const marketsInScope =
-        node.transfer.kind.dispatchStrategy?.marketIdsInScope?.map(
-          (id) => markets && markets[id]
-        );
-
-      return { ...node, asset, markets: marketsInScope };
-    });
-
-  if (!enrichedTransfers || !enrichedTransfers.length) return null;
-
-  if (!enrichedTransfers || enrichedTransfers.length === 0) {
+  if (!data || data.length === 0) {
     return (
       <p className="mb-6 text-muted">
         {t('There are currently no games available.')}
@@ -53,7 +21,7 @@ export const GamesContainer = ({
 
   return (
     <div className="mb-12 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
-      {enrichedTransfers.map((game, i) => {
+      {data.map((game, i) => {
         // TODO: Remove `kind` prop from ActiveRewardCard
         const { transfer } = game;
         if (

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

@@ -1,11 +1,9 @@
-import { isValidUrl } from '@vegaprotocol/utils';
 import classNames from 'classnames';
-import { useEffect, useState } from 'react';
 
 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
@@ -13,26 +11,6 @@ export const getFallbackAvatar = (teamId: string) => {
   return AVATAR_PATHNAME_PATTERN.replace('{id}', avatarId);
 };
 
-const useAvatar = (teamId: string, url: string) => {
-  const fallback = getFallbackAvatar(teamId);
-  const [avatar, setAvatar] = useState<string>(fallback);
-
-  useEffect(() => {
-    if (!isValidUrl(url)) return;
-    fetch(url, { cache: 'force-cache' })
-      .then((response) => {
-        if (response.ok) {
-          setAvatar(url);
-        }
-      })
-      .catch(() => {
-        /** noop */
-      });
-  });
-
-  return avatar;
-};
-
 export const TeamAvatar = ({
   teamId,
   imgUrl,
@@ -44,7 +22,7 @@ export const TeamAvatar = ({
   alt?: string;
   size?: 'large' | 'small';
 }) => {
-  const img = useAvatar(teamId, imgUrl);
+  const img = imgUrl && imgUrl.length > 0 ? imgUrl : getFallbackAvatar(teamId);
   return (
     // eslint-disable-next-line @next/next/no-img-element
     <img

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,
@@ -31,42 +30,35 @@ export const TeamStats = ({
     <>
       <StatSection>
         <StatList>
-          <Stat
-            value={members ? members.length : 0}
-            label={t('Members')}
-            valueTestId="members-count-stat"
-          />
+          <Stat value={members ? members.length : 0} label={t('Members')} />
           <Stat
             value={stats ? stats.totalGamesPlayed : 0}
             label={t('Total games')}
             tooltip={t('Total number of games this team has participated in')}
-            valueTestId="total-games-stat"
           />
           <StatSectionSeparator />
           <Stat
             value={
               stats
                 ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumVolume || 0),
+                    new BigNumber(stats.totalQuantumVolume),
                     '1e3'
                   )
                 : 0
             }
             label={t('Total volume')}
-            valueTestId="total-volume-stat"
           />
           <Stat
             value={
               stats
                 ? formatNumberRounded(
-                    new BigNumber(stats.totalQuantumRewards || 0),
+                    new BigNumber(stats.totalQuantumRewards),
                     '1e3'
                   )
                 : 0
             }
-            label={t('Rewards paid out')}
+            label={t('Rewards paid')}
             tooltip={'Total amount of rewards paid out to this team in qUSD'}
-            valueTestId="rewards-paid-stat"
           />
         </StatList>
       </StatSection>
@@ -103,13 +95,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 +121,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 +135,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 +143,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,24 +155,18 @@ 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)}>
-      <dd className="text-3xl lg:text-4xl" data-testid={valueTestId}>
-        {value}
-      </dd>
+    <div>
+      <dd className="text-3xl lg:text-4xl">{value}</dd>
       <dt className="text-sm text-muted">
         {tooltip ? (
           <Tooltip description={tooltip} underline={false}>

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,
@@ -16,7 +17,7 @@ export const LayoutWithSidebar = ({
   const sidebarOpen = sidebarView !== null;
   const gridClasses = classNames(
     'h-full relative z-0 grid',
-    'grid-rows-[min-content_1fr_50px]',
+    'grid-rows-[min-content_1fr_40px]',
     'lg:grid-rows-[min-content_1fr]',
     'lg:grid-cols-[1fr_280px_40px]',
     'xxxl:grid-cols-[1fr_320px_40px]'
@@ -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>
-  );
-};