fix(2425): fix for unit test

.github/workflows/add-ipfs-notes-to-release.yml

@@ -1,74 +0,0 @@
-name: After Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  after-release:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (ghcr)
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: resolve ipfs hashes for release
-        run: |
-          echo "Tag name: ${{ github.event.release.tag_name }}"
-          echo "Name: ${{ github.event.release.name }}"
-          echo "Description: ${{ github.event.release.body }}"
-          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
-            echo "Image not pushed yet, waiting 60 seconds"
-            sleep 60
-          done
-          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          echo IPFS_V0=$(cat ipfs-hash) >> $GITHUB_ENV
-          echo IPFS_V1=$(ipfs cid format -v 1 -b base32 $(cat ipfs-hash)) >> $GITHUB_ENV
-
-      - name: Edit Release
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          body: |
-            ---
-
-            # Deployments
-            * https://explorer.vega.xyz
-            * https://governance.vega.xyz
-
-            # IPFS releases
-            Tye IPFS hash of this release of the Trading app is:
-
-            CIDv0: ${{ env.IPFS_V0 }}
-            CIDv1: ${{ env.IPFS_V1 }}
-
-            You can always access the latest IPFS release by visiting [vega.trading](https://vega.trading).
-
-            You can also access Trading directly from an IPFS gateway.
-            BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).
-
-            Your settings are not remembered across different URLs.
-
-            IPFS gateways:
-
-            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
-            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
-            ipfs://${{ env.IPFS_V0 }}/

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 60
+    timeout-minutes: 40
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -98,4 +98,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

.github/workflows/publish-dist.yml

@@ -62,19 +62,17 @@ jobs:
       - name: Define variables
         run: |
           envName=''
-          domain="vega.rocks"
           if [[ "${{ github.event_name }}" = "push" ]]; then
+            domain="vega.rocks"
             if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
               envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
+                domain="vega.community"
+              fi
             elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
               envName="stagnet1"
             elif [[ "${{ matrix.app}}" = "trading" ]] && [[ ${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }} = "true" ]]; then
               envName="mainnet"
-            elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
-              envName="mainnet"
-            fi
-            if [[ "${envName}" = "mainnet" ]]; then
-              domain="vega.xyz"
             fi
             bucketName="${{ matrix.app }}.${envName}.${domain}"
             echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
@@ -172,6 +170,12 @@ jobs:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
 
+      - name: Add ipfs hash to release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        with:
+          files: ${{ matrix.app }}-ipfs-hash
+
       - name: Trigger fleek deployment
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         run: |

.github/workflows/rollback-console.yml

@@ -1,77 +0,0 @@
-name: 'Rollback console'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version that should be set on rollback'
-        required: true
-        type: string
-
-jobs:
-  rollback:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Retag mainnet
-        run: |
-          docker pull vegaprotocol/trading:${{ inputs.version }}
-          docker tag vegaprotocol/trading:${{ inputs.version }} vegaprotocol/trading:mainnet
-          docker push vegaprotocol/trading:mainnet
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
-
-      - name: Trigger fleek deployment
-        run: |
-          # display info about app
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-            https://api.fleek.co/graphql
-
-          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            -H "Content-Type: application/json" \
-            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-            https://api.fleek.co/graphql
-
-      - name: Update vega.trading DNS to redirect to the new console
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-
-          # Generate console URL
-          new_console_url_type=ipfs
-          # new_console_url_type=ipns
-          new_console_url_domain=cf-ipfs.com
-          # new_console_url_domain=dweb.link
-          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
-          echo "new_console_url=${new_console_url}"
-
-          # Update record in DNSimple
-          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-          dnsimple_account_id=84895
-          dnsimple_zone_name=vega.trading
-          dnsimple_record_id=44409591
-          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
-
-          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-                -H 'Accept: application/json' \
-                -H 'Content-Type: application/json' \
-                -X PATCH \
-                -d "{
-                      \"content\": \"${new_console_url}\"
-                }" \
-                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

.gitignore

@@ -49,4 +49,4 @@ cypress.env.json
 .next
 
 #cypress
-/apps/**/cypress/reports/
+/apps/trading-e2e/cypress/reports/

apps/explorer-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

apps/explorer-e2e/src/support/index.js

@@ -15,6 +15,5 @@
 
 import '@vegaprotocol/cypress';
 import './common.functions.js';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();

apps/explorer/.env

@@ -14,7 +14,6 @@ NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/m
 NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 
 # App flags
 NX_EXPLORER_ASSETS=1

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

@@ -48,13 +48,11 @@ export const Footer = () => {
           </Link>
         </div>
 
-        {ENV.addresses.feedback ? (
-          <div className="flex pl-2 content-center">
-            <ExternalLink href={ENV.addresses.feedback}>
-              {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
-            </ExternalLink>
-          </div>
-        ) : null}
+        <div className="flex pl-2 content-center">
+          <ExternalLink href={ENV.addresses.feedback}>
+            {showFullFeedbackLabel ? t('Share your feedback') : t('Feedback')}
+          </ExternalLink>
+        </div>
       </div>
     </footer>
   );
@@ -64,5 +62,9 @@ const NodeUrl = ({ url }: { url: string }) => {
   // get base url from api url, api sub domain
   const urlObj = new URL(url);
   const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');
-  return <span className="cursor-default">{nodeUrl}</span>;
+  return (
+    <Link href={'https://' + nodeUrl} target="_blank">
+      {nodeUrl}
+    </Link>
+  );
 };

apps/explorer/src/app/components/markets/market-details.tsx

@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  LiquidityInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,18 +12,20 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import { MarketInfoTable } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
 
-  const settlementData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
-  const terminationData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  const terminationData =
+    market.tradableInstrument.instrument.product
+      .dataSourceSpecForTradingTermination.data;
 
   const getSigners = (data: DataSourceDefinition) => {
     if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {

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

@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';

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

@@ -1,56 +0,0 @@
-import type { Proposal } from './tx-proposal';
-import { proposalRequiresSignatureBundle } from './tx-proposal';
-
-describe('proposalRequiresSignatureBundle', () => {
-  it('should return false for freeform proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newFreeform: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return false for newMarket proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newMarket: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return true for newAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return true for updateAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        updateAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return false when bad data is supplied', () => {
-    expect(
-      proposalRequiresSignatureBundle(false as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle(undefined as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle({ test: false } as unknown as Proposal)
-    ).toEqual(false);
-  });
-});

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

@@ -28,16 +28,11 @@ interface TxProposalProps {
  * @returns boolean True if a signature bundle is required. Used to fetch a signature bundle
  */
 export function proposalRequiresSignatureBundle(proposal?: Proposal): boolean {
-  const proposalsThatRequireBundles = ['newAsset', 'updateAsset'];
-
   if (!proposal?.terms) {
     return false;
   }
-
-  return (
-    proposalsThatRequireBundles.filter((requiredIfExists) =>
-      has(proposal.terms, requiredIfExists)
-    ).length > 0
+  return !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
+    has(proposal.terms, requiredIfExists)
   );
 }
 
@@ -86,7 +81,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
 
   const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;
 
-  // This component is not rendered if no bundle is required
   const SignatureBundleComponent = proposal.terms?.newAsset
     ? ProposalSignatureBundleNewAsset
     : ProposalSignatureBundleUpdateAsset;

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {

apps/explorer/src/app/routes/markets/markets-page.tsx

@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';

apps/explorer/src/styles.css

@@ -32,9 +32,9 @@
   line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }
 
-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
 }
 
 /* Light variables */
@@ -46,6 +46,7 @@
   --ag-header-column-separator-color: theme(colors.neutral[300]);
   --ag-row-border-color: theme(colors.white);
   --ag-row-hover-color: theme(colors.neutral[100]);
+  --ag-font-size: 12px;
 }
 
 /* Dark variables */
@@ -57,6 +58,7 @@
   --ag-header-column-separator-color: theme(colors.neutral[600]);
   --ag-row-border-color: theme(colors.black);
   --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
 }
 
 .voteicon svg {

apps/governance-e2e/.env

@@ -17,7 +17,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

apps/governance-e2e/src/support/index.js

@@ -8,7 +8,6 @@ import './wallet-eth.functions.ts';
 import './wallet-teardown.functions.ts';
 import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

apps/governance/.env

@@ -15,7 +15,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.capsule

@@ -17,7 +17,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.devnet

@@ -11,4 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/

apps/governance/.env.mainnet

@@ -12,4 +12,3 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-NX_VEGA_REST_URL=https://api.vega.community/api/v2/

apps/governance/.env.stagnet1

@@ -8,4 +8,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

apps/governance/.env.testnet

@@ -12,4 +12,3 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/

apps/governance/.env.validator-testnet

@@ -9,4 +9,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/

apps/governance/src/app.tsx

@@ -16,7 +16,6 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import { WithdrawalApprovalDialogContainer } from '@vegaprotocol/web3';
 import {
   createConnectors,
   useEthTransactionManager,
@@ -44,7 +43,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
+import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -53,7 +52,6 @@ import {
 } from './components/telemetry-dialog/telemetry-dialog';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useTranslation } from 'react-i18next';
-import { isPartyNotFoundError } from './lib/party';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -159,8 +157,7 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <CreateWithdrawalDialog />
-                  <WithdrawalApprovalDialogContainer />
+                  <WithdrawalDialog />
                   <TelemetryDialog />
                 </>
               </BalanceManager>
@@ -222,8 +219,9 @@ const AppContainer = () => {
           const transaction = event.transaction;
 
           if (
-            (errorIsString && isPartyNotFoundError({ message: error })) ||
-            (errorIsObject && isPartyNotFoundError(error))
+            (errorIsString && error.includes('failed to get party ID')) ||
+            (errorIsObject &&
+              error?.message?.includes('failed to get party ID'))
           ) {
             // This error is caused by a pubkey making an API request before
             // it has interacted with the chain. This isn't needed in Sentry.

apps/governance/src/components/vega-wallet/hooks.ts

@@ -26,7 +26,6 @@ import type {
   WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
 import { DelegationsDocument } from './__generated__/Delegations';
-import { isPartyNotFoundError } from '../../lib/party';
 
 export const usePollForDelegations = () => {
   const { token: vegaToken } = useContracts();
@@ -76,7 +75,6 @@ export const usePollForDelegations = () => {
           })
           .then((res) => {
             if (!mounted) return;
-
             const canonisedDelegations = removePaginationWrapper(
               res.data.party?.delegationsConnection?.edges
             );
@@ -205,15 +203,6 @@ export const usePollForDelegations = () => {
             setDelegatedNodes(delegatedAmounts);
           })
           .catch((err: Error) => {
-            // if party isn't found, dont log to Sentry, just clear state as, user
-            // will not have any delagations or accounts
-            if (isPartyNotFoundError(err)) {
-              setDelegations([]);
-              setAccounts([]);
-              setDelegatedNodes([]);
-              setCurrentStakeAvailable(new BigNumber(0));
-              return;
-            }
             Sentry.captureException(err);
             // If query fails stop interval. Its almost certain that the query
             // will just continue to fail

apps/governance/src/config/env.ts

@@ -62,7 +62,6 @@ export const ENV = {
   ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
   localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
   delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
-  rest: windowOrDefault('NX_VEGA_REST_URL'),
   flags: {
     NETWORK_DOWN: TRUTHY.includes(windowOrDefault('NX_NETWORK_DOWN')),
     MOCK: TRUTHY.includes(windowOrDefault('NX_MOCKED')),

apps/governance/src/lib/party.ts

@@ -1,8 +0,0 @@
-export const PARTY_NOT_FOUND = 'failed to get party for ID';
-
-export const isPartyNotFoundError = (error: { message: string }) => {
-  if (error.message.includes(PARTY_NOT_FOUND)) {
-    return true;
-  }
-  return false;
-};

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -124,7 +124,7 @@ describe('Proposal header', () => {
       })
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'New asset proposal'
+      'Unknown proposal'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -21,7 +21,6 @@ export const ProposalHeader = ({
 
   let details: ReactNode;
   let proposalType = '';
-  let fallbackTitle = '';
 
   const title = proposal?.rationale.title.trim();
 
@@ -30,7 +29,6 @@ export const ProposalHeader = ({
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType = 'NewMarket';
-      fallbackTitle = t('NewMarketProposal');
       details = (
         <>
           <span>
@@ -52,7 +50,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateMarket': {
       proposalType = 'UpdateMarket';
-      fallbackTitle = t('UpdateMarketProposal');
       details = (
         <>
           <span>{t('Market change')}:</span>{' '}
@@ -63,7 +60,6 @@ export const ProposalHeader = ({
     }
     case 'NewAsset': {
       proposalType = 'NewAsset';
-      fallbackTitle = t('NewAssetProposal');
       details = (
         <>
           <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
@@ -85,7 +81,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateNetworkParameter': {
       proposalType = 'NetworkParameter';
-      fallbackTitle = t('NetworkParameterProposal');
       details = (
         <>
           <span>{t('Change')}:</span>{' '}
@@ -100,13 +95,11 @@ export const ProposalHeader = ({
     }
     case 'NewFreeform': {
       proposalType = 'Freeform';
-      fallbackTitle = t('FreeformProposal');
       details = <span />;
       break;
     }
     case 'UpdateAsset': {
       proposalType = 'UpdateAsset';
-      fallbackTitle = t('UpdateAssetProposal');
       details = (
         <>
           <span>{t('AssetID')}:</span>{' '}
@@ -122,14 +115,10 @@ export const ProposalHeader = ({
       <div data-testid="proposal-title">
         {isListItem ? (
           <header>
-            <SubHeading
-              title={titleContent || fallbackTitle || t('Unknown proposal')}
-            />
+            <SubHeading title={titleContent || t('Unknown proposal')} />
           </header>
         ) : (
-          <Heading
-            title={titleContent || fallbackTitle || t('Unknown proposal')}
-          />
+          <Heading title={titleContent || t('Unknown proposal')} />
         )}
       </div>
 

apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx

@@ -43,17 +43,13 @@ jest.mock('../list-asset', () => ({
 
 it('Renders with data-testid', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });
 
 it('renders each section', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
@@ -80,8 +76,6 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
       },
     },
   });
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -24,11 +24,9 @@ export enum ProposalType {
 }
 export interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  restData: any;
 }
 
-export const Proposal = ({ proposal, restData }: ProposalProps) => {
+export const Proposal = ({ proposal }: ProposalProps) => {
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
     NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -106,7 +104,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
         </div>
 
         <div className="mb-6">
-          <ProposalJson proposal={restData?.data?.proposal} />
+          <ProposalJson proposal={proposal} />
         </div>
 
         <div className="mb-10">

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.tsx

@@ -107,7 +107,7 @@ export const ProtocolUpgradeProposalsListItem = ({
           <div className="grid grid-cols-1 mt-3">
             <div className="justify-self-end">
               <Link
-                to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
+                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
                   proposal.vegaReleaseTag
                 )}`}
               >

apps/governance/src/routes/proposals/proposal/proposal-container.tsx

@@ -5,15 +5,9 @@ import { useParams } from 'react-router-dom';
 import { Proposal } from '../components/proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
-import { useFetch } from '@vegaprotocol/react-helpers';
-import { ENV } from '../../../config';
 
 export const ProposalContainer = () => {
   const params = useParams<{ proposalId: string }>();
-  const {
-    state: { loading: restLoading, error: restError, data: restData },
-  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
-  console.log(restLoading, restError, restData);
   const { data, loading, error, refetch } = useProposalQuery({
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
@@ -29,7 +23,7 @@ export const ProposalContainer = () => {
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
       {data?.proposal ? (
-        <Proposal proposal={data.proposal} restData={restData} />
+        <Proposal proposal={data.proposal} />
       ) : (
         <ProposalNotFound />
       )}

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -49,7 +49,6 @@ export const ProposeFreeform = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<FreeformProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -86,13 +85,7 @@ export const ProposeFreeform = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -89,7 +89,6 @@ export const ProposeNetworkParameter = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NetworkParameterProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -149,13 +148,7 @@ export const ProposeNetworkParameter = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -61,7 +61,6 @@ export const ProposeNewAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -118,13 +117,7 @@ export const ProposeNewAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -59,7 +59,6 @@ export const ProposeNewMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeNewMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -59,7 +59,6 @@ export const ProposeUpdateAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeUpdateAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -106,7 +106,6 @@ export const ProposeUpdateMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -158,13 +157,7 @@ export const ProposeUpdateMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/router-config.tsx

@@ -224,10 +224,6 @@ const redirects = [
     path: '/vesting',
     element: <Navigate to={Routes.REDEEM} replace />,
   },
-  {
-    path: Routes.PROTOCOL_UPGRADES,
-    element: <Navigate to={Routes.PROPOSALS} replace />,
-  },
 ];
 
 const routerConfig = [
@@ -268,13 +264,13 @@ const routerConfig = [
       },
       { path: 'proposals', element: <LazyProposalsList /> },
       { path: ':proposalId', element: <LazyProposal /> },
+      {
+        path: 'protocol-upgrade/:proposalReleaseTag',
+        element: <LazyProtocolUpgradeProposal />,
+      },
       { path: 'rejected', element: <LazyRejectedProposalsList /> },
     ],
   },
-  {
-    path: `${Routes.PROTOCOL_UPGRADES}/:proposalReleaseTag`,
-    element: <LazyProtocolUpgradeProposal />,
-  },
   {
     path: Routes.VALIDATORS,
     element: <LazyStaking name="Staking" />,

apps/governance/src/routes/routes.ts

@@ -5,7 +5,6 @@ const Routes = {
   REWARDS: '/rewards',
   PROPOSALS: '/proposals',
   PROPOSALS_REJECTED: '/proposals/rejected',
-  PROTOCOL_UPGRADES: '/protocol-upgrades',
   NOT_PERMITTED: '/not-permitted',
   NOT_FOUND: '/not-found',
   CONTRACTS: '/contracts',

apps/governance/src/routes/staking/node/nodes-container.tsx

@@ -9,7 +9,6 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import type { ReactElement } from 'react';
 import type { StakingQuery } from '../__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated__/PreviousEpoch';
-import { isPartyNotFoundError } from '../../../lib/party';
 
 // TODO should only request a single node. When migrating from deprecated APIs we should address this.
 
@@ -51,7 +50,7 @@ export const NodeContainer = ({
 
   useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
 
-  if (error && !isPartyNotFoundError(error)) {
+  if (error && !error.message.includes('failed to get party for ID')) {
     return (
       <Callout intent={Intent.Danger} title={t('Something went wrong')}>
         <pre>

apps/governance/src/styles.css

@@ -40,9 +40,9 @@
   line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }
 
-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
 }
 
 /* Dark variables */
@@ -54,6 +54,7 @@
   --ag-header-column-separator-color: theme(colors.neutral[600]);
   --ag-row-border-color: theme(colors.black);
   --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
 }
 
 .validators-table .ag-theme-balham-dark .ag-body-horizontal-scroll {

apps/liquidity-provision-dashboard/src/app/components/detail/last-24h-volume/last-24h-volume.tsx

@@ -10,8 +10,8 @@ import {
   displayChange,
 } from '@vegaprotocol/liquidity';
 
-import type { Candle } from '@vegaprotocol/markets';
-import { marketCandlesProvider } from '@vegaprotocol/markets';
+import type { Candle } from '@vegaprotocol/market-list';
+import { marketCandlesProvider } from '@vegaprotocol/market-list';
 
 const THROTTLE_UPDATE_TIME = 500;
 

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

@@ -194,7 +194,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
   });
 
   it('shows node health', function () {
-    // 0006-NETW-010
     const market = this.market;
     cy.visit(`/#/markets/${market.id}`);
     cy.getByTestId('node-health')

apps/trading-e2e/src/integration/closed-markets.cy.ts

@@ -318,11 +318,10 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       .should('have.text', product.settlementAsset.symbol);
 
     // 6001-MARK-020
-    cy.get('.ag-pinned-right-cols-container')
-      .find('[col-id="market-actions"]')
+    cy.get(rowSelector)
       .first()
-      .find('button svg')
-      .should('exist');
+      .find('[col-id="id"]')
+      .should('have.text', settledMarket.id);
   });
 
   // test market list for market in terminated state
@@ -374,33 +373,5 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       'have.text',
       `Asset details - ${settlementAsset.symbol}`
     );
-
-    cy.get('[data-testid="dialog-close"]').click();
-  });
-
-  it('can open row actions', () => {
-    cy.get('.ag-pinned-right-cols-container')
-      .find('[col-id="market-actions"]')
-      .first()
-      .find('button')
-      .click();
-
-    const dropdownContent = '[data-testid="market-actions-content"]';
-    const dropdownContentItem = '[role="menuitem"]';
-    cy.get(dropdownContent)
-      .find(dropdownContentItem)
-      .eq(0)
-      // Cannot click the copy button as it falls back to window.prompt, blocking the test.
-      .should('have.text', 'Copy Market ID');
-
-    cy.get(dropdownContent)
-      .find(dropdownContentItem)
-      .eq(1)
-      .find('a')
-      .then(($el) => {
-        const href = $el.attr('href');
-        expect(/\/markets\/0/.test(href || '')).to.equal(true);
-      })
-      .should('have.text', 'View on Explorer');
   });
 });

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

@@ -108,9 +108,10 @@ describe('deposit actions', { tags: '@smoke' }, () => {
 
   it('Deposit to trade is visble', () => {
     cy.getByTestId('Collateral').click();
-    cy.contains('[data-testid="deposit"]', 'Deposit')
-      .should('be.visible')
-      .click();
+    cy.contains('[data-testid="deposit"]', 'Deposit to trade').should(
+      'be.visible'
+    );
+    cy.contains('[data-testid="deposit"]', 'Deposit to trade').click();
     cy.getByTestId('deposit-submit').should('be.visible');
   });
 });

apps/trading-e2e/src/integration/home-node-network.cy.ts

@@ -1,111 +0,0 @@
-import { closeWelcomeDialog } from '../support/helpers';
-
-const dialogContent = 'dialog-content';
-const nodeHealth = 'node-health';
-
-describe('home', { tags: '@regression' }, () => {
-  before(() => {
-    cy.clearLocalStorage();
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/');
-  });
-
-  describe('footer', () => {
-    it('shows current block height', () => {
-      closeWelcomeDialog();
-      // 0006-NETW-004
-      // 0006-NETW-005
-      // 0006-NETW-008
-      // 0006-NETW-009
-      // 0006-NETW-011
-
-      cy.intercept('POST', 'http://localhost:3008/graphql', (req) => {
-        req.on('response', (res) => {
-          res.setDelay(3000);
-        });
-      });
-
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Warning delay ( >3 sec)');
-
-      cy.intercept('POST', 'http://localhost:3008/graphql', (req) => {
-        req.on('response', (res) => {
-          res.setDelay(1);
-        });
-      });
-
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Operational', { timeout: 10000 })
-        .next()
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
-        .next()
-        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
-    });
-
-    it('shows node switcher details', () => {
-      // 0006-NETW-012
-      // 0006-NETW-013
-      // 0006-NETW-014
-      // 0006-NETW-015
-      // 0006-NETW-016
-
-      cy.getByTestId(nodeHealth).click();
-      cy.getByTestId(dialogContent).should('contain.text', 'Connected node');
-      cy.getByTestId(dialogContent).should(
-        'contain.text',
-        'This app will only work on CUSTOM. Select a node to connect to.'
-      );
-      cy.getByTestId('node')
-        .first()
-        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
-        .next()
-        .should('contain.text', 'Response time')
-        .next()
-        .should('contain.text', 'Block')
-        .next()
-        .should('contain.text', 'Subscription');
-      cy.getByTestId('custom-row').should('contain.text', 'Other');
-      cy.getByTestId('dialog-close').click();
-    });
-
-    it('switch to other node', () => {
-      // 0006-NETW-017
-      // 0006-NETW-018
-      // 0006-NETW-019
-      // 0006-NETW-020
-
-      cy.getByTestId(nodeHealth).click();
-      cy.getByTestId('connect').should('be.disabled');
-      cy.getByTestId('node-url-custom').click();
-      cy.getByTestId('connect').should('be.disabled');
-      cy.get("input[placeholder='https://']")
-        .focus()
-        .type(new URL(Cypress.env('VEGA_URL')).origin + '/graphql');
-      cy.getByTestId('connect').click();
-      cy.getByTestId(nodeHealth)
-        .children()
-        .first()
-        .should('contain.text', 'Operational');
-    });
-  });
-  describe('Network switcher', () => {
-    before(() => {
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.visit('/');
-    });
-
-    // 0006-NETW-002
-    // 0006-NETW-003
-    it('switch to fairground network', () => {
-      cy.getByTestId('network-switcher').click();
-      cy.getByTestId('network-item').contains('Fairground testnet').click();
-      cy.get('[aria-haspopup="menu"]').should('contain.text', 'Fairground');
-    });
-  });
-});

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

@@ -4,7 +4,6 @@ import { marketsDataQuery } from '@vegaprotocol/mock';
 import * as Schema from '@vegaprotocol/types';
 
 const selectMarketOverlay = 'select-market-list';
-const dialogContent = 'dialog-content';
 
 const generateProposal = (code: string): ProposalListFieldsFragment => ({
   __typename: 'Proposal',
@@ -82,12 +81,20 @@ const generateProposal = (code: string): ProposalListFieldsFragment => ({
             __typename: 'DataSourceDefinition',
             sourceType: {
               __typename: 'DataSourceDefinitionInternal',
+              sourceType: {
+                __typename: 'DataSourceSpecConfigurationTime',
+                conditions: [],
+              },
             },
           },
           dataSourceSpecForTradingTermination: {
             __typename: 'DataSourceDefinition',
             sourceType: {
               __typename: 'DataSourceDefinitionInternal',
+              sourceType: {
+                __typename: 'DataSourceSpecConfigurationTime',
+                conditions: [],
+              },
             },
           },
         },
@@ -281,7 +288,7 @@ describe('home', { tags: '@regression' }, () => {
         cy.visit('/');
         cy.wait('@Markets');
         cy.location('hash').should('equal', '#/markets/market-1');
-        cy.getByTestId(dialogContent).should('not.exist');
+        cy.getByTestId('dialog-content').should('not.exist');
       });
     });
 
@@ -294,8 +301,22 @@ describe('home', { tags: '@regression' }, () => {
         cy.visit('/');
         cy.wait('@Markets');
         cy.location('hash').should('equal', '#/markets/market-not-existing');
-        cy.getByTestId(dialogContent).should('not.exist');
+        cy.getByTestId('dialog-content').should('not.exist');
       });
     });
   });
+
+  describe('footer', () => {
+    it('shows current block height', () => {
+      cy.visit('/');
+      cy.getByTestId('node-health')
+        .children()
+        .first()
+        .should('contain.text', 'Operational')
+        .next()
+        .should('contain.text', new URL(Cypress.env('VEGA_URL')).origin)
+        .next()
+        .should('contain.text', '100'); // all mocked queries have x-block-height header set to 100
+    });
+  });
 });

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

@@ -48,7 +48,7 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="accounts-actions"]')
-      .should('have.text', '');
+      .should('have.text', ' ');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)

apps/trading-e2e/src/support/trading.ts

@@ -1,7 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
-import type { Provider, Status } from '@vegaprotocol/markets';
+import type { Provider, Status } from '@vegaprotocol/market-info';
 import {
   accountsQuery,
   assetQuery,
@@ -32,7 +32,7 @@ import {
   blockStatisticsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
 
 type MarketPageMockData = {
   state: Schema.MarketState;

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

@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { marketsWithDataProvider } from '@vegaprotocol/markets';
+import { marketsWithDataProvider } from '@vegaprotocol/market-list';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';

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

@@ -5,7 +5,7 @@ import {
   lpAggregatedDataProvider,
   useCheckLiquidityStatus,
 } from '@vegaprotocol/liquidity';
-import { tooltipMapping } from '@vegaprotocol/markets';
+import { tooltipMapping } from '@vegaprotocol/market-info';
 import {
   addDecimalsFormatNumber,
   formatNumberPercentage,
@@ -37,7 +37,7 @@ import type { LiquidityProvisionData, Filter } from '@vegaprotocol/liquidity';
 import { Link, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 
-import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
 import { DocsLinks } from '@vegaprotocol/environment';
 
 const enum LiquidityTabs {

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

@@ -2,12 +2,12 @@ import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { ButtonLink, Link } from '@vegaprotocol/ui-toolkit';
 import { MarketProposalNotification } from '@vegaprotocol/proposals';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import { getExpiryDate, getMarketExpiryDate } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { HeaderStat } from '../../components/header';
 import { MarketMarkPrice } from '../../components/market-mark-price';
-import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/markets';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketState } from '../../components/market-state';
 import { HeaderStatMarketTradingMode } from '../../components/market-trading-mode';
 import { MarketLiquiditySupplied } from '../../components/liquidity-supplied';

apps/trading/client-pages/market/market-selector-item.spec.tsx

@@ -8,8 +8,8 @@ import { MockedProvider } from '@apollo/client/testing';
 import type {
   MarketDataUpdateFieldsFragment,
   MarketDataUpdateSubscription,
-} from '@vegaprotocol/markets';
-import { MarketDataUpdateDocument } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
+import { MarketDataUpdateDocument } from '@vegaprotocol/market-list';
 import {
   AuctionTrigger,
   MarketState,

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

@@ -6,8 +6,8 @@ import {
   formatNumber,
   priceChangePercentage,
 } from '@vegaprotocol/utils';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
-import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
+import { useMarketDataUpdateSubscription } from '@vegaprotocol/market-list';
 import { Sparkline } from '@vegaprotocol/ui-toolkit';
 
 export const MarketSelectorItem = ({

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

@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { MarketSelector } from './market-selector';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { MemoryRouter } from 'react-router-dom';
@@ -10,9 +10,8 @@ import type { SortType } from './sort-dropdown';
 import { SortTypeMapping } from './sort-dropdown';
 import { Sort } from './sort-dropdown';
 import { subDays } from 'date-fns';
-import { isMarketActive } from './use-market-selector-list';
 
-jest.mock('@vegaprotocol/markets');
+jest.mock('@vegaprotocol/market-list');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 // mock market list items to avoid subscriptions starting
@@ -127,7 +126,9 @@ describe('MarketSelector', () => {
     }),
   ];
 
-  const activeMarkets = markets.filter((m) => isMarketActive(m.state));
+  const activeMarkets = markets.filter((m) =>
+    [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(m.state)
+  );
   mockUseMarketList.mockReturnValue({
     data: markets,
     loading: false,

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

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import uniqBy from 'lodash/uniqBy';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import {
   Input,
   TinyScroll,

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

@@ -7,7 +7,7 @@ import {
   useThrottledDataProvider,
 } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, ExternalLink, Splash } from '@vegaprotocol/ui-toolkit';
-import { marketProvider, marketDataProvider } from '@vegaprotocol/markets';
+import { marketProvider, marketDataProvider } from '@vegaprotocol/market-list';
 import { useGlobalStore, usePageTitleStore } from '../../stores';
 import { TradeGrid } from './trade-grid';
 import { TradePanels } from './trade-panels';

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

@@ -6,8 +6,8 @@ import classNames from 'classnames';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
 import { t } from '@vegaprotocol/i18n';
-import { OracleBanner } from '@vegaprotocol/markets';
-import type { Market } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/market-info';
+import type { Market } from '@vegaprotocol/market-list';
 import { Filter } from '@vegaprotocol/orders';
 import {
   usePaneLayout,

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

@@ -1,6 +1,6 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import type { Market } from '@vegaprotocol/markets';
-import { OracleBanner } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { OracleBanner } from '@vegaprotocol/market-info';
 import {
   useMarketClickHandler,
   useMarketLiquidityClickHandler,

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

@@ -1,5 +1,5 @@
 import { DealTicketContainer } from '@vegaprotocol/deal-ticket';
-import { MarketInfoAccordionContainer } from '@vegaprotocol/markets';
+import { MarketInfoAccordionContainer } from '@vegaprotocol/market-info';
 import { OrderbookContainer } from '@vegaprotocol/market-depth';
 import { OrderListContainer, Filter } from '@vegaprotocol/orders';
 import type { OrderListContainerProps } from '@vegaprotocol/orders';

apps/trading/client-pages/market/use-market-selector-list.spec.tsx

@@ -1,18 +1,15 @@
 import merge from 'lodash/merge';
 import { renderHook } from '@testing-library/react';
-import {
-  isMarketActive,
-  useMarketSelectorList,
-} from './use-market-selector-list';
+import { useMarketSelectorList } from './use-market-selector-list';
 import { Product } from './product-selector';
 import { Sort } from './sort-dropdown';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import type { Filter } from './market-selector';
 import { subDays } from 'date-fns';
 
-jest.mock('@vegaprotocol/markets');
+jest.mock('@vegaprotocol/market-list');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 describe('useMarketSelectorList', () => {
@@ -41,10 +38,6 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-3',
-        state: MarketState.STATE_CLOSED,
-      }),
-      createMarketFragment({
-        id: 'market-4',
         state: MarketState.STATE_PENDING,
       }),
     ];
@@ -55,7 +48,7 @@ describe('useMarketSelectorList', () => {
     });
     const { result } = setup();
     const expectedFilteredMarkets = markets.filter((m) =>
-      isMarketActive(m.state)
+      [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(m.state)
     );
     expect(result.current).toEqual({
       data: markets,

apps/trading/client-pages/market/use-market-selector-list.ts

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
 import { MarketState } from '@vegaprotocol/types';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from './market-selector';
 import { Sort } from './sort-dropdown';
@@ -18,7 +18,11 @@ export const useMarketSelectorList = ({
     if (!data?.length) return [];
     const markets = data
       // only active
-      .filter((m) => isMarketActive(m.state))
+      .filter((m) => {
+        return [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(
+          m.state
+        );
+      })
       // only selected product type
       .filter((m) => {
         if (m.tradableInstrument.instrument.product.__typename === product) {
@@ -76,11 +80,3 @@ export const useMarketSelectorList = ({
 
   return { markets, data, loading, error };
 };
-
-export const isMarketActive = (state: MarketState) => {
-  return [
-    MarketState.STATE_ACTIVE,
-    MarketState.STATE_SUSPENDED,
-    MarketState.STATE_PENDING,
-  ].includes(state);
-};

apps/trading/client-pages/markets/closed.spec.tsx

@@ -6,16 +6,8 @@ import { MarketState } from '@vegaprotocol/types';
 import { subDays } from 'date-fns';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type {
-  OracleSpecDataConnectionQuery,
-  MarketsDataQuery,
-  MarketsQuery,
-} from '@vegaprotocol/markets';
-import {
-  OracleSpecDataConnectionDocument,
-  MarketsDataDocument,
-  MarketsDocument,
-} from '@vegaprotocol/markets';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/market-info';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import type {
@@ -24,6 +16,9 @@ import type {
 } from '@vegaprotocol/positions';
 import { PositionsDocument } from '@vegaprotocol/positions';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import type { MarketsDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import { MarketsDataDocument } from '@vegaprotocol/market-list';
+import { MarketsDocument } from '@vegaprotocol/market-list';
 import {
   createMarketFragment,
   marketsQuery,
@@ -219,7 +214,7 @@ describe('Closed', () => {
       'Settlement price',
       'Realised PNL',
       'Settlement asset',
-      '', // actions row
+      'Market ID',
     ];
     expect(headers).toHaveLength(expectedHeaders.length);
     expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
@@ -241,7 +236,7 @@ describe('Closed', () => {
       addDecimalsFormatNumber(property.value, market.decimalPlaces),
       addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces),
       market.tradableInstrument.instrument.product.settlementAsset.symbol,
-      '', // actions row
+      market.id,
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
@@ -333,13 +328,8 @@ describe('Closed', () => {
     // check that only included ids are shown
     const cells = screen
       .getAllByRole('gridcell')
-      .filter((cell) => cell.getAttribute('col-id') === 'code')
-      .map((cell) => {
-        const marketId = within(cell)
-          .getByTestId('market-code')
-          .getAttribute('data-market-id');
-        return marketId;
-      });
+      .filter((cell) => cell.getAttribute('col-id') === 'id')
+      .map((cell) => cell.textContent?.trim());
     expect(cells).toEqual(expectedRows.map((m) => m.node.id));
   });
 });

apps/trading/client-pages/markets/closed.tsx

@@ -4,7 +4,7 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -13,11 +13,8 @@ import {
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import {
-  MarketTableActions,
-  closedMarketsWithDataProvider,
-} from '@vegaprotocol/markets';
+import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
+import { closedMarketsWithDataProvider } from '@vegaprotocol/market-list';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
@@ -124,16 +121,6 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
       {
         headerName: t('Market'),
         field: 'code',
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaICellRendererParams<Row, 'code'>) => {
-          return (
-            <span data-testid="market-code" data-market-id={data?.id}>
-              {value}
-            </span>
-          );
-        },
       },
       {
         headerName: t('Description'),
@@ -275,17 +262,9 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
         ),
       },
       {
-        colId: 'market-actions',
-        ...COL_DEFS.actions,
-        cellRenderer: ({ data }: VegaICellRendererParams<Row>) => {
-          if (!data) return null;
-          return (
-            <MarketTableActions
-              marketId={data.id}
-              assetId={data.settlementAsset.id}
-            />
-          );
-        },
+        headerName: t('Market ID'),
+        field: 'id',
+        flex: 1,
       },
     ];
     return cols;

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

@@ -1,4 +1,4 @@
-import { MarketsContainer } from '@vegaprotocol/markets';
+import { MarketsContainer } from '@vegaprotocol/market-list';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
 export const Markets = () => {

apps/trading/client-pages/markets/settlement-price-cell.spec.tsx

@@ -2,8 +2,8 @@ import { render, screen } from '@testing-library/react';
 import type { Property } from '@vegaprotocol/types';
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
-import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/markets';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/markets';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/market-info';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
 import type { SettlementPriceCellProps } from './settlement-price-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 

apps/trading/client-pages/markets/settlement-price-cell.tsx

@@ -1,6 +1,6 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
-import { useOracleSpecBindingData } from '@vegaprotocol/markets';
+import { useOracleSpecBindingData } from '@vegaprotocol/market-info';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 

apps/trading/client-pages/portfolio/account-history-container.tsx

@@ -26,7 +26,7 @@ import type { Account } from '@vegaprotocol/accounts';
 import { accountsDataProvider } from '@vegaprotocol/accounts';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 
 const DateRange = {
   RANGE_1D: '1D',

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

@@ -5,7 +5,6 @@ import {
   RoundedWrapper,
   Switch,
   ThemeSwitcher,
-  ToastPositionSetter,
 } from '@vegaprotocol/ui-toolkit';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 
@@ -42,8 +41,6 @@ export const Settings = () => {
                 'Help identify bugs and improve the service by sharing anonymous usage data.'
               )}
             />
-            <Divider />
-            <ToastPositionSetter />
           </RoundedWrapper>
         </div>
       </div>

apps/trading/components/liquidity-supplied/liquidity-supplied.tsx

@@ -4,8 +4,8 @@ import {
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketData } from '@vegaprotocol/markets';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import {
   ExternalLink,

apps/trading/components/market-mark-price/market-mark-price.tsx

@@ -3,7 +3,7 @@ import { useInView } from 'react-intersection-observer';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { PriceCell } from '@vegaprotocol/datagrid';
-import { marketDataProvider } from '@vegaprotocol/markets';
+import { marketDataProvider } from '@vegaprotocol/market-list';
 import { THROTTLE_UPDATE_TIME } from '../constants';
 
 interface Props {

apps/trading/components/market-state/market-state.tsx

@@ -1,6 +1,6 @@
 import throttle from 'lodash/throttle';
-import type { MarketData, Market } from '@vegaprotocol/markets';
-import { marketDataProvider } from '@vegaprotocol/markets';
+import type { MarketData, Market } from '@vegaprotocol/market-list';
+import { marketDataProvider } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import * as Schema from '@vegaprotocol/types';

apps/trading/components/market-trading-mode/market-trading-mode.tsx

@@ -5,7 +5,7 @@ import { useInView } from 'react-intersection-observer';
 import * as Schema from '@vegaprotocol/types';
 import { HeaderStat } from '../header';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useStaticMarketData } from '@vegaprotocol/markets';
+import { useStaticMarketData } from '@vegaprotocol/market-list';
 
 const getTradingModeLabel = (
   marketTradingMode?: Schema.MarketTradingMode,

apps/trading/components/market-volume/market-volume.tsx

@@ -3,8 +3,8 @@ import throttle from 'lodash/throttle';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketData } from '@vegaprotocol/markets';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';
 

apps/trading/components/select-market/select-market-columns.tsx

@@ -1,21 +1,20 @@
 import type { RefObject, MouseEvent } from 'react';
+import { FeesCell } from '@vegaprotocol/market-info';
 import {
-  FeesCell,
   calcCandleHigh,
   calcCandleLow,
   calcCandleVolume,
-  Last24hPriceChange,
-  Last24hVolume,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { PriceCell } from '@vegaprotocol/datagrid';
 import { Link as UILink, Sparkline, Tooltip } from '@vegaprotocol/ui-toolkit';
 import isNil from 'lodash/isNil';
 import type { CandleClose } from '@vegaprotocol/types';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import { Link } from 'react-router-dom';
 import { MarketMarkPrice } from '../market-mark-price';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/market-info';
 import { MarketTradingMode } from '../market-trading-mode';
 import { Links, Routes } from '../../pages/client-router';
 

apps/trading/components/vega-wallet-connect-button/vega-wallet-connect-button.tsx

@@ -21,7 +21,6 @@ import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { WalletIcon } from '../icons/wallet';
 import { useTransferDialog } from '@vegaprotocol/accounts';
-import { useCopyTimeout } from '@vegaprotocol/react-helpers';
 
 const MobileWalletButton = ({
   isConnected,
@@ -238,7 +237,21 @@ export const VegaWalletConnectButton = () => {
 };
 
 const KeypairItem = ({ pk }: { pk: PubKey }) => {
-  const [copied, setCopied] = useCopyTimeout();
+  const [copied, setCopied] = useState(false);
+  useEffect(() => {
+    // eslint-disable-next-line
+    let timeout: any;
+
+    if (copied) {
+      timeout = setTimeout(() => {
+        setCopied(false);
+      }, 800);
+    }
+
+    return () => {
+      clearTimeout(timeout);
+    };
+  }, [copied]);
 
   return (
     <DropdownMenuRadioItem value={pk.publicKey}>

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

@@ -4,7 +4,7 @@ import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { activeMarketsProvider } from '@vegaprotocol/markets';
+import { activeMarketsProvider } from '@vegaprotocol/market-list';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';
 import { WelcomeNoticeDialog } from './welcome-notice-dialog';

apps/trading/components/welcome-dialog/welcome-landing-dialog.spec.tsx

@@ -6,7 +6,7 @@ import type {
   MarketMaybeWithCandles,
   MarketMaybeWithData,
   MarketData,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
 const mockMarketClickHandler = jest.fn();
 jest.mock('../../lib/hooks/use-market-click-handler', () => ({
@@ -43,28 +43,10 @@ const MARKET_A: PartialMarket = {
         dataSourceSpecForTradingTermination: {
           __typename: 'DataSourceSpec',
           id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
         },
         dataSourceSpecForSettlementData: {
           __typename: 'DataSourceSpec',
           id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
         },
         dataSourceSpecBinding: {
           __typename: 'DataSourceSpecToFutureBinding',
@@ -147,28 +129,10 @@ const MARKET_B: PartialMarket = {
         dataSourceSpecForTradingTermination: {
           __typename: 'DataSourceSpec',
           id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
         },
         dataSourceSpecForSettlementData: {
           __typename: 'DataSourceSpec',
           id: 'oracleId',
-          data: {
-            __typename: 'DataSourceDefinition',
-            sourceType: {
-              __typename: 'DataSourceDefinitionExternal',
-              sourceType: {
-                __typename: 'DataSourceSpecConfiguration',
-              },
-            },
-          },
         },
         dataSourceSpecBinding: {
           __typename: 'DataSourceSpecToFutureBinding',

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

@@ -1,10 +1,10 @@
 import React, { useCallback } from 'react';
-import { useMarketList } from '@vegaprotocol/markets';
+import { useMarketList } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import { Link as UILink, TinyScroll } from '@vegaprotocol/ui-toolkit';
 import type { OnCellClickHandler } from '../select-market';
-import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/market-list';
 import {
   ColumnKind,
   columns,

apps/trading/pages/dialogs-container.tsx

@@ -6,10 +6,7 @@ import { VegaConnectDialog } from '@vegaprotocol/wallet';
 import { Connectors } from '../lib/vega-connectors';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { DepositDialog } from '@vegaprotocol/deposits';
-import {
-  Web3ConnectUncontrolledDialog,
-  WithdrawalApprovalDialogContainer,
-} from '@vegaprotocol/web3';
+import { Web3ConnectUncontrolledDialog } from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { TransferDialog } from '@vegaprotocol/accounts';
 
@@ -30,7 +27,6 @@ const DialogsContainer = () => {
       <Web3ConnectUncontrolledDialog />
       <CreateWithdrawalDialog />
       <TransferDialog />
-      <WithdrawalApprovalDialogContainer />
     </>
   );
 };

apps/trading/pages/styles.css

@@ -93,9 +93,9 @@ html [data-theme='light'] {
   line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }
 
-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
 }
 
 /* Light variables */
@@ -107,6 +107,7 @@ html [data-theme='light'] {
   --ag-header-column-separator-color: theme(colors.neutral[300]);
   --ag-row-border-color: theme(colors.white);
   --ag-row-hover-color: theme(colors.neutral[100]);
+  --ag-font-size: 12px;
 }
 
 /* Dark variables */
@@ -118,6 +119,7 @@ html [data-theme='light'] {
   --ag-header-column-separator-color: theme(colors.neutral[600]);
   --ag-row-border-color: theme(colors.black);
   --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
 }
 .ag-theme-balham-dark .ag-row.no-hover,
 .ag-theme-balham-dark .ag-row.no-hover:hover,

libs/accounts/__mocks__/react-markdown.js

@@ -1,6 +0,0 @@
-function ReactMarkdown({ children }) {
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return <>{children}</>;
-}
-
-export default ReactMarkdown;

libs/accounts/src/lib/accounts-actions-dropdown.tsx

@@ -1,103 +0,0 @@
-import { ETHERSCAN_ADDRESS, useEtherscanLink } from '@vegaprotocol/environment';
-import { t } from '@vegaprotocol/i18n';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuCopyItem,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-  Link,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { useTransferDialog } from './transfer-dialog';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-
-export const AccountsActionsDropdown = ({
-  assetId,
-  assetContractAddress,
-  onClickDeposit,
-  onClickWithdraw,
-  onClickBreakdown,
-}: {
-  assetId: string;
-  assetContractAddress?: string;
-  onClickDeposit: () => void;
-  onClickWithdraw: () => void;
-  onClickBreakdown: () => void;
-}) => {
-  const etherscanLink = useEtherscanLink();
-  const openTransferDialog = useTransferDialog((store) => store.open);
-  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
-  return (
-    <DropdownMenu
-      trigger={
-        <DropdownMenuTrigger
-          className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
-          data-testid="dropdown-menu"
-        >
-          <VegaIcon name={VegaIconNames.KEBAB} />
-        </DropdownMenuTrigger>
-      }
-    >
-      <DropdownMenuContent>
-        <DropdownMenuItem
-          key={'deposit'}
-          data-testid="deposit"
-          onClick={onClickDeposit}
-        >
-          <VegaIcon name={VegaIconNames.DEPOSIT} size={16} />
-          {t('Deposit')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'withdraw'}
-          data-testid="withdraw"
-          onClick={onClickWithdraw}
-        >
-          <VegaIcon name={VegaIconNames.WITHDRAW} size={16} />
-          {t('Withdraw')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'transfer'}
-          data-testid="transfer"
-          onClick={() => openTransferDialog(true, assetId)}
-        >
-          <VegaIcon name={VegaIconNames.TRANSFER} size={16} />
-          {t('Transfer')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          key={'breakdown'}
-          data-testid="breakdown"
-          onClick={onClickBreakdown}
-        >
-          <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
-          {t('Breakdown')}
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          onClick={(e) => {
-            openAssetDialog(assetId, e.target as HTMLElement);
-          }}
-        >
-          <VegaIcon name={VegaIconNames.BREAKDOWN} size={16} />
-          {t('View asset')}
-        </DropdownMenuItem>
-        <DropdownMenuCopyItem value={assetId} text={t('Copy asset ID')} />
-        {assetContractAddress && (
-          <DropdownMenuItem>
-            <Link
-              href={etherscanLink(
-                ETHERSCAN_ADDRESS.replace(':hash', assetContractAddress)
-              )}
-              target="_blank"
-            >
-              <span className="flex gap-2">
-                <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={16} />
-                {t('View on Etherscan')}
-              </span>
-            </Link>
-          </DropdownMenuItem>
-        )}
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};

libs/accounts/src/lib/accounts-data-provider.ts

@@ -1,5 +1,5 @@
 import { assetsProvider } from '@vegaprotocol/assets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   makeDataProvider,
@@ -20,7 +20,7 @@ import type {
   AccountEventsSubscription,
   AccountsQueryVariables,
 } from './__generated__/Accounts';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import type { Asset } from '@vegaprotocol/assets';
 
 const AccountType = Schema.AccountType;

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

@@ -9,11 +9,14 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { COL_DEFS } from '@vegaprotocol/datagrid';
 import {
   Button,
   ButtonLink,
   Dialog,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
   VegaIcon,
   VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
@@ -35,7 +38,6 @@ import type { AccountFields } from './accounts-data-provider';
 import type { Asset } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import classNames from 'classnames';
-import { AccountsActionsDropdown } from './accounts-actions-dropdown';
 
 const colorClass = (percentageUsed: number, neutral = false) => {
   return classNames({
@@ -107,7 +109,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
     const [row, setRow] = useState<AccountFields>();
     const pinnedAssetId = props.pinnedAsset?.id;
 
-    const pinnedAsset = useMemo(() => {
+    const pinnedAssetRow = useMemo(() => {
       const currentPinnedAssetRow = props.rowData?.find(
         (row) => row.asset.id === pinnedAssetId
       );
@@ -141,13 +143,6 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
       [pinnedAssetId, getRowHeight]
     );
 
-    const accountForPinnedAsset = props?.rowData?.find(
-      (a) => a.asset.id === pinnedAssetId
-    );
-    const showDepositButton = accountForPinnedAsset
-      ? new BigNumber(accountForPinnedAsset.total).isLessThanOrEqualTo(0)
-      : true;
-
     return (
       <>
         <AgGrid
@@ -167,7 +162,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
             comparator: accountValuesComparator,
           }}
           getRowHeight={getPinnedAssetRowHeight}
-          pinnedTopRowData={pinnedAsset ? [pinnedAsset] : undefined}
+          pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined}
         >
           <AgGridColumn
             headerName={t('Asset')}
@@ -271,57 +266,104 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
               formatWithAssetDecimals(data, data?.total)
             }
           />
-          <AgGridColumn
-            colId="accounts-actions"
-            {...COL_DEFS.actions}
-            minWidth={showDepositButton ? 130 : COL_DEFS.actions.minWidth}
-            maxWidth={showDepositButton ? 130 : COL_DEFS.actions.maxWidth}
-            cellRenderer={({
-              data,
-            }: VegaICellRendererParams<AccountFields>) => {
-              if (!data) return null;
-              else {
-                if (showDepositButton && data.asset.id === pinnedAssetId) {
+          {
+            <AgGridColumn
+              colId="accounts-actions"
+              headerName=""
+              sortable={false}
+              maxWidth={200}
+              type="rightAligned"
+              cellRenderer={({
+                data,
+              }: VegaICellRendererParams<AccountFields>) => {
+                if (!data) return null;
+                else {
+                  if (
+                    data.asset.id === pinnedAssetId &&
+                    new BigNumber(data.total).isLessThanOrEqualTo(0)
+                  ) {
+                    return (
+                      <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
+                        <Button
+                          size="xs"
+                          variant="primary"
+                          data-testid="deposit"
+                          onClick={() => {
+                            onClickDeposit && onClickDeposit(data.asset.id);
+                          }}
+                        >
+                          {t('Deposit to trade')}
+                        </Button>
+                      </CenteredGridCellWrapper>
+                    );
+                  }
                   return (
-                    <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
-                      <Button
-                        size="xs"
-                        variant="primary"
-                        data-testid="deposit"
-                        onClick={() => {
-                          onClickDeposit && onClickDeposit(data.asset.id);
-                        }}
+                    !props.isReadOnly && (
+                      <DropdownMenu
+                        trigger={
+                          <DropdownMenuTrigger
+                            iconName="more"
+                            className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
+                            data-testid="dropdown-menu"
+                          ></DropdownMenuTrigger>
+                        }
                       >
-                        <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
-                      </Button>
-                    </CenteredGridCellWrapper>
+                        <DropdownMenuContent>
+                          <DropdownMenuItem
+                            key={'deposit'}
+                            data-testid="deposit"
+                            onClick={() => {
+                              onClickDeposit && onClickDeposit(data.asset.id);
+                            }}
+                          >
+                            <span className="flex gap-2">
+                              <VegaIcon
+                                name={VegaIconNames.DEPOSIT}
+                                size={16}
+                              />
+                              {t('Deposit')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'withdraw'}
+                            data-testid="withdraw"
+                            onClick={() =>
+                              onClickWithdraw && onClickWithdraw(data.asset.id)
+                            }
+                          >
+                            <span className="flex gap-2">
+                              <VegaIcon
+                                name={VegaIconNames.WITHDRAW}
+                                size={16}
+                              />
+                              {t('Withdraw')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'breakdown'}
+                            data-testid="breakdown"
+                            onClick={() => {
+                              setOpenBreakdown(!openBreakdown);
+                              setRow(data);
+                            }}
+                          >
+                            <span className="flex gap-2">
+                              <VegaIcon
+                                name={VegaIconNames.BREAKDOWN}
+                                size={16}
+                              />
+                              {t('Breakdown')}
+                            </span>
+                          </DropdownMenuItem>
+                        </DropdownMenuContent>
+                      </DropdownMenu>
+                    )
                   );
                 }
-                return (
-                  !props.isReadOnly && (
-                    <AccountsActionsDropdown
-                      assetId={data.asset.id}
-                      assetContractAddress={
-                        data.asset.source?.__typename === 'ERC20'
-                          ? data.asset.source.contractAddress
-                          : undefined
-                      }
-                      onClickDeposit={() => {
-                        onClickDeposit && onClickDeposit(data.asset.id);
-                      }}
-                      onClickWithdraw={() => {
-                        onClickWithdraw && onClickWithdraw(data.asset.id);
-                      }}
-                      onClickBreakdown={() => {
-                        setOpenBreakdown(!openBreakdown);
-                        setRow(data);
-                      }}
-                    />
-                  )
-                );
-              }
-            }}
-          />
+              }}
+              flex={1}
+            />
+          }
         </AgGrid>
         <Dialog size="medium" open={openBreakdown} onChange={setOpenBreakdown}>
           <div

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

@@ -14,7 +14,7 @@ import { TransferForm } from './transfer-form';
 import { useTransferDialog } from './transfer-dialog';
 import { Lozenge } from '@vegaprotocol/ui-toolkit';
 
-export const TransferContainer = ({ assetId }: { assetId?: string }) => {
+export const TransferContainer = () => {
   const { pubKey, pubKeys } = useVegaWallet();
   const open = useTransferDialog((store) => store.open);
   const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
@@ -59,7 +59,6 @@ export const TransferContainer = ({ assetId }: { assetId?: string }) => {
         pubKey={pubKey}
         pubKeys={pubKeys ? pubKeys?.map((pk) => pk.publicKey) : null}
         assets={assets}
-        assetId={assetId}
         feeFactor={param}
         submitTransfer={transfer}
       />

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

@@ -5,26 +5,24 @@ import { TransferContainer } from './transfer-container';
 
 interface State {
   isOpen: boolean;
-  assetId: string | undefined;
 }
 
 interface Actions {
-  open: (open?: boolean, assetId?: string) => void;
+  open: (open?: boolean) => void;
 }
 
 export const useTransferDialog = create<State & Actions>()((set) => ({
   isOpen: false,
-  assetId: undefined,
-  open: (open = true, assetId) => {
-    set(() => ({ isOpen: open, assetId }));
+  open: (open = true) => {
+    set(() => ({ isOpen: open }));
   },
 }));
 
 export const TransferDialog = () => {
-  const { isOpen, open, assetId } = useTransferDialog();
+  const { isOpen, open } = useTransferDialog();
   return (
     <Dialog title={t('Transfer')} open={isOpen} onChange={open} size="small">
-      <TransferContainer assetId={assetId} />
+      <TransferContainer />
     </Dialog>
   );
 };

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

@@ -41,7 +41,6 @@ interface TransferFormProps {
     decimals: number;
     balance: string;
   }>;
-  assetId?: string;
   feeFactor: string | null;
   submitTransfer: (transfer: Transfer) => void;
 }
@@ -50,7 +49,6 @@ export const TransferForm = ({
   pubKey,
   pubKeys,
   assets,
-  assetId: initialAssetId,
   feeFactor,
   submitTransfer,
 }: TransferFormProps) => {
@@ -61,11 +59,7 @@ export const TransferForm = ({
     handleSubmit,
     setValue,
     formState: { errors },
-  } = useForm<FormFields>({
-    defaultValues: {
-      asset: initialAssetId,
-    },
-  });
+  } = useForm<FormFields>();
 
   const amount = watch('amount');
   const assetId = watch('asset');

libs/cypress/mock.ts

@@ -12,13 +12,13 @@ export * from '../fills/src/lib/fills.mock';
 export * from '../proposals/src/lib/proposals-data-provider/proposals.mock';
 export * from '../ledger/src/lib/ledger-entries.mock';
 export * from '../market-depth/src/lib/market-depth.mock';
-export * from '../markets/src/lib/components/market-info/market-info.mock';
-export * from '../markets/src/lib/market-candles.mock';
-export * from '../markets/src/lib/market-data.mock';
-export * from '../markets/src/lib/markets-candles.mock';
-export * from '../markets/src/lib/markets-data.mock';
-export * from '../markets/src/lib/markets.mock';
-export * from '../markets/src/lib/oracle-spec-data-connection.mock';
+export * from '../market-info/src/lib/components/market-info/market-info.mock';
+export * from '../market-list/src/lib/market-candles.mock';
+export * from '../market-list/src/lib/market-data.mock';
+export * from '../market-list/src/lib/markets-candles.mock';
+export * from '../market-list/src/lib/markets-data.mock';
+export * from '../market-list/src/lib/markets.mock';
+export * from '../market-info/src/lib/oracle-spec-data-connection.mock';
 export * from '../orders/src/lib/components/order-data-provider/orders.mock';
 export * from '../positions/src/lib/positions.mock';
 export * from '../network-parameters/src/network-params.mock';

libs/datagrid/src/index.ts

@@ -1,8 +1,6 @@
 export * from './lib/ag-grid/ag-grid-lazy';
 export * from './lib/ag-grid/use-column-sizes';
 
-export * from './lib/column-definitions';
-
 export * from './lib/cells/cumulative-vol-cell';
 export * from './lib/cells/flash-cell';
 export * from './lib/cells/numeric-cell';

libs/datagrid/src/lib/column-definitions.ts

@@ -1,12 +0,0 @@
-export const COL_DEFS = {
-  actions: {
-    headerName: '',
-    sortable: false,
-    resizable: false,
-    filter: false,
-    minWidth: 45,
-    maxWidth: 45,
-    type: 'rightAligned',
-    pinned: 'right',
-  },
-};

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

@@ -1,5 +1,5 @@
 import type { Control } from 'react-hook-form';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { DealTicketMarketAmount } from './deal-ticket-market-amount';
 import { DealTicketLimitAmount } from './deal-ticket-limit-amount';
 import * as Schema from '@vegaprotocol/types';

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

@@ -2,7 +2,7 @@ import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { useVegaTransactionStore } from '@vegaprotocol/wallet';
-import { useMarket, marketDataProvider } from '@vegaprotocol/markets';
+import { useMarket, marketDataProvider } from '@vegaprotocol/market-list';
 import { DealTicket } from './deal-ticket';
 
 export interface DealTicketContainerProps {

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

@@ -44,7 +44,7 @@ import {
 } from '../../utils';
 import { ZeroBalanceError } from '../deal-ticket-validation/zero-balance-error';
 import { SummaryValidationType } from '../../constants';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { MarginWarning } from '../deal-ticket-validation/margin-warning';
 import {
   useMarketAccountBalance,