fix: prevent empty call estimate position

apps/explorer-e2e/src/integration/market.cy.js

@@ -87,13 +87,7 @@ context('Market page', { tags: '@regression' }, function () {
       // Liquidity
       cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
       cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
-      // Liquidity price range
-      cy.validate_element_from_table(
-        'Liquidity Price Range',
-        '1,000.00% of mid price'
-      );
-      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
-      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
+      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
       cy.getByTestId('oracle-spec-links')
         .should('have.attr', 'href')
         .and(

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

@@ -12,6 +12,10 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { ExternalLink, Indicator } from '@vegaprotocol/ui-toolkit';
 import { DocsLinks } from '@vegaprotocol/environment';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { useCheckLiquidityStatus } from '@vegaprotocol/liquidity';
 import { useParams } from 'react-router-dom';
 
@@ -27,8 +31,12 @@ export const LiquidityHeader = () => {
   const assetDecimalPlaces = asset?.decimals || 0;
   const symbol = asset?.symbol;
 
+  const { params } = useNetworkParams([
+    NetworkParams.market_liquidity_stakeToCcyVolume,
+    NetworkParams.market_liquidity_targetstake_triggering_ratio,
+  ]);
   const triggeringRatio =
-    market?.liquidityMonitoringParameters.triggeringRatio || '1';
+    params.market_liquidity_targetstake_triggering_ratio || '1';
 
   const { percentage, status } = useCheckLiquidityStatus({
     suppliedStake: suppliedStake || 0,

apps/trading/components/market-selector/market-selector-item.spec.tsx

@@ -61,6 +61,7 @@ describe('MarketSelectorItem', () => {
     indicativeVolume: '100',
     marketState: MarketState.STATE_ACTIVE,
     marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+    marketValueProxy: '100',
     markPrice: '50000',
     midPrice: '100',
     staticMidPrice: '100',

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

@@ -126,12 +126,10 @@ export const MarketSelector = ({
           onSelect={onSelect}
           noItems={
             filter.product === Product.Perpetual
-              ? t('No perpetual markets.')
+              ? t('Perpetual markets coming soon.')
               : filter.product === Product.Spot
               ? t('Spot markets coming soon.')
-              : filter.product === Product.Future
-              ? t('No future markets.')
-              : t('No markets.')
+              : t('No markets')
           }
           allProducts={allProducts}
         />

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

@@ -264,7 +264,11 @@ export const DealTicket = ({
     orders,
     collateralAvailable:
       marginAccountBalance || generalAccountBalance ? balance : undefined,
-    skip: !normalizedOrder,
+    skip:
+      !normalizedOrder ||
+      (normalizedOrder.type !== Schema.OrderType.TYPE_MARKET &&
+        (!normalizedOrder.price || normalizedOrder.price === '0')) ||
+      normalizedOrder.size === '0',
   });
 
   const assetSymbol = getAsset(market).symbol;

libs/deal-ticket/src/hooks/use-position-estimate.ts

@@ -30,9 +30,11 @@ export const usePositionEstimate = ({
     fetchPolicy: 'no-cache',
   });
   useEffect(() => {
-    if (data) {
+    if (skip) {
+      setEstimates(undefined);
+    } else if (data) {
       setEstimates(data);
     }
-  }, [data]);
+  }, [data, skip]);
   return estimates;
 };

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

@@ -11,9 +11,6 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
     positionDecimalPlaces: 1,
     tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
     state: Schema.MarketState.STATE_ACTIVE,
-    liquidityMonitoringParameters: {
-      triggeringRatio: '1',
-    },
     marketTimestamps: {
       __typename: 'MarketTimestamps',
       close: '',

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

@@ -42,9 +42,6 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
       decimalPlaces: 5,
       state: MarketState.STATE_ACTIVE,
       tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      liquidityMonitoringParameters: {
-        triggeringRatio: '1',
-      },
       fees: {
         __typename: 'Fees',
         factors: {

libs/markets/src/lib/__generated__/market-data.ts

@@ -3,23 +3,23 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
+export type MarketDataUpdateFieldsFragment = { __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
 
 export type MarketDataUpdateSubscriptionVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
 }>;
 
 
-export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null }> };
+export type MarketDataUpdateSubscription = { __typename?: 'Subscription', marketsData: Array<{ __typename?: 'ObservableMarketData', marketId: string, auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null }> };
 
-export type MarketDataFieldsFragment = { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
+export type MarketDataFieldsFragment = { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null };
 
 export type MarketDataQueryVariables = Types.Exact<{
   marketId: Types.Scalars['ID'];
 }>;
 
 
-export type MarketDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null } }> } | null };
+export type MarketDataQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', data?: { __typename?: 'MarketData', auctionEnd?: string | null, auctionStart?: string | null, bestBidPrice: string, bestBidVolume: string, bestOfferPrice: string, bestOfferVolume: string, bestStaticBidPrice: string, bestStaticBidVolume: string, bestStaticOfferPrice: string, bestStaticOfferVolume: string, indicativePrice: string, indicativeVolume: string, marketState: Types.MarketState, marketTradingMode: Types.MarketTradingMode, marketValueProxy: string, markPrice: string, midPrice: string, openInterest: string, staticMidPrice: string, suppliedStake?: string | null, targetStake?: string | null, trigger: Types.AuctionTrigger, lastTradedPrice: string, market: { __typename?: 'Market', id: string }, productData?: { __typename?: 'PerpetualData', fundingRate?: string | null, fundingPayment?: string | null, externalTwap?: string | null, internalTwap?: string | null } | null, priceMonitoringBounds?: Array<{ __typename?: 'PriceMonitoringBounds', minValidPrice: string, maxValidPrice: string, referencePrice: string, trigger: { __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number } }> | null } | null } }> } | null };
 
 export const MarketDataUpdateFieldsFragmentDoc = gql`
     fragment MarketDataUpdateFields on ObservableMarketData {
@@ -46,6 +46,7 @@ export const MarketDataUpdateFieldsFragmentDoc = gql`
   indicativeVolume
   marketState
   marketTradingMode
+  marketValueProxy
   markPrice
   midPrice
   openInterest
@@ -93,6 +94,7 @@ export const MarketDataFieldsFragmentDoc = gql`
   indicativeVolume
   marketState
   marketTradingMode
+  marketValueProxy
   markPrice
   midPrice
   openInterest

libs/markets/src/lib/components/market-info/market-info-panels.spec.tsx

@@ -6,234 +6,226 @@ import {
 import { DataSourceProof, SuccessionLineInfoPanel } from './market-info-panels';
 import { MockedProvider } from '@apollo/react-testing';
 import { SuccessorMarketIdsDocument } from '../../__generated__';
-import { getDateTimeFormat } from '@vegaprotocol/utils';
 
 jest.mock('../../hooks/use-oracle-markets', () => ({
   useOracleMarkets: () => [],
 }));
 
-describe('MarketInfoPanels', () => {
-  describe('DataSourceProof', () => {
-    const ORACLE_PUBKEY =
-      '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f';
+describe('DataSourceProof', () => {
+  const ORACLE_PUBKEY =
+    '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f';
 
-    it('renders message if there are no providers', () => {
-      const props = {
-        data: {
+  it('renders message if there are no providers', () => {
+    const props = {
+      data: {
+        sourceType: {
+          __typename: 'DataSourceDefinitionExternal' as const,
           sourceType: {
-            __typename: 'DataSourceDefinitionExternal' as const,
-            sourceType: {
-              __typename: 'DataSourceSpecConfiguration' as const,
-              signers: [
-                {
-                  __typename: 'Signer' as const,
-                  signer: {
-                    __typename: 'PubKey' as const,
-                    key: ORACLE_PUBKEY,
-                  },
-                },
-              ],
-            },
-          },
-        },
-        providers: [],
-        type: 'termination' as const,
-      };
-      render(<DataSourceProof dataSourceSpecId={''} {...props} />);
-      expect(
-        screen.getByText('No oracle proof for termination')
-      ).toBeInTheDocument();
-    });
-
-    it('renders message if there are no matching proofs', () => {
-      const props = {
-        data: {
-          sourceType: {
-            __typename: 'DataSourceDefinitionExternal' as const,
-            sourceType: {
-              __typename: 'DataSourceSpecConfiguration' as const,
-              signers: [
-                {
-                  __typename: 'Signer' as const,
-                  signer: {
-                    __typename: 'PubKey' as const,
-                    key: ORACLE_PUBKEY,
-                  },
-                },
-              ],
-            },
-          },
-        },
-        providers: [
-          {
-            name: 'Another oracle',
-            url: 'https://zombo.com',
-            description_markdown:
-              'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-            oracle: {
-              status: 'GOOD' as const,
-              status_reason: '',
-              first_verified: '2022-01-01T00:00:00.000Z',
-              last_verified: '2022-12-31T00:00:00.000Z',
-              type: 'public_key' as const,
-              public_key: 'not-the-pubkey',
-            },
-            proofs: [
+            __typename: 'DataSourceSpecConfiguration' as const,
+            signers: [
               {
-                format: 'signed_message' as const,
-                available: true,
-                type: 'public_key' as const,
-                public_key: 'not-the-pubkey',
-                message: 'SOMEHEX',
+                __typename: 'Signer' as const,
+                signer: {
+                  __typename: 'PubKey' as const,
+                  key: ORACLE_PUBKEY,
+                },
               },
             ],
-            github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/PubKey-${ORACLE_PUBKEY}.toml`,
-          },
-        ],
-        type: 'settlementData' as const,
-      };
-      render(<DataSourceProof dataSourceSpecId={''} {...props} />);
-      expect(
-        screen.getByText('No oracle proof for settlement data')
-      ).toBeInTheDocument();
-    });
-
-    it('renders message if no data source on market', () => {
-      const props = {
-        data: {
-          sourceType: {
-            __typename: 'Invalid',
-          },
-        },
-        providers: [],
-        type: 'termination' as const,
-      };
-      // @ts-ignore types are invalid
-      render(<DataSourceProof {...props} />);
-      expect(screen.getByText('Invalid data source')).toBeInTheDocument();
-    });
-
-    it('renders conditions for internal data sources', () => {
-      const condition = {
-        __typename: 'Condition' as const,
-        operator: ConditionOperator.OPERATOR_GREATER_THAN,
-        value: '1696238009',
-      };
-      const props = {
-        data: {
-          sourceType: {
-            __typename: 'DataSourceDefinitionInternal' as const,
-            sourceType: {
-              __typename: 'DataSourceSpecConfigurationTime' as const,
-              conditions: [condition],
-            },
-          },
-        },
-        providers: [],
-        type: 'termination' as const,
-      };
-      render(<DataSourceProof dataSourceSpecId={''} {...props} />);
-      expect(screen.getByText('Internal conditions')).toBeInTheDocument();
-      const dateFromUnixTimestamp = condition.value
-        ? getDateTimeFormat().format(new Date(parseInt(condition.value)))
-        : '-';
-      expect(
-        screen.getByText(
-          `${
-            ConditionOperatorMapping[condition.operator]
-          } ${dateFromUnixTimestamp}`
-        )
-      ).toBeInTheDocument();
-    });
-  });
-
-  describe('SuccessionLineInfoPanel', () => {
-    const mocks = [
-      {
-        request: {
-          query: SuccessorMarketIdsDocument,
-        },
-        result: {
-          data: {
-            __typename: 'Query',
-            marketsConnection: {
-              __typename: 'MarketConnection',
-              edges: [
-                {
-                  __typename: 'MarketEdge',
-                  node: {
-                    __typename: 'Market',
-                    id: 'abc',
-                    successorMarketID: 'def',
-                    parentMarketID: null,
-                  },
-                },
-                {
-                  __typename: 'MarketEdge',
-                  node: {
-                    __typename: 'Market',
-                    id: 'def',
-                    successorMarketID: 'ghi',
-                    parentMarketID: 'abc',
-                  },
-                },
-                {
-                  __typename: 'MarketEdge',
-                  node: {
-                    __typename: 'Market',
-                    id: 'ghi',
-                    successorMarketID: null,
-                    parentMarketID: 'def',
-                  },
-                },
-              ],
-            },
           },
         },
       },
-    ];
+      providers: [],
+      type: 'termination' as const,
+    };
+    render(<DataSourceProof dataSourceSpecId={''} {...props} />);
+    expect(
+      screen.getByText('No oracle proof for termination')
+    ).toBeInTheDocument();
+  });
 
-    it.each([
-      ['abc', 1],
-      ['def', 2],
-      ['ghi', 3],
-    ])(
-      'renders succession line for %s (current position %d)',
-      async (id, number) => {
-        render(
-          <MockedProvider mocks={mocks}>
-            <SuccessionLineInfoPanel
-              market={{
-                id,
-              }}
-            />
-          </MockedProvider>
-        );
+  it('renders message if there are no matching proofs', () => {
+    const props = {
+      data: {
+        sourceType: {
+          __typename: 'DataSourceDefinitionExternal' as const,
+          sourceType: {
+            __typename: 'DataSourceSpecConfiguration' as const,
+            signers: [
+              {
+                __typename: 'Signer' as const,
+                signer: {
+                  __typename: 'PubKey' as const,
+                  key: ORACLE_PUBKEY,
+                },
+              },
+            ],
+          },
+        },
+      },
+      providers: [
+        {
+          name: 'Another oracle',
+          url: 'https://zombo.com',
+          description_markdown:
+            'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
+          oracle: {
+            status: 'GOOD' as const,
+            status_reason: '',
+            first_verified: '2022-01-01T00:00:00.000Z',
+            last_verified: '2022-12-31T00:00:00.000Z',
+            type: 'public_key' as const,
+            public_key: 'not-the-pubkey',
+          },
+          proofs: [
+            {
+              format: 'signed_message' as const,
+              available: true,
+              type: 'public_key' as const,
+              public_key: 'not-the-pubkey',
+              message: 'SOMEHEX',
+            },
+          ],
+          github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/PubKey-${ORACLE_PUBKEY}.toml`,
+        },
+      ],
+      type: 'settlementData' as const,
+    };
+    render(<DataSourceProof dataSourceSpecId={''} {...props} />);
+    expect(
+      screen.getByText('No oracle proof for settlement data')
+    ).toBeInTheDocument();
+  });
 
-        await waitFor(() => {
-          const items = screen.getAllByTestId('succession-line-item');
-          expect(items.length).toBe(3);
-          expect(
-            items[0].querySelector(
-              '[data-testid="succession-line-item-market-id"]'
-            )?.textContent
-          ).toBe('abc');
-          expect(
-            items[1].querySelector(
-              '[data-testid="succession-line-item-market-id"]'
-            )?.textContent
-          ).toBe('def');
-          expect(
-            items[2].querySelector(
-              '[data-testid="succession-line-item-market-id"]'
-            )?.textContent
-          ).toBe('ghi');
+  it('renders message if no data source on market', () => {
+    const props = {
+      data: {
+        sourceType: {
+          __typename: 'Invalid',
+        },
+      },
+      providers: [],
+      type: 'termination' as const,
+    };
+    // @ts-ignore types are invalid
+    render(<DataSourceProof {...props} />);
+    expect(screen.getByText('Invalid data source')).toBeInTheDocument();
+  });
 
-          expect(
-            items[number - 1].querySelector('[data-testid="icon-bullet"]')
-          ).toBeInTheDocument();
-        });
-      }
-    );
+  it('renders conditions for internal data sources', () => {
+    const condition = {
+      __typename: 'Condition' as const,
+      operator: ConditionOperator.OPERATOR_GREATER_THAN,
+      value: '100',
+    };
+    const props = {
+      data: {
+        sourceType: {
+          __typename: 'DataSourceDefinitionInternal' as const,
+          sourceType: {
+            __typename: 'DataSourceSpecConfigurationTime' as const,
+            conditions: [condition],
+          },
+        },
+      },
+      providers: [],
+      type: 'termination' as const,
+    };
+    render(<DataSourceProof dataSourceSpecId={''} {...props} />);
+    expect(screen.getByText('Internal conditions')).toBeInTheDocument();
+    expect(
+      screen.getByText(
+        `${ConditionOperatorMapping[condition.operator]} ${condition.value}`
+      )
+    ).toBeInTheDocument();
   });
 });
+
+describe('SuccessionLineInfoPanel', () => {
+  const mocks = [
+    {
+      request: {
+        query: SuccessorMarketIdsDocument,
+      },
+      result: {
+        data: {
+          __typename: 'Query',
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [
+              {
+                __typename: 'MarketEdge',
+                node: {
+                  __typename: 'Market',
+                  id: 'abc',
+                  successorMarketID: 'def',
+                  parentMarketID: null,
+                },
+              },
+              {
+                __typename: 'MarketEdge',
+                node: {
+                  __typename: 'Market',
+                  id: 'def',
+                  successorMarketID: 'ghi',
+                  parentMarketID: 'abc',
+                },
+              },
+              {
+                __typename: 'MarketEdge',
+                node: {
+                  __typename: 'Market',
+                  id: 'ghi',
+                  successorMarketID: null,
+                  parentMarketID: 'def',
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
+  ];
+
+  it.each([
+    ['abc', 1],
+    ['def', 2],
+    ['ghi', 3],
+  ])(
+    'renders succession line for %s (current position %d)',
+    async (id, number) => {
+      render(
+        <MockedProvider mocks={mocks}>
+          <SuccessionLineInfoPanel
+            market={{
+              id,
+            }}
+          />
+        </MockedProvider>
+      );
+
+      await waitFor(() => {
+        const items = screen.getAllByTestId('succession-line-item');
+        expect(items.length).toBe(3);
+        expect(
+          items[0].querySelector(
+            '[data-testid="succession-line-item-market-id"]'
+          )?.textContent
+        ).toBe('abc');
+        expect(
+          items[1].querySelector(
+            '[data-testid="succession-line-item-market-id"]'
+          )?.textContent
+        ).toBe('def');
+        expect(
+          items[2].querySelector(
+            '[data-testid="succession-line-item-market-id"]'
+          )?.textContent
+        ).toBe('ghi');
+
+        expect(
+          items[number - 1].querySelector('[data-testid="icon-bullet"]')
+        ).toBeInTheDocument();
+      });
+    }
+  );
+});

libs/markets/src/lib/components/market-info/market-info-panels.tsx

@@ -858,6 +858,7 @@ export const LiquidityInfoPanel = ({ market, children }: MarketInfoProps) => {
         data={{
           targetStake: data?.targetStake,
           suppliedStake: data?.suppliedStake,
+          marketValueProxy: data?.marketValueProxy,
         }}
         decimalPlaces={asset.decimals}
         assetSymbol={asset.symbol}
@@ -1032,13 +1033,9 @@ export const DataSourceProof = ({
           <h3>{t('Internal conditions')}</h3>
           {data.sourceType.sourceType?.conditions?.map((condition, i) => {
             if (!condition) return null;
-            const dateFromUnixTimestamp = condition.value
-              ? getDateTimeFormat().format(new Date(parseInt(condition.value)))
-              : '-';
             return (
               <p key={i}>
-                {ConditionOperatorMapping[condition.operator]}{' '}
-                {dateFromUnixTimestamp}
+                {ConditionOperatorMapping[condition.operator]} {condition.value}
               </p>
             );
           })}

libs/markets/src/lib/market-data.graphql

@@ -22,6 +22,7 @@ fragment MarketDataUpdateFields on ObservableMarketData {
   indicativeVolume
   marketState
   marketTradingMode
+  marketValueProxy
   markPrice
   midPrice
   openInterest
@@ -74,6 +75,7 @@ fragment MarketDataFields on MarketData {
   indicativeVolume
   marketState
   marketTradingMode
+  marketValueProxy
   markPrice
   midPrice
   openInterest

libs/markets/src/lib/market-data.mock.ts

@@ -58,6 +58,7 @@ const marketDataFields: MarketDataFieldsFragment = {
   indicativeVolume: '0',
   marketState: Schema.MarketState.STATE_ACTIVE,
   marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+  marketValueProxy: '2000000',
   markPrice: '4612690058',
   midPrice: '4612690000',
   openInterest: '0',
@@ -96,6 +97,7 @@ const marketDataUpdateFields: MarketDataUpdateFieldsFragment = {
   marketId: 'market-0',
   marketState: Schema.MarketState.STATE_ACTIVE,
   marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+  marketValueProxy: '',
   markPrice: '4612690058',
   midPrice: '0',
   lastTradedPrice: '0',

libs/markets/src/lib/markets.graphql

@@ -35,9 +35,6 @@ fragment MarketFields on Market {
     open
     close
   }
-  liquidityMonitoringParameters {
-    triggeringRatio
-  }
 }
 
 query Markets {

libs/markets/src/lib/markets.mock.ts

@@ -53,9 +53,6 @@ export const createMarketFragment = (
         liquidityFee: '',
       },
     },
-    liquidityMonitoringParameters: {
-      triggeringRatio: '1',
-    },
     tradableInstrument: {
       instrument: {
         id: '',

libs/orders/src/lib/components/mocks/generate-orders.ts

@@ -20,9 +20,6 @@ export const generateOrder = (partialOrder?: PartialDeep<Order>) => {
           makerFee: '0.1',
         },
       },
-      liquidityMonitoringParameters: {
-        triggeringRatio: '1',
-      },
       marketTimestamps: {
         __typename: 'MarketTimestamps',
         close: '',

libs/orders/src/lib/components/mocks/generate-stop-orders.ts

@@ -21,9 +21,6 @@ export const generateStopOrder = (
       __typename: 'Market',
       id: 'market-id',
       decimalPlaces: 1,
-      liquidityMonitoringParameters: {
-        triggeringRatio: '0.7',
-      },
       fees: {
         __typename: 'Fees',
         factors: {

libs/orders/src/lib/components/order-list/order-view-dialog.spec.tsx

@@ -31,9 +31,6 @@ describe('OrderViewDialog', () => {
             liquidityFee: '0.001',
           },
         },
-        liquidityMonitoringParameters: {
-          triggeringRatio: '1',
-        },
         tradableInstrument: {
           __typename: 'TradableInstrument',
           instrument: {

libs/withdraws/src/lib/withdraw-form-container.spec.tsx

@@ -149,9 +149,6 @@ describe('WithdrawFormContainer', () => {
               liquidityFee: '0.001',
             },
           },
-          liquidityMonitoringParameters: {
-            triggeringRatio: '0.7',
-          },
           tradableInstrument: {
             __typename: 'TradableInstrument',
             instrument: {

specs/6002-MDET-market-details.md

@@ -105,6 +105,7 @@ When I look into market info I **Must** see following specification:
 - Liquidity: (<a name="6002-MDET-214" href="#6002-MDET-214">6002-MDET-214</a>)
   - Target Stake
   - Supplied Stake
+  - Market Value Proxy
   - link to liquidity provision table
 - Liquidity price range: (<a name="6002-MDET-215" href="#6002-MDET-215">6002-MDET-215</a>)
   - Liquidity Price Range