@orderly.network/ui-orders 3.0.0-beta.1 → 3.0.0-beta.3

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;
@@ -286,6 +311,7 @@ var init_shareButton_script = __esm({
       const { sharePnLConfig, order, iconSize } = props;
       const { t } = i18n.useTranslation();
       const { getFirstRefCode } = hooks.useReferralInfo();
+      const { brokerNameRaw } = hooks.useBadgeBySymbol(order.symbol);
       const refCode = React2.useMemo(() => {
         return getFirstRefCode()?.code;
       }, [getFirstRefCode]);
@@ -303,7 +329,8 @@ var init_shareButton_script = __esm({
             },
             refCode,
             leverage,
-            ...sharePnLConfig
+            ...sharePnLConfig,
+            brokerName: sharePnLConfig?.brokerName ?? brokerNameRaw
           }
         });
       };
@@ -1149,10 +1176,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 +1197,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,
@@ -1990,6 +2017,29 @@ var init_triggerPriceCell = __esm({
     };
   }
 });
+var OrderSymbolCell;
+var init_orderSymbolCell = __esm({
+  "src/components/orderList/desktop/orderSymbolCell.tsx"() {
+    OrderSymbolCell = (props) => {
+      const { symbol, onSymbolChange } = props;
+      const { brokerId, brokerName, brokerNameRaw } = hooks.useBadgeBySymbol(symbol);
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Text.symbolBadge,
+        {
+          className: "oui-cursor-pointer",
+          badge: brokerName ?? brokerId ?? void 0,
+          fullName: brokerNameRaw,
+          onClick: (e) => {
+            onSymbolChange?.({ symbol });
+            e.stopPropagation();
+            e.preventDefault();
+          },
+          children: symbol
+        }
+      );
+    };
+  }
+});
 var Renew;
 var init_renew = __esm({
   "src/components/orderList/desktop/renew.tsx"() {
@@ -2361,31 +2411,25 @@ 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",
           {
             className: ui.cn(
-              "oui-h-7 oui-w-1 oui-shrink-0 oui-rounded-[1px]",
+              "oui-h-[34px] oui-w-1 oui-shrink-0 oui-rounded-[1px]",
               record.side === types.OrderSide.BUY ? "oui-bg-trade-profit" : "oui-bg-trade-loss"
             )
           }
         ),
-        /* @__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,
+            OrderSymbolCell,
             {
-              size: "xs",
-              className: "oui-cursor-pointer oui-text-xs",
-              onClick: (e) => {
-                option?.onSymbolChange?.({ symbol: value });
-                e.stopPropagation();
-                e.preventDefault();
-              },
-              children: `${value.split("_")[1]}-PERP`
+              symbol: value,
+              onSymbolChange: option?.onSymbolChange
             }
           ),
-          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",
@@ -2913,6 +2957,7 @@ var init_useColumn = __esm({
     init_quantityCell();
     init_trailingCallbackCell();
     init_triggerPriceCell();
+    init_orderSymbolCell();
     init_renew();
     init_tpslEdit();
     init_tpslPrice();
@@ -2931,7 +2976,7 @@ var init_useColumn = __esm({
           case "all" /* all */:
             return [
               instrument({
-                width: 130,
+                width: 200,
                 showType: true,
                 onSymbolChange,
                 enableSort: false
@@ -2969,7 +3014,7 @@ var init_useColumn = __esm({
           case "pending" /* pending */:
             return [
               instrument({
-                width: 172,
+                width: 200,
                 showType: true,
                 onSymbolChange,
                 enableSort: false
@@ -2993,7 +3038,7 @@ var init_useColumn = __esm({
           case "tp_sl" /* tp_sl */:
             return [
               instrument({
-                width: 176,
+                width: 200,
                 showType: true,
                 onSymbolChange,
                 enableSort: false
@@ -3011,7 +3056,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 200,
                 onSymbolChange
               }),
               // type({ width: 124 }),
@@ -3046,7 +3091,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 200,
                 onSymbolChange,
                 enableSort: false
               }),
@@ -3070,7 +3115,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 200,
                 onSymbolChange
               }),
               // side({ width: 124 }),
@@ -3093,7 +3138,7 @@ var init_useColumn = __esm({
             return [
               instrument({
                 showType: true,
-                width: 154,
+                width: 200,
                 onSymbolChange
               }),
               // side({ width: 124 }),
@@ -3131,10 +3176,23 @@ var init_useColumn = __esm({
     };
   }
 });
+var SymbolBadge;
+var init_symbolBadge = __esm({
+  "src/components/symbolBadge.tsx"() {
+    SymbolBadge = (props) => {
+      const { brokerId, brokerName, brokerNameRaw } = hooks.useBadgeBySymbol(
+        props.symbol
+      );
+      const badge = brokerName ?? brokerId ?? void 0;
+      return /* @__PURE__ */ jsxRuntime.jsx(ui.SymbolBadge, { badge, fullName: brokerNameRaw });
+    };
+  }
+});
 var SymbolToken, OrderTypeView, OrderTime, OrderState, Qty, Filled, EstTotal, TriggerPrice, MarkPrice, LimitPrice, TPTrigger, SLTrigger, TPPrice, SLPrice, TPSLQuantity, AvgPrice2, OrderPrice, RealizedPnL, MobileTooltip, Fee, TrailingCallback, TrailingPrice;
 var init_items = __esm({
   "src/components/orderList/mobile/items.tsx"() {
     init_util();
+    init_symbolBadge();
     init_tpslOrderRowContext();
     SymbolToken = (props) => {
       const { item } = props;
@@ -3145,9 +3203,10 @@ var init_items = __esm({
         {
           intensity: 80,
           rule: "symbol",
-          formatString: "base-type",
+          formatString: "base",
           size: "sm",
           prefix: /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { color: isBuy ? "success" : "danger", size: "xs", children: isBuy ? t("common.buy") : t("common.sell") }),
+          suffix: /* @__PURE__ */ jsxRuntime.jsx(SymbolBadge, { symbol: item.symbol }),
           onClick: () => {
             props.onSymbolChange?.({ symbol: item.symbol });
           },
@@ -4082,6 +4141,7 @@ var ConfirmDialogContent;
 var init_editDialogContent = __esm({
   "src/components/orderList/mobile/editSheet/components/editDialogContent.tsx"() {
     init_util();
+    init_symbolBadge();
     ConfirmDialogContent = (props) => {
       const { item } = props;
       const {
@@ -4104,16 +4164,19 @@ var init_editDialogContent = __esm({
           }
         ),
         /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { gap: 2, mb: 3, mt: 2, justify: "between", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.Text.formatted,
-            {
-              rule: "symbol",
-              formatString: "base-type",
-              size: "base",
-              showIcon: true,
-              children: item.symbol
-            }
-          ),
+          /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "column", itemAlign: "start", gap: 1, grow: true, children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              ui.Text.formatted,
+              {
+                rule: "symbol",
+                formatString: "base",
+                size: "base",
+                showIcon: true,
+                children: item.symbol
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(SymbolBadge, { symbol: item.symbol })
+          ] }),
           /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "row", gap: 1, children: [
             parseBadgesFor(item)?.map((e, index) => /* @__PURE__ */ jsxRuntime.jsx(
               ui.Badge,
@@ -4255,11 +4318,22 @@ var EditSheetHeader;
 var init_editSheetHeader = __esm({
   "src/components/orderList/mobile/editSheet/components/editSheetHeader.tsx"() {
     init_util();
+    init_symbolBadge();
     EditSheetHeader = (props) => {
       const { item } = props;
       const { t } = i18n.useTranslation();
       return /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { width: "100%", justify: "between", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text.formatted, { rule: "symbol", showIcon: true, intensity: 80, children: item.symbol }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.Text.formatted,
+          {
+            rule: "symbol",
+            formatString: "base",
+            showIcon: true,
+            intensity: 80,
+            suffix: /* @__PURE__ */ jsxRuntime.jsx(SymbolBadge, { symbol: item.symbol }),
+            children: item.symbol
+          }
+        ),
         /* @__PURE__ */ jsxRuntime.jsxs(ui.Flex, { direction: "row", gap: 1, children: [
           parseBadgesFor(props.item)?.map((e, index) => /* @__PURE__ */ jsxRuntime.jsx(
             ui.Badge,
@@ -5397,15 +5471,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
+                  });
                 }
               }
             }
@@ -5512,7 +5592,7 @@ var init_orderList_script = __esm({
         page: enableLoadMore || !manualPagination ? void 0 : page,
         // pending and ts_sl list get all data
         size: manualPagination ? pageSize : 500,
-        sourceTypeAll: type === "orderHistory" /* orderHistory */,
+        sourceTypeAll: type === "orderHistory" /* orderHistory */ || type === "filled" /* filled */,
         dateRange,
         includes,
         excludes