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

package/dist/index.d.mts

@@ -37,7 +37,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.11.2-alpha.0";
+declare const _default: "2.11.3-rc.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -1194,7 +1194,7 @@ declare const usePositionStream: (symbol?: string, options?: SWRConfiguration &
     readonly totalCollateral: _orderly_network_utils.Decimal;
     readonly totalValue: _orderly_network_utils.Decimal | null;
     readonly totalUnrealizedROI: number;
-}, Record<"unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index", <Key extends "unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index">(defaultValue?: Omit<API.PositionInfo, "rows">[Key] | undefined) => Omit<API.PositionInfo, "rows">[Key]> & {
+}, Record<"unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index" | "total_unsettled_cross_pnl" | "total_unsettled_isolated_pnl", <Key extends "unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index" | "total_unsettled_cross_pnl" | "total_unsettled_isolated_pnl">(defaultValue?: Omit<API.PositionInfo, "rows">[Key] | undefined) => Omit<API.PositionInfo, "rows">[Key]> & {
     isNil: boolean;
 }, {
     /**

package/dist/index.d.ts

@@ -37,7 +37,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.11.2-alpha.0";
+declare const _default: "2.11.3-rc.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -1194,7 +1194,7 @@ declare const usePositionStream: (symbol?: string, options?: SWRConfiguration &
     readonly totalCollateral: _orderly_network_utils.Decimal;
     readonly totalValue: _orderly_network_utils.Decimal | null;
     readonly totalUnrealizedROI: number;
-}, Record<"unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index", <Key extends "unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index">(defaultValue?: Omit<API.PositionInfo, "rows">[Key] | undefined) => Omit<API.PositionInfo, "rows">[Key]> & {
+}, Record<"unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index" | "total_unsettled_cross_pnl" | "total_unsettled_isolated_pnl", <Key extends "unsettledPnL" | "margin_ratio" | "initial_margin_ratio" | "maintenance_margin_ratio" | "open_margin_ratio" | "current_margin_ratio_with_orders" | "initial_margin_ratio_with_orders" | "maintenance_margin_ratio_with_orders" | "total_collateral_value" | "free_collateral" | "total_pnl_24_h" | "unrealPnL" | "total_unreal_pnl" | "total_unreal_pnl_index" | "total_unsettled_pnl" | "notional" | "unrealPnlROI" | "unrealPnlROI_index" | "total_unsettled_cross_pnl" | "total_unsettled_isolated_pnl">(defaultValue?: Omit<API.PositionInfo, "rows">[Key] | undefined) => Omit<API.PositionInfo, "rows">[Key]> & {
     isNil: boolean;
 }, {
     /**

package/dist/index.js

@@ -64,9 +64,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-alpha.0";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.11.3-rc.0";
 }
-var version_default = "2.11.2-alpha.0";
+var version_default = "2.11.3-rc.0";
 var fetcher = (url, init2 = {}, queryOptions) => net.get(url, init2, queryOptions?.formatter);
 var noCacheConfig = {
   dedupingInterval: 0,
@@ -5453,7 +5453,7 @@ var PositionCalculator = class extends BaseCalculator {
     if (!accountInfo || !fundingRates || !symbolsInfo) {
       return data;
     }
-    let unrealPnL_total = utils.zero, unrealPnL_total_index = utils.zero, notional_total = utils.zero, unsettlementPnL_total = utils.zero;
+    let unrealPnL_total = utils.zero, unrealPnL_total_index = utils.zero, notional_total = utils.zero, unsettlementPnL_total = utils.zero, totalUnsettledIsolatedPnl = utils.zero, totalUnsettledCrossPnl = utils.zero;
     let rows = data.rows.map((item) => {
       const info = symbolsInfo[item.symbol];
       const sum_unitary_funding = fundingRates?.[item.symbol]?.["sum_unitary_funding"] ?? 0;
@@ -5516,6 +5516,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 === types.MarginMode.CROSS) {
+        totalUnsettledCrossPnl = totalUnsettledCrossPnl.add(unsettlementPnL2);
+      }
+      if (item.margin_mode === types.MarginMode.ISOLATED) {
+        totalUnsettledIsolatedPnl = totalUnsettledIsolatedPnl.add(unsettlementPnL2);
+      }
       const fundingFee = new utils.Decimal(sum_unitary_funding).sub(item.last_sum_unitary_funding).mul(item.position_qty).negated().toNumber();
       return {
         ...item,
@@ -5531,7 +5537,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();
@@ -5597,6 +5604,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
     };
   }
@@ -5759,13 +5768,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 === types.MarginMode.ISOLATED ? sum : sum + (pos.unsettled_pnl ?? 0),
-      0
-    );
-    const totalUnsettlementPnL = positions3.rows.reduce(
-      (sum, pos) => sum + (pos.unsettled_pnl ?? 0),
-      0
+    const unsettledPnL = ramda.pathOr(0, ["total_unsettled_pnl"])(positions3);
+    const unsettledCrossPnL = ramda.pathOr(0, ["total_unsettled_cross_pnl"])(
+      positions3
     );
     const unrealizedPnL = ramda.pathOr(0, ["total_unreal_pnl"])(positions3);
     const [USDC_holding, nonUSDC] = parseHolding(
@@ -5777,7 +5782,7 @@ var PortfolioCalculator = class extends BaseCalculator {
     const totalCollateral = perp.account.totalCollateral({
       USDCHolding: USDC_holding,
       nonUSDCHolding: nonUSDC,
-      unsettlementPnL: totallCrossUnsettledPnL,
+      unsettlementPnL: unsettledCrossPnL,
       usdcBalancePendingShortQty: usdc?.pending_short ?? 0,
       usdcBalanceIsolatedOrderFrozen: usdc?.isolated_order_frozen ?? 0
     });
@@ -5788,7 +5793,7 @@ var PortfolioCalculator = class extends BaseCalculator {
       return acc.add(curr.margin ?? 0);
     }, utils.zero);
     const totalValue = perp.account.totalValue({
-      totalUnsettlementPnL,
+      totalUnsettlementPnL: unsettledPnL,
       USDCHolding: USDC_holding,
       nonUSDCHolding: nonUSDC,
       totalIsolatedPositionMargin: sumIsolatedMargin.toNumber()
@@ -5832,7 +5837,7 @@ var PortfolioCalculator = class extends BaseCalculator {
       totalUnrealizedROI,
       freeCollateral,
       availableBalance,
-      unsettledPnL: totalUnsettlementPnL,
+      unsettledPnL,
       holding,
       usdcHolding: USDC_holding,
       freeCollateralUSDCOnly
@@ -5951,7 +5956,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) {
@@ -6441,14 +6446,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 === types.MarginMode.ISOLATED ? sum : sum + (pos.unsettled_pnl ?? 0),
-    0
-  );
-  const totalUnsettlementPnL = positions3.rows.reduce(
-    (sum, pos) => sum + (pos.unsettled_pnl ?? 0),
-    0
-  );
+  const unsettledPnL = ramda.pathOr(0, ["total_unsettled_pnl"])(positions3);
+  const unsettledCrossPnL = ramda.pathOr(0, ["total_unsettled_cross_pnl"])(positions3);
   const unrealizedPnL = ramda.pathOr(0, ["total_unreal_pnl"])(positions3);
   const [USDC_holding, nonUSDC] = parseHolding(
     holding,
@@ -6459,7 +6458,7 @@ function formatPortfolio(inputs) {
   const totalCollateral = perp.account.totalCollateral({
     USDCHolding: USDC_holding,
     nonUSDCHolding: nonUSDC,
-    unsettlementPnL: totallCrossUnsettledPnL,
+    unsettlementPnL: unsettledCrossPnL,
     usdcBalancePendingShortQty: usdc?.pending_short ?? 0,
     usdcBalanceIsolatedOrderFrozen: usdc?.isolated_order_frozen ?? 0
   });
@@ -6470,7 +6469,7 @@ function formatPortfolio(inputs) {
     return acc.add(curr.margin ?? 0);
   }, utils.zero);
   const totalValue = perp.account.totalValue({
-    totalUnsettlementPnL,
+    totalUnsettlementPnL: unsettledPnL,
     USDCHolding: USDC_holding,
     nonUSDCHolding: nonUSDC,
     totalIsolatedPositionMargin: sumIsolatedMargin.toNumber()
@@ -6514,7 +6513,7 @@ function formatPortfolio(inputs) {
     totalUnrealizedROI,
     freeCollateral,
     availableBalance,
-    unsettledPnL: totalUnsettlementPnL,
+    unsettledPnL,
     holding,
     freeCollateralUSDCOnly
   };
@@ -6523,7 +6522,7 @@ function formatPositions(data, accountInfo, symbolsInfo, fundingRates) {
   if (!accountInfo || !fundingRates || !symbolsInfo) {
     return data;
   }
-  let unrealPnL_total = utils.zero, unrealPnL_total_index = utils.zero, notional_total = utils.zero, unsettlementPnL_total = utils.zero;
+  let unrealPnL_total = utils.zero, unrealPnL_total_index = utils.zero, notional_total = utils.zero, unsettlementPnL_total = utils.zero, totalUnsettledIsolatedPnl = utils.zero, totalUnsettledCrossPnl = utils.zero;
   const rows = data.rows.map((item) => {
     const info = symbolsInfo[item.symbol];
     const notional = perp.positions.notional(item.position_qty, item.mark_price);
@@ -6585,6 +6584,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 === types.MarginMode.CROSS) {
+      totalUnsettledCrossPnl = totalUnsettledCrossPnl.add(unsettlementPnL2);
+    }
+    if (item.margin_mode === types.MarginMode.ISOLATED) {
+      totalUnsettledIsolatedPnl = totalUnsettledIsolatedPnl.add(unsettlementPnL2);
+    }
     return {
       ...item,
       mm: perp.positions.maintenanceMargin({
@@ -6598,7 +6603,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();
@@ -6612,6 +6618,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
   };
 }