@orderly.network/ui-tpsl 2.12.0-alpha.0 → 2.12.1-alpha.0

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React, { ReactNode, SVGProps } from 'react';
 import * as _orderly_network_types from '@orderly.network/types';
-import { API, AlgoOrderRootType, PositionType, OrderSide, OrderlyOrder, AlgoOrder } from '@orderly.network/types';
+import { API, AlgoOrderRootType, PositionType, OrderSide, OrderlyOrder, AlgoOrder, MarginMode } from '@orderly.network/types';
 import { ButtonProps } from '@orderly.network/ui';
 import * as _orderly_network_hooks from '@orderly.network/hooks';
 import { ComputedAlgoOrder, OrderValidationResult } from '@orderly.network/hooks';
@@ -284,6 +284,7 @@ declare const TPSLSimpleDialogWidget: React.FC<{
     symbol: string;
     close?: () => void;
     onComplete?: () => void;
+    marginMode?: MarginMode;
     showAdvancedTPSLDialog?: () => void;
 }>;
 declare const TPSLSimpleSheetId = "TPSLSimpleSheetId";
@@ -293,6 +294,7 @@ type TPSLBuilderOptions = {
     type: "tp" | "sl";
     triggerPrice?: number;
     symbol: string;
+    marginMode?: MarginMode;
 };
 declare const useTPSLSimpleDialog: (options: TPSLBuilderOptions) => {
     readonly symbolInfo: (<Key extends keyof API.SymbolExt>(key: Key, defaultValue?: API.SymbolExt[Key] | undefined) => API.SymbolExt[Key]) & (() => API.SymbolExt);

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import React, { ReactNode, SVGProps } from 'react';
 import * as _orderly_network_types from '@orderly.network/types';
-import { API, AlgoOrderRootType, PositionType, OrderSide, OrderlyOrder, AlgoOrder } from '@orderly.network/types';
+import { API, AlgoOrderRootType, PositionType, OrderSide, OrderlyOrder, AlgoOrder, MarginMode } from '@orderly.network/types';
 import { ButtonProps } from '@orderly.network/ui';
 import * as _orderly_network_hooks from '@orderly.network/hooks';
 import { ComputedAlgoOrder, OrderValidationResult } from '@orderly.network/hooks';
@@ -284,6 +284,7 @@ declare const TPSLSimpleDialogWidget: React.FC<{
     symbol: string;
     close?: () => void;
     onComplete?: () => void;
+    marginMode?: MarginMode;
     showAdvancedTPSLDialog?: () => void;
 }>;
 declare const TPSLSimpleSheetId = "TPSLSimpleSheetId";
@@ -293,6 +294,7 @@ type TPSLBuilderOptions = {
     type: "tp" | "sl";
     triggerPrice?: number;
     symbol: string;
+    marginMode?: MarginMode;
 };
 declare const useTPSLSimpleDialog: (options: TPSLBuilderOptions) => {
     readonly symbolInfo: (<Key extends keyof API.SymbolExt>(key: Key, defaultValue?: API.SymbolExt[Key] | undefined) => API.SymbolExt[Key]) & (() => API.SymbolExt);

package/dist/index.js

@@ -1358,9 +1358,10 @@ var useTPSLBuilder = (options) => {
   const [needConfirm] = hooks.useLocalStorage("orderly_order_confirm", true);
   const { marginMode: symbolMarginMode } = hooks.useMarginModeBySymbol(symbol);
   const [{ rows: positions }] = hooks.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 = hooks.useEstLiqPriceBySymbol(
@@ -1410,7 +1411,6 @@ var useTPSLBuilder = (options) => {
   });
   const isSlPriceWarning = slPriceError?.sl_trigger_price?.type === hooks.ERROR_MSG_CODES.SL_PRICE_WARNING;
   const setQuantity = (value) => {
-    console.log("------>>>>>setQuantity", value);
     setValue("quantity", value);
   };
   const setOrderPrice = (name, value) => {
@@ -2931,9 +2931,8 @@ ui.registerSimpleSheet(TPSLDetailSheetId, TPSLDetailWidget, {
   }
 });
 var useTPSLSimpleDialog = (options) => {
-  const { type, triggerPrice, symbol } = options;
+  const { type, triggerPrice, symbol, marginMode } = options;
   const symbolInfo = hooks.useSymbolsInfo();
-  const { marginMode } = hooks.useMarginModeBySymbol(symbol ?? "");
   const [{ rows: positions }, positionsInfo] = hooks.usePositionStream(symbol);
   const position = positions?.find((item) => item.margin_mode === marginMode);
   react.useRef(types.AlgoOrderRootType.TP_SL);
@@ -3245,7 +3244,6 @@ var TPSLSimpleDialogUI = (props) => {
 var TPSLSimpleDialogWidget = (props) => {
   const { close, onComplete, showAdvancedTPSLDialog } = props;
   const state = useTPSLSimpleDialog(props);
-  console.log("------>>>>>TPSLSimpleDialogWidget", state);
   return /* @__PURE__ */ jsxRuntime.jsx(
     TPSLSimpleDialogUI,
     {