chore: remove fetch policy

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

@@ -0,0 +1,74 @@
+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,12 +170,6 @@ 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

@@ -0,0 +1,77 @@
+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/market-info';
-import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
-import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
+  LiquidityInfoPanel,
+  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,8 +12,8 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/market-info';
-import { MarketInfoTable } from '@vegaprotocol/market-info';
+} from '@vegaprotocol/markets';
+import { MarketInfoTable } from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 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/market-info';
+import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 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/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 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 {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
 }
 
 /* Light variables */
@@ -46,7 +46,6 @@
   --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 */
@@ -58,7 +57,6 @@
   --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/src/app.tsx

@@ -16,6 +16,7 @@ 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,
@@ -43,7 +44,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { WithdrawalDialog } from '@vegaprotocol/withdraws';
+import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -52,6 +53,7 @@ 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: {
@@ -157,7 +159,8 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <WithdrawalDialog />
+                  <CreateWithdrawalDialog />
+                  <WithdrawalApprovalDialogContainer />
                   <TelemetryDialog />
                 </>
               </BalanceManager>
@@ -219,9 +222,8 @@ const AppContainer = () => {
           const transaction = event.transaction;
 
           if (
-            (errorIsString && error.includes('failed to get party ID')) ||
-            (errorIsObject &&
-              error?.message?.includes('failed to get party ID'))
+            (errorIsString && isPartyNotFoundError({ message: error })) ||
+            (errorIsObject && isPartyNotFoundError(error))
           ) {
             // 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,6 +26,7 @@ import type {
   WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
 import { DelegationsDocument } from './__generated__/Delegations';
+import { isPartyNotFoundError } from '../../lib/party';
 
 export const usePollForDelegations = () => {
   const { token: vegaToken } = useContracts();
@@ -75,6 +76,7 @@ export const usePollForDelegations = () => {
           })
           .then((res) => {
             if (!mounted) return;
+
             const canonisedDelegations = removePaginationWrapper(
               res.data.party?.delegationsConnection?.edges
             );
@@ -203,6 +205,15 @@ 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/lib/party.ts

@@ -0,0 +1,8 @@
+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/staking/node/nodes-container.tsx

@@ -9,6 +9,7 @@ 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.
 
@@ -50,7 +51,7 @@ export const NodeContainer = ({
 
   useRefreshAfterEpoch(data?.epoch.timestamps.expiry, refetch);
 
-  if (error && !error.message.includes('failed to get party for ID')) {
+  if (error && !isPartyNotFoundError(error)) {
     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 {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
 }
 
 /* Dark variables */
@@ -54,7 +54,6 @@
   --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/market-list';
-import { marketCandlesProvider } from '@vegaprotocol/market-list';
+import type { Candle } from '@vegaprotocol/markets';
+import { marketCandlesProvider } from '@vegaprotocol/markets';
 
 const THROTTLE_UPDATE_TIME = 500;
 

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

@@ -318,10 +318,11 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       .should('have.text', product.settlementAsset.symbol);
 
     // 6001-MARK-020
-    cy.get(rowSelector)
+    cy.get('.ag-pinned-right-cols-container')
+      .find('[col-id="market-actions"]')
       .first()
-      .find('[col-id="id"]')
-      .should('have.text', settledMarket.id);
+      .find('button svg')
+      .should('exist');
   });
 
   // test market list for market in terminated state
@@ -373,5 +374,33 @@ 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,10 +108,9 @@ describe('deposit actions', { tags: '@smoke' }, () => {
 
   it('Deposit to trade is visble', () => {
     cy.getByTestId('Collateral').click();
-    cy.contains('[data-testid="deposit"]', 'Deposit to trade').should(
-      'be.visible'
-    );
-    cy.contains('[data-testid="deposit"]', 'Deposit to trade').click();
+    cy.contains('[data-testid="deposit"]', 'Deposit')
+      .should('be.visible')
+      .click();
     cy.getByTestId('deposit-submit').should('be.visible');
   });
 });

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/market-info';
+import type { Provider, Status } from '@vegaprotocol/markets';
 import {
   accountsQuery,
   assetQuery,
@@ -32,7 +32,7 @@ import {
   blockStatisticsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
-import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
 
 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/market-list';
+import { marketsWithDataProvider } from '@vegaprotocol/markets';
 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/market-info';
+import { tooltipMapping } from '@vegaprotocol/markets';
 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/market-list';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market } from '@vegaprotocol/markets';
 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/market-info';
+import { Last24hPriceChange, Last24hVolume } from '@vegaprotocol/markets';
 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/market-list';
-import { MarketDataUpdateDocument } from '@vegaprotocol/market-list';
+} from '@vegaprotocol/markets';
+import { MarketDataUpdateDocument } from '@vegaprotocol/markets';
 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/market-list';
-import { useMarketDataUpdateSubscription } from '@vegaprotocol/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
+import { useMarketDataUpdateSubscription } from '@vegaprotocol/markets';
 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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { MemoryRouter } from 'react-router-dom';
@@ -10,8 +10,9 @@ 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/market-list');
+jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 // mock market list items to avoid subscriptions starting
@@ -126,9 +127,7 @@ describe('MarketSelector', () => {
     }),
   ];
 
-  const activeMarkets = markets.filter((m) =>
-    [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(m.state)
-  );
+  const activeMarkets = markets.filter((m) => isMarketActive(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/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 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/market-list';
+import { marketProvider, marketDataProvider } from '@vegaprotocol/markets';
 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/market-info';
-import type { Market } from '@vegaprotocol/market-list';
+import { OracleBanner } from '@vegaprotocol/markets';
+import type { Market } from '@vegaprotocol/markets';
 import { Filter } from '@vegaprotocol/orders';
 import {
   usePaneLayout,
@@ -32,6 +32,7 @@ import {
 import { TradingViews } from './trade-views';
 import { MarketSelector } from './market-selector';
 import { HeaderStats } from './header-stats';
+import { PositionsMultiKey } from '@vegaprotocol/positions';
 
 interface TradeGridProps {
   market: Market | null;
@@ -130,6 +131,11 @@ const MarketBottomPanel = memo(
         >
           <TradeGridChild>
             <Tabs storageKey="console-trade-grid-bottom-right">
+              <Tab id="positions-multi" name={t('Positions v2')}>
+                <VegaWalletContainer>
+                  <PositionsMultiKey />
+                </VegaWalletContainer>
+              </Tab>
               <Tab id="positions" name={t('Positions')}>
                 <VegaWalletContainer>
                   <TradingViews.positions.component

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

@@ -1,6 +1,6 @@
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import type { Market } from '@vegaprotocol/market-list';
-import { OracleBanner } from '@vegaprotocol/market-info';
+import type { Market } from '@vegaprotocol/markets';
+import { OracleBanner } from '@vegaprotocol/markets';
 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/market-info';
+import { MarketInfoAccordionContainer } from '@vegaprotocol/markets';
 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,15 +1,18 @@
 import merge from 'lodash/merge';
 import { renderHook } from '@testing-library/react';
-import { useMarketSelectorList } from './use-market-selector-list';
+import {
+  isMarketActive,
+  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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 import type { Filter } from './market-selector';
 import { subDays } from 'date-fns';
 
-jest.mock('@vegaprotocol/market-list');
+jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;
 
 describe('useMarketSelectorList', () => {
@@ -38,6 +41,10 @@ describe('useMarketSelectorList', () => {
       }),
       createMarketFragment({
         id: 'market-3',
+        state: MarketState.STATE_CLOSED,
+      }),
+      createMarketFragment({
+        id: 'market-4',
         state: MarketState.STATE_PENDING,
       }),
     ];
@@ -48,7 +55,7 @@ describe('useMarketSelectorList', () => {
     });
     const { result } = setup();
     const expectedFilteredMarkets = markets.filter((m) =>
-      [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(m.state)
+      isMarketActive(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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from './market-selector';
 import { Sort } from './sort-dropdown';
@@ -18,11 +18,7 @@ export const useMarketSelectorList = ({
     if (!data?.length) return [];
     const markets = data
       // only active
-      .filter((m) => {
-        return [MarketState.STATE_ACTIVE, MarketState.STATE_SUSPENDED].includes(
-          m.state
-        );
-      })
+      .filter((m) => isMarketActive(m.state))
       // only selected product type
       .filter((m) => {
         if (m.tradableInstrument.instrument.product.__typename === product) {
@@ -80,3 +76,11 @@ 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,8 +6,16 @@ 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 } from '@vegaprotocol/market-info';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
+import type {
+  OracleSpecDataConnectionQuery,
+  MarketsDataQuery,
+  MarketsQuery,
+} from '@vegaprotocol/markets';
+import {
+  OracleSpecDataConnectionDocument,
+  MarketsDataDocument,
+  MarketsDocument,
+} from '@vegaprotocol/markets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import type {
@@ -16,9 +24,6 @@ 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,
@@ -214,7 +219,7 @@ describe('Closed', () => {
       'Settlement price',
       'Realised PNL',
       'Settlement asset',
-      'Market ID',
+      '', // actions row
     ];
     expect(headers).toHaveLength(expectedHeaders.length);
     expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
@@ -236,7 +241,7 @@ describe('Closed', () => {
       addDecimalsFormatNumber(property.value, market.decimalPlaces),
       addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces),
       market.tradableInstrument.instrument.product.settlementAsset.symbol,
-      market.id,
+      '', // actions row
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
@@ -328,8 +333,13 @@ describe('Closed', () => {
     // check that only included ids are shown
     const cells = screen
       .getAllByRole('gridcell')
-      .filter((cell) => cell.getAttribute('col-id') === 'id')
-      .map((cell) => cell.textContent?.trim());
+      .filter((cell) => cell.getAttribute('col-id') === 'code')
+      .map((cell) => {
+        const marketId = within(cell)
+          .getByTestId('market-code')
+          .getAttribute('data-market-id');
+        return marketId;
+      });
     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 } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -13,8 +13,11 @@ import {
   getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
-import { closedMarketsWithDataProvider } from '@vegaprotocol/market-list';
+import type { MarketMaybeWithData } from '@vegaprotocol/markets';
+import {
+  MarketTableActions,
+  closedMarketsWithDataProvider,
+} from '@vegaprotocol/markets';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 import type { ColDef } from 'ag-grid-community';
@@ -121,6 +124,16 @@ 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'),
@@ -262,9 +275,17 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
         ),
       },
       {
-        headerName: t('Market ID'),
-        field: 'id',
-        flex: 1,
+        colId: 'market-actions',
+        ...COL_DEFS.actions,
+        cellRenderer: ({ data }: VegaICellRendererParams<Row>) => {
+          if (!data) return null;
+          return (
+            <MarketTableActions
+              marketId={data.id}
+              assetId={data.settlementAsset.id}
+            />
+          );
+        },
       },
     ];
     return cols;

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

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

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

@@ -20,6 +20,7 @@ export const SettlementDateCell = ({
 }: SettlementDataCellProps) => {
   const linkCreator = useLinks(DApp.Explorer);
   const date = closeTimestamp ? new Date(closeTimestamp) : metaDate;
+  console.log(metaDate);
 
   let text = '';
   if (!date) {

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/market-info';
-import { OracleSpecDataConnectionDocument } from '@vegaprotocol/market-info';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/markets';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/markets';
 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/market-info';
+import { useOracleSpecBindingData } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market } from '@vegaprotocol/markets';
 
 const DateRange = {
   RANGE_1D: '1D',

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

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

apps/trading/components/app-loader/app-loader.tsx

@@ -92,5 +92,8 @@ const cacheConfig: InMemoryCacheConfig = {
     Fees: {
       keyFields: false,
     },
+    Position: {
+      keyFields: ['market', ['id'], 'party', ['id']],
+    },
   },
 };

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/market-list';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
 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/market-list';
+import { marketDataProvider } from '@vegaprotocol/markets';
 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/market-list';
-import { marketDataProvider } from '@vegaprotocol/market-list';
+import type { MarketData, Market } from '@vegaprotocol/markets';
+import { marketDataProvider } from '@vegaprotocol/markets';
 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/market-list';
+import { useStaticMarketData } from '@vegaprotocol/markets';
 
 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/market-list';
-import { marketDataProvider, marketProvider } from '@vegaprotocol/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
 import { HeaderStat } from '../header';
 import * as constants from '../constants';
 

apps/trading/components/navbar/navbar.tsx

@@ -46,7 +46,7 @@ export const Navbar = ({
   return (
     <Navigation
       appName="Console"
-      theme={theme}
+      theme={'dark'}
       actions={
         <>
           <ProtocolUpgradeCountdown

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

@@ -1,20 +1,21 @@
 import type { RefObject, MouseEvent } from 'react';
-import { FeesCell } from '@vegaprotocol/market-info';
 import {
+  FeesCell,
   calcCandleHigh,
   calcCandleLow,
   calcCandleVolume,
-} from '@vegaprotocol/market-list';
+  Last24hPriceChange,
+  Last24hVolume,
+} from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 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,6 +21,7 @@ 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,
@@ -237,21 +238,7 @@ export const VegaWalletConnectButton = () => {
 };
 
 const KeypairItem = ({ pk }: { pk: PubKey }) => {
-  const [copied, setCopied] = useState(false);
-  useEffect(() => {
-    // eslint-disable-next-line
-    let timeout: any;
-
-    if (copied) {
-      timeout = setTimeout(() => {
-        setCopied(false);
-      }, 800);
-    }
-
-    return () => {
-      clearTimeout(timeout);
-    };
-  }, [copied]);
+  const [copied, setCopied] = useCopyTimeout();
 
   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/market-list';
+import { activeMarketsProvider } from '@vegaprotocol/markets';
 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/market-list';
+} from '@vegaprotocol/markets';
 import { SelectMarketLandingTable } from './welcome-landing-dialog';
 const mockMarketClickHandler = jest.fn();
 jest.mock('../../lib/hooks/use-market-click-handler', () => ({
@@ -43,10 +43,28 @@ 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',
@@ -129,10 +147,28 @@ 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/market-list';
+import { useMarketList } from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketMaybeWithDataAndCandles } from '@vegaprotocol/markets';
 import {
   ColumnKind,
   columns,

apps/trading/pages/dialogs-container.tsx

@@ -6,7 +6,10 @@ import { VegaConnectDialog } from '@vegaprotocol/wallet';
 import { Connectors } from '../lib/vega-connectors';
 import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
 import { DepositDialog } from '@vegaprotocol/deposits';
-import { Web3ConnectUncontrolledDialog } from '@vegaprotocol/web3';
+import {
+  Web3ConnectUncontrolledDialog,
+  WithdrawalApprovalDialogContainer,
+} from '@vegaprotocol/web3';
 import { WelcomeDialog } from '../components/welcome-dialog';
 import { TransferDialog } from '@vegaprotocol/accounts';
 
@@ -27,6 +30,7 @@ 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 {
-  border-width: 1px 0;
-  border-bottom: 1px solid transparent;
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
 }
 
 /* Light variables */
@@ -107,7 +107,6 @@ 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 */
@@ -119,7 +118,6 @@ 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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,103 @@
+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/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import {
   makeDataProvider,
@@ -20,7 +20,7 @@ import type {
   AccountEventsSubscription,
   AccountsQueryVariables,
 } from './__generated__/Accounts';
-import type { Market } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
 import type { Asset } from '@vegaprotocol/assets';
 
 const AccountType = Schema.AccountType;

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

@@ -9,14 +9,11 @@ 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';
@@ -38,6 +35,7 @@ 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({
@@ -109,7 +107,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
     const [row, setRow] = useState<AccountFields>();
     const pinnedAssetId = props.pinnedAsset?.id;
 
-    const pinnedAssetRow = useMemo(() => {
+    const pinnedAsset = useMemo(() => {
       const currentPinnedAssetRow = props.rowData?.find(
         (row) => row.asset.id === pinnedAssetId
       );
@@ -143,6 +141,13 @@ 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
@@ -162,7 +167,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
             comparator: accountValuesComparator,
           }}
           getRowHeight={getPinnedAssetRowHeight}
-          pinnedTopRowData={pinnedAssetRow ? [pinnedAssetRow] : undefined}
+          pinnedTopRowData={pinnedAsset ? [pinnedAsset] : undefined}
         >
           <AgGridColumn
             headerName={t('Asset')}
@@ -266,104 +271,57 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
               formatWithAssetDecimals(data, data?.total)
             }
           />
-          {
-            <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>
-                    );
-                  }
+          <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) {
                   return (
-                    !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>
-                        }
+                    <CenteredGridCellWrapper className="h-[30px] justify-end py-1">
+                      <Button
+                        size="xs"
+                        variant="primary"
+                        data-testid="deposit"
+                        onClick={() => {
+                          onClickDeposit && onClickDeposit(data.asset.id);
+                        }}
                       >
-                        <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>
-                    )
+                        <VegaIcon name={VegaIconNames.DEPOSIT} /> {t('Deposit')}
+                      </Button>
+                    </CenteredGridCellWrapper>
                   );
                 }
-              }}
-              flex={1}
-            />
-          }
+                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);
+                      }}
+                    />
+                  )
+                );
+              }
+            }}
+          />
         </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 = () => {
+export const TransferContainer = ({ assetId }: { assetId?: string }) => {
   const { pubKey, pubKeys } = useVegaWallet();
   const open = useTransferDialog((store) => store.open);
   const { param } = useNetworkParam(NetworkParams.transfer_fee_factor);
@@ -59,6 +59,7 @@ export const TransferContainer = () => {
         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,24 +5,26 @@ import { TransferContainer } from './transfer-container';
 
 interface State {
   isOpen: boolean;
+  assetId: string | undefined;
 }
 
 interface Actions {
-  open: (open?: boolean) => void;
+  open: (open?: boolean, assetId?: string) => void;
 }
 
 export const useTransferDialog = create<State & Actions>()((set) => ({
   isOpen: false,
-  open: (open = true) => {
-    set(() => ({ isOpen: open }));
+  assetId: undefined,
+  open: (open = true, assetId) => {
+    set(() => ({ isOpen: open, assetId }));
   },
 }));
 
 export const TransferDialog = () => {
-  const { isOpen, open } = useTransferDialog();
+  const { isOpen, open, assetId } = useTransferDialog();
   return (
     <Dialog title={t('Transfer')} open={isOpen} onChange={open} size="small">
-      <TransferContainer />
+      <TransferContainer assetId={assetId} />
     </Dialog>
   );
 };

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

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

@@ -0,0 +1,12 @@
+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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 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/market-list';
+import { useMarket, marketDataProvider } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market, StaticMarketData } from '@vegaprotocol/markets';
 
 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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 
 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/market-list';
+import { useMarket, useStaticMarketData } from '@vegaprotocol/markets';
 
 type TradingModeTooltipProps = {
   marketId?: string;

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

@@ -1,8 +1,8 @@
-import { FeesBreakdown } from '@vegaprotocol/market-info';
+import { FeesBreakdown } from '@vegaprotocol/markets';
 import { addDecimalsFormatNumber, isNumeric } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import type { Market } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
 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/market-list';
+import type { Market, MarketData } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
@@ -37,10 +37,28 @@ 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/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
 
 /**
  * Get the market price based on market mode (auction or not auction)

libs/deposits/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+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

@@ -154,19 +154,21 @@ export const NetworkSwitcher = ({
           <>
             {advancedNetworkKeys.map((key) => (
               <DropdownMenuItem key={key} data-testid="network-item-advanced">
-                <div className="mr-4">
-                  <Link href={VEGA_NETWORKS[key]}>{envNameMapping[key]}</Link>
-                  <NetworkLabel
-                    isCurrent={current === key}
-                    isAvailable={!!VEGA_NETWORKS[key]}
-                  />
+                <div className="w-full flex justify-between gap-2">
+                  <div>
+                    <Link href={VEGA_NETWORKS[key]}>{envNameMapping[key]}</Link>
+                    <NetworkLabel
+                      isCurrent={current === key}
+                      isAvailable={!!VEGA_NETWORKS[key]}
+                    />
+                  </div>
+                  <span
+                    className="hidden md:inline"
+                    data-testid="network-item-description"
+                  >
+                    {envDescriptionMapping[key]}
+                  </span>
                 </div>
-                <span
-                  className="hidden md:inline"
-                  data-testid="network-item-description"
-                >
-                  {envDescriptionMapping[key]}
-                </span>
               </DropdownMenuItem>
             ))}
           </>

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

@@ -133,6 +133,7 @@ export const useProtocolUpgradeProposalLink = () => {
 // Explorer pages
 export const EXPLORER_TX = '/txs/:hash';
 export const EXPLORER_ORACLE = '/oracles/:id';
+export const EXPLORER_MARKET = '/markets/:id';
 
 // Etherscan pages
 export const ETHERSCAN_ADDRESS = '/address/:hash';

libs/fills/__mocks__/react-markdown.js

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

libs/fills/src/lib/fill-actions-dropdown.tsx

@@ -0,0 +1,44 @@
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuCopyItem,
+  DropdownMenuTrigger,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+
+export const FillActionsDropdown = ({
+  tradeId,
+  buyOrderId,
+  sellOrderId,
+}: {
+  tradeId: string;
+  buyOrderId: string;
+  sellOrderId: string;
+}) => {
+  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 data-testid="market-actions-content">
+        <DropdownMenuCopyItem value={tradeId} text={t('Copy trade ID')} />
+        <DropdownMenuCopyItem
+          value={buyOrderId}
+          text={t('Copy buy order ID')}
+        />
+        <DropdownMenuCopyItem
+          value={sellOrderId}
+          text={t('Copy sell order ID')}
+        />
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+};

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/market-list';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { FillsDocument, FillsEventDocument } from './__generated__/Fills';
 import type {
   FillsQuery,

libs/fills/src/lib/fills-table.spec.tsx

@@ -48,6 +48,7 @@ describe('FillsTable', () => {
       'Role',
       'Fee',
       'Date',
+      '', // action column
     ];
     expect(headers).toHaveLength(expectedHeaders.length);
     expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
@@ -77,6 +78,7 @@ describe('FillsTable', () => {
       'Maker',
       '2.00 BTC',
       getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+      '', // action column
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
@@ -111,6 +113,7 @@ describe('FillsTable', () => {
       'Taker',
       '0.03 BTC',
       getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+      '', // action column
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);
@@ -145,6 +148,7 @@ describe('FillsTable', () => {
       '-',
       '0.03 BTC',
       getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+      '', // action column
     ];
     cells.forEach((cell, i) => {
       expect(cell).toHaveTextContent(expectedValues[i]);

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

@@ -19,12 +19,17 @@ import {
   positiveClassNames,
   negativeClassNames,
   MarketNameCell,
+  COL_DEFS,
+} from '@vegaprotocol/datagrid';
+import type {
+  VegaValueFormatterParams,
+  VegaICellRendererParams,
 } from '@vegaprotocol/datagrid';
-import type { VegaValueFormatterParams } from '@vegaprotocol/datagrid';
 import { forwardRef } from 'react';
 import BigNumber from 'bignumber.js';
 import type { Trade } from './fills-data-provider';
 import type { FillFieldsFragment } from './__generated__/Fills';
+import { FillActionsDropdown } from './fill-actions-dropdown';
 
 const TAKER = 'Taker';
 const MAKER = 'Maker';
@@ -108,6 +113,20 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
             return value ? getDateTimeFormat().format(new Date(value)) : '';
           }}
         />
+        <AgGridColumn
+          colId="fill-actions"
+          {...COL_DEFS.actions}
+          cellRenderer={({ data }: VegaICellRendererParams<Trade, 'id'>) => {
+            if (!data) return null;
+            return (
+              <FillActionsDropdown
+                buyOrderId={data.buyOrder}
+                sellOrderId={data.sellOrder}
+                tradeId={data.id}
+              />
+            );
+          }}
+        />
       </AgGrid>
     );
   }

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

@@ -80,10 +80,28 @@ 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/market-list';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/markets';
 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/market-list';
+} from '@vegaprotocol/markets';
 
-import { marketListProvider } from '@vegaprotocol/market-list';
+import { marketListProvider } from '@vegaprotocol/markets';
 
 import type { LiquidityProvisionMarketsQuery } from './__generated__/MarketsLiquidity';
 import { LiquidityProvisionMarketsDocument } from './__generated__/MarketsLiquidity';

libs/market-depth/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+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/market-list';
-import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/markets';
 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/market-list';
+import type { MarketData } from '@vegaprotocol/markets';
 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/market-list';
-import type { MarketData } from '@vegaprotocol/market-list';
+import { marketDataProvider, marketProvider } from '@vegaprotocol/markets';
+import type { MarketData } from '@vegaprotocol/markets';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import type {
   MarketDepthUpdateSubscription,

libs/market-info/README.md

@@ -1,7 +0,0 @@
-# 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/package.json

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

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

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

libs/market-info/src/lib/hooks/use-market-oracle.ts

@@ -1,56 +0,0 @@
-import { useEnvironment } from '@vegaprotocol/environment';
-import { useOracleProofs } from './use-oracle-proofs';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoProvider } from '../components/market-info/market-info-data-provider';
-import { useMemo } from 'react';
-
-export const useMarketOracle = (
-  marketId: string,
-  dataSourceSpecKey:
-    | 'dataSourceSpecForSettlementData'
-    | 'dataSourceSpecForTradingTermination' = 'dataSourceSpecForSettlementData'
-) => {
-  const { ORACLE_PROOFS_URL } = useEnvironment();
-  const { data: marketInfo } = useDataProvider({
-    dataProvider: marketInfoProvider,
-    variables: { marketId },
-  });
-  const { data } = useOracleProofs(ORACLE_PROOFS_URL);
-  return useMemo(() => {
-    if (!data || !marketInfo) {
-      return undefined;
-    }
-    const dataSourceSpec =
-      marketInfo.tradableInstrument.instrument.product[dataSourceSpecKey];
-    const { data: dataSource, id: dataSourceSpecId } = dataSourceSpec;
-    const provider = data.find((provider) =>
-      provider.proofs.some((proof) => {
-        if (
-          proof.type === 'eth_address' &&
-          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
-        ) {
-          return dataSource.sourceType.sourceType.signers?.some(
-            (signer) =>
-              signer.signer.__typename === 'ETHAddress' &&
-              signer.signer.address === proof.eth_address
-          );
-        }
-        if (
-          proof.type === 'public_key' &&
-          dataSource.sourceType.__typename === 'DataSourceDefinitionExternal'
-        ) {
-          return dataSource.sourceType.sourceType.signers?.some(
-            (signer) =>
-              signer.signer.__typename === 'PubKey' &&
-              signer.signer.key === proof.public_key
-          );
-        }
-        return false;
-      })
-    );
-    if (provider) {
-      return { provider, dataSourceSpecId };
-    }
-    return undefined;
-  }, [data, dataSourceSpecKey, marketInfo]);
-};

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

@@ -1,5 +0,0 @@
-export * from './__generated__';
-export * from './components';
-export * from './oracle-schema';
-export * from './oracle-spec-data-connection.mock';
-export * from './hooks';

libs/market-info/tsconfig.spec.json

@@ -1,22 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
-    "types": ["jest", "node", "@testing-library/jest-dom"]
-  },
-  "include": [
-    "**/*.test.ts",
-    "**/*.spec.ts",
-    "**/*.test.tsx",
-    "**/*.spec.tsx",
-    "**/*.test.js",
-    "**/*.spec.js",
-    "**/*.test.jsx",
-    "**/*.spec.jsx",
-    "**/*.d.ts",
-    "jest.config.ts",
-    "../../index.d.ts",
-    "src/lib/use-oracle-spec-binding-data.spec.tsx"
-  ]
-}

libs/market-list/.babelrc

@@ -1,12 +0,0 @@
-{
-  "presets": [
-    [
-      "@nrwl/react/babel",
-      {
-        "runtime": "automatic",
-        "useBuiltIns": "usage"
-      }
-    ]
-  ],
-  "plugins": []
-}

libs/market-list/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
-  "overrides": [
-    {
-      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.ts", "*.tsx"],
-      "rules": {}
-    },
-    {
-      "files": ["*.js", "*.jsx"],
-      "rules": {}
-    }
-  ]
-}

libs/market-list/README.md

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

libs/market-list/jest.config.ts

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