Merge branch 'develop' into feat/margin-estimate-update

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

@@ -1,6 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import {
+  LiquidationStrategyInfoPanel,
   LiquidityPriceRangeInfoPanel,
   LiquiditySLAParametersInfoPanel,
   MarginScalingFactorsPanel,
@@ -94,6 +95,8 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
           </>
         )
       )}
+      <h2 className={headerClassName}>{t('Liquidation strategy')}</h2>
+      <LiquidationStrategyInfoPanel market={market} />
       <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
       <LiquidityMonitoringParametersInfoPanel market={market} />
       <h2 className={headerClassName}>{t('Liquidity price range')}</h2>

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -215,7 +215,7 @@ context(
     });
 
     // 3003-PMAN-001
-    it(
+    it.skip(
       'Able to submit valid new market proposal',
       // @ts-ignore clash between jest and cypress
       { tags: '@smoke' },

apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -266,7 +266,6 @@ export const ProposalMarketData = ({
                 />
               </>
             ))}
-
             <h2 className={marketDataHeaderStyles}>
               {t('Liquidity monitoring parameters')}
             </h2>

apps/trading/e2e/tests/deal_ticket/test_trading_deal_ticket_submit_account.py

@@ -26,7 +26,6 @@ def continuous_market(vega):
 @pytest.mark.usefixtures("auth", "risk_accepted")
 def test_should_display_info_and_button_for_deposit(continuous_market, page: Page):
     page.goto(f"/#/markets/{continuous_market}")
-    page.pause()
     page.get_by_test_id(order_size).fill("200000")
     page.get_by_test_id(order_price).fill("20")
     # 7002-SORD-060

apps/trading/e2e/tests/market/test_market_info.py

@@ -86,11 +86,23 @@ def test_market_info_market_volume(page: Page):
     validate_info_section(page, fields)
 
 
-def test_market_info_insurance_pool(page: Page):
+def test_market_info_liquidation_strategy(page: Page):
+    page.get_by_test_id(market_title_test_id).get_by_text(
+        "Liquidation strategy").click()
+    fields = [
+        ["Disposal Fraction", "1"],
+        ["Disposal Time Step", "1"],
+        ["Full Disposal Size", "1,000,000,000"],
+        ["Max Fraction Consumed", "0.5"],
+    ]
+    validate_info_section(page, fields)
+
+
+def test_market_info_liquidation(page: Page):
     # 6002-MDET-104
     page.get_by_test_id(market_title_test_id).get_by_text(
-        "Insurance pool").click()
-    fields = [["Balance", "0.00 tDAI"]]
+        "Liquidations").click()
+    fields = [["Insurance Pool Balance", "0.00 tDAI"]]
     validate_info_section(page, fields)
 
 

apps/trading/e2e/tests/order/test_order_match.py

@@ -128,10 +128,11 @@ def test_limit_order_trade_open_position(continuous_market, page: Page):
         position["leverage"]
     )
 
-    liquidation = table.locator("[col-id='liquidationPrice']")
-    expect(liquidation.get_by_test_id("liquidation-price")).to_have_text(
-        position["liquidation"]
-    )
+    # need to ne check why it is not visible
+    # liquidation = table.locator("[col-id='liquidationPrice']")
+    # expect(liquidation.get_by_test_id("liquidation-price")).to_have_text(
+    #     position["liquidation"]
+    # )
 
     realisedPNL = table.locator("[col-id='realisedPNL']")
     expect(realisedPNL).to_have_text(position["realised_pnl"])

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

@@ -38,7 +38,7 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
         {
           headerName: t('Market'),
           field: 'market.tradableInstrument.instrument.code',
-          width: 90,
+          maxWidth: 150,
           pinned: true,
           sort: 'desc',
           cellRenderer: ({

libs/deal-ticket/src/components/deal-ticket/margin-mode-selector.tsx

@@ -226,7 +226,7 @@ const CrossMarginModeDialog = ({
         onClick={() => {
           create({
             updateMarginMode: {
-              market_id: marketId,
+              marketId,
               mode: MarginMode.MARGIN_MODE_CROSS_MARGIN,
             },
           });
@@ -292,7 +292,7 @@ const IsolatedMarginModeDialog = ({
         onSubmit={() => {
           create({
             updateMarginMode: {
-              market_id: marketId,
+              marketId,
               mode: MarginMode.MARGIN_MODE_ISOLATED_MARGIN,
               marginFactor: `${1 / leverage}`,
             },

libs/i18n/src/locales/en/markets.json

@@ -39,6 +39,7 @@
   "Key": "Key",
   "Key details": "Key details",
   "Liquidity": "Liquidity",
+  "Liquidations": "Liquidations",
   "Liquidity monitoring parameters": "Liquidity monitoring parameters",
   "Liquidity portion of the fee is paid to liquidity providers, and is transferred to the liquidity fee pool for the market.": "Liquidity portion of the fee is paid to liquidity providers, and is transferred to the liquidity fee pool for the market.",
   "Liquidity price range": "Liquidity price range",

libs/markets/src/lib/components/market-info/MarketInfo.graphql

@@ -198,6 +198,12 @@ query MarketInfo($marketId: ID!) {
       performanceHysteresisEpochs
       slaCompetitionFactor
     }
+    liquidationStrategy {
+      disposalTimeStep
+      disposalFraction
+      fullDisposalSize
+      maxFractionConsumed
+    }
     tradableInstrument {
       instrument {
         id

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

@@ -27,6 +27,7 @@ import {
   InstrumentInfoPanel,
   InsurancePoolInfoPanel,
   KeyDetailsInfoPanel,
+  LiquidationStrategyInfoPanel,
   LiquidityInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -151,7 +152,7 @@ export const MarketInfoAccordion = ({
                 <AccordionItem
                   key={id}
                   itemId={id}
-                  title={t('Insurance pool')}
+                  title={t('Liquidations')}
                   content={
                     <InsurancePoolInfoPanel market={market} account={a} />
                   }
@@ -269,6 +270,11 @@ export const MarketInfoAccordion = ({
               );
             }
           )}
+          <AccordionItem
+            itemId="liquidation-strategy"
+            title={t('Liquidation strategy')}
+            content={<LiquidationStrategyInfoPanel market={market} />}
+          />
           <AccordionItem
             itemId="liquidity-monitoring-parameters"
             title={t('Liquidity monitoring parameters')}

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

@@ -210,10 +210,15 @@ export const KeyDetailsInfoPanel = ({
       skip: !featureFlags.SUCCESSOR_MARKETS || !market.proposal?.id,
     });
 
-  const successorProposal =
-    successorProposalDetails?.proposal as SingleProposal<
-      SuccessorMarketProposalDetailsQuery['proposal']
-    >;
+  const successorProposal = successorProposalDetails?.proposal as
+    | SingleProposal<SuccessorMarketProposalDetailsQuery['proposal']>
+    | undefined;
+
+  const successorConfiguration =
+    successorProposal?.terms.change.__typename === 'NewMarket' &&
+    successorProposal.terms.change.successorConfiguration?.__typename ===
+      'SuccessorConfiguration' &&
+    successorProposal.terms.change.successorConfiguration;
 
   // The following queries are needed as the parent market could also have been a successor market.
   // Note: the parent market is only passed to this component if the successor markets flag is enabled,
@@ -232,17 +237,16 @@ export const KeyDetailsInfoPanel = ({
       },
       skip: !parentMarket?.proposal?.id,
     });
-  const parentProposal =
-    parentSuccessorProposalDetails?.proposal as SingleProposal<
-      SuccessorMarketProposalDetailsQuery['proposal']
-    >;
+  const parentProposal = parentSuccessorProposalDetails?.proposal as
+    | SingleProposal<SuccessorMarketProposalDetailsQuery['proposal']>
+    | undefined;
 
   const assetDecimals = getAsset(market).decimals;
 
   return (
     <>
       <KeyValueTable>
-        <KeyValueTableRow noBorder>
+        <KeyValueTableRow noBorder className="text-xs">
           <div>{t('Market ID')}</div>
           <CopyWithTooltip text={market.id}>
             <button
@@ -259,16 +263,13 @@ export const KeyDetailsInfoPanel = ({
       </KeyValueTable>
       <MarketInfoTable
         data={
-          featureFlags.SUCCESSOR_MARKETS
+          featureFlags.SUCCESSOR_MARKETS && successorConfiguration
             ? {
                 name: market.tradableInstrument.instrument.name,
                 parentMarketID:
                   parentMarketIdData?.market?.parentMarketID || '-',
                 insurancePoolFraction:
-                  (successorProposal.terms.change.__typename === 'NewMarket' &&
-                    successorProposal.terms.change.successorConfiguration
-                      ?.insurancePoolFraction) ||
-                  '-',
+                  successorConfiguration.insurancePoolFraction || '-',
                 status: market.state && MarketStateMapping[market.state],
                 tradingMode:
                   market.tradingMode &&
@@ -749,6 +750,30 @@ export const PriceMonitoringBoundsInfoPanel = ({
   );
 };
 
+export const LiquidationStrategyInfoPanel = ({
+  market,
+  parentMarket,
+}: MarketInfoProps) => {
+  const marketData = {
+    disposalFraction: market.liquidationStrategy?.disposalFraction,
+    disposalTimeStep: market.liquidationStrategy?.disposalTimeStep,
+    fullDisposalSize: market.liquidationStrategy?.fullDisposalSize,
+    maxFractionConsumed: market.liquidationStrategy?.maxFractionConsumed,
+  };
+
+  const parentMarketData = parentMarket
+    ? {
+        disposalFraction: parentMarket.liquidationStrategy?.disposalFraction,
+        disposalTimeStep: parentMarket.liquidationStrategy?.disposalTimeStep,
+        fullDisposalSize: parentMarket.liquidationStrategy?.fullDisposalSize,
+        maxFractionConsumed:
+          parentMarket.liquidationStrategy?.maxFractionConsumed,
+      }
+    : undefined;
+
+  return <MarketInfoTable data={marketData} parentData={parentMarketData} />;
+};
+
 export const LiquidityMonitoringParametersInfoPanel = ({
   market,
   parentMarket,

libs/ui-toolkit/src/components/dialog/dialog.tsx

@@ -38,14 +38,14 @@ export function Dialog({
   );
   const wrapperClasses = classNames(
     // Dimensions
-    'max-w-[90vw] p-4 md:p-8',
+    'w-screen sm:max-w-[90vw] p-4 md:p-8',
     // Need to apply background and text colors again as content is rendered in a portal
     'dark:bg-black bg-white dark:text-white',
     getIntentBorder(intent),
     {
-      'w-[520px]': size === 'small',
-      'w-[680px]': size === 'medium',
-      'w-[720px] lg:w-[940px]': size === 'large',
+      'sm:w-[520px]': size === 'small',
+      'sm:w-[680px]': size === 'medium',
+      'sm:w-[720px] lg:w-[940px]': size === 'large',
     }
   );
 

libs/wallet/src/connectors/vega-connector.ts

@@ -456,7 +456,7 @@ export enum MarginMode {
   MARGIN_MODE_ISOLATED_MARGIN,
 }
 export interface UpdateMarginMode {
-  market_id: string;
+  marketId: string;
   mode: MarginMode;
   marginFactor?: string;
 }

libs/web3/src/lib/use-vega-transaction-toasts.tsx

@@ -453,7 +453,7 @@ const CancelOrderDetails = ({
 const MarginModeDetails = ({ data }: { data: UpdateMarginMode }) => {
   const t = useT();
   const { data: markets } = useMarketsMapProvider();
-  const marketId = data.market_id;
+  const { marketId } = data;
   const market = marketId && markets?.[marketId];
   if (!market) {
     return null;