@orderly.network/ui-orders 2.11.1 → 2.11.2

package/dist/index.js

@@ -47,67 +47,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 === types.AlgoOrderType.STOP_LOSS) {
-        const types$1 = orderType === types.OrderType.CLOSE_POSITION ? [i18n.i18n.t("common.position"), i18n.i18n.t("tpsl.sl")] : [i18n.i18n.t("tpsl.sl")];
-        list.push(...types$1);
-      }
-      if (algoType === types.AlgoOrderType.TAKE_PROFIT) {
-        const types$1 = orderType === types.OrderType.CLOSE_POSITION ? [i18n.i18n.t("common.position"), i18n.i18n.t("tpsl.tp")] : [i18n.i18n.t("tpsl.tp")];
-        list.push(...types$1);
-      }
-      return list;
-    }
-    const type = typeof orderType === "string" ? orderType.replace("_ORDER", "") : "";
-    if ([types.OrderType.ASK, types.OrderType.BID].includes(orderType)) {
-      return [i18n.i18n.t("orderEntry.orderType.limit")];
-    }
-    if (record.algo_order_id === void 0 || record.algo_order_id && algoType === "BRACKET") {
-      const typeMap = {
-        [types.OrderType.LIMIT]: i18n.i18n.t("orderEntry.orderType.limit"),
-        [types.OrderType.MARKET]: i18n.i18n.t("orderEntry.orderType.market"),
-        [types.OrderType.POST_ONLY]: i18n.i18n.t("orderEntry.orderType.postOnly"),
-        [types.OrderType.IOC]: i18n.i18n.t("orderEntry.orderType.ioc"),
-        [types.OrderType.FOK]: i18n.i18n.t("orderEntry.orderType.fok")
-      };
-      return [
-        typeMap[type] || upperCaseFirstLetter(type)
-      ];
-    }
-    if (algoType === types.AlgoOrderRootType.TRAILING_STOP) {
-      return [i18n.i18n.t("orderEntry.orderType.trailingStop")];
-    }
-    if (type) {
-      const typeMap = {
-        [types.OrderType.LIMIT]: i18n.i18n.t("orderEntry.orderType.stopLimit"),
-        [types.OrderType.MARKET]: i18n.i18n.t("orderEntry.orderType.stopMarket")
-      };
-      return [typeMap[type] || type];
-    }
-  }
-  if (typeof algoType !== "undefined") {
-    const list = [];
-    if (algoType === types.AlgoOrderRootType.POSITIONAL_TP_SL) {
-      list.push(i18n.i18n.t("common.position"));
-    }
-    const tpOrder = record?.child_orders?.find(
-      (order) => order.algo_type === types.AlgoOrderType.TAKE_PROFIT && !!order.trigger_price
-    );
-    const slOrder = record?.child_orders?.find(
-      (order) => order.algo_type === types.AlgoOrderType.STOP_LOSS && !!order.trigger_price
-    );
-    if (tpOrder || slOrder) {
-      list.push(
-        tpOrder && slOrder ? i18n.i18n.t("common.tpsl") : tpOrder ? i18n.i18n.t("tpsl.tp") : i18n.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 === types.OrderStatus.CANCELLED || record.algo_status === types.OrderStatus.CANCELLED;
@@ -211,7 +154,7 @@ function convertApiOrderTypeToOrderEntryType(order) {
   }
   return order.type;
 }
-var upperCaseFirstLetter;
+var upperCaseFirstLetter, normalizeMarginMode, getMarginModeBadges, getOrderTypeBadges;
 var init_util = __esm({
   "src/utils/util.ts"() {
     upperCaseFirstLetter = (str) => {
@@ -220,6 +163,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 === types.MarginMode.ISOLATED) {
+        return types.MarginMode.ISOLATED;
+      }
+      if (value === 0 || value === types.MarginMode.CROSS) {
+        return types.MarginMode.CROSS;
+      }
+      return void 0;
+    };
+    getMarginModeBadges = (record) => {
+      const marginMode = normalizeMarginMode(record?.margin_mode);
+      if (marginMode === types.MarginMode.ISOLATED) {
+        return [i18n.i18n.t("marginMode.isolated")];
+      }
+      if (marginMode === types.MarginMode.CROSS) {
+        return [i18n.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 === types.AlgoOrderType.STOP_LOSS) {
+            const types$1 = orderType === types.OrderType.CLOSE_POSITION ? [i18n.i18n.t("common.position"), i18n.i18n.t("tpsl.sl")] : [i18n.i18n.t("tpsl.sl")];
+            list.push(...types$1);
+          }
+          if (algoType === types.AlgoOrderType.TAKE_PROFIT) {
+            const types$1 = orderType === types.OrderType.CLOSE_POSITION ? [i18n.i18n.t("common.position"), i18n.i18n.t("tpsl.tp")] : [i18n.i18n.t("tpsl.tp")];
+            list.push(...types$1);
+          }
+          return list;
+        }
+        const type = typeof orderType === "string" ? orderType.replace("_ORDER", "") : "";
+        if ([types.OrderType.ASK, types.OrderType.BID].includes(orderType)) {
+          return [i18n.i18n.t("orderEntry.orderType.limit")];
+        }
+        if (record.algo_order_id === void 0 || record.algo_order_id && algoType === "BRACKET") {
+          const typeMap = {
+            [types.OrderType.LIMIT]: i18n.i18n.t("orderEntry.orderType.limit"),
+            [types.OrderType.MARKET]: i18n.i18n.t("orderEntry.orderType.market"),
+            [types.OrderType.POST_ONLY]: i18n.i18n.t("orderEntry.orderType.postOnly"),
+            [types.OrderType.IOC]: i18n.i18n.t("orderEntry.orderType.ioc"),
+            [types.OrderType.FOK]: i18n.i18n.t("orderEntry.orderType.fok")
+          };
+          return [
+            typeMap[type] || upperCaseFirstLetter(type)
+          ];
+        }
+        if (algoType === types.AlgoOrderRootType.TRAILING_STOP) {
+          return [i18n.i18n.t("orderEntry.orderType.trailingStop")];
+        }
+        if (type) {
+          const typeMap = {
+            [types.OrderType.LIMIT]: i18n.i18n.t("orderEntry.orderType.stopLimit"),
+            [types.OrderType.MARKET]: i18n.i18n.t("orderEntry.orderType.stopMarket")
+          };
+          return [typeMap[type] || type];
+        }
+      }
+      if (typeof algoType !== "undefined") {
+        const list = [];
+        if (algoType === types.AlgoOrderRootType.POSITIONAL_TP_SL) {
+          list.push(i18n.i18n.t("common.position"));
+        }
+        const tpOrder = record?.child_orders?.find(
+          (order) => order.algo_type === types.AlgoOrderType.TAKE_PROFIT && !!order.trigger_price
+        );
+        const slOrder = record?.child_orders?.find(
+          (order) => order.algo_type === types.AlgoOrderType.STOP_LOSS && !!order.trigger_price
+        );
+        if (tpOrder || slOrder) {
+          list.push(
+            tpOrder && slOrder ? i18n.i18n.t("common.tpsl") : tpOrder ? i18n.i18n.t("tpsl.tp") : i18n.i18n.t("tpsl.sl")
+          );
+        }
+        return list;
+      }
+      return [];
+    };
   }
 });
 var SymbolContext, useSymbolContext;
@@ -1149,10 +1174,10 @@ var init_tpslOrderRowContext = __esm({
         }
       );
       const getRelatedPosition = hooks.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 ?? types.MarginMode.CROSS) === (marginMode ?? types.MarginMode.CROSS)
           );
         }
       );
@@ -1170,12 +1195,12 @@ var init_tpslOrderRowContext = __esm({
       });
       React2.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 = React2.useMemo(() => {
         return {
           order,
@@ -2361,7 +2386,7 @@ function instrument(option) {
     },
     render: (value, record) => {
       const showGray = grayCell(record);
-      return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { gap: 2, children: [
+      return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { gap: 2, className: "oui-py-1", children: [
         /* @__PURE__ */ jsxRuntime.jsx(
           "div",
           {
@@ -2371,7 +2396,7 @@ function instrument(option) {
             )
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "column", itemAlign: "start", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "column", itemAlign: "start", gap: 1, children: [
           /* @__PURE__ */ jsxRuntime.jsx(
             ui.Text.formatted,
             {
@@ -2385,7 +2410,7 @@ function instrument(option) {
               children: `${value.split("_")[1]}-PERP`
             }
           ),
-          option?.showType && /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { direction: "row", gap: 1, children: parseBadgesFor(record)?.map((e, index) => /* @__PURE__ */ jsxRuntime.jsx(
+          option?.showType && /* @__PURE__ */ jsxRuntime.jsx(ui.Flex, { direction: "row", gap: 1, wrap: "wrap", children: parseBadgesFor(record)?.map((e, index) => /* @__PURE__ */ jsxRuntime.jsx(
             ui.Badge,
             {
               color: e.toLocaleLowerCase() === "position" ? showGray ? "neutral" : "primary" : "neutral",
@@ -2931,7 +2956,7 @@ var init_useColumn = __esm({
           case "all" /* all */:
             return [
               instrument({
-                width: 130,
+                width: 174,
                 showType: true,
                 onSymbolChange,
                 enableSort: false
@@ -3011,7 +3036,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 166,
                 onSymbolChange
               }),
               // type({ width: 124 }),
@@ -3093,7 +3118,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 160,
                 onSymbolChange
               }),
               // side({ width: 124 }),
@@ -5397,15 +5422,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 === types.OrderStatus.FILLED || e.algo_status === types.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
+                  });
                 }
               }
             }