fix: accounts actions hear text in 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/publish-dist.yml

@@ -170,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}

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,8 +12,8 @@ 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';
 

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/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/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 {
@@ -159,8 +158,7 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <CreateWithdrawalDialog />
-                  <WithdrawalApprovalDialogContainer />
+                  <WithdrawalDialog />
                   <TelemetryDialog />
                 </>
               </BalanceManager>

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/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',
@@ -289,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');
       });
     });
 
@@ -302,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/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,

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

@@ -13,11 +13,11 @@ import {
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
+import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
 import {
   MarketTableActions,
   closedMarketsWithDataProvider,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';

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

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-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/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/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,

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

@@ -10,7 +10,7 @@ import { t } from '@vegaprotocol/i18n';
 import { timeInForceLabel } from '@vegaprotocol/orders';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';
-import type { Market, StaticMarketData } from '@vegaprotocol/markets';
+import type { Market, StaticMarketData } from '@vegaprotocol/market-list';
 
 interface TimeInForceSelectorProps {
   value: Schema.OrderTimeInForce;

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

@@ -7,7 +7,7 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { Toggle } from '@vegaprotocol/ui-toolkit';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import { compileGridData } from '../trading-mode-tooltip';
 import { MarketModeValidationType } from '../../constants';
 

libs/deal-ticket/src/components/trading-mode-tooltip/compile-grid-data.tsx

@@ -8,7 +8,7 @@ import { Link as UILink } from '@vegaprotocol/ui-toolkit';
 import type { SimpleGridProps } from '@vegaprotocol/ui-toolkit';
 import type { ReactNode } from 'react';
 import { Link } from 'react-router-dom';
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 
 export const compileGridData = (
   market: Pick<

libs/deal-ticket/src/components/trading-mode-tooltip/trading-mode-tooltip.tsx

@@ -8,7 +8,7 @@ import { t } from '@vegaprotocol/i18n';
 import * as Schema from '@vegaprotocol/types';
 import { ExternalLink, SimpleGrid } from '@vegaprotocol/ui-toolkit';
 import { compileGridData } from './compile-grid-data';
-import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/market-list';
 
 type TradingModeTooltipProps = {
   marketId?: string;

libs/deal-ticket/src/hooks/use-fee-deal-ticket-details.tsx

@@ -1,8 +1,8 @@
-import { FeesBreakdown } from '@vegaprotocol/markets';
+import { FeesBreakdown } from '@vegaprotocol/market-info';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { Market } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
 import type { EstimatePositionQuery } from '@vegaprotocol/positions';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import {

libs/deal-ticket/src/test-helpers.ts

@@ -1,4 +1,4 @@
-import type { Market, MarketData } from '@vegaprotocol/markets';
+import type { Market, MarketData } from '@vegaprotocol/market-list';
 import * as Schema from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
@@ -37,28 +37,10 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
           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',

libs/deal-ticket/src/utils/get-price.ts

@@ -1,6 +1,6 @@
 import * as Schema from '@vegaprotocol/types';
 import { isMarketInAuction } from './is-market-in-auction';
-import type { MarketData } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
 
 /**
  * Get the market price based on market mode (auction or not auction)

libs/deposits/__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/environment/src/components/network-switcher/network-switcher.tsx

@@ -107,7 +107,6 @@ export const NetworkSwitcher = ({
       onOpenChange={handleOpen}
       trigger={
         <DropdownMenuTrigger
-          data-testid="network-switcher"
           ref={menuRef}
           className={classNames(
             'flex justify-between items-center text-sm text-vega-dark-600 dark:text-vega-light-600 py-1 px-2 rounded border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500 hover:bg-vega-light-500',

libs/fills/__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/fills/src/lib/fills-data-provider.ts

@@ -9,8 +9,8 @@ import {
   paginatedCombineDelta as combineDelta,
   paginatedCombineInsertionData as combineInsertionData,
 } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { FillsDocument, FillsEventDocument } from './__generated__/Fills';
 import type {
   FillsQuery,

libs/fills/src/lib/test-helpers.ts

@@ -80,28 +80,10 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
             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',

libs/ledger/src/lib/ledger-entries-data-provider.ts

@@ -1,7 +1,7 @@
 import type { Asset } from '@vegaprotocol/assets';
 import { assetsProvider } from '@vegaprotocol/assets';
-import type { Market } from '@vegaprotocol/markets';
-import { marketsProvider } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { makeInfiniteScrollGetRows } from '@vegaprotocol/data-provider';
 import { updateGridData } from '@vegaprotocol/datagrid';
 import {

libs/liquidity/src/lib/markets-liquidity-provider.ts

@@ -10,9 +10,9 @@ import type {
   MarketCandles,
   MarketMaybeWithDataAndCandles,
   MarketsCandlesQueryVariables,
-} from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-list';
 
-import { marketListProvider } from '@vegaprotocol/markets';
+import { marketListProvider } from '@vegaprotocol/market-list';
 
 import type { LiquidityProvisionMarketsQuery } from './__generated__/MarketsLiquidity';
 import { LiquidityProvisionMarketsDocument } from './__generated__/MarketsLiquidity';

libs/market-depth/__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/market-depth/src/lib/depth-chart.tsx

@@ -7,8 +7,8 @@ import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
-import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import type {
   MarketDepthQuery,
   MarketDepthUpdateSubscription,

libs/market-depth/src/lib/orderbook-data.ts

@@ -3,7 +3,7 @@ import uniqBy from 'lodash/uniqBy';
 import reverse from 'lodash/reverse';
 import cloneDeep from 'lodash/cloneDeep';
 import * as Schema from '@vegaprotocol/types';
-import type { MarketData } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/market-list';
 import type { PriceLevelFieldsFragment } from './__generated__/MarketDepth';
 
 export enum VolumeType {

libs/market-depth/src/lib/orderbook-manager.tsx

@@ -3,8 +3,8 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Orderbook } from './orderbook';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { marketDepthProvider } from './market-depth-provider';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
-import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/market-list';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import type {
   MarketDepthUpdateSubscription,

libs/market-info/README.md

@@ -0,0 +1,7 @@
+# market-info
+
+This library was generated with [Nx](https://nx.dev).
+
+## Running unit tests
+
+Run `nx test market-info` to execute the unit tests via [Jest](https://jestjs.io).

libs/market-info/jest.config.ts

@@ -1,11 +1,11 @@
 /* eslint-disable */
 export default {
-  displayName: 'markets',
+  displayName: 'market-info',
   preset: '../../jest.preset.js',
   transform: {
     '^.+\\.[tj]sx?$': 'babel-jest',
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/libs/markets',
+  coverageDirectory: '../../coverage/libs/market-info',
   setupFilesAfterEnv: ['./src/setup-tests.ts'],
 };

libs/market-info/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@vegaprotocol/market-info",
+  "version": "0.0.1"
+}

libs/market-info/project.json

@@ -1,6 +1,6 @@
 {
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "libs/markets/src",
+  "sourceRoot": "libs/market-info/src",
   "projectType": "library",
   "tags": [],
   "targets": {
@@ -8,16 +8,16 @@
       "executor": "@nrwl/web:rollup",
       "outputs": ["{options.outputPath}"],
       "options": {
-        "outputPath": "dist/libs/markets",
-        "tsConfig": "libs/markets/tsconfig.lib.json",
-        "project": "libs/markets/package.json",
-        "entryFile": "libs/markets/src/index.ts",
+        "outputPath": "dist/libs/market-info",
+        "tsConfig": "libs/market-info/tsconfig.lib.json",
+        "project": "libs/market-info/package.json",
+        "entryFile": "libs/market-info/src/index.ts",
         "external": ["react/jsx-runtime"],
         "rollupConfig": "@nrwl/react/plugins/bundle-rollup",
         "compiler": "babel",
         "assets": [
           {
-            "glob": "libs/markets/README.md",
+            "glob": "libs/market-info/README.md",
             "input": ".",
             "output": "."
           }
@@ -28,14 +28,14 @@
       "executor": "@nrwl/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["libs/markets/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["libs/market-info/**/*.{ts,tsx,js,jsx}"]
       }
     },
     "test": {
       "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/libs/markets"],
+      "outputs": ["coverage/libs/market-info"],
       "options": {
-        "jestConfig": "libs/markets/jest.config.ts",
+        "jestConfig": "libs/market-info/jest.config.ts",
         "passWithNoTests": true
       }
     },
@@ -45,7 +45,7 @@
         "uiFramework": "@storybook/react",
         "port": 4400,
         "config": {
-          "configFolder": "libs/markets/.storybook"
+          "configFolder": "libs/market-info/.storybook"
         }
       },
       "configurations": {
@@ -59,9 +59,9 @@
       "outputs": ["{options.outputPath}"],
       "options": {
         "uiFramework": "@storybook/react",
-        "outputPath": "dist/storybook/markets",
+        "outputPath": "dist/storybook/market-info",
         "config": {
-          "configFolder": "libs/markets/.storybook"
+          "configFolder": "libs/market-info/.storybook"
         }
       },
       "configurations": {
@@ -74,7 +74,7 @@
       "executor": "@nrwl/workspace:run-commands",
       "outputs": [],
       "options": {
-        "command": "yarn tsc --project ./libs/markets/tsconfig.spec.json"
+        "command": "yarn tsc --project ./libs/market-info/tsconfig.spec.json"
       }
     }
   }

libs/market-info/src/lib/__generated__/index.ts

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

libs/market-info/src/lib/components/fees-breakdown/fees-breakdown.tsx

@@ -1,4 +1,4 @@
-import { totalFeesPercentage } from '../../market-utils';
+import { totalFeesPercentage } from '@vegaprotocol/market-list';
 import type { TradeFee, FeeFactors } from '@vegaprotocol/types';
 import {
   addDecimalsFormatNumber,

libs/market-info/src/lib/components/index.ts

@@ -1,8 +1,7 @@
-export * from './fees-breakdown';
+export * from './market-info';
 export * from './last-24h-price-change';
 export * from './last-24h-volume';
-export * from './market-info';
-export * from './markets-container';
-export * from './oracle-banner';
+export * from './fees-breakdown';
 export * from './oracle-basic-profile';
 export * from './oracle-full-profile';
+export * from './oracle-banner';

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

@@ -6,7 +6,7 @@ import { useThrottledDataProvider } from '@vegaprotocol/data-provider';
 import { PriceChangeCell } from '@vegaprotocol/datagrid';
 import * as Schema from '@vegaprotocol/types';
 import type { CandleClose } from '@vegaprotocol/types';
-import { marketCandlesProvider } from '../../market-candles-provider';
+import { marketCandlesProvider } from '@vegaprotocol/market-list';
 
 interface Props {
   marketId?: string;

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

@@ -1,7 +1,9 @@
 import type { RefObject } from 'react';
 import { useInView } from 'react-intersection-observer';
-import { marketCandlesProvider } from '../../market-candles-provider';
-import { calcCandleVolume } from '../../market-utils';
+import {
+  calcCandleVolume,
+  marketCandlesProvider,
+} from '@vegaprotocol/market-list';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { useYesterday } from '@vegaprotocol/react-helpers';
 import { useThrottledDataProvider } from '@vegaprotocol/data-provider';

libs/market-info/src/lib/components/market-info/market-info-data-provider.ts

@@ -6,9 +6,8 @@ import type {
   MarketInfoQuery,
   MarketInfoQueryVariables,
 } from './__generated__/MarketInfo';
-import { marketDataProvider } from '../../market-data-provider';
-import type { MarketData } from '../../market-data-provider';
-import type { Candle } from '../../market-candles-provider';
+import { marketDataProvider } from '@vegaprotocol/market-list';
+import type { MarketData, Candle } from '@vegaprotocol/market-list';
 import { MarketInfoDocument } from './__generated__/MarketInfo';
 
 export type MarketInfo = NonNullable<MarketInfoQuery['market']>;