@orderly.network/hooks 2.11.2 → 2.11.3-rc.0

package/dist/index.mjs

@@ -38,9 +38,9 @@ var __export = (target, all) => {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.11.2";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.11.3-rc.0";
 }
-var version_default = "2.11.2";
+var version_default = "2.11.3-rc.0";
 var fetcher = (url, init2 = {}, queryOptions) => get(url, init2, queryOptions?.formatter);
 var noCacheConfig = {
   dedupingInterval: 0,
@@ -5427,7 +5427,7 @@ var PositionCalculator = class extends BaseCalculator {
     if (!accountInfo || !fundingRates || !symbolsInfo) {
       return data;
     }
-    let unrealPnL_total = zero, unrealPnL_total_index = zero, notional_total = zero, unsettlementPnL_total = zero;
+    let unrealPnL_total = zero, unrealPnL_total_index = zero, notional_total = zero, unsettlementPnL_total = zero, totalUnsettledIsolatedPnl = zero, totalUnsettledCrossPnl = zero;
     let rows = data.rows.map((item) => {
       const info = symbolsInfo[item.symbol];
       const sum_unitary_funding = fundingRates?.[item.symbol]?.["sum_unitary_funding"] ?? 0;
@@ -5490,6 +5490,12 @@ var PositionCalculator = class extends BaseCalculator {
       unrealPnL_total_index = unrealPnL_total_index.add(unrealPnl_index);
       notional_total = notional_total.add(notional);
       unsettlementPnL_total = unsettlementPnL_total.add(unsettlementPnL2);
+      if (item.margin_mode === MarginMode.CROSS) {
+        totalUnsettledCrossPnl = totalUnsettledCrossPnl.add(unsettlementPnL2);
+      }
+      if (item.margin_mode === MarginMode.ISOLATED) {
+        totalUnsettledIsolatedPnl = totalUnsettledIsolatedPnl.add(unsettlementPnL2);
+      }
       const fundingFee = new Decimal(sum_unitary_funding).sub(item.last_sum_unitary_funding).mul(item.position_qty).negated().toNumber();
       return {
         ...item,
@@ -5505,7 +5511,8 @@ var PositionCalculator = class extends BaseCalculator {
         unrealized_pnl: unrealPnl,
         unrealized_pnl_index: unrealPnl_index,
         unrealized_pnl_ROI: unrealPnlROI,
-        unrealized_pnl_ROI_index: unrealPnlROI_index
+        unrealized_pnl_ROI_index: unrealPnlROI_index,
+        unsettled_pnl: unsettlementPnL2
       };
     });
     const totalUnrealPnl = unrealPnL_total.toNumber();
@@ -5571,6 +5578,8 @@ var PositionCalculator = class extends BaseCalculator {
       total_unsettled_pnl: unsettlementPnL,
       unrealPnlROI: totalUnrealizedROI,
       unrealPnlROI_index: totalUnrealizedROI_index,
+      total_unsettled_cross_pnl: totalUnsettledCrossPnl.toNumber(),
+      total_unsettled_isolated_pnl: totalUnsettledIsolatedPnl.toNumber(),
       rows
     };
   }
@@ -5733,13 +5742,9 @@ var PortfolioCalculator = class extends BaseCalculator {
     if (!holding || !positions3 || !Array.isArray(positions3.rows) || !markPrices || !indexPrices || !accountInfo) {
       return null;
     }
-    const totallCrossUnsettledPnL = positions3.rows.reduce(
-      (sum, pos) => pos.margin_mode === MarginMode.ISOLATED ? sum : sum + (pos.unsettled_pnl ?? 0),
-      0
-    );
-    const totalUnsettlementPnL = positions3.rows.reduce(
-      (sum, pos) => sum + (pos.unsettled_pnl ?? 0),
-      0
+    const unsettledPnL = pathOr(0, ["total_unsettled_pnl"])(positions3);
+    const unsettledCrossPnL = pathOr(0, ["total_unsettled_cross_pnl"])(
+      positions3
     );
     const unrealizedPnL = pathOr(0, ["total_unreal_pnl"])(positions3);
     const [USDC_holding, nonUSDC] = parseHolding(
@@ -5751,7 +5756,7 @@ var PortfolioCalculator = class extends BaseCalculator {
     const totalCollateral = account.totalCollateral({
       USDCHolding: USDC_holding,
       nonUSDCHolding: nonUSDC,
-      unsettlementPnL: totallCrossUnsettledPnL,
+      unsettlementPnL: unsettledCrossPnL,
       usdcBalancePendingShortQty: usdc?.pending_short ?? 0,
       usdcBalanceIsolatedOrderFrozen: usdc?.isolated_order_frozen ?? 0
     });
@@ -5762,7 +5767,7 @@ var PortfolioCalculator = class extends BaseCalculator {
       return acc.add(curr.margin ?? 0);
     }, zero);
     const totalValue = account.totalValue({
-      totalUnsettlementPnL,
+      totalUnsettlementPnL: unsettledPnL,
       USDCHolding: USDC_holding,
       nonUSDCHolding: nonUSDC,
       totalIsolatedPositionMargin: sumIsolatedMargin.toNumber()
@@ -5806,7 +5811,7 @@ var PortfolioCalculator = class extends BaseCalculator {
       totalUnrealizedROI,
       freeCollateral,
       availableBalance,
-      unsettledPnL: totalUnsettlementPnL,
+      unsettledPnL,
       holding,
       usdcHolding: USDC_holding,
       freeCollateralUSDCOnly
@@ -5925,7 +5930,7 @@ var usePositionStream = (symbol = "all", options) => {
       total_unreal_pnl: total_unreal_pnl_index,
       unrealPnlROI: unrealPnlROI_index
     };
-  }, [calcMode]);
+  }, [calcMode, formattedPositions]);
   let rows = formattedPositions[0];
   {
     if (!rows) {
@@ -6415,14 +6420,8 @@ function formatPortfolio(inputs) {
   if (!holding || !positions3 || !Array.isArray(positions3.rows) || !markPrices || !indexPrices || !accountInfo || symbolsInfo?.isNil) {
     return null;
   }
-  const totallCrossUnsettledPnL = positions3.rows.reduce(
-    (sum, pos) => pos.margin_mode === MarginMode.ISOLATED ? sum : sum + (pos.unsettled_pnl ?? 0),
-    0
-  );
-  const totalUnsettlementPnL = positions3.rows.reduce(
-    (sum, pos) => sum + (pos.unsettled_pnl ?? 0),
-    0
-  );
+  const unsettledPnL = pathOr(0, ["total_unsettled_pnl"])(positions3);
+  const unsettledCrossPnL = pathOr(0, ["total_unsettled_cross_pnl"])(positions3);
   const unrealizedPnL = pathOr(0, ["total_unreal_pnl"])(positions3);
   const [USDC_holding, nonUSDC] = parseHolding(
     holding,
@@ -6433,7 +6432,7 @@ function formatPortfolio(inputs) {
   const totalCollateral = account.totalCollateral({
     USDCHolding: USDC_holding,
     nonUSDCHolding: nonUSDC,
-    unsettlementPnL: totallCrossUnsettledPnL,
+    unsettlementPnL: unsettledCrossPnL,
     usdcBalancePendingShortQty: usdc?.pending_short ?? 0,
     usdcBalanceIsolatedOrderFrozen: usdc?.isolated_order_frozen ?? 0
   });
@@ -6444,7 +6443,7 @@ function formatPortfolio(inputs) {
     return acc.add(curr.margin ?? 0);
   }, zero);
   const totalValue = account.totalValue({
-    totalUnsettlementPnL,
+    totalUnsettlementPnL: unsettledPnL,
     USDCHolding: USDC_holding,
     nonUSDCHolding: nonUSDC,
     totalIsolatedPositionMargin: sumIsolatedMargin.toNumber()
@@ -6488,7 +6487,7 @@ function formatPortfolio(inputs) {
     totalUnrealizedROI,
     freeCollateral,
     availableBalance,
-    unsettledPnL: totalUnsettlementPnL,
+    unsettledPnL,
     holding,
     freeCollateralUSDCOnly
   };
@@ -6497,7 +6496,7 @@ function formatPositions(data, accountInfo, symbolsInfo, fundingRates) {
   if (!accountInfo || !fundingRates || !symbolsInfo) {
     return data;
   }
-  let unrealPnL_total = zero, unrealPnL_total_index = zero, notional_total = zero, unsettlementPnL_total = zero;
+  let unrealPnL_total = zero, unrealPnL_total_index = zero, notional_total = zero, unsettlementPnL_total = zero, totalUnsettledIsolatedPnl = zero, totalUnsettledCrossPnl = zero;
   const rows = data.rows.map((item) => {
     const info = symbolsInfo[item.symbol];
     const notional = positions.notional(item.position_qty, item.mark_price);
@@ -6559,6 +6558,12 @@ function formatPositions(data, accountInfo, symbolsInfo, fundingRates) {
     unrealPnL_total_index = unrealPnL_total_index.add(unrealPnl_index);
     notional_total = notional_total.add(notional);
     unsettlementPnL_total = unsettlementPnL_total.add(unsettlementPnL2);
+    if (item.margin_mode === MarginMode.CROSS) {
+      totalUnsettledCrossPnl = totalUnsettledCrossPnl.add(unsettlementPnL2);
+    }
+    if (item.margin_mode === MarginMode.ISOLATED) {
+      totalUnsettledIsolatedPnl = totalUnsettledIsolatedPnl.add(unsettlementPnL2);
+    }
     return {
       ...item,
       mm: positions.maintenanceMargin({
@@ -6572,7 +6577,8 @@ function formatPositions(data, accountInfo, symbolsInfo, fundingRates) {
       unrealized_pnl: unrealPnl,
       unrealized_pnl_index: unrealPnl_index,
       unrealized_pnl_ROI: unrealPnlROI,
-      unrealized_pnl_ROI_index: unrealPnlROI_index
+      unrealized_pnl_ROI_index: unrealPnlROI_index,
+      unsettled_pnl: unsettlementPnL2
     };
   });
   const totalUnrealPnl = unrealPnL_total.toNumber();
@@ -6586,6 +6592,8 @@ function formatPositions(data, accountInfo, symbolsInfo, fundingRates) {
     notional: notional_total.toNumber(),
     unsettledPnL: unsettlementPnL,
     total_unsettled_pnl: unsettlementPnL,
+    total_unsettled_cross_pnl: totalUnsettledCrossPnl.toNumber(),
+    total_unsettled_isolated_pnl: totalUnsettledIsolatedPnl.toNumber(),
     rows
   };
 }