@orderly.network/ui-tpsl 3.0.0-beta.0 → 3.0.0-beta.2

package/dist/index.mjs

@@ -1,21 +1,29 @@
 import { SDKError, MarginMode, PositionType, AlgoOrderRootType, OrderType, OrderSide, OrderStatus, AlgoOrderType } from '@orderly.network/types';
-import { Flex, Input, inputFormatter, cn, Slider, Text, registerSimpleSheet, registerSimpleDialog, useScreen, ScrollArea, DotStatus, Grid, Button, ThrottledButton, Divider, Box, toast, TokenIcon, capitalizeFirstLetter, modal, Tooltip, ExclamationFillIcon, Select, ChevronDownIcon, Badge, textVariants, Checkbox, SimpleDropdownMenu, CaretDownIcon, useModal } from '@orderly.network/ui';
+import { Flex, Input, inputFormatter, cn, Slider, Text, registerSimpleSheet, registerSimpleDialog, useScreen, ScrollArea, DotStatus, Grid, Button, ThrottledButton, Divider, Box, toast, TokenIcon, modal, SymbolBadge as SymbolBadge$1, Tooltip, ExclamationFillIcon, Select, ChevronDownIcon, Badge, textVariants, Checkbox, SimpleDropdownMenu, CaretDownIcon, useModal } from '@orderly.network/ui';
 import { memo, useRef, useState, useEffect, createContext, useMemo, useContext, Fragment as Fragment$1 } from 'react';
-import { utils, useSymbolsInfo, useAccount, useEventEmitter, useLocalStorage, useMarginModeBySymbol, usePositionStream, useEstLiqPriceBySymbol, useTPSLOrder, useTpslPriceChecker, ERROR_MSG_CODES, useMemoizedFn, useOrderEntry, useGetEstLiqPrice, useOrderStream, useSubAccountAlgoOrderStream, findPositionTPSLFromOrders, useMutation, useMarkPrice, useIndexPrice, useLeverageBySymbol, useMaxQty, findTPSLFromOrder, findTPSLOrderPriceFromOrder } from '@orderly.network/hooks';
+import { utils, useSymbolsInfo, useAccount, useEventEmitter, useLocalStorage, useMarginModeBySymbol, usePositionStream, useEstLiqPriceBySymbol, useTPSLOrder, useTpslPriceChecker, ERROR_MSG_CODES, useMemoizedFn, useOrderEntry, useGetEstLiqPrice, useOrderStream, useSubAccountAlgoOrderStream, findPositionTPSLFromOrders, useMutation, useMarkPrice, useIndexPrice, useLeverageBySymbol, useMaxQty, useBadgeBySymbol, useSymbolWithBroker, findTPSLFromOrder, findTPSLOrderPriceFromOrder } from '@orderly.network/hooks';
 import { useTranslation, i18n, Trans } from '@orderly.network/i18n';
 import { useOrderEntryFormErrorMsg } from '@orderly.network/react-app';
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
-import { Decimal, checkIsNaN, transSymbolformString, getTPSLDirection, formatNum, todpIfNeed } from '@orderly.network/utils';
+import { Decimal, checkIsNaN, getTPSLDirection, formatNum, todpIfNeed } from '@orderly.network/utils';
 import { order, positions } from '@orderly.network/perp';
 import { AuthGuardDataTable } from '@orderly.network/ui-connector';
 
 // src/editorPopover.tsx
+var SymbolBadge = (props) => {
+  const { brokerId, brokerName, brokerNameRaw } = useBadgeBySymbol(
+    props.symbol
+  );
+  const badge = brokerName ?? brokerId ?? void 0;
+  return /* @__PURE__ */ jsx(SymbolBadge$1, { badge, fullName: brokerNameRaw });
+};
 var OrderInfo = (props) => {
   const { t } = useTranslation();
   const { order: order2, symbolLeverage } = props;
   const { symbol } = order2;
   const markPrice = useMarkPrice(symbol);
   const indexPrice = useIndexPrice(symbol);
+  const marginModeLabel = props.marginMode === MarginMode.ISOLATED ? t("marginMode.isolated") : props.marginMode === MarginMode.CROSS ? t("marginMode.cross") : void 0;
   const leverage = useLeverageBySymbol(
     symbolLeverage ? void 0 : symbol,
     props.marginMode
@@ -44,20 +52,21 @@ var OrderInfo = (props) => {
                   {
                     className: "oui-whitespace-nowrap oui-break-normal",
                     rule: "symbol",
-                    formatString: "base-type",
+                    formatString: "base",
                     size: "sm",
                     weight: "semibold",
                     intensity: 98,
+                    suffix: /* @__PURE__ */ jsx(SymbolBadge, { symbol: symbol ?? "" }),
                     children: symbol
                   }
                 )
               ] }),
-              props.marginMode && /* @__PURE__ */ jsx(
+              marginModeLabel && /* @__PURE__ */ jsx(
                 Text,
                 {
                   size: "2xs",
                   className: "oui-h-[18px] oui-rounded oui-bg-base-7 oui-px-2 oui-font-semibold oui-text-base-contrast-36",
-                  children: capitalizeFirstLetter(props.marginMode)
+                  children: marginModeLabel
                 }
               ),
               /* @__PURE__ */ jsxs(
@@ -253,6 +262,7 @@ var useTPSLInputRowScript = (props) => {
       });
       return roi2 * 100;
     } catch (error) {
+      console.error("error", error);
       return null;
     }
   }, [values, leverage, rootOrderPrice, type, side]);
@@ -829,10 +839,10 @@ var TPSLQuantity = memo((props) => {
         tooltip: errorMsg,
         color: errorMsg ? "danger" : void 0,
         formatters: [
+          inputFormatter.decimalPointFormatter,
           inputFormatter.dpFormatter(props.base_dp),
           inputFormatter.numberFormatter,
-          inputFormatter.currencyFormatter,
-          inputFormatter.decimalPointFormatter
+          inputFormatter.currencyFormatter
         ],
         onValueChange: (value) => {
           props.onQuantityChange?.(value);
@@ -1104,6 +1114,7 @@ var TPSL = (props) => {
               props.close?.();
               onComplete?.();
             }).catch((err) => {
+              console.log("--->>>cancel order", err);
             });
           },
           children: t("common.confirm")
@@ -1182,21 +1193,25 @@ var PositionTPSLConfirm = (props) => {
     );
   };
   const isPositionTPSL = _isPositionTPSL;
+  const displaySymbol = useSymbolWithBroker(symbol);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
-    isEditing && /* @__PURE__ */ jsx(Text, { as: "div", size: "2xs", intensity: 80, className: "oui-mb-3", children: t("tpsl.agreement", { symbol: transSymbolformString(symbol) }) }),
+    isEditing && /* @__PURE__ */ jsx(Text, { as: "div", size: "2xs", intensity: 80, className: "oui-mb-3", children: t("tpsl.agreement", { symbol: displaySymbol }) }),
     /* @__PURE__ */ jsxs(Flex, { pb: 4, children: [
-      /* @__PURE__ */ jsx(Box, { grow: true, children: /* @__PURE__ */ jsx(
-        Text.formatted,
-        {
-          rule: "symbol",
-          formatString: "base-type",
-          size: "base",
-          showIcon: true,
-          as: "div",
-          intensity: 80,
-          children: symbol
-        }
-      ) }),
+      /* @__PURE__ */ jsxs(Flex, { direction: "column", itemAlign: "start", gap: 1, grow: true, children: [
+        /* @__PURE__ */ jsx(Box, { grow: true, children: /* @__PURE__ */ jsx(
+          Text.formatted,
+          {
+            rule: "symbol",
+            formatString: "base",
+            size: "base",
+            showIcon: true,
+            as: "div",
+            intensity: 80,
+            children: symbol
+          }
+        ) }),
+        /* @__PURE__ */ jsx(SymbolBadge, { symbol })
+      ] }),
       /* @__PURE__ */ jsxs(Flex, { gap: 1, children: [
         isPositionTPSL && /* @__PURE__ */ jsx(Badge, { size: "xs", color: "primary", children: t("common.position") }),
         /* @__PURE__ */ jsx(TPSLOrderType, { tpPrice, slPrice }),
@@ -1341,9 +1356,10 @@ var useTPSLBuilder = (options) => {
   const [needConfirm] = useLocalStorage("orderly_order_confirm", true);
   const { marginMode: symbolMarginMode } = useMarginModeBySymbol(symbol);
   const [{ rows: positions }] = usePositionStream();
-  const mainAccountPosition = positions.find(
-    (item) => item.symbol === symbol && item.margin_mode === (options.position?.margin_mode ?? symbolMarginMode)
-  );
+  const mainAccountPosition = positions.find((item) => {
+    const marginMode = options.position?.margin_mode ?? symbolMarginMode;
+    return item.symbol === symbol && item.margin_mode === marginMode;
+  });
   const isSubAccount = options.position?.account_id && options.position?.account_id !== state.mainAccountId;
   const position = isSubAccount ? options.position : mainAccountPosition;
   const estLiqPrice = useEstLiqPriceBySymbol(
@@ -1951,6 +1967,8 @@ var useTPSLAdvanced = (props) => {
     helper.validate(isSlPriceError ? slPriceError : void 0).then(() => {
       props.onSubmit(formattedOrder);
     }).catch((err) => {
+      console.log("metaState", metaState);
+      console.log("err", err);
     });
   };
   return {
@@ -2616,6 +2634,7 @@ var TPSLDetailUI = (props) => {
     symbolInfo
   } = props;
   const { estLiqPrice } = useTPSLDetailContext();
+  console.log("----- position", position);
   return /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsxs(ScrollArea, { className: cn(isMobile && "oui-h-[calc(100vh-100px)]"), children: [
     /* @__PURE__ */ jsx(
       OrderInfo,
@@ -2910,9 +2929,8 @@ registerSimpleSheet(TPSLDetailSheetId, TPSLDetailWidget, {
   }
 });
 var useTPSLSimpleDialog = (options) => {
-  const { type, triggerPrice, symbol } = options;
+  const { type, triggerPrice, symbol, marginMode } = options;
   const symbolInfo = useSymbolsInfo();
-  const { marginMode } = useMarginModeBySymbol(symbol ?? "");
   const [{ rows: positions }, positionsInfo] = usePositionStream(symbol);
   const position = positions?.find((item) => item.margin_mode === marginMode);
   useRef(AlgoOrderRootType.TP_SL);
@@ -3162,7 +3180,7 @@ var TPSLSimpleDialogUI = (props) => {
       TPSLQuantity,
       {
         maxQty: props.maxQty,
-        quantity: Number(props.orderQuantity ?? props.maxQty),
+        quantity: props.orderQuantity ?? props.maxQty,
         baseTick: props.symbolInfo("base_tick"),
         base_dp: props.symbolInfo("base_dp"),
         base: props.symbolInfo("base"),
@@ -3631,6 +3649,7 @@ var EditBracketOrderUI = (props) => {
               props.onSubmit().then(() => {
                 props.onClose?.();
               }).catch((err) => {
+                console.log("--->>>cancel order", err);
               });
             },
             children: t("common.confirm")