@orderly.network/ui-positions 2.11.0 → 3.0.0-beta.1

package/dist/index.mjs

@@ -1633,7 +1633,17 @@ var usePositionMargin = (symbol, isAdd, isolatedMargin, finalMargin) => {
     if (!currentPosition) return null;
     return new Decimal(currentPosition.notional);
   }, [currentPosition]);
-  const unSettledPnl = currentPosition?.unsettled_pnl;
+  const unSettledPnl = useMemo(() => {
+    if (!currentPosition || !notional || !fundingRates) return null;
+    const fundingRate = fundingRates[currentPosition.symbol];
+    return notional.sub(new Decimal(currentPosition.cost_position)).sub(
+      new Decimal(currentPosition.position_qty).mul(
+        new Decimal(fundingRate.sum_unitary_funding ?? 0).sub(
+          new Decimal(currentPosition.last_sum_unitary_funding)
+        )
+      )
+    );
+  }, [notional, currentPosition, fundingRates]);
   const imr = useMemo(() => {
     if (!currentPosition || !symbolsInfo?.[symbol] || !notional) {
       return null;
@@ -1661,12 +1671,12 @@ var usePositionMargin = (symbol, isAdd, isolatedMargin, finalMargin) => {
     }
     const positionNotional = notional;
     const imrValue = imr;
-    const unsettledPnlValue = unSettledPnl ?? 0;
+    const unsettledPnlValue = unSettledPnl ?? new Decimal(0);
     return account.maxReduce({
       isolatedPositionMargin: isolatedMargin,
       positionNotional: positionNotional.toNumber(),
       imr: imrValue.toNumber(),
-      positionUnsettledPnL: unsettledPnlValue
+      positionUnsettledPnL: unsettledPnlValue.toNumber()
     });
   }, [
     total_cross_unsettled_pnl,
@@ -1683,14 +1693,14 @@ var usePositionMargin = (symbol, isAdd, isolatedMargin, finalMargin) => {
     const currentSymbolInfo = symbolsInfo[symbol];
     const currentPositionNotional = notional?.toNumber() ?? 0;
     const currentPositionIMRFactor = accountInfo.imr_factor[symbol] ?? currentSymbolInfo.imr_factor ?? 0;
-    positions.MMR({
+    const currentPositionMMR = positions.MMR({
       baseMMR: currentSymbolInfo.base_mmr ?? 0,
       baseIMR: currentSymbolInfo.base_imr ?? 0,
       IMRFactor: currentPositionIMRFactor,
       positionNotional: currentPositionNotional,
       IMR_factor_power: 4 / 5
     });
-    positions2?.filter((item) => item.symbol !== symbol).map((item) => {
+    const otherPositions = positions2?.filter((item) => item.symbol !== symbol).map((item) => {
       const itemSymbolInfo = symbolsInfo[item.symbol];
       const itemIMRFactor = accountInfo.imr_factor[item.symbol] ?? itemSymbolInfo?.imr_factor ?? 0;
       const itemNotional = item.notional ?? new Decimal(item.position_qty).mul(item.mark_price).abs().toNumber();
@@ -1708,19 +1718,18 @@ var usePositionMargin = (symbol, isAdd, isolatedMargin, finalMargin) => {
         mmr: itemMMR
       };
     }) ?? [];
-    new Decimal(finalMargin).add(currentPosition.unsettled_pnl ?? 0).toNumber();
-    const sumUnitaryFunding = fundingRates?.[symbol]?.sum_unitary_funding ?? 0;
-    const liqPrice = positions.liquidationPriceIsolated({
-      isolatedPositionMargin: finalMargin,
-      costPosition: currentPosition.cost_position ?? 0,
-      positionQty: currentPosition.position_qty ?? 0,
-      sumUnitaryFunding,
-      lastSumUnitaryFunding: currentPosition.last_sum_unitary_funding ?? 0,
+    const totalCollateral = new Decimal(finalMargin).add(currentPosition.unsettled_pnl ?? 0).toNumber();
+    const liqPrice = positions.liqPrice({
+      markPrice,
+      symbol,
+      totalCollateral,
+      positionQty: currentPosition.position_qty,
+      positions: otherPositions,
+      MMR: currentPositionMMR,
       baseMMR: currentSymbolInfo.base_mmr ?? 0,
       baseIMR: currentSymbolInfo.base_imr ?? 0,
       IMRFactor: currentPositionIMRFactor,
-      referencePrice: markPrice,
-      leverage: currentPosition.leverage ?? 0
+      costPosition: currentPosition.cost_position ?? 0
     });
     return liqPrice;
   }, [
@@ -1866,7 +1875,7 @@ var useAdjustMarginScript = (props) => {
     sliderValue,
     maxAmount: maxAmount ?? 0,
     currentMargin,
-    liquidationPrice,
+    liquidationPrice: liquidationPrice ?? 0,
     effectiveLeverage: effectiveLeverage ?? 0,
     isLoading,
     isAdd,