@orderly.network/ui-orders 2.11.1 → 2.11.2

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import React2, { forwardRef, useMemo, useEffect, useRef, useImperativeHandle, useCallback, useState, createContext, memo, useContext } from 'react';
 import { useSymbolsInfo, useOrderStream, useLocalStorage, utils, useThrottledCallback, useMutation, useSWRConfig, useAccount, unstable_serialize, useMemoizedFn, getMinNotional, findTPSLFromOrder, findTPSLOrderPriceFromOrder, useMaxQty, useConfig, useTpslPriceChecker, useOrderEntity, useReferralInfo, useLeverageBySymbol } from '@orderly.network/hooks';
 import { useTranslation, Trans, i18n } from '@orderly.network/i18n';
-import { OrderStatus, AlgoOrderRootType, AlgoOrderType, OrderSide, OrderType, MarginMode, EMPTY_LIST } from '@orderly.network/types';
+import { OrderStatus, AlgoOrderRootType, MarginMode, AlgoOrderType, OrderSide, OrderType, EMPTY_LIST } from '@orderly.network/types';
 import { formatSymbol, Decimal, commify, commifyOptional, getTrailingStopPrice, formatNum } from '@orderly.network/utils';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { usePagination, modal, Text, Button, ThrottledButton, CloseIcon, cn, Flex, Input, inputFormatter, Slider, DataFilter, TableFeatures, Grid, Picker, ListView, Tabs, TabPanel, Badge, Tooltip, EditIcon, toast as toast$1, Popover, PopoverRoot, PopoverTrigger, PopoverContent, Divider, ShareIcon, CheckIcon, Statistic, SimpleDialog, useModal, Checkbox } from '@orderly.network/ui';
@@ -41,67 +41,10 @@ var init_orders_script = __esm({
   }
 });
 function parseBadgesFor(record) {
-  const orderType = record.type;
-  const algoType = record.algo_type;
-  if (typeof orderType !== "undefined") {
-    const list = [];
-    if (!!record.parent_algo_type) {
-      if (algoType === AlgoOrderType.STOP_LOSS) {
-        const types = orderType === OrderType.CLOSE_POSITION ? [i18n.t("common.position"), i18n.t("tpsl.sl")] : [i18n.t("tpsl.sl")];
-        list.push(...types);
-      }
-      if (algoType === AlgoOrderType.TAKE_PROFIT) {
-        const types = orderType === OrderType.CLOSE_POSITION ? [i18n.t("common.position"), i18n.t("tpsl.tp")] : [i18n.t("tpsl.tp")];
-        list.push(...types);
-      }
-      return list;
-    }
-    const type = typeof orderType === "string" ? orderType.replace("_ORDER", "") : "";
-    if ([OrderType.ASK, OrderType.BID].includes(orderType)) {
-      return [i18n.t("orderEntry.orderType.limit")];
-    }
-    if (record.algo_order_id === void 0 || record.algo_order_id && algoType === "BRACKET") {
-      const typeMap = {
-        [OrderType.LIMIT]: i18n.t("orderEntry.orderType.limit"),
-        [OrderType.MARKET]: i18n.t("orderEntry.orderType.market"),
-        [OrderType.POST_ONLY]: i18n.t("orderEntry.orderType.postOnly"),
-        [OrderType.IOC]: i18n.t("orderEntry.orderType.ioc"),
-        [OrderType.FOK]: i18n.t("orderEntry.orderType.fok")
-      };
-      return [
-        typeMap[type] || upperCaseFirstLetter(type)
-      ];
-    }
-    if (algoType === AlgoOrderRootType.TRAILING_STOP) {
-      return [i18n.t("orderEntry.orderType.trailingStop")];
-    }
-    if (type) {
-      const typeMap = {
-        [OrderType.LIMIT]: i18n.t("orderEntry.orderType.stopLimit"),
-        [OrderType.MARKET]: i18n.t("orderEntry.orderType.stopMarket")
-      };
-      return [typeMap[type] || type];
-    }
-  }
-  if (typeof algoType !== "undefined") {
-    const list = [];
-    if (algoType === AlgoOrderRootType.POSITIONAL_TP_SL) {
-      list.push(i18n.t("common.position"));
-    }
-    const tpOrder = record?.child_orders?.find(
-      (order) => order.algo_type === AlgoOrderType.TAKE_PROFIT && !!order.trigger_price
-    );
-    const slOrder = record?.child_orders?.find(
-      (order) => order.algo_type === AlgoOrderType.STOP_LOSS && !!order.trigger_price
-    );
-    if (tpOrder || slOrder) {
-      list.push(
-        tpOrder && slOrder ? i18n.t("common.tpsl") : tpOrder ? i18n.t("tpsl.tp") : i18n.t("tpsl.sl")
-      );
-    }
-    return list;
-  }
-  return void 0;
+  const orderTypeBadges = getOrderTypeBadges(record);
+  const marginModeBadges = getMarginModeBadges(record);
+  const badges = [...orderTypeBadges, ...marginModeBadges];
+  return badges.length ? badges : void 0;
 }
 function grayCell(record) {
   return record.status === OrderStatus.CANCELLED || record.algo_status === OrderStatus.CANCELLED;
@@ -205,7 +148,7 @@ function convertApiOrderTypeToOrderEntryType(order) {
   }
   return order.type;
 }
-var upperCaseFirstLetter;
+var upperCaseFirstLetter, normalizeMarginMode, getMarginModeBadges, getOrderTypeBadges;
 var init_util = __esm({
   "src/utils/util.ts"() {
     upperCaseFirstLetter = (str) => {
@@ -214,6 +157,88 @@ var init_util = __esm({
       if (str.length === 1) return str.charAt(0).toUpperCase();
       return str.charAt(0).toUpperCase() + str.toLowerCase().slice(1);
     };
+    normalizeMarginMode = (value) => {
+      if (value === 1 || value === MarginMode.ISOLATED) {
+        return MarginMode.ISOLATED;
+      }
+      if (value === 0 || value === MarginMode.CROSS) {
+        return MarginMode.CROSS;
+      }
+      return void 0;
+    };
+    getMarginModeBadges = (record) => {
+      const marginMode = normalizeMarginMode(record?.margin_mode);
+      if (marginMode === MarginMode.ISOLATED) {
+        return [i18n.t("marginMode.isolated")];
+      }
+      if (marginMode === MarginMode.CROSS) {
+        return [i18n.t("marginMode.cross")];
+      }
+      return [];
+    };
+    getOrderTypeBadges = (record) => {
+      const orderType = record.type;
+      const algoType = record.algo_type;
+      if (typeof orderType !== "undefined") {
+        const list = [];
+        if (!!record.parent_algo_type) {
+          if (algoType === AlgoOrderType.STOP_LOSS) {
+            const types = orderType === OrderType.CLOSE_POSITION ? [i18n.t("common.position"), i18n.t("tpsl.sl")] : [i18n.t("tpsl.sl")];
+            list.push(...types);
+          }
+          if (algoType === AlgoOrderType.TAKE_PROFIT) {
+            const types = orderType === OrderType.CLOSE_POSITION ? [i18n.t("common.position"), i18n.t("tpsl.tp")] : [i18n.t("tpsl.tp")];
+            list.push(...types);
+          }
+          return list;
+        }
+        const type = typeof orderType === "string" ? orderType.replace("_ORDER", "") : "";
+        if ([OrderType.ASK, OrderType.BID].includes(orderType)) {
+          return [i18n.t("orderEntry.orderType.limit")];
+        }
+        if (record.algo_order_id === void 0 || record.algo_order_id && algoType === "BRACKET") {
+          const typeMap = {
+            [OrderType.LIMIT]: i18n.t("orderEntry.orderType.limit"),
+            [OrderType.MARKET]: i18n.t("orderEntry.orderType.market"),
+            [OrderType.POST_ONLY]: i18n.t("orderEntry.orderType.postOnly"),
+            [OrderType.IOC]: i18n.t("orderEntry.orderType.ioc"),
+            [OrderType.FOK]: i18n.t("orderEntry.orderType.fok")
+          };
+          return [
+            typeMap[type] || upperCaseFirstLetter(type)
+          ];
+        }
+        if (algoType === AlgoOrderRootType.TRAILING_STOP) {
+          return [i18n.t("orderEntry.orderType.trailingStop")];
+        }
+        if (type) {
+          const typeMap = {
+            [OrderType.LIMIT]: i18n.t("orderEntry.orderType.stopLimit"),
+            [OrderType.MARKET]: i18n.t("orderEntry.orderType.stopMarket")
+          };
+          return [typeMap[type] || type];
+        }
+      }
+      if (typeof algoType !== "undefined") {
+        const list = [];
+        if (algoType === AlgoOrderRootType.POSITIONAL_TP_SL) {
+          list.push(i18n.t("common.position"));
+        }
+        const tpOrder = record?.child_orders?.find(
+          (order) => order.algo_type === AlgoOrderType.TAKE_PROFIT && !!order.trigger_price
+        );
+        const slOrder = record?.child_orders?.find(
+          (order) => order.algo_type === AlgoOrderType.STOP_LOSS && !!order.trigger_price
+        );
+        if (tpOrder || slOrder) {
+          list.push(
+            tpOrder && slOrder ? i18n.t("common.tpsl") : tpOrder ? i18n.t("tpsl.tp") : i18n.t("tpsl.sl")
+          );
+        }
+        return list;
+      }
+      return [];
+    };
   }
 });
 var SymbolContext, useSymbolContext;
@@ -1143,10 +1168,10 @@ var init_tpslOrderRowContext = __esm({
         }
       );
       const getRelatedPosition = useMemoizedFn(
-        (symbol) => {
+        (symbol, marginMode) => {
           const positions = config.cache.get(positionKey);
           return positions?.data?.rows?.find(
-            (p) => p.symbol === symbol
+            (p) => p.symbol === symbol && (p.margin_mode ?? MarginMode.CROSS) === (marginMode ?? MarginMode.CROSS)
           );
         }
       );
@@ -1164,12 +1189,12 @@ var init_tpslOrderRowContext = __esm({
       });
       useEffect(() => {
         if ("algo_type" in order || (order?.reduce_only ?? false)) {
-          const position2 = getRelatedPosition(order.symbol);
+          const position2 = getRelatedPosition(order.symbol, order.margin_mode);
           if (position2) {
             setPosition(position2);
           }
         }
-      }, [order.symbol]);
+      }, [getRelatedPosition, order.margin_mode, order.symbol]);
       const memoizedValue = useMemo(() => {
         return {
           order,
@@ -2355,7 +2380,7 @@ function instrument(option) {
     },
     render: (value, record) => {
       const showGray = grayCell(record);
-      return /* @__PURE__ */ jsxs(Flex, { gap: 2, children: [
+      return /* @__PURE__ */ jsxs(Flex, { gap: 2, className: "oui-py-1", children: [
         /* @__PURE__ */ jsx(
           "div",
           {
@@ -2365,7 +2390,7 @@ function instrument(option) {
             )
           }
         ),
-        /* @__PURE__ */ jsxs(Flex, { direction: "column", itemAlign: "start", children: [
+        /* @__PURE__ */ jsxs(Flex, { direction: "column", itemAlign: "start", gap: 1, children: [
           /* @__PURE__ */ jsx(
             Text.formatted,
             {
@@ -2379,7 +2404,7 @@ function instrument(option) {
               children: `${value.split("_")[1]}-PERP`
             }
           ),
-          option?.showType && /* @__PURE__ */ jsx(Flex, { direction: "row", gap: 1, children: parseBadgesFor(record)?.map((e, index) => /* @__PURE__ */ jsx(
+          option?.showType && /* @__PURE__ */ jsx(Flex, { direction: "row", gap: 1, wrap: "wrap", children: parseBadgesFor(record)?.map((e, index) => /* @__PURE__ */ jsx(
             Badge,
             {
               color: e.toLocaleLowerCase() === "position" ? showGray ? "neutral" : "primary" : "neutral",
@@ -2925,7 +2950,7 @@ var init_useColumn = __esm({
           case "all" /* all */:
             return [
               instrument({
-                width: 130,
+                width: 174,
                 showType: true,
                 onSymbolChange,
                 enableSort: false
@@ -3005,7 +3030,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 166,
                 onSymbolChange
               }),
               // type({ width: 124 }),
@@ -3087,7 +3112,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 160,
                 onSymbolChange
               }),
               // side({ width: 124 }),
@@ -5391,15 +5416,21 @@ var init_useFormatOrderHistory = __esm({
                 if (!e.is_activated || !e.trigger_price) {
                   continue;
                 }
-                e.parent_algo_type = element.algo_type;
-                _data.push(e);
+                _data.push({
+                  ...e,
+                  parent_algo_type: element.algo_type,
+                  margin_mode: e.margin_mode ?? element.margin_mode
+                });
               }
             } else {
               for (let j = 0; j < element.child_orders.length; j++) {
                 const e = element.child_orders[j];
                 if (!!e && (e.algo_status === OrderStatus.FILLED || e.algo_status === OrderStatus.PARTIAL_FILLED)) {
-                  e.parent_algo_type = element.algo_type;
-                  _data.push(e);
+                  _data.push({
+                    ...e,
+                    parent_algo_type: element.algo_type,
+                    margin_mode: e.margin_mode ?? element.margin_mode
+                  });
                 }
               }
             }