fix(ui-toolkit): test toast configuration

feat(trading): move trade grid panel - fix id of store (#3872 )
feat(trading): move deal ticket panel to the left (#3842 )
2023-05-22 16:55:03 +02:00 · 2023-05-22 14:09:37 +00:00 · 2023-05-22 15:40:42 +02:00 · 2023-05-22 13:38:51 +00:00 · 2023-05-22 12:08:25 +00:00 · 2023-05-22 11:42:09 +02:00
34 changed files with 4342 additions and 652 deletions
@@ -98,36 +98,37 @@ jobs:
      # See affected apps
      - name: See affected apps
        run: |
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+
          echo ">>>> debug"
          echo "NX_BASE: ${{ env.NX_BASE }}"
          echo "NX_HEAD: ${{ env.NX_HEAD }}"
+          echo "Affected: ${affected}"
+          echo "Branch slug: ${branch_slug}"
          echo ">>>> eof debug"

-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
          projects_e2e=""
          preview_governance="not deployed"
          preview_trading="not deployed"
          preview_explorer="not deployed"
+          if [[ $affected == *"governance"* ]]; then
+            projects_e2e+='"governance-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+          fi
+          if [[ $affected == *"trading"* ]]; then
+            projects_e2e+='"trading-e2e" '
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+          fi
+          if [[ $affected == *"explorer"* ]]; then
+            projects_e2e+='"explorer-e2e" '
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          fi
          if [[ -z "$projects_e2e" ]]; then
            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          else
-            if [[ $affected == *"governance"* ]]; then
-              projects_e2e+='"governance-e2e" '
-              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-            fi
-            if [[ $affected == *"trading"* ]]; then
-              projects_e2e+='"trading-e2e" '
-              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-            fi
-            if [[ $affected == *"explorer"* ]]; then
-              projects_e2e+='"explorer-e2e" '
-              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-            fi
          fi
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
@@ -1,6 +1,7 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
+NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
@@ -8,7 +8,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
+NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
@@ -12,3 +12,4 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -3,9 +3,10 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/6684b914570bbfa533ba9324
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
@@ -12,4 +12,5 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
+NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -9,4 +9,5 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
+NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
@@ -209,7 +209,10 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    [proposalsData]
  );

-  const sortedProposals = useMemo(() => orderByDate(proposals), [proposals]);
+  const sortedProposals = useMemo(
+    () => orderByDate(proposals).reverse(),
+    [proposals]
+  );

  const protocolUpgradeProposals = useMemo(
    () =>
@@ -1,5 +1,10 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
+import {
+  MarketState,
+  MarketStateMapping,
+  PropertyKeyType,
+} from '@vegaprotocol/types';
 import { addDays, subDays } from 'date-fns';
 import {
  chainIdQuery,
@@ -20,6 +25,25 @@ import {
 } from '@vegaprotocol/utils';

 describe('Closed markets', { tags: '@smoke' }, () => {
+  const settlementDataProperty = 'settlement-data-property';
+  const settlementDataPropertyKey = {
+    __typename: 'PropertyKey' as const,
+    name: settlementDataProperty,
+    type: PropertyKeyType.TYPE_INTEGER,
+    numberDecimalPlaces: 2,
+  };
+  const settlementDataSourceData: DataSourceDefinition = {
+    sourceType: {
+      sourceType: {
+        filters: [
+          {
+            __typename: 'Filter',
+            key: settlementDataPropertyKey,
+          },
+        ],
+      },
+    },
+  };
  const rowSelector =
    '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row';

@@ -37,11 +61,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
    tradableInstrument: {
      instrument: {
        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
          dataSourceSpecForTradingTermination: {
            id: 'market-1-trading-termination-oracle-id',
          },
          dataSourceSpecForSettlementData: {
            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
          },
          settlementAsset,
        },
@@ -63,6 +91,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
            `settlement-expiry-date:${addDays(new Date(), 4).toISOString()}`,
          ],
        },
+        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
+          },
+        },
      },
    },
  });
@@ -81,6 +118,15 @@ describe('Closed markets', { tags: '@smoke' }, () => {
            `settlement-expiry-date:${subDays(new Date(), 2).toISOString()}`,
          ],
        },
+        product: {
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+            data: settlementDataSourceData,
+          },
+        },
      },
    },
  });
@@ -301,7 +347,7 @@ describe('Closed markets', { tags: '@smoke' }, () => {
        addDecimalsFormatNumber(
          // @ts-ignore cannot deep un-partial
          specDataConnection.externalData.data.data[0].value,
-          settledMarket.decimalPlaces
+          settlementDataPropertyKey.numberDecimalPlaces
        )
      );

@@ -5,14 +5,15 @@ const nodeHealth = 'node-health';

 describe('home', { tags: '@regression' }, () => {
  before(() => {
-    cy.clearLocalStorage();
+    cy.clearAllLocalStorage();
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.visit('/');
+    closeWelcomeDialog();
  });

  describe('footer', () => {
-    it('shows current block height', () => {
+    it.skip('shows current block height', () => {
      closeWelcomeDialog();
      // 0006-NETW-004
      // 0006-NETW-005
@@ -22,7 +23,7 @@ describe('home', { tags: '@regression' }, () => {

      cy.intercept('POST', 'http://localhost:3008/graphql', (req) => {
        req.on('response', (res) => {
-          res.setDelay(3000);
+          res.setDelay(3001);
        });
      });

@@ -53,7 +54,6 @@ describe('home', { tags: '@regression' }, () => {
      // 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(
@@ -78,7 +78,6 @@ describe('home', { tags: '@regression' }, () => {
      // 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();
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
@@ -1,6 +1,7 @@
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/af6a2d529a11f8158bc8ca2a
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_ENV=MAINNET
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -2,6 +2,7 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_TRADING_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/testnet2/testnet2.toml
 NX_VEGA_ENV=VALIDATOR_TESTNET
 NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz
@@ -247,7 +247,7 @@ const MainGrid = memo(
    const navigate = useNavigate();
    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
    const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
-      id: 'middle',
+      id: 'middle-1',
    });

    return (
@@ -259,27 +259,7 @@ const MainGrid = memo(
            onChange={handleOnMiddleLayoutChange}
          >
            <ResizableGridPanel
-              priority={LayoutPriority.High}
-              minSize={200}
-              preferredSize={sizesMiddle[0] || '50%'}
-            >
-              <TradeGridChild>
-                <Tabs storageKey="console-trade-grid-main-left">
-                  <Tab id="chart" name={t('Chart')}>
-                    <TradingViews.candles.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="depth" name={t('Depth')}>
-                    <TradingViews.depth.component marketId={marketId} />
-                  </Tab>
-                  <Tab id="liquidity" name={t('Liquidity')}>
-                    <TradingViews.liquidity.component marketId={marketId} />
-                  </Tab>
-                </Tabs>
-              </TradeGridChild>
-            </ResizableGridPanel>
-            <ResizableGridPanel
-              priority={LayoutPriority.Low}
-              preferredSize={sizesMiddle[1] || 330}
+              preferredSize={sizesMiddle[0] || 330}
              minSize={300}
            >
              <TradeGridChild>
@@ -297,7 +277,24 @@ const MainGrid = memo(
              </TradeGridChild>
            </ResizableGridPanel>
            <ResizableGridPanel
-              priority={LayoutPriority.Low}
+              minSize={200}
+              preferredSize={sizesMiddle[1] || '50%'}
+            >
+              <TradeGridChild>
+                <Tabs storageKey="console-trade-grid-main-left">
+                  <Tab id="chart" name={t('Chart')}>
+                    <TradingViews.candles.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="depth" name={t('Depth')}>
+                    <TradingViews.depth.component marketId={marketId} />
+                  </Tab>
+                  <Tab id="liquidity" name={t('Liquidity')}>
+                    <TradingViews.liquidity.component marketId={marketId} />
+                  </Tab>
+                </Tabs>
+              </TradeGridChild>
+            </ResizableGridPanel>
+            <ResizableGridPanel
              preferredSize={sizesMiddle[2] || 430}
              minSize={200}
            >
@@ -1,6 +1,6 @@
 import { act, render, screen, within } from '@testing-library/react';
 import { Closed } from './closed';
-import { MarketStateMapping } from '@vegaprotocol/types';
+import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
 import { PositionStatus } from '@vegaprotocol/types';
 import { MarketState } from '@vegaprotocol/types';
 import { subDays } from 'date-fns';
@@ -55,6 +55,23 @@ describe('Closed', () => {
        product: {
          dataSourceSpecForSettlementData: {
            id: settlementDataId,
+            data: {
+              sourceType: {
+                sourceType: {
+                  filters: [
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: settlementDataProperty,
+                        type: PropertyKeyType.TYPE_INTEGER,
+                        numberDecimalPlaces: 5,
+                      },
+                    },
+                  ],
+                },
+              },
+            },
          },
          dataSourceSpecBinding: {
            settlementDataProperty,
@@ -13,7 +13,10 @@ import {
  getMarketExpiryDate,
 } from '@vegaprotocol/utils';
 import { usePositionsQuery } from '@vegaprotocol/positions';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
+import type {
+  DataSourceFilterFragment,
+  MarketMaybeWithData,
+} from '@vegaprotocol/markets';
 import {
  MarketTableActions,
  closedMarketsWithDataProvider,
@@ -42,6 +45,7 @@ interface Row {
  markPrice: string | undefined;
  settlementDataOracleId: string;
  settlementDataSpecBinding: string;
+  setlementDataSourceFilter: DataSourceFilterFragment | undefined;
  tradingTerminationOracleId: string;
  settlementAsset: SettlementAsset;
  realisedPNL: string | undefined;
@@ -74,28 +78,40 @@ export const Closed = () => {
      }
    );

+    const instrument = market.tradableInstrument.instrument;
+
+    const spec =
+      instrument.product.dataSourceSpecForSettlementData.data.sourceType
+        .__typename === 'DataSourceDefinitionExternal'
+        ? instrument.product.dataSourceSpecForSettlementData.data.sourceType
+            .sourceType
+        : undefined;
+    const filters = spec?.filters || [];
+
+    const settlementDataSpecBinding =
+      instrument.product.dataSourceSpecBinding.settlementDataProperty;
+    const filter = filters?.find((filter) => {
+      return filter.key.name === settlementDataSpecBinding;
+    });
+
    const row: Row = {
      id: market.id,
-      code: market.tradableInstrument.instrument.code,
-      name: market.tradableInstrument.instrument.name,
+      code: instrument.code,
+      name: instrument.name,
      decimalPlaces: market.decimalPlaces,
      state: market.state,
-      metadata: market.tradableInstrument.instrument.metadata.tags ?? [],
+      metadata: instrument.metadata.tags ?? [],
      closeTimestamp: market.marketTimestamps.close,
      bestBidPrice: market.data?.bestBidPrice,
      bestOfferPrice: market.data?.bestOfferPrice,
      markPrice: market.data?.markPrice,
      settlementDataOracleId:
-        market.tradableInstrument.instrument.product
-          .dataSourceSpecForSettlementData.id,
-      settlementDataSpecBinding:
-        market.tradableInstrument.instrument.product.dataSourceSpecBinding
-          .settlementDataProperty,
+        instrument.product.dataSourceSpecForSettlementData.id,
+      settlementDataSpecBinding,
+      setlementDataSourceFilter: filter,
      tradingTerminationOracleId:
-        market.tradableInstrument.instrument.product
-          .dataSourceSpecForTradingTermination.id,
-      settlementAsset:
-        market.tradableInstrument.instrument.product.settlementAsset,
+        instrument.product.dataSourceSpecForTradingTermination.id,
+      settlementAsset: instrument.product.settlementAsset,
      realisedPNL: position?.node.realisedPNL,
    };

@@ -238,8 +254,8 @@ const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
        }: VegaICellRendererParams<Row, 'settlementDataOracleId'>) => (
          <SettlementPriceCell
            oracleSpecId={value}
-            decimalPlaces={data?.decimalPlaces ?? 0}
            settlementDataSpecBinding={data?.settlementDataSpecBinding}
+            filter={data?.setlementDataSourceFilter}
          />
        ),
      },
@@ -12,7 +12,7 @@ export const Proposed = () => {
  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
  return (
    <>
-      <div className="min-h-[200px]">
+      <div className="h-[400px]">
        <ProposalsList />
      </div>
      <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>
@@ -1,13 +1,17 @@
 import { render, screen } from '@testing-library/react';
 import type { Property } from '@vegaprotocol/types';
+import { PropertyKeyType } 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 { SettlementPriceCellProps } from './settlement-price-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 describe('SettlementPriceCell', () => {
+  const settlementDataSpecBinding = 'settlement-data-spec-binding';
+
  const createMock = (
    id: string,
    property: Property
@@ -40,11 +44,19 @@ describe('SettlementPriceCell', () => {
      },
    };
  };
-  const createProps = (): SettlementPriceCellProps => {
+  const createProps = (
+    filterKey = {
+      name: settlementDataSpecBinding,
+      type: PropertyKeyType.TYPE_INTEGER,
+      numberDecimalPlaces: 2,
+    }
+  ): SettlementPriceCellProps => {
    return {
      oracleSpecId: 'oracle-spec-id',
-      decimalPlaces: 2,
-      settlementDataSpecBinding: 'settlement-data-spec-binding',
+      filter: {
+        key: filterKey,
+      },
+      settlementDataSpecBinding,
    };
  };
  it('renders fetches and renders the settlment data value', async () => {
@@ -65,14 +77,19 @@ describe('SettlementPriceCell', () => {

    expect(screen.getByText('-')).toBeInTheDocument();
    const link = await screen.findByRole('link');
-    expect(link).toHaveTextContent('12.34');
+    expect(link).toHaveTextContent(
+      addDecimalsFormatNumber(
+        property.value,
+        props.filter?.key.numberDecimalPlaces || 0
+      )
+    );
    expect(link).toHaveAttribute(
      'href',
      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
    );
  });

-  it('renders "-" if no spec value is found', async () => {
+  it('renders "Unknown" if no spec value is found', async () => {
    const props = createProps();
    const property = {
      __typename: 'Property' as const,
@@ -90,7 +107,7 @@ describe('SettlementPriceCell', () => {

    expect(screen.getByText('-')).toBeInTheDocument();
    const link = await screen.findByRole('link');
-    expect(link).toHaveTextContent('-');
+    expect(link).toHaveTextContent('Unknown');
    expect(link).toHaveAttribute(
      'href',
      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
@@ -110,4 +127,33 @@ describe('SettlementPriceCell', () => {
    expect(screen.getByText('-')).toBeInTheDocument();
    expect(screen.queryByRole('link')).not.toBeInTheDocument();
  });
+
+  it('does not format value if property key type is not integer', async () => {
+    const props = createProps({
+      name: settlementDataSpecBinding,
+      type: PropertyKeyType.TYPE_TIMESTAMP,
+      numberDecimalPlaces: 2,
+    });
+    const property = {
+      __typename: 'Property' as const,
+      name: props.settlementDataSpecBinding as string,
+      value: '1234',
+    };
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const mock = createMock(props.oracleSpecId!, property);
+
+    render(
+      <MockedProvider mocks={[mock]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    const link = await screen.findByRole('link');
+    expect(link).toHaveTextContent(property.value);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
 });
@@ -1,19 +1,21 @@
 import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
+import type { DataSourceFilterFragment } from '@vegaprotocol/markets';
 import { useOracleSpecBindingData } from '@vegaprotocol/markets';
+import { PropertyKeyType } from '@vegaprotocol/types';
 import { Link } from '@vegaprotocol/ui-toolkit';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 export interface SettlementPriceCellProps {
  oracleSpecId: string | undefined;
-  decimalPlaces: number;
  settlementDataSpecBinding: string | undefined;
+  filter: DataSourceFilterFragment | undefined;
 }

 export const SettlementPriceCell = ({
  oracleSpecId,
-  decimalPlaces,
  settlementDataSpecBinding,
+  filter,
 }: SettlementPriceCellProps) => {
  const linkCreator = useLinks(DApp.Explorer);
  const { property, loading } = useOracleSpecBindingData(
@@ -25,15 +27,32 @@ export const SettlementPriceCell = ({
    return <span>-</span>;
  }

+  const renderText = () => {
+    if (!property || !filter) {
+      return t('Unknown');
+    }
+
+    if (
+      filter.key.type === PropertyKeyType.TYPE_INTEGER &&
+      filter.key.numberDecimalPlaces !== null &&
+      filter.key.numberDecimalPlaces !== undefined
+    ) {
+      return addDecimalsFormatNumber(
+        property.value,
+        filter.key.numberDecimalPlaces
+      );
+    }
+
+    return property.value;
+  };
+
  return (
    <Link
      href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
      className="underline font-mono"
      target="_blank"
    >
-      {property
-        ? addDecimalsFormatNumber(property.value, decimalPlaces)
-        : t('-')}
+      {renderText()}
    </Link>
  );
 };
@@ -31,27 +31,6 @@ fragment OracleMarketSpecFields on Market {
  }
 }

-fragment DataSourceSpec on DataSourceDefinition {
-  sourceType {
-    ... on DataSourceDefinitionExternal {
-      sourceType {
-        ... on DataSourceSpecConfiguration {
-          signers {
-            signer {
-              ... on PubKey {
-                key
-              }
-              ... on ETHAddress {
-                address
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 query OracleMarketsSpec {
  marketsConnection {
    edges {
@@ -1,39 +1,16 @@
 import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
+import { DataSourceSpecFragmentDoc } from './markets';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type OracleMarketSpecFieldsFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } };
-
-export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };
+export type OracleMarketSpecFieldsFragment = { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } };

 export type OracleMarketsSpecQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type OracleMarketsSpecQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } } }> } | null };
+export type OracleMarketsSpecQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, state: Types.MarketState, tradingMode: Types.MarketTradingMode, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } } } }> } | null };

-export const DataSourceSpecFragmentDoc = gql`
-    fragment DataSourceSpec on DataSourceDefinition {
-  sourceType {
-    ... on DataSourceDefinitionExternal {
-      sourceType {
-        ... on DataSourceSpecConfiguration {
-          signers {
-            signer {
-              ... on PubKey {
-                key
-              }
-              ... on ETHAddress {
-                address
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-    `;
 export const OracleMarketSpecFieldsFragmentDoc = gql`
    fragment OracleMarketSpecFields on Market {
  id
@@ -1,16 +1,53 @@
 import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
-import { DataSourceSpecFragmentDoc } from './OracleMarketsSpec';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };
+export type DataSourceFilterFragment = { __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } };
+
+export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };
+
+export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };

 export type MarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };
+export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };

+export const DataSourceFilterFragmentDoc = gql`
+    fragment DataSourceFilter on Filter {
+  key {
+    name
+    type
+    numberDecimalPlaces
+  }
+}
+    `;
+export const DataSourceSpecFragmentDoc = gql`
+    fragment DataSourceSpec on DataSourceDefinition {
+  sourceType {
+    ... on DataSourceDefinitionExternal {
+      sourceType {
+        ... on DataSourceSpecConfiguration {
+          signers {
+            signer {
+              ... on PubKey {
+                key
+              }
+              ... on ETHAddress {
+                address
+              }
+            }
+          }
+          filters {
+            ...DataSourceFilter
+          }
+        }
+      }
+    }
+  }
+}
+    ${DataSourceFilterFragmentDoc}`;
 export const MarketFieldsFragmentDoc = gql`
    fragment MarketFields on Market {
  id
@@ -4,7 +4,7 @@ import { useMarket } from '../markets-provider';

 import { useMemo } from 'react';
 import type { Provider } from '../oracle-schema';
-import type { DataSourceSpecFragment } from '../__generated__/OracleMarketsSpec';
+import type { DataSourceSpecFragment } from '../__generated__';

 export const getMatchingOracleProvider = (
  dataSourceSpec: DataSourceSpecFragment,
@@ -1,3 +1,11 @@
+fragment DataSourceFilter on Filter {
+  key {
+    name
+    type
+    numberDecimalPlaces
+  }
+}
+
 fragment DataSourceSpec on DataSourceDefinition {
  sourceType {
    ... on DataSourceDefinitionExternal {
@@ -13,6 +21,9 @@ fragment DataSourceSpec on DataSourceDefinition {
              }
            }
          }
+          filters {
+            ...DataSourceFilter
+          }
        }
      }
    }
@@ -80,6 +80,17 @@ export const createMarketFragment = (
                      },
                    },
                  ],
+                  filters: [
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'settlement-data-property',
+                        type: Schema.PropertyKeyType.TYPE_TIMESTAMP,
+                        numberDecimalPlaces: null,
+                      },
+                    },
+                  ],
                },
              },
            },
@@ -102,6 +113,17 @@ export const createMarketFragment = (
                      },
                    },
                  ],
+                  filters: [
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'settlement-data-property',
+                        type: Schema.PropertyKeyType.TYPE_INTEGER,
+                        numberDecimalPlaces: 2,
+                      },
+                    },
+                  ],
                },
              },
            },
@@ -5,57 +5,74 @@ import {
  waitFor,
  getAllByRole,
 } from '@testing-library/react';
+import merge from 'lodash/merge';
+import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { ProposalsList } from './proposals-list';
-import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider';
 import * as Types from '@vegaprotocol/types';
-
-const votesMock = {
-  yes: {
-    totalTokens: '5000',
-  },
-  no: {
-    totalTokens: '2000',
-  },
-};
-let marketsProposalMock: ProposalListFieldsFragment[] | null = [
-  {
-    id: 'id-1',
-    state: Types.ProposalState.STATE_OPEN,
-    votes: { ...votesMock },
-  },
-  {
-    id: 'id-2',
-    state: Types.ProposalState.STATE_PASSED,
-    votes: { ...votesMock },
-  },
-  {
-    id: 'id-3',
-    state: Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-    votes: { ...votesMock },
-  },
-] as ProposalListFieldsFragment[];
-
-const useDataProvider = () => {
-  return {
-    data: marketsProposalMock,
-    loading: false,
-    error: false,
-  };
-};
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn(() => useDataProvider()),
-}));
+import { createProposalListFieldsFragment } from '../../lib/proposals-data-provider/proposals.mock';
+import type { ProposalsListQuery } from '../../lib';
+import { ProposalsListDocument } from '../../lib';
+import type { PartialDeep } from 'type-fest';

 describe('ProposalsList', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
+  const createProposalsMock = (override?: PartialDeep<ProposalsListQuery>) => {
+    const defaultProposalEdges = [
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-1',
+          state: Types.ProposalState.STATE_OPEN,
+        }),
+      },
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-2',
+          state: Types.ProposalState.STATE_PASSED,
+        }),
+      },
+      {
+        __typename: 'ProposalEdge' as const,
+        node: createProposalListFieldsFragment({
+          id: 'id-3',
+          state: Types.ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+        }),
+      },
+    ];
+    const data = merge(
+      {
+        proposalsConnection: {
+          __typename: 'ProposalsConnection' as const,
+          edges: defaultProposalEdges,
+        },
+      },
+      override
+    );
+
+    const mock: MockedResponse<ProposalsListQuery> = {
+      request: {
+        query: ProposalsListDocument,
+        variables: {
+          proposalType: Types.ProposalType.TYPE_NEW_MARKET,
+        },
+      },
+      result: {
+        data,
+      },
+    };
+
+    return mock;
+  };

  it('should be properly rendered', async () => {
+    const mock = createProposalsMock();
    await act(() => {
-      render(<ProposalsList />, { wrapper: MockedProvider });
+      render(
+        <MockedProvider mocks={[mock]}>
+          <ProposalsList />
+        </MockedProvider>
+      );
    });
    const container = document.querySelector('.ag-center-cols-container');
    await waitFor(() => {
@@ -65,15 +82,25 @@ describe('ProposalsList', () => {
  });

  it('some of states should be filtered out', async () => {
-    marketsProposalMock = [
-      {
-        ...(marketsProposalMock as ProposalListFieldsFragment[])[0],
-        state: Types.ProposalState.STATE_ENACTED,
+    const mock = createProposalsMock({
+      proposalsConnection: {
+        edges: [
+          {
+            __typename: 'ProposalEdge',
+            node: createProposalListFieldsFragment({
+              id: 'id-1',
+              state: Types.ProposalState.STATE_ENACTED,
+            }),
+          },
+        ],
      },
-      ...(marketsProposalMock as ProposalListFieldsFragment[]).slice(1),
-    ];
+    });
    await act(() => {
-      render(<ProposalsList />, { wrapper: MockedProvider });
+      render(
+        <MockedProvider mocks={[mock]}>
+          <ProposalsList />
+        </MockedProvider>
+      );
    });
    const container = document.querySelector('.ag-center-cols-container');
    await waitFor(() => {
@@ -83,9 +110,12 @@ describe('ProposalsList', () => {
  });

  it('empty response should causes no data message display', async () => {
-    marketsProposalMock = null;
    await act(() => {
-      render(<ProposalsList />, { wrapper: MockedProvider });
+      render(
+        <MockedProvider>
+          <ProposalsList />
+        </MockedProvider>
+      );
    });
    const container = document.querySelector('.ag-center-cols-container');
    await waitFor(() => {
@@ -1,13 +1,13 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
-import { useDataProvider } from '@vegaprotocol/data-provider';
 import { t } from '@vegaprotocol/i18n';
 import * as Types from '@vegaprotocol/types';
-import { proposalsDataProvider } from '../../lib/proposals-data-provider';
 import type { AgGridReact } from 'ag-grid-react';
 import { useColumnDefs } from './use-column-defs';
 import type { ProposalListFieldsFragment } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { useProposalsListQuery } from '../../lib/proposals-data-provider/__generated__/Proposals';
+import { removePaginationWrapper } from '@vegaprotocol/utils';

 export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
  data.filter((proposal) =>
@@ -21,13 +21,15 @@ export const getNewMarketProposals = (data: ProposalListFieldsFragment[]) =>
 export const ProposalsList = () => {
  const gridRef = useRef<AgGridReact | null>(null);
  const [dataCount, setDataCount] = useState(0);
-  const { data, loading, error, reload } = useDataProvider({
-    dataProvider: proposalsDataProvider,
+  const { data, loading, error, refetch } = useProposalsListQuery({
    variables: {
      proposalType: Types.ProposalType.TYPE_NEW_MARKET,
    },
+    errorPolicy: 'all', // currently there are some proposals failing due to proposals existing without settlement asset ids
  });
-  const filteredData = getNewMarketProposals(data || []);
+  const filteredData = getNewMarketProposals(
+    removePaginationWrapper(data?.proposalsConnection?.edges)
+  );
  const { columnDefs, defaultColDef } = useColumnDefs();
  useEffect(() => {
    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
@@ -36,11 +38,10 @@ export const ProposalsList = () => {
    setDataCount(gridRef.current?.api?.getModel().getRowCount() ?? 0);
  }, []);
  return (
-    <div className="relative">
+    <div className="relative h-full">
      <AgGrid
        ref={gridRef}
        className="w-full h-full"
-        domLayout="autoHeight"
        columnDefs={columnDefs}
        rowData={filteredData}
        defaultColDef={defaultColDef}
@@ -48,6 +49,8 @@ export const ProposalsList = () => {
        suppressNoRowsOverlay
        onFilterChanged={onFilterChanged}
        storeKey="proposedMarkets"
+        getRowId={({ data }) => data.id}
+        style={{ width: '100%', height: '100%' }}
      />
      <div className="pointer-events-none absolute inset-0">
        <AsyncRenderer
@@ -56,7 +59,7 @@ export const ProposalsList = () => {
          data={filteredData}
          noDataMessage={t('No markets')}
          noDataCondition={() => !dataCount}
-          reload={reload}
+          reload={refetch}
        />
      </div>
    </div>
@@ -11,6 +11,7 @@ export const proposalListQuery = (
 ): ProposalsListQuery => {
  const defaultResult: ProposalsListQuery = {
    proposalsConnection: {
+      __typename: 'ProposalsConnection',
      edges: proposalListFields.map((node) => ({
        __typename: 'ProposalEdge',
        node,
@@ -104,8 +105,10 @@ export const marketUpdateProposal: ProposalListFieldsFragment = {
  },
 };

-const proposalListFields: ProposalListFieldsFragment[] = [
-  {
+export const createProposalListFieldsFragment = (
+  override?: PartialDeep<ProposalListFieldsFragment>
+): ProposalListFieldsFragment => {
+  const defaultProposal: ProposalListFieldsFragment = {
    id: 'e9ec6d5c46a7e7bcabf9ba7a893fa5a5eeeec08b731f06f7a6eb7bf0e605b829',
    reference: 'injected_at_runtime',
    state: Schema.ProposalState.STATE_OPEN,
@@ -194,7 +197,12 @@ const proposalListFields: ProposalListFieldsFragment[] = [
      __typename: 'ProposalTerms',
    },
    __typename: 'Proposal',
-  },
+  };
+  return merge(defaultProposal, override);
+};
+
+const proposalListFields: ProposalListFieldsFragment[] = [
+  createProposalListFieldsFragment(),
  {
    id: '1cd1deb532b97fbeb9262fe94499ecec5835e60ae564b7c5af530c90a13c29cb',
    reference: 'injected_at_runtime',
@@ -7,10 +7,11 @@ import { ToastPosition, useToastsConfiguration, useToasts } from './use-toasts';
 import { useCallback } from 'react';
 import { Intent } from '../../utils/intent';

-const testToast = {
+const TEST_TOAST = {
  id: 'test-toast',
  intent: Intent.Primary,
  content: <>{t('This is an example of a toast notification')}</>,
+  onClose: () => useToasts.getState().remove('test-toast'),
 };

 export const ToastPositionSetter = () => {
@@ -20,7 +21,7 @@ export const ToastPositionSetter = () => {
  const handleChange = useCallback(
    (position: ToastPosition) => {
      setPostion(position);
-      setToast(testToast);
+      setToast(TEST_TOAST);
    },
    [setToast, setPostion]
  );
@@ -109,12 +109,12 @@ export enum ToastPosition {
  BottomCenter,
 }

-type ToastConfiguration = {
+type ToastsConfiguration = {
  position: ToastPosition;
  setPosition: (position: ToastPosition) => void;
 };

-export const useToastsConfiguration = create<ToastConfiguration>()(
+export const useToastsConfiguration = create<ToastsConfiguration>()(
  persist(
    immer((set) => ({
      position: ToastPosition.BottomRight,
Author	SHA1	Message	Date
asiaznik	8a30cc6237	fix(ui-toolkit): test toast configuration	2023-05-22 16:55:03 +02:00
Maciek	fff8fdd78b	feat(trading): move trade grid panel - fix id of store (#3872 )	2023-05-22 14:09:37 +00:00
m.rayandmaciek	079d8bc48d	feat(trading): move deal ticket panel to the left (#3842 ) Co-authored-by: maciek <maciek@vegaprotocol.io>	2023-05-22 15:40:42 +02:00
Eddandm.ray	9658363b56	chore(explorer): update be env for validator testnet (#3867 ) Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>	2023-05-22 13:38:51 +00:00
dexturr	e24289330e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 12:08:25 +00:00
Mikołaj Młodzikowski	0fbd2bfa72	feat(ci): adjust environment name	2023-05-22 11:42:09 +02:00
Mikołaj MłodzikowskiandMikołaj Młodzikowski	43ef4fad6f	feat(ci): fix affected resolution (#3849 ) Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@github.com>	2023-05-22 11:16:33 +02:00
Matthew Russell	828dcf6e93	chore(governance,explorer,trading): move sentry dsn to env files (#3860 )	2023-05-22 08:54:15 +02:00
dexturr	4a583ccf09	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 06:07:44 +00:00
dexturr	8bcad28f50	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-22 00:16:28 +00:00
dexturr	b375681076	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 18:07:08 +00:00
dexturr	8a2db407cf	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 12:10:41 +00:00
dexturr	491844d3fd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 06:09:53 +00:00
dexturr	f1f51c5ecd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-21 00:15:03 +00:00
dexturr	9bc78f8ccd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 18:06:53 +00:00
dexturr	a03031a283	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 12:10:14 +00:00
Matthew Russell	b499c293e3	fix(trading): fix proposals not showing (#3859 )	2023-05-20 10:55:52 +01:00
dexturr	65747e8d26	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 06:09:41 +00:00
dexturr	9a84eda21b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-20 00:14:21 +00:00
Maciek	fba98f2fd0	feat(trading,governance): improve flow of risk disclaimer presentation (#3772 )	2023-05-19 21:27:45 +00:00
Matthew Russell	3e32d0f396	chore(governance,trading): update mainnet envs with new ethereum provider url (#3857 )	2023-05-19 13:31:49 -07:00
Matthew Russell	b75d189054	fix(trading): settlement price of closed markets (#3831 )	2023-05-19 13:29:24 -07:00
Sam Keen	afa627864c	fix(governance): homepage proposals ordering fixed (#3856 )	2023-05-19 18:12:14 +00:00
dexturr	b13a866b2a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-19 18:07:12 +00:00
daro-maj	c65f07eee6	test(trading): skip failing node tests (#3854 )	2023-05-19 19:54:56 +02:00