@orderly.network/hooks 2.5.3 → 2.6.0

package/dist/index.mjs

@@ -3,13 +3,13 @@ import useSWR__default, { mutate } from 'swr';
 import * as useSWR from 'swr';
 export { useSWR as swr };
 export { unstable_serialize, default as useSWR, useSWRConfig } from 'swr';
-import { TesntTokenFallback, ArbitrumSepoliaTokenInfo, SolanaDevnetTokenInfo, OrderType, OrderSide, SDKError, TrackerEventName, AccountStatusEnum, AlgoOrderRootType, OrderStatus, ArbitrumSepoliaChainInfo, SolanaDevnetChainInfo, ARBITRUM_TESTNET_CHAINID, SOLANA_TESTNET_CHAINID, MONAD_TESTNET_CHAINID, ABSTRACT_TESTNET_CHAINID, BSC_TESTNET_CHAINID, nativeTokenAddress, ChainKey, chainsInfoMap, ARBITRUM_MAINNET_CHAINID, isNativeTokenChecker, ChainNamespace, MaxUint256, DEPOSIT_FEE_RATE, EMPTY_LIST, LedgerWalletKey, SolanaChains, AlgoOrderType, DistributionType, TriggerPriceType } from '@orderly.network/types';
-import React, { createContext, useContext, useCallback, useState, useEffect, useMemo, useRef, useId, useLayoutEffect } from 'react';
+import { TesntTokenFallback, ArbitrumSepoliaTokenInfo, SolanaDevnetTokenInfo, OrderType, OrderSide, SDKError, TrackerEventName, AccountStatusEnum, EMPTY_LIST, AlgoOrderType, AlgoOrderRootType, OrderStatus, EMPTY_OBJECT, ArbitrumSepoliaChainInfo, SolanaDevnetChainInfo, ARBITRUM_TESTNET_CHAINID, SOLANA_TESTNET_CHAINID, MONAD_TESTNET_CHAINID, ABSTRACT_TESTNET_CHAINID, BSC_TESTNET_CHAINID, nativeTokenAddress, ChainKey, chainsInfoMap, ARBITRUM_MAINNET_CHAINID, isNativeTokenChecker, ChainNamespace, MaxUint256, ETHEREUM_MAINNET_CHAINID, DEPOSIT_FEE_RATE, LedgerWalletKey, SolanaChains, PositionType, DistributionType, TriggerPriceType } from '@orderly.network/types';
+import React2, { createContext, useContext, useCallback, useState, useEffect, useMemo, useRef, useId, useLayoutEffect } from 'react';
 import useSWRMutation from 'swr/mutation';
+import { zero, windowGuard, getTimestamp, getGlobalObject, Decimal, timeConvertString, isTestnet, getPrecisionByNumber, camelCaseToUnderscoreCase, removeTrailingZeros, commify, todpIfNeed } from '@orderly.network/utils';
 import useConstant from 'use-constant';
 export { default as useConstant } from 'use-constant';
-import { SimpleDI, Account, EventEmitter, EVENT_NAMES, DefaultConfigStore, LocalStorageStore } from '@orderly.network/core';
-import { zero, windowGuard, getTimestamp, getGlobalObject, Decimal, timeConvertString, isTestnet, getPrecisionByNumber, camelCaseToUnderscoreCase, removeTrailingZeros, commify, todpIfNeed } from '@orderly.network/utils';
+import { SimpleDI, Account, EventEmitter, DefaultConfigStore, EVENT_NAMES, LocalStorageStore } from '@orderly.network/core';
 import { debounce } from 'lodash';
 import useSWRInfinite, { unstable_serialize } from 'swr/infinite';
 import * as amplitude from '@amplitude/analytics-browser';
@@ -17,11 +17,11 @@ import { jsx } from 'react/jsx-runtime';
 import { DefaultEVMWalletAdapter } from '@orderly.network/default-evm-adapter';
 import { DefaultSolanaWalletAdapter } from '@orderly.network/default-solana-adapter';
 import { EthersProvider } from '@orderly.network/web3-provider-ethers';
+import useSWRSubscription from 'swr/subscription';
+import { pathOr, omit, prop, pick, compose, head, mergeDeepRight, min, max, isNil, propOr, path, lensIndex, over } from 'ramda';
 import { create } from 'zustand';
 import { immer } from 'zustand/middleware/immer';
-import { pathOr, omit, prop, pick, compose, head, mergeDeepRight, min, max, isNil, propOr, path, lensIndex, over } from 'ramda';
 import { account, order, positions } from '@orderly.network/perp';
-import useSWRSubscription from 'swr/subscription';
 import { useDebouncedCallback, useThrottledCallback } from 'use-debounce';
 export * from 'use-debounce';
 import { produce } from 'immer';
@@ -36,13 +36,16 @@ var __export = (target, all) => {
 // src/version.ts
 if (typeof window !== "undefined") {
   window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.5.3";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.6.0";
 }
-var version_default = "2.5.3";
+var version_default = "2.6.0";
 var fetcher = (url, init2 = {}, queryOptions) => get(url, init2, queryOptions?.formatter);
 var OrderlyContext = createContext({
   // configStore: new MemoryConfigStore(),
 });
+var useOrderlyContext = () => {
+  return useContext(OrderlyContext);
+};
 var OrderlyProvider = OrderlyContext.Provider;
 function useConfig(key, defaultValue) {
   const { configStore } = useContext(OrderlyContext);
@@ -120,6 +123,8 @@ var useAccountInstance = () => {
   });
   return account9;
 };
+
+// src/useMutation.ts
 var fetcher2 = (url, options) => {
   const init2 = {
     method: options.arg.method,
@@ -131,7 +136,7 @@ var fetcher2 = (url, options) => {
     init2.body = JSON.stringify(options.arg.data);
   }
   if (typeof options.arg.params === "object" && Object.keys(options.arg.params).length) {
-    let search = new URLSearchParams(options.arg.params);
+    const search = new URLSearchParams(options.arg.params);
     url = `${url}?${search.toString()}`;
   }
   return mutate$1(url, init2);
@@ -152,7 +157,7 @@ var useMutation = (url, method = "POST", options) => {
   const mutation = async (data2, params, options2) => {
     let newUrl = url;
     if (typeof params === "object" && Object.keys(params).length) {
-      let search = new URLSearchParams(params);
+      const search = new URLSearchParams(params);
       newUrl = `${url}?${search.toString()}`;
     }
     const payload = {
@@ -175,15 +180,7 @@ var useMutation = (url, method = "POST", options) => {
       options2
     );
   };
-  return [
-    mutation,
-    {
-      data,
-      error,
-      reset,
-      isMutating
-    }
-  ];
+  return [useMemoizedFn(mutation), { data, error, reset, isMutating }];
 };
 var signatureMiddleware = (useSWRNext) => {
   const apiBaseUrl = useConfig("apiBaseUrl");
@@ -471,6 +468,53 @@ var useMemoizedFn = (fn) => {
   }
   return memoizedFn.current;
 };
+var useAudioPlayer = (src, options = {}) => {
+  const { volume = 1, loop, autoPlay } = options;
+  const audioRef = useRef(null);
+  const [status, setStatus] = useState("idle");
+  const onPlay = () => {
+    setStatus("play");
+  };
+  const onPlaying = () => {
+    setStatus("playing");
+  };
+  const onPause = () => {
+    setStatus("paused");
+  };
+  const onEnded = () => {
+    setStatus("ended");
+  };
+  const onError = () => {
+    setStatus("error");
+  };
+  const element = useMemo(() => {
+    return React2.createElement("audio", {
+      controls: false,
+      ref: audioRef,
+      autoPlay,
+      src,
+      style: { display: "none" },
+      onPlay,
+      onPlaying,
+      onPause,
+      onEnded,
+      onError
+    });
+  }, [autoPlay, src, onPlay, onPlaying, onPause, onEnded, onError]);
+  useEffect(() => {
+    const el = audioRef.current;
+    if (!el) {
+      return;
+    }
+    el.loop = loop ?? false;
+    el.volume = Math.max(0, Math.min(1, volume));
+    return () => {
+      audioRef.current?.pause();
+      audioRef.current = null;
+    };
+  }, [loop, volume]);
+  return [element, audioRef, status];
+};
 var usePreLoadData = () => {
   const [timestampOffsetInitialized, setTimestampOffsetInitialized] = useState(false);
   const { error: tokenError, data: tokenData } = useQuery(
@@ -705,73 +749,693 @@ var useTrackingInstance = () => {
       });
       SimpleDI.registerByName("instance", instance);
     }
-    return instance;
-  });
-  return trackInstace;
-};
-var useKeyStore = () => {
-  const ctx = useContext(OrderlyContext);
-  return ctx.keyStore;
-};
-var useSimpleDI = () => {
+    return instance;
+  });
+  return trackInstace;
+};
+var useKeyStore = () => {
+  const ctx = useContext(OrderlyContext);
+  return ctx.keyStore;
+};
+var useSimpleDI = () => {
+  return {
+    get: SimpleDI.get,
+    // getOr: SimpleDI.getOr<T>(name, SimpleDI.get<T>(name)),
+    register: SimpleDI.register
+  };
+};
+var WsNetworkStatus = /* @__PURE__ */ ((WsNetworkStatus2) => {
+  WsNetworkStatus2["Connected"] = "connected";
+  WsNetworkStatus2["Unstable"] = "unstable";
+  WsNetworkStatus2["Disconnected"] = "disconnected";
+  return WsNetworkStatus2;
+})(WsNetworkStatus || {});
+function useWsStatus() {
+  const ws = useWS();
+  const [wsStatus, setWsStatus] = useState(
+    ws.client.public.readyState ? "connected" /* Connected */ : "disconnected" /* Disconnected */
+  );
+  const connectCount = useRef(0);
+  useEffect(() => {
+    ws.on("status:change", (status) => {
+      const { type, isPrivate } = status;
+      if (!isPrivate) {
+        switch (type) {
+          case "open":
+            connectCount.current = 0;
+            setWsStatus("connected" /* Connected */);
+            break;
+          case "close":
+            connectCount.current = 0;
+            setWsStatus("disconnected" /* Disconnected */);
+            break;
+          case "reconnecting":
+            connectCount.current++;
+            if (connectCount.current >= 3) {
+              setWsStatus("unstable" /* Unstable */);
+            }
+            break;
+        }
+      }
+    });
+    return () => {
+      ws.off("status:change", () => {
+      });
+    };
+  }, []);
+  return wsStatus;
+}
+var StatusContext = createContext({});
+var StatusProvider = (props) => {
+  const wsStatus = useWsStatus();
+  const memoizedValue = useMemo(() => {
+    return { ws: wsStatus };
+  }, [wsStatus]);
+  return /* @__PURE__ */ jsx(StatusContext.Provider, { value: memoizedValue, children: props.children });
+};
+
+// src/constants.ts
+var DEFAULT_TICK_SIZES = {
+  PERP_BTC_USDC: "1",
+  PERP_ETH_USDC: "0.1",
+  PERP_SOL_USDC: "0.01"
+};
+var ProxyConfigStore = class {
+  constructor(_originConfigStore) {
+    this._originConfigStore = _originConfigStore;
+    windowGuard(() => {
+      this._proxyConfigStore = window.__ORDERLY_CONFIG_STORE__ || _originConfigStore;
+    });
+  }
+  get(key) {
+    const value = this._proxyConfigStore?.get(key);
+    if (typeof value === "undefined") {
+      return this._originConfigStore.get(key);
+    }
+    return value;
+  }
+  getOr(key, defaultValue) {
+    return (this._proxyConfigStore ?? this._originConfigStore).getOr(
+      key,
+      defaultValue
+    );
+  }
+  set(key, value) {
+    (this._proxyConfigStore ?? this._originConfigStore).set(key, value);
+  }
+  clear() {
+    throw new SDKError("Method not implemented.");
+  }
+  getFromOrigin(key) {
+    return this._originConfigStore.get(key);
+  }
+  getOrFromOrigin(key, defaultValue) {
+    return this._originConfigStore.getOr(key, defaultValue);
+  }
+  setToOrigin(key, value) {
+    this._originConfigStore.set(key, value);
+  }
+  clearOrigin() {
+    this._originConfigStore.clear();
+  }
+};
+var useMarketsStream = () => {
+  const ws = useWS();
+  const { data: futures } = useQuery(`/v1/public/futures`, {
+    revalidateOnFocus: false
+  });
+  const topic = "tickers";
+  const { data: tickers } = useSWRSubscription("tickers", (_, { next }) => {
+    const unsubscribe = ws.subscribe(
+      // { event: "subscribe", topic: "markprices" },
+      topic,
+      {
+        onMessage: (message) => {
+          next(null, message);
+        }
+        // onUnsubscribe: () => {
+        //   return "markprices";
+        // },
+        // onError: (error: any) => {
+        //
+        // },
+      }
+    );
+    return () => {
+      unsubscribe?.();
+    };
+  });
+  const value = useMemo(() => {
+    if (!futures)
+      return null;
+    if (!tickers)
+      return futures;
+    return futures.map((item) => {
+      const ticker = tickers.find(
+        (t) => t.symbol === item.symbol
+      );
+      if (ticker) {
+        const data = {
+          ...item,
+          ["24h_close"]: ticker.close,
+          ["24h_open"]: ticker.open,
+          /**
+           * @deprecated
+           * spelling mistake, use 24h_volume to instead, will be remove next version
+           */
+          ["24h_volumn"]: ticker.volume,
+          ["24h_volume"]: ticker.volume,
+          ["24h_amount"]: ticker.amount,
+          change: 0
+        };
+        if (ticker.close !== void 0 && ticker.open !== void 0) {
+          data["change"] = new Decimal(ticker.close).minus(ticker.open).div(ticker.open).toNumber();
+        }
+        return data;
+      }
+      return item;
+    });
+  }, [futures, tickers]);
+  return { data: value };
+};
+function createGetter(data, depth = 2) {
+  const getValue = (value, defaultValue) => {
+    if (defaultValue === void 0) {
+      return value;
+    }
+    return value ?? defaultValue;
+  };
+  return new Proxy(data || {}, {
+    get(target, property, receiver) {
+      if (property === "isNil") {
+        return isNil(data);
+      }
+      if (depth === 1) {
+        return (defaultValue) => {
+          if (!target)
+            return defaultValue;
+          return getValue(target[property], defaultValue);
+        };
+      }
+      return (key, defaultValue) => {
+        if (key) {
+          return getValue(target[property]?.[key], defaultValue);
+        } else {
+          return getValue(target[property], defaultValue);
+        }
+      };
+    }
+  });
+}
+var useAppStore = create()(
+  immer((set) => ({
+    // accountInfo: null,
+    portfolio: {
+      totalCollateral: zero,
+      totalValue: null,
+      freeCollateral: zero,
+      availableBalance: 0,
+      unsettledPnL: 0,
+      totalUnrealizedROI: 0
+    },
+    appState: {
+      positionsLoading: false,
+      ordersLoading: false,
+      fundingRatesLoading: false,
+      ready: false
+    },
+    actions: {
+      cleanAll: () => {
+        set((state) => {
+          state.accountInfo = void 0;
+          state.portfolio = {
+            totalCollateral: zero,
+            totalValue: null,
+            freeCollateral: zero,
+            availableBalance: 0,
+            unsettledPnL: 0,
+            totalUnrealizedROI: 0
+          };
+        }, false);
+      },
+      setAccountInfo: (accountInfo) => {
+        set(
+          (state) => {
+            state.accountInfo = accountInfo;
+          },
+          false
+          // "setAccountInfo"
+        );
+      },
+      setSymbolsInfo: (symbolsInfo) => {
+        set(
+          (state) => {
+            state.symbolsInfo = symbolsInfo;
+          },
+          false
+          // "setSymbolsInfo"
+        );
+      },
+      setFundingRates: (fundingRates) => {
+        set(
+          (state) => {
+            state.fundingRates = fundingRates;
+          },
+          false
+          // "setFundingRates"
+        );
+      },
+      updateAppStatus: (key, value) => {
+        set(
+          (state) => {
+            state.appState[key] = value;
+          },
+          false
+          // "updateAppStatus"
+        );
+      },
+      updatePortfolio: (key, value) => {
+        set(
+          (state) => {
+            state.portfolio[key] = value;
+          },
+          false
+          // "updatePortfolio"
+        );
+      },
+      batchUpdateForPortfolio: (data) => {
+        set(
+          (state) => {
+            state.portfolio = { ...state.portfolio, ...data };
+          },
+          false
+          // "batchUpdateForPortfolio"
+        );
+      },
+      restoreHolding: (holding) => {
+        set(
+          (state) => {
+            state.portfolio.holding = holding;
+          },
+          false
+          // "updateHolding"
+        );
+      },
+      updateHolding(msg) {
+        set(
+          (state) => {
+            if (state.portfolio.holding && state.portfolio.holding.length) {
+              for (const key in msg) {
+                const holding = state.portfolio.holding.find(
+                  (item) => item.token === key
+                );
+                if (holding) {
+                  holding.holding = msg[key].holding;
+                  holding.frozen = msg[key].frozen;
+                }
+              }
+            }
+          },
+          false
+          // "updateHolding"
+        );
+      }
+    }
+  }))
+);
+var useAccountInfo = () => useAppStore((state) => state.accountInfo);
+
+// src/orderly/useSymbolsInfo.ts
+var useSymbolsInfo = () => {
+  const symbolsInfo = useAppStore((state) => state.symbolsInfo);
+  return useMemo(() => createGetter({ ...symbolsInfo }), [symbolsInfo]);
+};
+var useSymbolsInfoStore = () => {
+  return useAppStore((state) => state.symbolsInfo);
+};
+
+// src/orderly/useMarkets.ts
+var MarketsType = /* @__PURE__ */ ((MarketsType2) => {
+  MarketsType2[MarketsType2["FAVORITES"] = 0] = "FAVORITES";
+  MarketsType2[MarketsType2["RECENT"] = 1] = "RECENT";
+  MarketsType2[MarketsType2["ALL"] = 2] = "ALL";
+  MarketsType2[MarketsType2["NEW_LISTING"] = 3] = "NEW_LISTING";
+  return MarketsType2;
+})(MarketsType || {});
+var MarketsStorageKey = "orderly_markets";
+var DefaultFavoriteTab = { name: "Popular", id: 1 };
+var useMarketsStore = () => {
+  const { configStore } = useContext(OrderlyContext);
+  const ee = useEventEmitter();
+  const id = useId();
+  const getStore = () => {
+    const store = configStore.get(MarketsStorageKey);
+    return store || getDefaultStoreData();
+  };
+  const getStoreByKey = (key, defaultValue) => {
+    const store = getStore();
+    return store[key] || defaultValue;
+  };
+  const updateStore = (data) => {
+    configStore.set(MarketsStorageKey, {
+      ...getStore(),
+      ...data
+    });
+  };
+  const getFavoriteTabs = () => {
+    return getStoreByKey("favoriteTabs", [{ ...DefaultFavoriteTab }]);
+  };
+  const getSelectedFavoriteTab = () => {
+    return getStoreByKey("selectedFavoriteTab", { ...DefaultFavoriteTab });
+  };
+  const getFavorites = () => {
+    const favs = getStoreByKey("favorites", []);
+    const tabs = getFavoriteTabs();
+    return filterInvalidTabs(favs, tabs);
+  };
+  const getRecent = () => {
+    return getStoreByKey("recent", []);
+  };
+  const getNewListing = () => {
+    return getStoreByKey("newListing", []);
+  };
+  const getTabSort = () => {
+    return getStoreByKey("tabSort", {});
+  };
+  const [favoriteTabs, setFavoriteTabs] = useState(getFavoriteTabs);
+  const [selectedFavoriteTab, setSelectedFavoriteTab] = useState(
+    getSelectedFavoriteTab
+  );
+  const [favorites, setFavorites] = useState(getFavorites);
+  const [recent, setRecent] = useState(getRecent);
+  const [newListing, setNewListing] = useState(getNewListing);
+  const [tabSort, setTabSort] = useState(getTabSort);
+  const updateFavoriteTabs = (tab, operator) => {
+    const tabs = updateTabs(favoriteTabs, tab, operator);
+    setFavoriteTabs(tabs);
+    ee.emit("markets:changed", createEventData(id, "favoriteTabs", tabs));
+  };
+  const updateSelectedFavoriteTab = (tab) => {
+    setSelectedFavoriteTab(tab);
+    ee.emit(
+      "markets:changed",
+      createEventData(id, "lastSelectedFavoriteTab", tab)
+    );
+  };
+  const updateSymbolFavoriteState = (symbol, tab, remove = false) => {
+    const list = updateSymbolFavorite({ favorites, symbol, tab, remove });
+    setFavorites(list);
+    ee.emit("markets:changed", createEventData(id, "favorites", list));
+  };
+  const addToHistory = (symbol) => {
+    const list = addToTop(recent, symbol);
+    setRecent(list);
+    ee.emit("markets:changed", id);
+    ee.emit("markets:changed", createEventData(id, "recent", list));
+  };
+  const pinToTop = (symbol) => {
+    const newList = moveToTop(favorites, symbol);
+    if (newList) {
+      setFavorites(newList);
+      ee.emit("markets:changed", createEventData(id, "favorites", newList));
+    }
+  };
+  const updateTabsSortState = (tabId, sortKey, sortOrder) => {
+    const map = getStoreByKey("tabSort", {});
+    map[tabId] = {
+      sortKey,
+      sortOrder
+    };
+    setTabSort(map);
+  };
+  useEffect(() => {
+    updateStore({
+      favoriteTabs,
+      favorites,
+      recent,
+      newListing,
+      tabSort,
+      selectedFavoriteTab
+    });
+  }, [
+    favoriteTabs,
+    favorites,
+    recent,
+    newListing,
+    tabSort,
+    selectedFavoriteTab
+  ]);
+  useEffect(() => {
+    const event = ({ id: srcId, key, data }) => {
+      if (srcId === id) {
+        return;
+      }
+      if (key === "favoriteTabs") {
+        setFavoriteTabs(data);
+      } else if (key === "lastSelectedFavoriteTab") {
+        setSelectedFavoriteTab(data);
+      } else if (key === "favorites") {
+        setFavorites(data);
+      } else if (key === "recent") {
+        setRecent(data);
+      } else if (key === "newListing") {
+        setNewListing(data);
+      }
+    };
+    ee.on("markets:changed", event);
+    return () => {
+      ee.off("markets:changed", event);
+    };
+  }, [id]);
+  return {
+    favoriteTabs,
+    favorites,
+    recent,
+    newListing,
+    tabSort,
+    selectedFavoriteTab,
+    updateFavorites: setFavorites,
+    updateFavoriteTabs,
+    updateSymbolFavoriteState,
+    pinToTop,
+    addToHistory,
+    updateSelectedFavoriteTab,
+    updateTabsSortState
+  };
+};
+var useMarkets = (type = 2 /* ALL */) => {
+  const { data: futures } = useMarketsStream();
+  const symbolsInfo = useSymbolsInfo();
+  const [markets, setMarkets] = useState([]);
+  const store = useMarketsStore();
+  const { favorites, recent, newListing } = store;
+  useEffect(() => {
+    const markets2 = addFieldToMarkets(futures, symbolsInfo);
+    const filterList = filterMarkets({
+      markets: markets2,
+      favorites,
+      recent,
+      newListing,
+      type
+    });
+    setMarkets(filterList);
+  }, [futures, symbolsInfo, favorites, recent, newListing, type]);
+  return [markets, store];
+};
+var addFieldToMarkets = (futures, symbolsInfo) => {
+  return (futures || [])?.map((item) => {
+    const info = symbolsInfo[item.symbol];
+    return {
+      ...item,
+      quote_dp: info("quote_dp"),
+      created_time: info("created_time"),
+      leverage: getLeverage(info("base_imr")),
+      openInterest: getOpenInterest(item.open_interest, item.index_price),
+      "8h_funding": get8hFunding(item.est_funding_rate, info("funding_period")),
+      change: get24hChange({
+        change: item.change,
+        close: item["24h_close"],
+        open: item["24h_open"]
+      })
+    };
+  });
+};
+var filterMarkets = (params) => {
+  const { markets, favorites, recent, newListing, type } = params;
+  let curData = [];
+  if (type === 2 /* ALL */) {
+    curData = markets;
+  } else if (type === 3 /* NEW_LISTING */) {
+    curData = markets.filter((item) => isNewListing(item.created_time)).sort((a, b) => b.created_time - a.created_time);
+  } else {
+    const storageData = type === 0 /* FAVORITES */ ? favorites : type === 1 /* RECENT */ ? recent : newListing;
+    const keys = storageData.map((item) => item.name);
+    curData = markets?.filter((item) => keys.includes(item.symbol));
+  }
+  const favoriteKeys = favorites.map((item) => item.name);
+  return curData?.map((item) => ({
+    ...item,
+    isFavorite: type === 0 /* FAVORITES */ ? true : favoriteKeys.includes(item.symbol)
+  }));
+};
+function isEmpty(value) {
+  return value === void 0 || value === null;
+}
+var isNewListing = (createdTime) => {
+  const thirtyDaysInMs = 30 * 24 * 60 * 60 * 1e3;
+  const now = Date.now();
+  return now - createdTime < thirtyDaysInMs;
+};
+function get8hFunding(est_funding_rate, funding_period) {
+  let funding8h = 0;
+  if (isEmpty(est_funding_rate)) {
+    return null;
+  }
+  if (funding_period) {
+    funding8h = new Decimal(est_funding_rate || 0).mul(funding_period).div(8).toNumber();
+  }
+  return funding8h;
+}
+function get24hChange(params) {
+  const { change, close, open } = params;
+  if (change !== void 0) {
+    return change;
+  }
+  if (!isEmpty(close) && !isEmpty(open)) {
+    if (open === 0) {
+      return 0;
+    }
+    return new Decimal(close).minus(open).div(open).toNumber();
+  }
+}
+function getLeverage(base_imr) {
+  return base_imr ? 1 / base_imr : void 0;
+}
+function getOpenInterest(open_interest, index_price) {
+  return new Decimal(open_interest || 0).mul(index_price || 0).toNumber();
+}
+function getDefaultStoreData() {
+  return {
+    recent: [],
+    favorites: [
+      { name: "PERP_ETH_USDC", tabs: [{ ...DefaultFavoriteTab }] },
+      { name: "PERP_BTC_USDC", tabs: [{ ...DefaultFavoriteTab }] }
+    ],
+    favoriteTabs: [{ ...DefaultFavoriteTab }],
+    selectedFavoriteTab: { ...DefaultFavoriteTab },
+    tabSort: {}
+  };
+}
+function filterInvalidTabs(favorites, tabs) {
+  return favorites.map((favorite) => {
+    return {
+      ...favorite,
+      tabs: favorite.tabs.filter(
+        (tab) => !!tabs.find((item) => item.id === tab.id)
+      )
+    };
+  }).filter((item) => !!item.tabs.length);
+}
+function updateTabs(favoriteTabs, tab, operator) {
+  if (Array.isArray(tab)) {
+    return tab;
+  }
+  const tabs = [...favoriteTabs];
+  const index = tabs.findIndex((item) => item.id === tab.id);
+  if (operator?.add) {
+    tabs.push(tab);
+  } else if (operator?.update && index !== -1) {
+    tabs[index] = tab;
+  } else if (operator?.delete && index !== -1) {
+    tabs.splice(index, 1);
+  }
+  return tabs;
+}
+function addToTop(recent, symbol) {
+  const list = [...recent];
+  const index = list.findIndex((item) => item.name == symbol.symbol);
+  if (index !== -1) {
+    list.splice(index, 1);
+  }
+  list.unshift({ name: symbol.symbol });
+  return list;
+}
+function moveToTop(favorites, symbol) {
+  const index = favorites.findIndex((item) => item.name === symbol.symbol);
+  if (index !== -1) {
+    const item = favorites[index];
+    const list = [...favorites];
+    list.splice(index, 1);
+    list.unshift(item);
+    return list;
+  }
+}
+function updateSymbolFavorite(params) {
+  const { favorites, symbol, tab, remove = false } = params;
+  const list = [...favorites];
+  const index = list.findIndex((item) => item.name == symbol.symbol);
+  const tabs = Array.isArray(tab) ? tab : [tab];
+  if (index === -1) {
+    if (tabs.length && !remove) {
+      list.unshift({ name: symbol.symbol, tabs });
+    }
+  } else {
+    const favorite = list[index];
+    if (Array.isArray(tab)) {
+      if (!tab.length) {
+        list.splice(index, 1);
+      } else {
+        list[index] = { ...favorite, tabs: tab };
+      }
+    } else {
+      if (remove) {
+        const tabs2 = favorite.tabs.filter((item) => item.id != tab.id);
+        if (!tabs2.length) {
+          list.splice(index, 1);
+        } else {
+          list[index] = { ...favorite, tabs: tabs2 };
+        }
+      } else {
+        list[index] = { ...favorite, tabs: [...favorite.tabs, tab] };
+      }
+    }
+  }
+  return list;
+}
+function createEventData(id, key, data) {
   return {
-    get: SimpleDI.get,
-    // getOr: SimpleDI.getOr<T>(name, SimpleDI.get<T>(name)),
-    register: SimpleDI.register
+    id,
+    key,
+    data
   };
-};
-var WsNetworkStatus = /* @__PURE__ */ ((WsNetworkStatus2) => {
-  WsNetworkStatus2["Connected"] = "connected";
-  WsNetworkStatus2["Unstable"] = "unstable";
-  WsNetworkStatus2["Disconnected"] = "disconnected";
-  return WsNetworkStatus2;
-})(WsNetworkStatus || {});
-function useWsStatus() {
-  const ws = useWS();
-  const [wsStatus, setWsStatus] = useState(
-    ws.client.public.readyState ? "connected" /* Connected */ : "disconnected" /* Disconnected */
-  );
-  const connectCount = useRef(0);
-  useEffect(() => {
-    ws.on("status:change", (status) => {
-      const { type, isPrivate } = status;
-      if (!isPrivate) {
-        switch (type) {
-          case "open":
-            connectCount.current = 0;
-            setWsStatus("connected" /* Connected */);
-            break;
-          case "close":
-            connectCount.current = 0;
-            setWsStatus("disconnected" /* Disconnected */);
-            break;
-          case "reconnecting":
-            connectCount.current++;
-            if (connectCount.current >= 3) {
-              setWsStatus("unstable" /* Unstable */);
-            }
-            break;
-        }
-      }
-    });
-    return () => {
-      ws.off("status:change", () => {
-      });
-    };
-  }, []);
-  return wsStatus;
 }
-var StatusContext = createContext({});
-var StatusProvider = (props) => {
-  const wsStatus = useWsStatus();
-  return /* @__PURE__ */ jsx(StatusContext.Provider, { value: { ws: wsStatus }, children: props.children });
-};
 
-// src/constants.ts
-var DEFAULT_TICK_SIZES = {
-  PERP_BTC_USDC: "1",
-  PERP_ETH_USDC: "0.1",
-  PERP_SOL_USDC: "0.01"
+// src/extendedConfigStore.ts
+var ExtendedConfigStore = class extends DefaultConfigStore {
+  constructor(init2) {
+    super(init2);
+  }
+  get(key) {
+    if (key === MarketsStorageKey) {
+      const jsonStr = localStorage.getItem(MarketsStorageKey);
+      if (!jsonStr) {
+        const oldJsonStr = localStorage.getItem(
+          MarketsStorageKey.replace("orderly_", "")
+        );
+        return oldJsonStr ? JSON.parse(oldJsonStr) : "";
+      }
+      return JSON.parse(jsonStr);
+    }
+    return super.get(key);
+  }
+  set(key, value) {
+    if (key === MarketsStorageKey) {
+      const jsonStr = JSON.stringify(value);
+      localStorage.setItem(MarketsStorageKey, jsonStr);
+      return;
+    }
+    super.set(key, value);
+  }
 };
 var useWSObserver = (calculatorService) => {
   const ws = useWS();
@@ -880,7 +1544,7 @@ var BaseMergeHandler = class {
         if (key.startsWith("orders:FILLED") || key.startsWith("orders:REJECTED")) {
           return prevData;
         }
-        if (key.startsWith("orders:NEW") || key.startsWith("orders:INCOMPLETE")) {
+        if (key.startsWith("orders:NEW") || key.startsWith("orders:INCOMPLETE") || key.startsWith("algoOrders:INCOMPLETE")) {
           return this.remove(prevData);
         }
         if (key.startsWith("orders:CANCELLED")) {
@@ -892,7 +1556,7 @@ var BaseMergeHandler = class {
         return this.update(prevData);
       case "FILLED": {
         if (this.orderIsExisting(prevData)) {
-          if (key.startsWith("orders:INCOMPLETE") || key.startsWith("orders:NEW") || // all orders key
+          if (key.startsWith("orders:INCOMPLETE") || key.startsWith("orders:NEW") || key.startsWith("algoOrders:INCOMPLETE") || // all orders key
           key.startsWith("orders:")) {
             if (this.isFullFilled()) {
               return this.remove(prevData);
@@ -900,7 +1564,7 @@ var BaseMergeHandler = class {
             return this.update(prevData);
           }
         } else {
-          if (key.startsWith("orders:CANCELLED") || key.startsWith("orders:INCOMPLETE") || key.startsWith("orders:NEW")) {
+          if (key.startsWith("orders:CANCELLED") || key.startsWith("orders:INCOMPLETE") || key.startsWith("orders:NEW") || key.startsWith("algoOrders:INCOMPLETE")) {
             return prevData;
           }
           return this.insert(prevData);
@@ -1063,123 +1727,6 @@ var AlgoOrderMergeHandler = class _AlgoOrderMergeHandler extends BaseMergeHandle
     return rootOrder;
   }
 };
-var useAppStore = create()(
-  immer((set) => ({
-    // accountInfo: null,
-    portfolio: {
-      totalCollateral: zero,
-      totalValue: null,
-      freeCollateral: zero,
-      availableBalance: 0,
-      unsettledPnL: 0,
-      totalUnrealizedROI: 0
-    },
-    appState: {
-      positionsLoading: false,
-      ordersLoading: false,
-      fundingRatesLoading: false,
-      ready: false
-    },
-    actions: {
-      cleanAll: () => {
-        set((state) => {
-          state.accountInfo = void 0;
-          state.portfolio = {
-            totalCollateral: zero,
-            totalValue: null,
-            freeCollateral: zero,
-            availableBalance: 0,
-            unsettledPnL: 0,
-            totalUnrealizedROI: 0
-          };
-        }, false);
-      },
-      setAccountInfo: (accountInfo) => {
-        set(
-          (state) => {
-            state.accountInfo = accountInfo;
-          },
-          false
-          // "setAccountInfo"
-        );
-      },
-      setSymbolsInfo: (symbolsInfo) => {
-        set(
-          (state) => {
-            state.symbolsInfo = symbolsInfo;
-          },
-          false
-          // "setSymbolsInfo"
-        );
-      },
-      setFundingRates: (fundingRates) => {
-        set(
-          (state) => {
-            state.fundingRates = fundingRates;
-          },
-          false
-          // "setFundingRates"
-        );
-      },
-      updateAppStatus: (key, value) => {
-        set(
-          (state) => {
-            state.appState[key] = value;
-          },
-          false
-          // "updateAppStatus"
-        );
-      },
-      updatePortfolio: (key, value) => {
-        set(
-          (state) => {
-            state.portfolio[key] = value;
-          },
-          false
-          // "updatePortfolio"
-        );
-      },
-      batchUpdateForPortfolio: (data) => {
-        set(
-          (state) => {
-            state.portfolio = { ...state.portfolio, ...data };
-          },
-          false
-          // "batchUpdateForPortfolio"
-        );
-      },
-      restoreHolding: (holding) => {
-        set(
-          (state) => {
-            state.portfolio.holding = holding;
-          },
-          false
-          // "updateHolding"
-        );
-      },
-      updateHolding(msg) {
-        set(
-          (state) => {
-            if (state.portfolio.holding && state.portfolio.holding.length) {
-              for (const key in msg) {
-                const holding = state.portfolio.holding.find(
-                  (item) => item.token === key
-                );
-                if (holding) {
-                  holding.holding = msg[key].holding;
-                  holding.frozen = msg[key].frozen;
-                }
-              }
-            }
-          },
-          false
-          // "updateHolding"
-        );
-      }
-    }
-  }))
-);
-var useAccountInfo = () => useAppStore((state) => state.accountInfo);
 var useTokensInfoStore = create(
   (set) => ({
     tokensInfo: [],
@@ -1740,48 +2287,19 @@ var PositionCalculator = class extends BaseCalculator {
     if (positions3 && Array.isArray(positions3.rows)) {
       return positions3;
     }
-    return this.preprocess(this.getAllPositions(ctx));
-  }
-  destroy() {
-    usePositionStore.getState().actions.closePosition(this.symbol);
-    CalculatorContext.instance?.deleteByName(this.name);
-  }
-  getAllPositions(ctx) {
-    return ctx.get((output) => output[AllPositions]) || usePositionStore.getState().positions[AllPositions];
-  }
-};
-PositionCalculator.logPosition = (symbol = "all") => {
-  return usePositionStore.getState().positions[symbol];
-};
-function createGetter(data, depth = 2) {
-  const getValue = (value, defaultValue) => {
-    if (defaultValue === void 0) {
-      return value;
-    }
-    return value ?? defaultValue;
-  };
-  return new Proxy(data || {}, {
-    get(target, property, receiver) {
-      if (property === "isNil") {
-        return isNil(data);
-      }
-      if (depth === 1) {
-        return (defaultValue) => {
-          if (!target)
-            return defaultValue;
-          return getValue(target[property], defaultValue);
-        };
-      }
-      return (key, defaultValue) => {
-        if (key) {
-          return getValue(target[property]?.[key], defaultValue);
-        } else {
-          return getValue(target[property], defaultValue);
-        }
-      };
-    }
-  });
-}
+    return this.preprocess(this.getAllPositions(ctx));
+  }
+  destroy() {
+    usePositionStore.getState().actions.closePosition(this.symbol);
+    CalculatorContext.instance?.deleteByName(this.name);
+  }
+  getAllPositions(ctx) {
+    return ctx.get((output) => output[AllPositions]) || usePositionStore.getState().positions[AllPositions];
+  }
+};
+PositionCalculator.logPosition = (symbol = "all") => {
+  return usePositionStore.getState().positions[symbol];
+};
 var parseHolding = (holding, indexPrices, tokensInfo) => {
   const nonUSDC = [];
   let USDC_holding = 0;
@@ -2215,13 +2733,6 @@ var useMarkPrice = (symbol) => {
   }, [symbol]);
   return { data: price };
 };
-var useSymbolsInfo = () => {
-  const symbolsInfo = useAppStore((state) => state.symbolsInfo);
-  return useMemo(() => createGetter({ ...symbolsInfo }), [symbolsInfo]);
-};
-var useSymbolsInfoStore = () => {
-  return useAppStore((state) => state.symbolsInfo);
-};
 var useIndexPrice = (symbol) => {
   symbol = symbol.replace("PERP", "SPOT");
   const ws = useWS();
@@ -2619,65 +3130,6 @@ var useAccountInfo2 = () => {
     revalidateOnFocus: false
   });
 };
-var useMarketsStream = () => {
-  const ws = useWS();
-  const { data: futures } = useQuery(`/v1/public/futures`, {
-    revalidateOnFocus: false
-  });
-  const topic = "tickers";
-  const { data: tickers } = useSWRSubscription("tickers", (_, { next }) => {
-    const unsubscribe = ws.subscribe(
-      // { event: "subscribe", topic: "markprices" },
-      topic,
-      {
-        onMessage: (message) => {
-          next(null, message);
-        }
-        // onUnsubscribe: () => {
-        //   return "markprices";
-        // },
-        // onError: (error: any) => {
-        //
-        // },
-      }
-    );
-    return () => {
-      unsubscribe?.();
-    };
-  });
-  const value = useMemo(() => {
-    if (!futures)
-      return null;
-    if (!tickers)
-      return futures;
-    return futures.map((item) => {
-      const ticker = tickers.find(
-        (t) => t.symbol === item.symbol
-      );
-      if (ticker) {
-        const data = {
-          ...item,
-          ["24h_close"]: ticker.close,
-          ["24h_open"]: ticker.open,
-          /**
-           * @deprecated
-           * spelling mistake, use 24h_volume to instead, will be remove next version
-           */
-          ["24h_volumn"]: ticker.volume,
-          ["24h_volume"]: ticker.volume,
-          ["24h_amount"]: ticker.amount,
-          change: 0
-        };
-        if (ticker.close !== void 0 && ticker.open !== void 0) {
-          data["change"] = new Decimal(ticker.close).minus(ticker.open).div(ticker.open).toNumber();
-        }
-        return data;
-      }
-      return item;
-    });
-  }, [futures, tickers]);
-  return { data: value };
-};
 var useFundingRates = () => {
   const data = useAppStore((state) => state.fundingRates);
   return createGetter({ ...data });
@@ -2829,11 +3281,11 @@ var useMarket = (type) => {
       const rate = fundingRates[item.symbol];
       const est_funding_rate = rate("est_funding_rate");
       const funding_period = info("funding_period");
-      const change = item.change === void 0 ? get24hChange(item["24h_close"], item["24h_open"]) : item.change;
+      const change = item.change === void 0 ? get24hChange2(item["24h_close"], item["24h_open"]) : item.change;
       return {
         ...item,
         change,
-        "8h_funding": get8hFunding(est_funding_rate, funding_period),
+        "8h_funding": get8hFunding2(est_funding_rate, funding_period),
         quote_dp: info("quote_dp"),
         created_time: info("created_time"),
         openInterest: new Decimal(open_interest || 0).mul(index_price || 0).toNumber()
@@ -2886,266 +3338,37 @@ var useMarket = (type) => {
   const updateSelectedFavoriteTab = (tab) => {
     updateStore("lastSelectedFavoriteTab", tab);
   };
-  const updateTabsSortState = (tabId, sortKey, sortOrder) => {
-    const map = getStore("tabSort", {});
-    map[tabId] = {
-      sortKey,
-      sortOrder
-    };
-    updateStore("tabSort", map);
-    setTabSort(map);
-  };
-  const markets = getData(type);
-  return [
-    markets || [],
-    {
-      favoriteTabs,
-      favorites,
-      recent,
-      tabSort,
-      addToHistory,
-      updateFavorites,
-      updateFavoriteTabs,
-      updateSymbolFavoriteState,
-      pinToTop,
-      getLastSelFavTab,
-      updateSelectedFavoriteTab,
-      updateTabsSortState
-    }
-  ];
-};
-function get8hFunding(est_funding_rate, funding_period) {
-  let funding8h = 0;
-  if (est_funding_rate === void 0 || est_funding_rate === null) {
-    return null;
-  }
-  if (funding_period) {
-    funding8h = new Decimal(est_funding_rate || 0).mul(funding_period).div(8).toNumber();
-  }
-  return funding8h;
-}
-function get24hChange(close, open) {
-  if (close !== void 0 && open !== void 0) {
-    if (open === 0) {
-      return 0;
-    }
-    return new Decimal(close).minus(open).div(open).toNumber();
-  }
-}
-var MarketsType = /* @__PURE__ */ ((MarketsType2) => {
-  MarketsType2[MarketsType2["FAVORITES"] = 0] = "FAVORITES";
-  MarketsType2[MarketsType2["RECENT"] = 1] = "RECENT";
-  MarketsType2[MarketsType2["ALL"] = 2] = "ALL";
-  MarketsType2[MarketsType2["NEW_LISTING"] = 3] = "NEW_LISTING";
-  return MarketsType2;
-})(MarketsType || {});
-var MarketsStorageKey = "orderly_markets";
-var DefaultFavoriteTab = { name: "Popular", id: 1 };
-var useMarketsStore = () => {
-  const { configStore } = useContext(OrderlyContext);
-  const ee = useEventEmitter();
-  const id = useId();
-  const getStore = () => {
-    const store = configStore.get(MarketsStorageKey);
-    return store || getDefaultStoreData();
-  };
-  const getStoreByKey = (key, defaultValue) => {
-    const store = getStore();
-    return store[key] || defaultValue;
-  };
-  const updateStore = (data) => {
-    configStore.set(MarketsStorageKey, {
-      ...getStore(),
-      ...data
-    });
-  };
-  const getFavoriteTabs = () => {
-    return getStoreByKey("favoriteTabs", [{ ...DefaultFavoriteTab }]);
-  };
-  const getSelectedFavoriteTab = () => {
-    return getStoreByKey("selectedFavoriteTab", { ...DefaultFavoriteTab });
-  };
-  const getFavorites = () => {
-    const favs = getStoreByKey("favorites", []);
-    const tabs = getFavoriteTabs();
-    return filterInvalidTabs(favs, tabs);
-  };
-  const getRecent = () => {
-    return getStoreByKey("recent", []);
-  };
-  const getNewListing = () => {
-    return getStoreByKey("newListing", []);
-  };
-  const getTabSort = () => {
-    return getStoreByKey("tabSort", {});
-  };
-  const [favoriteTabs, setFavoriteTabs] = useState(getFavoriteTabs);
-  const [selectedFavoriteTab, setSelectedFavoriteTab] = useState(
-    getSelectedFavoriteTab
-  );
-  const [favorites, setFavorites] = useState(getFavorites);
-  const [recent, setRecent] = useState(getRecent);
-  const [newListing, setNewListing] = useState(getNewListing);
-  const [tabSort, setTabSort] = useState(getTabSort);
-  const updateFavoriteTabs = (tab, operator) => {
-    const tabs = updateTabs(favoriteTabs, tab, operator);
-    setFavoriteTabs(tabs);
-    ee.emit("markets:changed", createEventData(id, "favoriteTabs", tabs));
-  };
-  const updateSelectedFavoriteTab = (tab) => {
-    setSelectedFavoriteTab(tab);
-    ee.emit(
-      "markets:changed",
-      createEventData(id, "lastSelectedFavoriteTab", tab)
-    );
-  };
-  const updateSymbolFavoriteState = (symbol, tab, remove = false) => {
-    const list = updateSymbolFavorite({ favorites, symbol, tab, remove });
-    setFavorites(list);
-    ee.emit("markets:changed", createEventData(id, "favorites", list));
-  };
-  const addToHistory = (symbol) => {
-    const list = addToTop(recent, symbol);
-    setRecent(list);
-    ee.emit("markets:changed", id);
-    ee.emit("markets:changed", createEventData(id, "recent", list));
-  };
-  const pinToTop = (symbol) => {
-    const newList = moveToTop(favorites, symbol);
-    if (newList) {
-      setFavorites(newList);
-      ee.emit("markets:changed", createEventData(id, "favorites", newList));
-    }
-  };
-  const updateTabsSortState = (tabId, sortKey, sortOrder) => {
-    const map = getStoreByKey("tabSort", {});
-    map[tabId] = {
-      sortKey,
-      sortOrder
-    };
-    setTabSort(map);
-  };
-  useEffect(() => {
-    updateStore({
-      favoriteTabs,
-      favorites,
-      recent,
-      newListing,
-      tabSort,
-      selectedFavoriteTab
-    });
-  }, [
-    favoriteTabs,
-    favorites,
-    recent,
-    newListing,
-    tabSort,
-    selectedFavoriteTab
-  ]);
-  useEffect(() => {
-    const event = ({ id: srcId, key, data }) => {
-      if (srcId === id) {
-        return;
-      }
-      if (key === "favoriteTabs") {
-        setFavoriteTabs(data);
-      } else if (key === "lastSelectedFavoriteTab") {
-        setSelectedFavoriteTab(data);
-      } else if (key === "favorites") {
-        setFavorites(data);
-      } else if (key === "recent") {
-        setRecent(data);
-      } else if (key === "newListing") {
-        setNewListing(data);
-      }
-    };
-    ee.on("markets:changed", event);
-    return () => {
-      ee.off("markets:changed", event);
+  const updateTabsSortState = (tabId, sortKey, sortOrder) => {
+    const map = getStore("tabSort", {});
+    map[tabId] = {
+      sortKey,
+      sortOrder
     };
-  }, [id]);
-  return {
-    favoriteTabs,
-    favorites,
-    recent,
-    newListing,
-    tabSort,
-    selectedFavoriteTab,
-    updateFavorites: setFavorites,
-    updateFavoriteTabs,
-    updateSymbolFavoriteState,
-    pinToTop,
-    addToHistory,
-    updateSelectedFavoriteTab,
-    updateTabsSortState
+    updateStore("tabSort", map);
+    setTabSort(map);
   };
-};
-var useMarkets = (type = 2 /* ALL */) => {
-  const { data: futures } = useMarketsStream();
-  const symbolsInfo = useSymbolsInfo();
-  const [markets, setMarkets] = useState([]);
-  const store = useMarketsStore();
-  const { favorites, recent, newListing } = store;
-  useEffect(() => {
-    const markets2 = addFieldToMarkets(futures, symbolsInfo);
-    const filterList = filterMarkets({
-      markets: markets2,
+  const markets = getData(type);
+  return [
+    markets || [],
+    {
+      favoriteTabs,
       favorites,
       recent,
-      newListing,
-      type
-    });
-    setMarkets(filterList);
-  }, [futures, symbolsInfo, favorites, recent, newListing, type]);
-  return [markets, store];
-};
-var addFieldToMarkets = (futures, symbolsInfo) => {
-  return (futures || [])?.map((item) => {
-    const info = symbolsInfo[item.symbol];
-    return {
-      ...item,
-      quote_dp: info("quote_dp"),
-      created_time: info("created_time"),
-      leverage: getLeverage(info("base_imr")),
-      openInterest: getOpenInterest(item.open_interest, item.index_price),
-      "8h_funding": get8hFunding2(item.est_funding_rate, info("funding_period")),
-      change: get24hChange2({
-        change: item.change,
-        close: item["24h_close"],
-        open: item["24h_open"]
-      })
-    };
-  });
-};
-var filterMarkets = (params) => {
-  const { markets, favorites, recent, newListing, type } = params;
-  let curData = [];
-  if (type === 2 /* ALL */) {
-    curData = markets;
-  } else if (type === 3 /* NEW_LISTING */) {
-    curData = markets.filter((item) => isNewListing(item.created_time)).sort((a, b) => b.created_time - a.created_time);
-  } else {
-    const storageData = type === 0 /* FAVORITES */ ? favorites : type === 1 /* RECENT */ ? recent : newListing;
-    const keys = storageData.map((item) => item.name);
-    curData = markets?.filter((item) => keys.includes(item.symbol));
-  }
-  const favoriteKeys = favorites.map((item) => item.name);
-  return curData?.map((item) => ({
-    ...item,
-    isFavorite: type === 0 /* FAVORITES */ ? true : favoriteKeys.includes(item.symbol)
-  }));
-};
-function isEmpty(value) {
-  return value === void 0 || value === null;
-}
-var isNewListing = (createdTime) => {
-  const thirtyDaysInMs = 30 * 24 * 60 * 60 * 1e3;
-  const now = Date.now();
-  return now - createdTime < thirtyDaysInMs;
+      tabSort,
+      addToHistory,
+      updateFavorites,
+      updateFavoriteTabs,
+      updateSymbolFavoriteState,
+      pinToTop,
+      getLastSelFavTab,
+      updateSelectedFavoriteTab,
+      updateTabsSortState
+    }
+  ];
 };
 function get8hFunding2(est_funding_rate, funding_period) {
   let funding8h = 0;
-  if (isEmpty(est_funding_rate)) {
+  if (est_funding_rate === void 0 || est_funding_rate === null) {
     return null;
   }
   if (funding_period) {
@@ -3153,119 +3376,14 @@ function get8hFunding2(est_funding_rate, funding_period) {
   }
   return funding8h;
 }
-function get24hChange2(params) {
-  const { change, close, open } = params;
-  if (change !== void 0) {
-    return change;
-  }
-  if (!isEmpty(close) && !isEmpty(open)) {
+function get24hChange2(close, open) {
+  if (close !== void 0 && open !== void 0) {
     if (open === 0) {
       return 0;
     }
     return new Decimal(close).minus(open).div(open).toNumber();
   }
 }
-function getLeverage(base_imr) {
-  return base_imr ? 1 / base_imr : void 0;
-}
-function getOpenInterest(open_interest, index_price) {
-  return new Decimal(open_interest || 0).mul(index_price || 0).toNumber();
-}
-function getDefaultStoreData() {
-  return {
-    recent: [],
-    favorites: [
-      { name: "PERP_ETH_USDC", tabs: [{ ...DefaultFavoriteTab }] },
-      { name: "PERP_BTC_USDC", tabs: [{ ...DefaultFavoriteTab }] }
-    ],
-    favoriteTabs: [{ ...DefaultFavoriteTab }],
-    selectedFavoriteTab: { ...DefaultFavoriteTab },
-    tabSort: {}
-  };
-}
-function filterInvalidTabs(favorites, tabs) {
-  return favorites.map((favorite) => {
-    return {
-      ...favorite,
-      tabs: favorite.tabs.filter(
-        (tab) => !!tabs.find((item) => item.id === tab.id)
-      )
-    };
-  }).filter((item) => !!item.tabs.length);
-}
-function updateTabs(favoriteTabs, tab, operator) {
-  if (Array.isArray(tab)) {
-    return tab;
-  }
-  const tabs = [...favoriteTabs];
-  const index = tabs.findIndex((item) => item.id === tab.id);
-  if (operator?.add) {
-    tabs.push(tab);
-  } else if (operator?.update && index !== -1) {
-    tabs[index] = tab;
-  } else if (operator?.delete && index !== -1) {
-    tabs.splice(index, 1);
-  }
-  return tabs;
-}
-function addToTop(recent, symbol) {
-  const list = [...recent];
-  const index = list.findIndex((item) => item.name == symbol.symbol);
-  if (index !== -1) {
-    list.splice(index, 1);
-  }
-  list.unshift({ name: symbol.symbol });
-  return list;
-}
-function moveToTop(favorites, symbol) {
-  const index = favorites.findIndex((item) => item.name === symbol.symbol);
-  if (index !== -1) {
-    const item = favorites[index];
-    const list = [...favorites];
-    list.splice(index, 1);
-    list.unshift(item);
-    return list;
-  }
-}
-function updateSymbolFavorite(params) {
-  const { favorites, symbol, tab, remove = false } = params;
-  const list = [...favorites];
-  const index = list.findIndex((item) => item.name == symbol.symbol);
-  const tabs = Array.isArray(tab) ? tab : [tab];
-  if (index === -1) {
-    if (tabs.length && !remove) {
-      list.unshift({ name: symbol.symbol, tabs });
-    }
-  } else {
-    const favorite = list[index];
-    if (Array.isArray(tab)) {
-      if (!tab.length) {
-        list.splice(index, 1);
-      } else {
-        list[index] = { ...favorite, tabs: tab };
-      }
-    } else {
-      if (remove) {
-        const tabs2 = favorite.tabs.filter((item) => item.id != tab.id);
-        if (!tabs2.length) {
-          list.splice(index, 1);
-        } else {
-          list[index] = { ...favorite, tabs: tabs2 };
-        }
-      } else {
-        list[index] = { ...favorite, tabs: [...favorite.tabs, tab] };
-      }
-    }
-  }
-  return list;
-}
-function createEventData(id, key, data) {
-  return {
-    id,
-    key,
-    data
-  };
-}
 
 // src/orderly/useMarkPricesStream.ts
 var useMarkPricesStream = () => {
@@ -3473,8 +3591,9 @@ var useFundingDetails = (symbol) => {
   });
 };
 var calculatePositiveRate = (periodData, period) => {
-  if (!periodData || !period)
+  if (!periodData || !period) {
     return 0;
+  }
   const daysMap = {
     "1d": 1,
     "3d": 3,
@@ -3492,8 +3611,9 @@ var useFundingRateHistory = () => {
   );
   const getPositiveRates = useCallback(
     (data, period) => {
-      if (!data?.length)
+      if (!data?.length) {
         return {};
+      }
       return data.reduce(
         (acc, item) => {
           acc[item.symbol] = calculatePositiveRate(
@@ -3508,17 +3628,11 @@ var useFundingRateHistory = () => {
     []
   );
   return {
-    data: historyData ?? [],
+    data: historyData ?? EMPTY_LIST,
     isLoading,
     getPositiveRates
   };
 };
-var findTPSLFromOrders = (orders, symbol) => {
-  const order = findPositionTPSLFromOrders(orders, symbol);
-  if (!order)
-    return;
-  return findTPSLFromOrder(order);
-};
 var findTPSLFromOrder = (order) => {
   let tp_trigger_price;
   let sl_trigger_price;
@@ -3539,10 +3653,51 @@ var findTPSLFromOrder = (order) => {
     sl_trigger_price
   };
 };
+var findTPSLOrderPriceFromOrder = (order) => {
+  let tp_order_price;
+  let sl_order_price;
+  const tpOrder = order?.child_orders?.find(
+    (order2) => order2.algo_type === AlgoOrderType.TAKE_PROFIT
+  );
+  const slOrder = order?.child_orders?.find(
+    (order2) => order2.algo_type === AlgoOrderType.STOP_LOSS
+  );
+  if (tpOrder) {
+    if (tpOrder.trigger_price) {
+      if (tpOrder.price) {
+        tp_order_price = tpOrder.price;
+      } else {
+        tp_order_price = OrderType.MARKET;
+      }
+    }
+  }
+  if (slOrder) {
+    if (slOrder.trigger_price) {
+      if (slOrder.price) {
+        sl_order_price = slOrder.price;
+      } else {
+        sl_order_price = OrderType.MARKET;
+      }
+    }
+  }
+  return {
+    tp_order_price,
+    sl_order_price
+  };
+};
 var findPositionTPSLFromOrders = (orders, symbol) => {
-  return orders?.find((order) => {
+  const fullPositionOrder = orders?.find((order) => {
     return order.symbol === symbol && order.algo_type === AlgoOrderRootType.POSITIONAL_TP_SL && (order.root_algo_status === OrderStatus.NEW || order.root_algo_status === OrderStatus.REPLACED || order.root_algo_status === OrderStatus.PARTIAL_FILLED);
   });
+  const partialPositionOrders = orders?.filter((order) => {
+    return order.symbol === symbol && order.algo_type === AlgoOrderRootType.TP_SL && (order.root_algo_status === OrderStatus.NEW || order.root_algo_status === OrderStatus.REPLACED || order.root_algo_status === OrderStatus.PARTIAL_FILLED);
+  }).sort((a, b) => {
+    return b.created_time - a.created_time;
+  });
+  return {
+    fullPositionOrder,
+    partialPositionOrders
+  };
 };
 
 // src/orderly/usePositionStream/usePositionStream.ts
@@ -3636,16 +3791,27 @@ var usePositionStream = (symbol = "all", options) => {
     }
     if (Array.isArray(tpslOrders) && tpslOrders.length) {
       rows = rows.map((item) => {
-        const related_order = findPositionTPSLFromOrders(
-          tpslOrders,
-          item.symbol
-        );
-        const tp_sl_pricer = !!related_order ? findTPSLFromOrder(related_order) : void 0;
+        const { fullPositionOrder, partialPositionOrders } = findPositionTPSLFromOrders(tpslOrders, item.symbol);
+        const full_tp_sl = fullPositionOrder ? findTPSLFromOrder(fullPositionOrder) : void 0;
+        const partialPossitionOrder = partialPositionOrders && partialPositionOrders.length ? partialPositionOrders[0] : void 0;
+        const partial_tp_sl = partialPossitionOrder ? findTPSLFromOrder(partialPossitionOrder) : void 0;
         return {
           ...item,
-          tp_trigger_price: tp_sl_pricer?.tp_trigger_price,
-          sl_trigger_price: tp_sl_pricer?.sl_trigger_price,
-          algo_order: related_order
+          // tp_trigger_price: tp_sl_pricer?.tp_trigger_price,
+          // sl_trigger_price: tp_sl_pricer?.sl_trigger_price,
+          // algo_order: related_order,
+          full_tp_sl: {
+            tp_trigger_price: full_tp_sl?.tp_trigger_price,
+            sl_trigger_price: full_tp_sl?.sl_trigger_price,
+            algo_order: fullPositionOrder
+          },
+          partial_tp_sl: {
+            order_num: partialPositionOrders?.length ?? 0,
+            tp_trigger_price: partial_tp_sl?.tp_trigger_price,
+            sl_trigger_price: partial_tp_sl?.sl_trigger_price,
+            algo_order: partialPossitionOrder
+            // algo_order: partialPositionOrders,
+          }
         };
       });
     }
@@ -3658,7 +3824,7 @@ var usePositionStream = (symbol = "all", options) => {
     {
       rows,
       // rows: formattedPositions[0],
-      aggregated: formattedPositions?.[1] ?? {},
+      aggregated: formattedPositions?.[1] ?? EMPTY_OBJECT,
       totalCollateral,
       totalValue,
       totalUnrealizedROI
@@ -3683,6 +3849,12 @@ pathOr(0, [
   "aggregated",
   "unsettledPnL"
 ]);
+var DataCenterContext = createContext({});
+var useDataCenterContext = () => {
+  return useContext(DataCenterContext);
+};
+
+// src/orderly/useOrderStream/useOrderStream.ts
 var useOrderStream = (params, options) => {
   const {
     status,
@@ -3832,6 +4004,15 @@ var useOrderStream = (params, options) => {
       doCancelAllAlgoOrders(null, { algo_type: "STOP" })
     ]);
   }, [normalOrdersResponse.data, algoOrdersResponse.data]);
+  const cancelPostionOrdersByTypes = useCallback(
+    (symbol2, types) => {
+      return doCancelAllAlgoOrders(null, {
+        symbol: symbol2,
+        algo_type: types
+      });
+    },
+    [algoOrdersResponse.data]
+  );
   const cancelAllTPSLOrders = useCallback(() => {
     return cancelAlgoOrdersByTypes([
       AlgoOrderRootType.POSITIONAL_TP_SL,
@@ -3951,6 +4132,7 @@ var useOrderStream = (params, options) => {
       cancelAlgoOrder,
       cancelTPSLChildOrder,
       updateTPSLOrder,
+      cancelPostionOrdersByTypes,
       meta,
       errors: {
         cancelOrder: cancelOrderError,
@@ -4132,7 +4314,7 @@ var useMarginRatio = () => {
     return account.totalMarginRatio({
       totalCollateral,
       markPrices,
-      positions: rows ?? []
+      positions: rows ?? EMPTY_LIST
     });
   }, [rows, markPrices, totalCollateral]);
   const currentLeverage = useMemo(() => {
@@ -4781,16 +4963,29 @@ var useDeposit = (options) => {
   const fetchBalanceHandler = useCallback(
     async (address, decimals) => {
       let balance2;
-      if (address && isNativeTokenChecker(address)) {
-        balance2 = await account9.assetsManager.getNativeBalance({
-          decimals
-        });
-      } else {
-        balance2 = await account9.assetsManager.getBalance(address, { decimals });
+      try {
+        if (address && isNativeTokenChecker(address)) {
+          balance2 = await account9.assetsManager.getNativeBalance({
+            decimals
+          });
+        } else {
+          balance2 = await account9.assetsManager.getBalance(address, {
+            decimals
+          });
+        }
+      } catch (err) {
+        if (ignoreBalanceError({
+          token: options.srcToken,
+          chainNamespace: account9.walletAdapter?.chainNamespace,
+          err
+        })) {
+          return "0";
+        }
+        throw err;
       }
       return balance2;
     },
-    []
+    [options.srcToken, account9]
   );
   const fetchBalances = useCallback(async (tokens) => {
     const tasks = [];
@@ -4943,15 +5138,62 @@ var useDeposit = (options) => {
     quantity,
     isNativeToken
   ]);
+  const checkIfChainTokenNeedRestApprove = useCallback(
+    (chainId, token) => {
+      if (chainId !== ETHEREUM_MAINNET_CHAINID) {
+        return false;
+      }
+      if (token !== "USDT") {
+        return false;
+      }
+      return true;
+    },
+    []
+  );
+  const resetApprove = useCallback(
+    async (tokenAddress, decimal, vaultAddress2) => {
+      const result = await account9.assetsManager.approve({
+        address: tokenAddress,
+        amount: "0",
+        vaultAddress: vaultAddress2,
+        decimals: decimal
+      });
+      const txResult = await account9.walletAdapter?.pollTransactionReceiptWithBackoff(
+        result.hash
+      );
+      if (txResult && txResult.status === 1) {
+        account9.assetsManager.getAllowance({
+          address: tokenAddress,
+          decimals: decimal,
+          vaultAddress: vaultAddress2
+        }).then((allowance2) => {
+          setAllowance(allowance2);
+        });
+      }
+    },
+    []
+  );
   const approve = useCallback(
     async (amount) => {
       if (!options.address) {
         throw new Error("address is required");
       }
+      let isSetMaxValue = false;
+      if (checkIfChainTokenNeedRestApprove(options.srcChainId, options.srcToken)) {
+        isSetMaxValue = true;
+        if (allowance && new Decimal(allowance).gt(0)) {
+          await resetApprove(
+            options.address,
+            options.decimals,
+            vaultAddress
+          );
+        }
+      }
       return account9.assetsManager.approve({
         address: options.address,
         amount,
         vaultAddress,
+        isSetMaxValue,
         decimals: options.decimals
       }).then((result) => {
         return updateAllowanceWhenTxSuccess(result.hash);
@@ -4959,10 +5201,15 @@ var useDeposit = (options) => {
     },
     [
       account9,
+      options.srcChainId,
+      options.srcToken,
+      allowance,
       options.address,
       options.decimals,
       vaultAddress,
-      updateAllowanceWhenTxSuccess
+      updateAllowanceWhenTxSuccess,
+      checkIfChainTokenNeedRestApprove,
+      resetApprove
     ]
   );
   const deposit = useCallback(async () => {
@@ -5096,6 +5343,10 @@ var useDeposit = (options) => {
     setQuantity
   };
 };
+function ignoreBalanceError(options) {
+  const { token, chainNamespace, err } = options;
+  return chainNamespace === ChainNamespace.solana && token === "USDC" && err?.name === "TokenAccountNotFoundError";
+}
 
 // src/orderly/useConvert.ts
 var useConvert = (options) => {
@@ -5140,45 +5391,34 @@ var useSubAccountMutation = (url, method = "POST", options) => {
     fetcher3,
     restOptions
   );
-  const mutation = useCallback(
-    async (data2, params, options2) => {
-      const { accountId: _accountId, ...restOptions2 } = options2 || {};
-      let newUrl = url;
-      if (typeof params === "object" && Object.keys(params).length) {
-        const search = new URLSearchParams(params);
-        newUrl = `${url}?${search.toString()}`;
-      }
-      const payload = {
-        method,
-        url: newUrl,
-        data: data2
-      };
-      const signer = account9.signer;
-      const signature = await signer.sign(payload, getTimestamp());
-      return trigger(
-        {
-          data: data2,
-          params,
-          method,
-          signature: {
-            ...signature,
-            "orderly-account-id": accountId || _accountId || account9.accountId
-          }
-        },
-        restOptions2
-      );
-    },
-    [trigger, account9, accountId]
-  );
-  return [
-    mutation,
-    {
-      data,
-      error,
-      reset,
-      isMutating
+  const mutation = async (data2, params, options2) => {
+    const { accountId: _accountId, ...restOptions2 } = options2 || {};
+    let newUrl = url;
+    if (typeof params === "object" && Object.keys(params).length) {
+      const search = new URLSearchParams(params);
+      newUrl = `${url}?${search.toString()}`;
     }
-  ];
+    const payload = {
+      method,
+      url: newUrl,
+      data: data2
+    };
+    const signer = account9.signer;
+    const signature = await signer.sign(payload, getTimestamp());
+    return trigger(
+      {
+        data: data2,
+        params,
+        method,
+        signature: {
+          ...signature,
+          "orderly-account-id": accountId || _accountId || account9.accountId
+        }
+      },
+      restOptions2
+    );
+  };
+  return [useMemoizedFn(mutation), { data, error, reset, isMutating }];
 };
 
 // src/orderly/useTransfer.ts
@@ -5423,10 +5663,14 @@ var OrderValidation = class {
         return "TP price";
       case "sl_trigger_price":
         return "SL price";
-      case "max_price":
-        return "Upper price";
-      case "min_price":
-        return "Lower price";
+      case "tp_order_price":
+        return "TP order price";
+      case "sl_order_price":
+        return "SL order price";
+      case "start_price":
+        return "Start price";
+      case "end_price":
+        return "End price";
       case "total_orders":
         return "Total orders";
       case "skew":
@@ -5441,6 +5685,18 @@ var OrderValidation = class {
       message: `${this.getLabel(key)} is required`
     };
   }
+  static priceErrorMin(key) {
+    return {
+      type: "priceErrorMin",
+      message: `Your ${this.getLabel(key)} should be set lower than your order price.`
+    };
+  }
+  static priceErrorMax(key) {
+    return {
+      type: "priceErrorMax",
+      message: `Your ${this.getLabel(key)} should be set higher than your order price.`
+    };
+  }
   static min(key, value) {
     return {
       type: "min",
@@ -5556,36 +5812,57 @@ var BaseOrderCreator = class {
   get type() {
     return this.orderType;
   }
+  getChildOrderType(positionType, orderPrice) {
+    if (positionType === PositionType.FULL) {
+      return OrderType.CLOSE_POSITION;
+    }
+    let type = OrderType.MARKET;
+    if (orderPrice) {
+      type = OrderType.LIMIT;
+    }
+    return type;
+  }
   parseBracketOrder(data) {
     const orders = [];
     const side = data.side === OrderSide.BUY ? OrderSide.SELL : OrderSide.BUY;
+    const algoType = data.position_type === PositionType.PARTIAL ? AlgoOrderRootType.TP_SL : AlgoOrderRootType.POSITIONAL_TP_SL;
     if (!!data.tp_trigger_price) {
       const tp_trigger_price = data.tp_trigger_price;
-      orders.push({
+      const orderItem = {
         algo_type: AlgoOrderType.TAKE_PROFIT,
         side,
-        type: OrderType.CLOSE_POSITION,
+        // TODO need confirm child order type
+        type: this.getChildOrderType(data.position_type, data.tp_order_price),
         trigger_price: tp_trigger_price,
         symbol: data.symbol,
         reduce_only: true
-      });
+      };
+      if (data.tp_order_price) {
+        orderItem.price = data.tp_order_price;
+      }
+      orders.push(orderItem);
     }
     if (!!data.sl_trigger_price) {
       const sl_trigger_price = data.sl_trigger_price;
-      orders.push({
+      const orderItem = {
         algo_type: AlgoOrderType.STOP_LOSS,
         side,
-        type: OrderType.CLOSE_POSITION,
+        // TODO need confirm child order type
+        type: this.getChildOrderType(data.position_type, data.sl_order_price),
         trigger_price: sl_trigger_price,
         symbol: data.symbol,
         reduce_only: true
-      });
+      };
+      if (data.sl_order_price) {
+        orderItem.price = data.sl_order_price;
+      }
+      orders.push(orderItem);
     }
     if (!orders.length)
       return null;
     return {
       symbol: data.symbol,
-      algo_type: AlgoOrderRootType.POSITIONAL_TP_SL,
+      algo_type: algoType,
       child_orders: orders
     };
   }
@@ -5770,15 +6047,75 @@ var LimitOrderCreator = class extends BaseOrderCreator {
     });
   }
 };
+function getOrderPrice(order, askAndBid) {
+  const orderPrice = Number(order.order_price);
+  if (order.order_type === OrderType.MARKET || order.order_type === OrderType.STOP_MARKET) {
+    if (order.side === OrderSide.BUY) {
+      return askAndBid[0];
+    } else {
+      return askAndBid[1];
+    }
+  } else {
+    if (order.side === OrderSide.BUY) {
+      if (orderPrice >= askAndBid[0]) {
+        return askAndBid[0];
+      } else {
+        return orderPrice;
+      }
+    } else {
+      if (orderPrice <= askAndBid[1]) {
+        return askAndBid[1];
+      } else {
+        return orderPrice;
+      }
+    }
+  }
+}
+function getPriceRange(inputs) {
+  const { basePrice, side, symbolInfo } = inputs;
+  const { price_range, price_scope, quote_min, quote_max } = symbolInfo;
+  const maxPriceNumber = order.maxPrice(basePrice, price_range);
+  const minPriceNumber = order.minPrice(basePrice, price_range);
+  const scopePriceNumber = order.scopePrice(basePrice, price_scope, side);
+  const priceRange = side === OrderSide.BUY ? {
+    min: scopePriceNumber,
+    max: maxPriceNumber
+  } : {
+    min: minPriceNumber,
+    max: scopePriceNumber
+  };
+  const minPrice3 = Math.max(quote_min, priceRange?.min);
+  const maxPrice3 = Math.min(quote_max, priceRange?.max);
+  return {
+    minPrice: minPrice3,
+    maxPrice: maxPrice3
+  };
+}
+
+// src/services/orderCreator/baseBracketOrderCreator.ts
+var formatPrice = (price, quote_dp) => {
+  return new Decimal(price).toDecimalPlaces(quote_dp).toNumber();
+};
 async function bracketOrderValidator(values2, config) {
   const result = /* @__PURE__ */ Object.create(null);
   await Promise.resolve();
-  const { tp_trigger_price, sl_trigger_price, side } = values2;
+  const {
+    tp_enable,
+    tp_trigger_price,
+    tp_order_price,
+    tp_order_type,
+    sl_trigger_price,
+    sl_enable,
+    sl_order_price,
+    sl_order_type,
+    side
+  } = values2;
   const qty = Number(values2.quantity);
   const maxQty = config.maxQty;
   const type = values2.order_type;
-  const { quote_max, quote_min, price_scope, quote_dp } = config.symbol ?? {};
+  const { quote_max, quote_min, quote_dp } = config.symbol ?? {};
   const mark_price = type === OrderType.MARKET ? config.markPrice : values2.order_price ? Number(values2.order_price) : void 0;
+  const tpslSide = side === OrderSide.BUY ? OrderSide.SELL : OrderSide.BUY;
   if (!isNaN(qty) && qty > maxQty) {
     result.quantity = OrderValidation.max("quantity", config.maxQty);
   }
@@ -5788,58 +6125,156 @@ async function bracketOrderValidator(values2, config) {
   if (Number(sl_trigger_price) < 0) {
     result.sl_trigger_price = OrderValidation.min("sl_trigger_price", 0);
   }
+  if (tp_enable && !tp_trigger_price) {
+    result.tp_trigger_price = OrderValidation.required("tp_trigger_price");
+  }
+  if (sl_enable && !sl_trigger_price) {
+    result.sl_trigger_price = OrderValidation.required("sl_trigger_price");
+  }
+  if (tp_order_type === OrderType.LIMIT && !tp_order_price) {
+    result.tp_order_price = OrderValidation.required("tp_order_price");
+  }
+  if (sl_order_type === OrderType.LIMIT && !sl_order_price) {
+    result.sl_order_price = OrderValidation.required("sl_order_price");
+  }
   if (side === OrderSide.BUY && mark_price) {
-    const slTriggerPriceScope = new Decimal(mark_price * (1 - price_scope)).toDecimalPlaces(quote_dp, Decimal.ROUND_DOWN).toNumber();
-    if (!!sl_trigger_price && Number(sl_trigger_price) < slTriggerPriceScope) {
+    if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
       result.sl_trigger_price = OrderValidation.min(
         "sl_trigger_price",
-        slTriggerPriceScope
+        formatPrice(quote_min, quote_dp)
+      );
+    }
+    if (!!sl_trigger_price && Number(sl_trigger_price) > mark_price) {
+      result.sl_trigger_price = OrderValidation.max(
+        "sl_trigger_price",
+        formatPrice(mark_price, quote_dp)
       );
     }
     if (!!tp_trigger_price && Number(tp_trigger_price) <= mark_price) {
       result.tp_trigger_price = OrderValidation.min(
         "tp_trigger_price",
-        mark_price
+        formatPrice(mark_price, quote_dp)
       );
     }
     if (!!tp_trigger_price && Number(tp_trigger_price) > quote_max) {
       result.tp_trigger_price = OrderValidation.max(
         "tp_trigger_price",
-        quote_max
+        formatPrice(quote_max, quote_dp)
       );
     }
-    if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
-      result.sl_trigger_price = OrderValidation.min(
-        "sl_trigger_price",
-        quote_min
-      );
+    if (sl_trigger_price && sl_order_price) {
+      const priceRange = getPriceRange({
+        side: tpslSide,
+        basePrice: Number(sl_trigger_price),
+        symbolInfo: config.symbol
+      });
+      if (Number(sl_order_price) < priceRange.minPrice) {
+        result.sl_order_price = OrderValidation.min(
+          "sl_order_price",
+          formatPrice(priceRange.minPrice, quote_dp)
+        );
+      }
+      if (Number(sl_order_price) > priceRange.maxPrice) {
+        result.sl_order_price = OrderValidation.max(
+          "sl_order_price",
+          formatPrice(priceRange.maxPrice, quote_dp)
+        );
+      }
+      if (Number(sl_trigger_price) < Number(sl_order_price)) {
+        result.sl_trigger_price = OrderValidation.priceErrorMax("sl_trigger_price");
+      }
+    }
+    if (tp_trigger_price && tp_order_price) {
+      const priceRange = getPriceRange({
+        side: tpslSide,
+        basePrice: Number(tp_trigger_price),
+        symbolInfo: config.symbol
+      });
+      if (Number(tp_order_price) > priceRange.maxPrice) {
+        result.tp_order_price = OrderValidation.max(
+          "tp_order_price",
+          formatPrice(priceRange.maxPrice, quote_dp)
+        );
+      }
+      if (Number(tp_order_price) < priceRange.minPrice) {
+        result.tp_order_price = OrderValidation.min(
+          "tp_order_price",
+          formatPrice(priceRange.minPrice, quote_dp)
+        );
+      }
+      if (Number(tp_trigger_price) > Number(tp_order_price)) {
+        result.tp_trigger_price = OrderValidation.priceErrorMin("tp_trigger_price");
+      }
     }
   }
   if (side === OrderSide.SELL && mark_price) {
-    const slTriggerPriceScope = new Decimal(mark_price * (1 + price_scope)).toDecimalPlaces(quote_dp, Decimal.ROUND_DOWN).toNumber();
-    if (!!sl_trigger_price && Number(sl_trigger_price) > slTriggerPriceScope) {
+    if (!!sl_trigger_price && Number(sl_trigger_price) > quote_max) {
       result.sl_trigger_price = OrderValidation.max(
         "sl_trigger_price",
-        slTriggerPriceScope
+        formatPrice(quote_max, quote_dp)
+      );
+    }
+    if (!!sl_trigger_price && Number(sl_trigger_price) < mark_price) {
+      result.sl_trigger_price = OrderValidation.min(
+        "sl_trigger_price",
+        formatPrice(mark_price, quote_dp)
       );
     }
     if (!!tp_trigger_price && Number(tp_trigger_price) >= mark_price) {
       result.tp_trigger_price = OrderValidation.max(
         "tp_trigger_price",
-        mark_price
+        formatPrice(mark_price, quote_dp)
       );
     }
-    if (!!tp_trigger_price && Number(tp_trigger_price) > quote_max) {
-      result.tp_trigger_price = OrderValidation.max(
+    if (!!tp_trigger_price && Number(tp_trigger_price) < quote_min) {
+      result.tp_trigger_price = OrderValidation.min(
         "tp_trigger_price",
-        quote_max
+        formatPrice(quote_min, quote_dp)
       );
     }
-    if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
-      result.sl_trigger_price = OrderValidation.min(
-        "sl_trigger_price",
-        quote_min
-      );
+    if (sl_trigger_price && sl_order_price) {
+      const priceRange = getPriceRange({
+        side: tpslSide,
+        basePrice: Number(sl_trigger_price),
+        symbolInfo: config.symbol
+      });
+      if (Number(sl_order_price) < priceRange.minPrice) {
+        result.sl_order_price = OrderValidation.min(
+          "sl_order_price",
+          formatPrice(priceRange.minPrice, quote_dp)
+        );
+      }
+      if (Number(sl_order_price) > priceRange.maxPrice) {
+        result.sl_order_price = OrderValidation.max(
+          "sl_order_price",
+          formatPrice(priceRange.maxPrice, quote_dp)
+        );
+      }
+      if (Number(sl_trigger_price) > Number(sl_order_price)) {
+        result.sl_trigger_price = OrderValidation.priceErrorMin("sl_trigger_price");
+      }
+    }
+    if (tp_trigger_price && tp_order_price) {
+      const priceRange = getPriceRange({
+        side: tpslSide,
+        basePrice: Number(tp_trigger_price),
+        symbolInfo: config.symbol
+      });
+      if (Number(tp_order_price) < priceRange.minPrice) {
+        result.tp_order_price = OrderValidation.min(
+          "tp_order_price",
+          formatPrice(priceRange.minPrice, quote_dp)
+        );
+      }
+      if (Number(tp_order_price) > priceRange.maxPrice) {
+        result.tp_order_price = OrderValidation.max(
+          "tp_order_price",
+          formatPrice(priceRange.maxPrice, quote_dp)
+        );
+      }
+      if (Number(tp_trigger_price) < Number(tp_order_price)) {
+        result.tp_trigger_price = OrderValidation.priceErrorMax("tp_trigger_price");
+      }
     }
   }
   return Object.keys(result).length > 0 ? result : null;
@@ -5916,233 +6351,78 @@ var BracketMarketOrderCreator = class extends MarketOrderCreator {
     return { ...value, ...bracketData };
   }
 };
-
-// src/services/orderCreator/fokCreator.ts
-var FOKOrderCreator = class extends LimitOrderCreator {
-};
-
-// src/services/orderCreator/generalCreator.ts
-var GeneralOrderCreator = class extends BaseOrderCreator {
-  create(data) {
-    return {
-      ...this.baseOrder(data),
-      order_price: data.order_price,
-      order_quantity: data.order_quantity
-    };
-  }
-  validate(values2, configs) {
-    return super.baseValidate(values2, configs);
-  }
-};
-
-// src/services/orderCreator/iocCreator.ts
-var IOCOrderCreator = class extends LimitOrderCreator {
-};
-
-// src/services/orderCreator/postOnlyCreator.ts
-var PostOnlyOrderCreator = class extends LimitOrderCreator {
-};
-var getCreateOrderUrl = (order) => {
-  const isAlgoOrder = order?.order_type === OrderType.STOP_LIMIT || order?.order_type === OrderType.STOP_MARKET || order?.order_type === OrderType.CLOSE_POSITION || order.algo_type && order.algo_type === AlgoOrderRootType.BRACKET || isBracketOrder(order);
-  if (order.order_type === OrderType.SCALED) {
-    return "/v1/batch-order";
-  }
-  return isAlgoOrder ? "/v1/algo/order" : "/v1/order";
-};
-var getOrderCreator = (order) => {
-  let type;
-  if (isBracketOrder(order)) {
-    type = `${AlgoOrderRootType.BRACKET}:${order.order_type}`;
-  } else if (order.order_type === OrderType.LIMIT) {
-    type = order.order_type_ext || order.order_type;
-  } else {
-    type = order.order_type;
-  }
-  return OrderFactory.create(type);
-};
-var tpslFields = [
-  "tp_trigger_price",
-  "sl_trigger_price",
-  "tp_pnl",
-  "sl_pnl",
-  "tp_offset",
-  "sl_offset",
-  "tp_offset_percentage",
-  "sl_offset_percentage"
-];
-var isBracketOrder = (order) => {
-  return !!order.tp_trigger_price || !!order.sl_trigger_price;
-};
-var hasTPSL = (order) => {
-  return tpslFields.some((field) => !!order[field]);
-};
-function getOrderPrice(order, askAndBid) {
-  const orderPrice = Number(order.order_price);
-  if (order.order_type === OrderType.MARKET || order.order_type === OrderType.STOP_MARKET) {
-    if (order.side === OrderSide.BUY) {
-      return askAndBid[0];
-    } else {
-      return askAndBid[1];
-    }
-  } else {
-    if (order.side === OrderSide.BUY) {
-      if (orderPrice >= askAndBid[0]) {
-        return askAndBid[0];
-      } else {
-        return orderPrice;
-      }
-    } else {
-      if (orderPrice <= askAndBid[1]) {
-        return askAndBid[1];
-      } else {
-        return orderPrice;
-      }
-    }
-  }
-}
-var getPriceAndQty = (order, symbolInfo, askAndBid) => {
-  let quantity = Number(order.order_quantity);
-  const orderPrice = Number(order.order_price);
-  if (isNaN(quantity) || quantity <= 0) {
-    return null;
-  }
-  if (askAndBid.length === 0) {
-    return null;
-  }
-  if ((order.order_type === OrderType.LIMIT || order.order_type === OrderType.STOP_LIMIT) && isNaN(orderPrice)) {
-    return null;
-  }
-  let price;
-  if (order.order_type === OrderType.SCALED) {
-    price = calcScaledOrderAvgOrderPrice(order, symbolInfo, askAndBid);
-    const orders = calcScaledOrderBatchBody(order, symbolInfo);
-    const sumQtys = orders.reduce((acc, order2) => {
-      return acc.plus(new Decimal(order2.order_quantity));
-    }, zero);
-    quantity = sumQtys.todp(symbolInfo.base_dp).toNumber();
-    if (!quantity || isNaN(quantity)) {
-      return null;
-    }
-  } else {
-    price = getOrderPrice(order, askAndBid);
-  }
-  if (!price || isNaN(price)) {
-    return null;
+
+// src/services/orderCreator/fokCreator.ts
+var FOKOrderCreator = class extends LimitOrderCreator {
+};
+
+// src/services/orderCreator/generalCreator.ts
+var GeneralOrderCreator = class extends BaseOrderCreator {
+  create(data) {
+    return {
+      ...this.baseOrder(data),
+      order_price: data.order_price,
+      order_quantity: data.order_quantity
+    };
   }
-  if (order.side === OrderSide.SELL) {
-    quantity = -quantity;
+  validate(values2, configs) {
+    return super.baseValidate(values2, configs);
   }
-  return { price, quantity };
 };
-var calcEstLiqPrice = (order$1, askAndBid, inputs) => {
-  const { symbolInfo } = inputs;
-  const result = getPriceAndQty(order$1, symbolInfo, askAndBid);
-  if (!result)
-    return null;
-  const { price, quantity } = result;
-  if (!price || !quantity)
-    return null;
-  const {
-    symbol,
-    imr_factor,
-    markPrice,
-    totalCollateral,
-    futures_taker_fee_rate,
-    positions: positions3
-  } = inputs;
-  const orderFee = order.orderFee({
-    qty: quantity,
-    price,
-    futuresTakeFeeRate: Number(futures_taker_fee_rate) / 1e4
-  });
-  const liqPrice = order.estLiqPrice({
-    markPrice,
-    baseIMR: symbolInfo.base_imr,
-    baseMMR: symbolInfo.base_mmr,
-    totalCollateral,
-    positions: positions3 == null ? [] : positions3,
-    IMR_Factor: imr_factor,
-    orderFee,
-    newOrder: {
-      qty: quantity,
-      price,
-      symbol
-    }
-  });
-  if (liqPrice <= 0)
-    return null;
-  return liqPrice;
+
+// src/services/orderCreator/iocCreator.ts
+var IOCOrderCreator = class extends LimitOrderCreator {
 };
-var calcEstLeverage = (order$1, askAndBid, inputs) => {
-  const { totalCollateral, positions: positions3, symbol, symbolInfo } = inputs;
-  const result = getPriceAndQty(order$1, symbolInfo, askAndBid);
-  if (!result)
-    return null;
-  const { price, quantity } = result;
-  if (!price || !quantity)
-    return null;
-  return order.estLeverage({
-    totalCollateral,
-    positions: positions3,
-    newOrder: {
-      symbol,
-      qty: result.quantity,
-      price: result.price
-    }
-  });
+
+// src/services/orderCreator/postOnlyCreator.ts
+var PostOnlyOrderCreator = class extends LimitOrderCreator {
 };
-function isBBOOrder(options) {
-  const { order_type, order_type_ext } = options;
-  return order_type === OrderType.LIMIT && [OrderType.ASK, OrderType.BID].includes(order_type_ext);
-}
 function calcScaledOrderPrices(inputs) {
-  const { min_price, max_price, total_orders, quote_dp } = inputs;
-  if (!min_price || !max_price || !total_orders) {
-    return [];
-  }
-  const minPrice3 = new Decimal(min_price);
-  const maxPrice3 = new Decimal(max_price);
+  const { start_price, end_price, total_orders, quote_dp } = inputs;
+  const startPrice = new Decimal(start_price);
+  const endPrice = new Decimal(end_price);
   const totalOrders = Number(total_orders);
-  const priceStep = maxPrice3.minus(minPrice3).div(totalOrders - 1);
+  const priceStep = endPrice.minus(startPrice).div(totalOrders - 1);
   const prices = [];
   for (let i = 0; i < totalOrders; i++) {
-    prices[i] = minPrice3.plus(priceStep.mul(i)).todp(quote_dp).toString();
+    prices[i] = startPrice.plus(priceStep.mul(i)).todp(quote_dp).toString();
   }
   return prices;
 }
 function getScaledOrderSkew(inputs) {
   const { skew, distribution_type, total_orders } = inputs;
   if (distribution_type === DistributionType.FLAT) {
-    return 1;
+    return new Decimal(1);
   } else if (distribution_type === DistributionType.ASCENDING) {
-    return total_orders;
+    return new Decimal(total_orders);
   } else if (distribution_type === DistributionType.DESCENDING) {
-    return 1 / total_orders;
+    return new Decimal(1).div(total_orders);
   }
-  return skew;
+  return new Decimal(skew);
 }
 function calcScaledOrderWeights(inputs) {
   const { total_orders, distribution_type, skew } = inputs;
   const weights = [];
-  if (!total_orders || !distribution_type || distribution_type === DistributionType.CUSTOM && (!skew || skew <= 0 || skew > 100)) {
+  if (isInvalidTotalOrders(total_orders) || isInvalidSkew(skew, distribution_type)) {
     return {
       weights: [],
-      sumWeights: 0,
-      minWeight: 0
+      sumWeights: zero,
+      minWeight: zero
     };
   }
   const totalOrders = Number(total_orders);
-  const skewNum = getScaledOrderSkew({
+  const _skew = getScaledOrderSkew({
     skew,
     distribution_type,
-    total_orders: totalOrders
+    total_orders
   });
+  const slope = _skew.minus(1).div(totalOrders - 1);
   for (let i = 0; i < totalOrders; i++) {
-    weights[i] = 1 + (skewNum - 1) * i / (totalOrders - 1);
+    weights[i] = new Decimal(1).plus(slope.mul(i));
   }
-  const sumWeights = weights.reduce((acc, cur) => acc + cur, 0);
+  const sumWeights = weights.reduce((acc, cur) => acc.plus(cur), zero);
   const minWeight = weights.reduce(
-    (min3, current) => current < min3 ? current : min3,
+    (min3, current) => current.lt(min3) ? current : min3,
     weights?.[0]
   );
   return {
@@ -6153,23 +6433,21 @@ function calcScaledOrderWeights(inputs) {
 }
 function calcScaledOrderQtys(inputs) {
   const {
-    order_quantity = 0,
-    total_orders = 0,
+    order_quantity,
+    total_orders,
     distribution_type,
     skew,
     base_dp,
     base_tick
   } = inputs;
   const qtys = [];
-  if (!order_quantity || !total_orders) {
-    return [];
-  }
+  const totalOrders = Number(total_orders);
   const { weights, sumWeights } = calcScaledOrderWeights({
     total_orders,
     distribution_type,
     skew
   });
-  for (let i = 0; i < total_orders; i++) {
+  for (let i = 0; i < totalOrders; i++) {
     let qty = new Decimal(order_quantity).mul(weights[i]).div(sumWeights);
     if (base_tick > 1) {
       qty = qty.div(base_tick).todp(0, Decimal.ROUND_DOWN).mul(base_tick);
@@ -6181,7 +6459,7 @@ function calcScaledOrderQtys(inputs) {
   return qtys;
 }
 function calcScaledOrderBatchBody(order, symbolInfo) {
-  if (!validateScaledOrderInput(order)) {
+  if (isInvalidScaledOrderInput(order)) {
     return [];
   }
   try {
@@ -6190,8 +6468,8 @@ function calcScaledOrderBatchBody(order, symbolInfo) {
       symbol,
       side,
       order_quantity,
-      min_price,
-      max_price,
+      start_price,
+      end_price,
       total_orders,
       distribution_type,
       skew,
@@ -6199,13 +6477,12 @@ function calcScaledOrderBatchBody(order, symbolInfo) {
       visible_quantity
     } = order;
     const prices = calcScaledOrderPrices({
-      min_price,
-      max_price,
+      start_price,
+      end_price,
       total_orders,
       quote_dp
     });
     const qtys = calcScaledOrderQtys({
-      side,
       order_quantity,
       total_orders,
       distribution_type,
@@ -6236,8 +6513,8 @@ function calcScaledOrderBatchBody(order, symbolInfo) {
     return [];
   }
 }
-function calcScaledOrderAvgOrderPrice(order, symbolInfo, askAndBid) {
-  if (!validateScaledOrderInput(order)) {
+function calcScaledOrderAvgPrice(order, symbolInfo, askAndBid) {
+  if (isInvalidScaledOrderInput(order)) {
     return null;
   }
   try {
@@ -6254,20 +6531,6 @@ function calcScaledOrderAvgOrderPrice(order, symbolInfo, askAndBid) {
     return null;
   }
 }
-function validateScaledOrderInput(order) {
-  const {
-    min_price,
-    max_price,
-    order_quantity,
-    total_orders,
-    distribution_type,
-    skew
-  } = order;
-  if (!min_price || !max_price || !order_quantity || !total_orders || !distribution_type || distribution_type === DistributionType.CUSTOM && (!skew || skew <= 0 || skew > 100) || total_orders < 2 || total_orders > 20) {
-    return false;
-  }
-  return true;
-}
 function calcScaledOrderMinTotalAmount(order, symbolInfo, askAndBid) {
   try {
     const minTotalAmount_baseMin = calcScaledOrderMinTotalAmountByBaseMin(
@@ -6292,7 +6555,7 @@ function calcScaledOrderMinTotalAmountByBaseMin(order, symbolInfo) {
     distribution_type,
     skew
   });
-  const minTotalAmount = new Decimal(base_min).mul(new Decimal(sumWeights).div(minWeight)).todp(base_dp, Decimal.ROUND_UP).toNumber();
+  const minTotalAmount = new Decimal(base_min).mul(sumWeights.div(minWeight)).todp(base_dp, Decimal.ROUND_UP).toNumber();
   return minTotalAmount;
 }
 function calcScaledOrderMinTotalAmountByMinNotional(order, symbolInfo, askAndBid) {
@@ -6314,6 +6577,25 @@ function calcScaledOrderMinTotalAmountByMinNotional(order, symbolInfo, askAndBid
   );
   return max_minQty.todp(base_dp, Decimal.ROUND_UP).toNumber();
 }
+function isInvalidSkew(skew, distribution_type) {
+  const skewNum = Number(skew);
+  return !distribution_type || distribution_type === DistributionType.CUSTOM && (!skew || skewNum <= 0 || skewNum > 100);
+}
+function isInvalidTotalOrders(total_orders) {
+  const totalOrders = Number(total_orders);
+  return !total_orders || totalOrders < 2 || totalOrders > 20;
+}
+function isInvalidScaledOrderInput(order) {
+  const {
+    start_price,
+    end_price,
+    order_quantity,
+    total_orders,
+    distribution_type,
+    skew
+  } = order;
+  return !start_price || !end_price || !order_quantity || isInvalidTotalOrders(total_orders) || isInvalidSkew(skew, distribution_type);
+}
 
 // src/services/orderCreator/scaledOrderCreator.ts
 var ScaledOrderCreator = class extends BaseOrderCreator {
@@ -6347,64 +6629,11 @@ var ScaledOrderCreator = class extends BaseOrderCreator {
       order
     );
   }
-  validatePrice(values2, config) {
-    const errors = {};
-    const { side, min_price, max_price } = values2;
-    const { price_range, price_scope, quote_max, quote_min, quote_dp } = config.symbol;
-    const maxPriceNumber = order.maxPrice(config.markPrice, price_range);
-    const minPriceNumber = order.minPrice(config.markPrice, price_range);
-    const scopePriceNumber = order.scopePrice(
-      config.markPrice,
-      price_scope,
-      side
-    );
-    const priceRange = side === OrderSide.BUY ? {
-      min: scopePriceNumber,
-      max: maxPriceNumber
-    } : {
-      min: minPriceNumber,
-      max: scopePriceNumber
-    };
-    const minPrice3 = Number(min_price || 0);
-    const maxPrice3 = Number(max_price || 0);
-    if (!min_price) {
-      errors.min_price = OrderValidation.required("min_price");
-    } else {
-      if (minPrice3 < priceRange?.min) {
-        errors.min_price = OrderValidation.min(
-          "min_price",
-          new Decimal(priceRange.min).todp(quote_dp).toString()
-        );
-      } else if (minPrice3 < quote_min) {
-        errors.min_price = OrderValidation.min("min_price", quote_min);
-      } else if (minPrice3 > maxPrice3) {
-        errors.min_price = OrderValidation.max("min_price", max_price);
-      }
-    }
-    if (!max_price) {
-      errors.max_price = OrderValidation.required("max_price");
-    } else {
-      if (maxPrice3 < priceRange?.min) {
-        errors.max_price = OrderValidation.min(
-          "max_price",
-          new Decimal(priceRange.min).todp(quote_dp).toString()
-        );
-      } else if (maxPrice3 > priceRange?.max) {
-        errors.max_price = OrderValidation.max(
-          "max_price",
-          new Decimal(priceRange.max).todp(quote_dp).toString()
-        );
-      } else if (maxPrice3 > quote_max) {
-        errors.max_price = OrderValidation.max("max_price", quote_max);
-      }
-    }
-    return errors;
-  }
   async validate(values2, config) {
-    const { base_dp } = config.symbol;
-    const { maxQty, askAndBid } = config;
-    const { order_quantity, total_orders, distribution_type, skew } = values2;
-    const errors = this.validatePrice(values2, config);
+    const { maxQty, askAndBid, markPrice, symbol } = config;
+    const { base_dp, quote_dp } = config.symbol;
+    const { order_quantity, total, total_orders, distribution_type, skew } = values2;
+    const errors = validatePrice(values2, config);
     if (!total_orders) {
       errors.total_orders = OrderValidation.required("total_orders");
     } else {
@@ -6434,10 +6663,14 @@ var ScaledOrderCreator = class extends BaseOrderCreator {
           "order_quantity",
           new Decimal(maxQty).todp(base_dp).toString()
         );
+        errors.total = OrderValidation.max(
+          "total",
+          new Decimal(maxQty).mul(markPrice).todp(quote_dp).toString()
+        );
       } else if (!errors.skew && !errors.total_orders) {
         const minTotalAmount = calcScaledOrderMinTotalAmount(
           values2,
-          config.symbol,
+          symbol,
           askAndBid
         );
         if (minTotalAmount && qty.lt(minTotalAmount)) {
@@ -6445,12 +6678,49 @@ var ScaledOrderCreator = class extends BaseOrderCreator {
             "order_quantity",
             minTotalAmount
           );
+          errors.total = OrderValidation.min(
+            "total",
+            new Decimal(minTotalAmount).mul(markPrice).todp(quote_dp).toString()
+          );
         }
       }
     }
+    if (!total) {
+      errors.total = OrderValidation.required("total");
+    }
     return errors;
   }
 };
+function validatePrice(values2, config) {
+  const errors = {};
+  const { start_price, end_price } = values2;
+  const { quote_dp } = config.symbol;
+  if (!config.markPrice) {
+    return errors;
+  }
+  const { minPrice: minPrice3, maxPrice: maxPrice3 } = getPriceRange({
+    side: values2.side,
+    basePrice: config.markPrice,
+    symbolInfo: config.symbol
+  });
+  const comparePrice = (key, value) => {
+    const price = new Decimal(value || 0);
+    if (price.lt(minPrice3)) {
+      errors[key] = OrderValidation.min(
+        key,
+        new Decimal(minPrice3).todp(quote_dp).toString()
+      );
+    } else if (price.gt(maxPrice3)) {
+      errors[key] = OrderValidation.max(
+        key,
+        new Decimal(maxPrice3).todp(quote_dp).toString()
+      );
+    }
+  };
+  comparePrice("start_price", start_price);
+  comparePrice("end_price", end_price);
+  return errors;
+}
 var { maxPrice: maxPrice2, minPrice: minPrice2, scopePrice: scopePrice2 } = order;
 var StopLimitOrderCreator = class extends BaseOrderCreator {
   constructor() {
@@ -6587,6 +6857,9 @@ var StopMarketOrderCreator = class extends BaseOrderCreator {
     });
   }
 };
+var formatPrice2 = (price, quote_dp) => {
+  return new Decimal(price).toDecimalPlaces(quote_dp).toNumber();
+};
 var BaseAlgoOrderCreator = class {
   /**
    * base validate
@@ -6594,7 +6867,17 @@ var BaseAlgoOrderCreator = class {
   validate(values2, config) {
     const result = /* @__PURE__ */ Object.create(null);
     return Promise.resolve().then(() => {
-      const { tp_trigger_price, sl_trigger_price, side } = values2;
+      const {
+        tp_trigger_price,
+        sl_trigger_price,
+        side,
+        tp_enable,
+        sl_enable,
+        tp_order_type,
+        sl_order_type,
+        tp_order_price,
+        sl_order_price
+      } = values2;
       const qty = Number(values2.quantity);
       const maxQty = config.maxQty;
       const orderType = values2.order_type;
@@ -6618,77 +6901,166 @@ var BaseAlgoOrderCreator = class {
       if (Number(sl_trigger_price) < 0) {
         result.sl_trigger_price = OrderValidation.min("sl_trigger_price", 0);
       }
+      if (tp_enable && !tp_trigger_price) {
+        result.tp_trigger_price = OrderValidation.required("tp_trigger_price");
+      }
+      if (sl_enable && !sl_trigger_price) {
+        result.sl_trigger_price = OrderValidation.required("sl_trigger_price");
+      }
+      if (tp_order_type === OrderType.LIMIT && !tp_order_price) {
+        result.tp_order_price = OrderValidation.required("tp_order_price");
+      }
+      if (sl_order_type === OrderType.LIMIT && !sl_order_price) {
+        result.sl_order_price = OrderValidation.required("sl_order_price");
+      }
       const mark_price = orderType === OrderType.MARKET || orderType == null ? config.markPrice : values2.order_price ? Number(values2.order_price) : void 0;
+      const tpslSide = side === OrderSide.BUY ? OrderSide.SELL : OrderSide.BUY;
       if (side === OrderSide.BUY && mark_price) {
-        const slTriggerPriceScope = new Decimal(mark_price * (1 - price_scope)).toDecimalPlaces(quote_dp, Decimal.ROUND_DOWN).toNumber();
-        if (!!sl_trigger_price && Number(sl_trigger_price) < slTriggerPriceScope) {
+        if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
           result.sl_trigger_price = OrderValidation.min(
             "sl_trigger_price",
-            slTriggerPriceScope
+            formatPrice2(quote_min, quote_dp)
           );
         }
-        if (!!sl_trigger_price && Number(sl_trigger_price) > config.markPrice) {
+        if (!!sl_trigger_price && Number(sl_trigger_price) > mark_price) {
           result.sl_trigger_price = OrderValidation.max(
             "sl_trigger_price",
-            config.markPrice
+            formatPrice2(mark_price, quote_dp)
           );
         }
-        if (!!tp_trigger_price && Number(tp_trigger_price) <= config.markPrice) {
+        if (!!tp_trigger_price && Number(tp_trigger_price) <= mark_price) {
           result.tp_trigger_price = OrderValidation.min(
             "tp_trigger_price",
-            config.markPrice
+            formatPrice2(mark_price, quote_dp)
           );
         }
         if (!!tp_trigger_price && Number(tp_trigger_price) > quote_max) {
           result.tp_trigger_price = OrderValidation.max(
             "tp_trigger_price",
-            quote_max
+            formatPrice2(quote_max, quote_dp)
           );
         }
-        if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
-          result.sl_trigger_price = OrderValidation.min(
-            "sl_trigger_price",
-            quote_min
-          );
+        if (sl_trigger_price && sl_order_price) {
+          const slOrderPriceRange = getPriceRange({
+            side: tpslSide,
+            basePrice: Number(sl_trigger_price),
+            symbolInfo: config.symbol
+          });
+          if (Number(sl_order_price) < slOrderPriceRange.minPrice) {
+            result.sl_order_price = OrderValidation.min(
+              "sl_order_price",
+              formatPrice2(slOrderPriceRange.minPrice, quote_dp)
+            );
+          }
+          if (Number(sl_order_price) > slOrderPriceRange.maxPrice) {
+            result.sl_order_price = OrderValidation.max(
+              "sl_order_price",
+              formatPrice2(slOrderPriceRange.maxPrice, quote_dp)
+            );
+          }
+          if (Number(sl_trigger_price) < Number(sl_order_price)) {
+            result.sl_trigger_price = OrderValidation.priceErrorMax("sl_trigger_price");
+          }
+        }
+        if (tp_trigger_price && tp_order_price) {
+          const tpOrderPriceRange = getPriceRange({
+            side: tpslSide,
+            basePrice: Number(tp_trigger_price),
+            symbolInfo: config.symbol
+          });
+          if (Number(tp_order_price) > tpOrderPriceRange.maxPrice) {
+            result.tp_order_price = OrderValidation.max(
+              "tp_order_price",
+              formatPrice2(tpOrderPriceRange.maxPrice, quote_dp)
+            );
+          }
+          if (Number(tp_order_price) < tpOrderPriceRange.minPrice) {
+            result.tp_order_price = OrderValidation.min(
+              "tp_order_price",
+              formatPrice2(tpOrderPriceRange.minPrice, quote_dp)
+            );
+          }
+          if (Number(tp_trigger_price) > Number(tp_order_price)) {
+            result.tp_trigger_price = OrderValidation.priceErrorMin("tp_trigger_price");
+          }
         }
       }
       if (side === OrderSide.SELL && mark_price) {
-        const slTriggerPriceScope = new Decimal(mark_price * (1 + price_scope)).toDecimalPlaces(quote_dp, Decimal.ROUND_DOWN).toNumber();
-        if (!!sl_trigger_price && Number(sl_trigger_price) > slTriggerPriceScope) {
+        if (!!sl_trigger_price && Number(sl_trigger_price) > quote_max) {
           result.sl_trigger_price = OrderValidation.max(
             "sl_trigger_price",
-            slTriggerPriceScope
+            formatPrice2(quote_max, quote_dp)
           );
         }
-        if (!!sl_trigger_price && Number(sl_trigger_price) < config.markPrice) {
+        if (!!sl_trigger_price && Number(sl_trigger_price) < mark_price) {
           result.sl_trigger_price = OrderValidation.min(
             "sl_trigger_price",
-            config.markPrice
+            formatPrice2(mark_price, quote_dp)
           );
         }
-        if (!!tp_trigger_price && Number(tp_trigger_price) >= config.markPrice) {
+        if (!!tp_trigger_price && Number(tp_trigger_price) >= mark_price) {
           result.tp_trigger_price = OrderValidation.max(
             "tp_trigger_price",
-            config.markPrice
+            formatPrice2(mark_price, quote_dp)
           );
         }
-        if (!!tp_trigger_price && Number(tp_trigger_price) > quote_max) {
-          result.tp_trigger_price = OrderValidation.max(
+        if (!!tp_trigger_price && Number(tp_trigger_price) < quote_min) {
+          result.tp_trigger_price = OrderValidation.min(
             "tp_trigger_price",
-            quote_max
+            formatPrice2(quote_min, quote_dp)
           );
         }
-        if (!!sl_trigger_price && Number(sl_trigger_price) < quote_min) {
-          result.sl_trigger_price = OrderValidation.min(
-            "sl_trigger_price",
-            quote_min
-          );
+        if (sl_trigger_price && sl_order_price) {
+          const slOrderPriceRange = getPriceRange({
+            side: tpslSide,
+            basePrice: Number(sl_trigger_price),
+            symbolInfo: config.symbol
+          });
+          if (Number(sl_order_price) < slOrderPriceRange.minPrice) {
+            result.sl_order_price = OrderValidation.min(
+              "sl_order_price",
+              formatPrice2(slOrderPriceRange.minPrice, quote_dp)
+            );
+          }
+          if (Number(sl_order_price) > slOrderPriceRange.maxPrice) {
+            result.sl_order_price = OrderValidation.max(
+              "sl_order_price",
+              formatPrice2(slOrderPriceRange.maxPrice, quote_dp)
+            );
+          }
+          if (Number(sl_trigger_price) > Number(sl_order_price)) {
+            result.sl_trigger_price = OrderValidation.priceErrorMin("sl_trigger_price");
+          }
+        }
+        if (tp_trigger_price && tp_order_price) {
+          const tpOrderPriceRange = getPriceRange({
+            side: tpslSide,
+            basePrice: Number(tp_trigger_price),
+            symbolInfo: config.symbol
+          });
+          if (Number(tp_order_price) < tpOrderPriceRange.minPrice) {
+            result.tp_order_price = OrderValidation.min(
+              "tp_order_price",
+              formatPrice2(tpOrderPriceRange.minPrice, quote_dp)
+            );
+          }
+          if (Number(tp_order_price) > tpOrderPriceRange.maxPrice) {
+            result.tp_order_price = OrderValidation.max(
+              "tp_order_price",
+              formatPrice2(tpOrderPriceRange.maxPrice, quote_dp)
+            );
+          }
+          if (Number(tp_trigger_price) < Number(tp_order_price)) {
+            result.tp_trigger_price = OrderValidation.priceErrorMax("tp_trigger_price");
+          }
         }
       }
       return Object.keys(result).length > 0 ? result : null;
     });
   }
 };
+
+// src/services/orderCreator/tpslOrderCreator.ts
 var TPSLOrderCreator = class extends BaseAlgoOrderCreator {
   constructor() {
     super(...arguments);
@@ -6697,29 +7069,39 @@ var TPSLOrderCreator = class extends BaseAlgoOrderCreator {
   create(values2, config) {
     const side = values2.side === OrderSide.BUY ? OrderSide.SELL : OrderSide.BUY;
     const child_orders = [];
-    if (typeof values2.tp_trigger_price !== "undefined") {
+    if (values2.tp_trigger_price) {
       const tp_trigger_price = !!values2.tp_trigger_price ? new Decimal(values2.tp_trigger_price).todp(config.symbol.quote_dp).toNumber() : values2.tp_trigger_price;
-      child_orders.push({
+      const orderItem = {
         algo_type: AlgoOrderType.TAKE_PROFIT,
         reduce_only: true,
         side,
         type: OrderType.MARKET,
-        trigger_price: tp_trigger_price,
+        trigger_price: new Decimal(tp_trigger_price).toNumber(),
         symbol: values2.symbol,
         is_activated: !!values2.tp_trigger_price
-      });
+      };
+      if (values2.tp_order_price) {
+        orderItem.price = new Decimal(values2.tp_order_price).toNumber();
+        orderItem.type = OrderType.LIMIT;
+      }
+      child_orders.push(orderItem);
     }
-    if (typeof values2.sl_trigger_price !== "undefined") {
+    if (values2.sl_trigger_price) {
       const sl_trigger_price = !!values2.sl_trigger_price ? new Decimal(values2.sl_trigger_price).todp(config.symbol.quote_dp).toNumber() : values2.sl_trigger_price;
-      child_orders.push({
+      const orderItem = {
         algo_type: AlgoOrderType.STOP_LOSS,
         reduce_only: true,
         side,
         type: OrderType.MARKET,
-        trigger_price: sl_trigger_price,
+        trigger_price: new Decimal(sl_trigger_price).toNumber(),
         symbol: values2.symbol,
         is_activated: !!values2.sl_trigger_price
-      });
+      };
+      if (values2.sl_order_price) {
+        orderItem.price = new Decimal(values2.sl_order_price).toNumber();
+        orderItem.type = OrderType.LIMIT;
+      }
+      child_orders.push(orderItem);
     }
     return {
       algo_type: AlgoOrderRootType.TP_SL,
@@ -6735,7 +7117,7 @@ var TPSLOrderCreator = class extends BaseAlgoOrderCreator {
     const newData = [];
     const needUpdateQty = values2.quantity !== oldValue.quantity;
     data.child_orders.forEach((order) => {
-      let _order = /* @__PURE__ */ Object.create(null);
+      const _order = /* @__PURE__ */ Object.create(null);
       if (needUpdateQty) {
         _order["quantity"] = data.quantity;
       }
@@ -6745,24 +7127,31 @@ var TPSLOrderCreator = class extends BaseAlgoOrderCreator {
       if (oldOrder) {
         if (!order.is_activated) {
           _order["is_activated"] = false;
-        } else if (oldOrder.trigger_price !== order.trigger_price) {
-          _order["trigger_price"] = order.trigger_price;
-        }
-        if (Object.keys(_order).length > 0) {
-          _order["order_id"] = Number(oldOrder.algo_order_id);
-          newData.push(_order);
+        } else {
+          if (oldOrder.trigger_price !== order.trigger_price) {
+            _order["trigger_price"] = order.trigger_price;
+          }
+          if (oldOrder.price !== order.price && order.type === OrderType.LIMIT) {
+            _order["price"] = order.price;
+          }
         }
+        _order["order_id"] = Number(oldOrder.algo_order_id);
+        newData.push(_order);
       }
     });
-    if (needUpdateQty && newData.length < 2) {
+    if (newData.length < 2) {
       const missingOrders = oldValue.child_orders.filter(
         (order) => order.algo_order_id !== newData[0].order_id
       );
       if (missingOrders.length) {
-        newData.push({
-          quantity: Number(data.quantity),
+        const _data = {
+          is_activated: false,
           order_id: missingOrders[0].algo_order_id
-        });
+        };
+        if (needUpdateQty) {
+          _data.quantity = Number(data.quantity);
+        }
+        newData.push(_data);
       }
     }
     return [
@@ -6783,32 +7172,42 @@ var TPSLPositionOrderCreator = class extends BaseAlgoOrderCreator {
     const child_orders = [];
     if (typeof values2.tp_trigger_price !== "undefined") {
       const tp_trigger_price = !!values2.tp_trigger_price ? new Decimal(values2.tp_trigger_price).todp(config.symbol.quote_dp).toNumber() : values2.tp_trigger_price;
-      child_orders.push({
+      const childOrderItem = {
         algo_type: AlgoOrderType.TAKE_PROFIT,
         reduce_only: true,
         side,
-        type: OrderType.CLOSE_POSITION,
+        type: values2.tp_order_price ? OrderType.LIMIT : OrderType.CLOSE_POSITION,
         trigger_price: tp_trigger_price,
         trigger_price_type: TriggerPriceType.MARK_PRICE,
         symbol: values2.symbol,
         is_activated: !!values2.tp_trigger_price
-      });
+      };
+      if (values2.tp_order_price) {
+        childOrderItem.type = OrderType.LIMIT;
+        childOrderItem.price = new Decimal(values2.tp_order_price).todp(config.symbol.quote_dp).toNumber();
+      }
+      child_orders.push(childOrderItem);
     }
     if (typeof values2.sl_trigger_price !== "undefined") {
       const sl_trigger_price = !!values2.sl_trigger_price ? new Decimal(values2.sl_trigger_price).todp(config.symbol.quote_dp).toNumber() : values2.sl_trigger_price;
-      child_orders.push({
+      const childOrderItem = {
         algo_type: AlgoOrderType.STOP_LOSS,
         reduce_only: true,
         side,
-        type: OrderType.CLOSE_POSITION,
+        type: values2.sl_order_price ? OrderType.LIMIT : OrderType.CLOSE_POSITION,
         trigger_price: sl_trigger_price,
         trigger_price_type: TriggerPriceType.MARK_PRICE,
         symbol: values2.symbol,
         is_activated: !!values2.sl_trigger_price
-      });
+      };
+      if (values2.sl_order_price) {
+        childOrderItem.type = OrderType.LIMIT;
+        childOrderItem.price = new Decimal(values2.sl_order_price).todp(config.symbol.quote_dp).toNumber();
+      }
+      child_orders.push(childOrderItem);
     }
     return {
-      algo_type: AlgoOrderRootType.POSITIONAL_TP_SL,
+      algo_type: values2.position_type === PositionType.FULL ? AlgoOrderRootType.POSITIONAL_TP_SL : AlgoOrderRootType.TP_SL,
       trigger_price_type: TriggerPriceType.MARK_PRICE,
       // reduce_only: true,
       symbol: values2.symbol,
@@ -7340,7 +7739,7 @@ function useSubAccountMaxWithdrawal(options) {
   return maxAmount;
 }
 function offsetToPrice(inputs) {
-  const { offset, entryPrice, orderType, orderSide } = inputs;
+  const { qty, offset, entryPrice, orderType, orderSide } = inputs;
   if (!offset)
     return;
   if (orderSide === OrderSide.BUY) {
@@ -7378,7 +7777,7 @@ function priceToOffset(inputs, options = {}) {
   return decimal.abs().toNumber();
 }
 function offsetPercentageToPrice(inputs) {
-  const { percentage, entryPrice, orderType, orderSide } = inputs;
+  const { qty, percentage, entryPrice, orderType, orderSide } = inputs;
   if (!percentage)
     return;
   if (orderSide === OrderSide.BUY) {
@@ -7458,7 +7857,7 @@ function priceToPnl(inputs, options = {}) {
     );
   }
   if (symbol) {
-    return decimal.todp(2, Decimal.ROUND_DOWN).toNumber();
+    return decimal.todp(2, Decimal.ROUND_UP).toNumber();
   }
   return decimal.toNumber();
 }
@@ -7469,78 +7868,153 @@ function calcTPSL_ROI(inputs) {
     return "0";
   return new Decimal(inputs.pnl).div(new Decimal(qtyNum).abs().mul(new Decimal(priceNum))).toString();
 }
+function checkTPSLOrderTypeIsMarket(key, values2) {
+  const keyPrefix = key.slice(0, 3);
+  const orderTypeKey = `${keyPrefix}order_type`;
+  return values2[orderTypeKey] ? values2[orderTypeKey] === OrderType.MARKET : true;
+}
 function tpslCalculateHelper(key, inputs, options = {}) {
   const { symbol } = options;
-  if (key !== "quantity" && key !== "tp_trigger_price" && key !== "sl_trigger_price" && key !== "tp_pnl" && key !== "sl_pnl" && key !== "tp_offset" && key !== "sl_offset" && key !== "tp_offset_percentage" && key !== "sl_offset_percentage") {
+  if (key !== "quantity" && key !== "tp_trigger_price" && key !== "sl_trigger_price" && key !== "tp_pnl" && key !== "sl_pnl" && key !== "tp_offset" && key !== "sl_offset" && key !== "tp_offset_percentage" && key !== "sl_offset_percentage" && key !== "tp_order_price" && key !== "sl_order_price" && key !== "tp_order_type" && key !== "sl_order_type" && key !== "tp_enable" && key !== "sl_enable") {
     return {
       [key]: inputs.value
     };
   }
   const orderType = key.startsWith("tp_") ? AlgoOrderType.TAKE_PROFIT : AlgoOrderType.STOP_LOSS;
   const keyPrefix = key.slice(0, 3);
-  let qty = Number(key === "quantity" ? inputs.value : inputs.qty);
+  const qty = Number(key === "quantity" ? inputs.value : inputs.qty);
   if (qty === 0 && (key === "tp_pnl" || key === "sl_pnl" || key === "tp_trigger_price" || key === "sl_trigger_price")) {
     return {
-      [`${keyPrefix}trigger_price`]: "",
+      // [`${keyPrefix}trigger_price`]: "",
+      // [`${keyPrefix}order_price`]: "",
       // [`${keyPrefix}offset`]: "",
       // [`${keyPrefix}offset_percentage`]: "",
       [`${keyPrefix}pnl`]: "",
       [key]: inputs.value
     };
   }
-  let trigger_price, offset, offset_percentage, pnl;
+  let trigger_price, offset, offset_percentage, pnl, order_price, tpsl_order_type = inputs.values[`${keyPrefix}order_type`] ?? OrderType.MARKET;
   const entryPrice = new Decimal(inputs.entryPrice).todp(options.symbol?.quote_dp ?? 2, Decimal.ROUND_UP).toNumber();
   switch (key) {
     case "tp_trigger_price":
     case "sl_trigger_price": {
       trigger_price = inputs.value;
-      if (inputs.value === "") {
-        return {
-          [`${keyPrefix}trigger_price`]: trigger_price,
-          [`${keyPrefix}offset`]: "",
-          [`${keyPrefix}offset_percentage`]: "",
-          [`${keyPrefix}pnl`]: "",
-          [`${keyPrefix}ROI`]: ""
-        };
+      if (checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        if (inputs.value === "") {
+          return {
+            [`${keyPrefix}trigger_price`]: trigger_price,
+            [`${keyPrefix}offset`]: "",
+            [`${keyPrefix}offset_percentage`]: "",
+            [`${keyPrefix}pnl`]: "",
+            [`${keyPrefix}ROI`]: ""
+          };
+        }
+      } else {
+        order_price = inputs.values[`${keyPrefix}order_price`] ?? "";
       }
       break;
     }
+    case "tp_enable":
+    case "sl_enable": {
+      return {
+        [`${keyPrefix}enable`]: inputs.value,
+        [`${keyPrefix}order_type`]: OrderType.MARKET,
+        [`${keyPrefix}trigger_price`]: "",
+        [`${keyPrefix}order_price`]: "",
+        [`${keyPrefix}offset`]: "",
+        [`${keyPrefix}offset_percentage`]: "",
+        [`${keyPrefix}pnl`]: "",
+        [`${keyPrefix}ROI`]: ""
+      };
+    }
     case "tp_pnl":
     case "sl_pnl": {
       pnl = inputs.value;
-      trigger_price = pnlToPrice({
-        qty,
-        pnl: Number(inputs.value),
-        entryPrice,
-        orderSide: inputs.orderSide,
-        orderType
-      });
+      if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        order_price = pnlToPrice({
+          qty,
+          pnl: Number(inputs.value),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+        trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      } else {
+        trigger_price = pnlToPrice({
+          qty,
+          pnl: Number(inputs.value),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+      }
       break;
     }
     case "tp_offset":
     case "sl_offset": {
       offset = inputs.value;
-      trigger_price = offsetToPrice({
-        offset: Number(inputs.value),
-        entryPrice,
-        orderSide: inputs.orderSide,
-        orderType: key === "tp_offset" ? AlgoOrderType.TAKE_PROFIT : AlgoOrderType.STOP_LOSS
-      });
+      if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        order_price = offsetToPrice({
+          qty,
+          offset: Number(inputs.value),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType: key === "tp_offset" ? AlgoOrderType.TAKE_PROFIT : AlgoOrderType.STOP_LOSS
+        });
+        trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      } else {
+        trigger_price = offsetToPrice({
+          qty,
+          offset: Number(inputs.value),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType: key === "tp_offset" ? AlgoOrderType.TAKE_PROFIT : AlgoOrderType.STOP_LOSS
+        });
+      }
+      break;
+    }
+    case "tp_order_price":
+    case "sl_order_price": {
+      order_price = inputs.value;
+      trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      break;
+    }
+    case "tp_order_type":
+    case "sl_order_type": {
+      tpsl_order_type = inputs.value;
+      trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? "";
+      if (tpsl_order_type === OrderType.MARKET) {
+        order_price = "";
+      } else {
+        order_price = trigger_price;
+      }
       break;
     }
     case "tp_offset_percentage":
     case "sl_offset_percentage": {
       offset_percentage = inputs.value;
-      trigger_price = offsetPercentageToPrice({
-        percentage: Number(`${inputs.value}`.replace(/\.0{0,2}$/, "")),
-        entryPrice,
-        orderSide: inputs.orderSide,
-        orderType
-      });
+      if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+        order_price = offsetPercentageToPrice({
+          qty,
+          percentage: Number(`${inputs.value}`.replace(/\.0{0,2}$/, "")),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+        trigger_price = inputs.values[`${keyPrefix}trigger_price`] ?? order_price;
+      } else {
+        trigger_price = offsetPercentageToPrice({
+          qty,
+          percentage: Number(`${inputs.value}`.replace(/\.0{0,2}$/, "")),
+          entryPrice,
+          orderSide: inputs.orderSide,
+          orderType
+        });
+      }
       break;
     }
   }
-  if (!trigger_price)
+  if (!trigger_price && checkTPSLOrderTypeIsMarket(key, inputs.values)) {
     return {
       [`${keyPrefix}trigger_price`]: "",
       [`${keyPrefix}offset`]: "",
@@ -7549,36 +8023,47 @@ function tpslCalculateHelper(key, inputs, options = {}) {
       [`${keyPrefix}ROI`]: "",
       [key]: inputs.value
     };
-  return {
-    [`${keyPrefix}trigger_price`]: todpIfNeed(
-      trigger_price,
-      symbol?.quote_dp ?? 2
-    ),
-    [`${keyPrefix}offset`]: offset ?? priceToOffset(
+  }
+  let calcPrice = trigger_price;
+  if (tpsl_order_type && tpsl_order_type === OrderType.LIMIT) {
+    calcPrice = order_price;
+  } else if (!checkTPSLOrderTypeIsMarket(key, inputs.values)) {
+    calcPrice = order_price;
+  }
+  if (calcPrice) {
+    pnl = pnl ?? priceToPnl(
       {
-        price: Number(trigger_price),
+        qty,
+        price: Number(calcPrice),
         entryPrice,
         orderSide: inputs.orderSide,
         orderType
       },
       options
-    ),
-    [`${keyPrefix}offset_percentage`]: offset_percentage ?? priceToOffsetPercentage({
-      price: Number(trigger_price),
-      entryPrice,
-      orderSide: inputs.orderSide,
-      orderType
-    }),
-    [`${keyPrefix}pnl`]: pnl ?? priceToPnl(
+    );
+    offset = offset ?? priceToOffset(
       {
-        qty,
-        price: Number(trigger_price),
+        price: Number(calcPrice),
         entryPrice,
         orderSide: inputs.orderSide,
         orderType
       },
       options
-    )
+    );
+    offset_percentage = offset_percentage ?? priceToOffsetPercentage({
+      price: Number(calcPrice),
+      entryPrice,
+      orderSide: inputs.orderSide,
+      orderType
+    });
+  }
+  return {
+    [`${keyPrefix}trigger_price`]: trigger_price ? todpIfNeed(trigger_price, symbol?.quote_dp ?? 2) : "",
+    [`${keyPrefix}order_type`]: tpsl_order_type ?? OrderType.MARKET,
+    [`${keyPrefix}order_price`]: order_price ? todpIfNeed(order_price, symbol?.quote_dp ?? 2) : "",
+    [`${keyPrefix}offset`]: offset ?? "",
+    [`${keyPrefix}offset_percentage`]: offset_percentage ?? "",
+    [`${keyPrefix}pnl`]: pnl ?? ""
     // [`${keyPrefix}ROI`]: calcROI({
     //   pnl: Number(pnl ?? 0),
     //   qty,
@@ -7588,16 +8073,45 @@ function tpslCalculateHelper(key, inputs, options = {}) {
 }
 
 // src/orderly/useTakeProfitAndStopLoss/useTPSL.ts
+var checkIsEnableTpSL = (order) => {
+  const result = {
+    tp_enable: true,
+    sl_enable: true
+  };
+  if (!order) {
+    return result;
+  }
+  const tp = order.child_orders.find(
+    (o) => o.algo_type === AlgoOrderType.TAKE_PROFIT && o.is_activated
+  );
+  const sl = order.child_orders.find(
+    (o) => o.algo_type === AlgoOrderType.STOP_LOSS && o.is_activated
+  );
+  if (!tp) {
+    result.tp_enable = false;
+  }
+  if (!sl) {
+    result.sl_enable = false;
+  }
+  return result;
+};
 var useTaskProfitAndStopLossInternal = (position, options) => {
   const isEditing = typeof options?.isEditing !== "undefined" ? options.isEditing : !!options?.defaultOrder;
   const [order, setOrder] = useState({
     algo_order_id: options?.defaultOrder?.algo_order_id,
     symbol: position.symbol,
     side: Number(position.position_qty) > 0 ? OrderSide.BUY : OrderSide.SELL,
-    quantity: isEditing ? options?.defaultOrder?.quantity === 0 ? Math.abs(position.position_qty) : options?.defaultOrder?.quantity : "",
+    quantity: isEditing ? options?.defaultOrder?.quantity === 0 ? Math.abs(position.position_qty) : options?.defaultOrder?.quantity : options?.positionType === PositionType.FULL ? Math.abs(position.position_qty) : 0,
+    // quantity:
+    //   options?.positionType === PositionType.PARTIAL
+    //     ? 0
+    //     : Math.abs(position.position_qty),
     // quantity:
     //   options?.defaultOrder?.quantity || Math.abs(position.position_qty),
-    algo_type: options?.defaultOrder?.algo_type
+    algo_type: options?.defaultOrder?.algo_type,
+    tp_enable: isEditing ? checkIsEnableTpSL(options?.defaultOrder).tp_enable : options?.tpslEnable?.tp_enable,
+    sl_enable: isEditing ? checkIsEnableTpSL(options?.defaultOrder).sl_enable : options?.tpslEnable?.sl_enable,
+    position_type: options?.positionType
   });
   const symbolInfo = useSymbolsInfo()[position.symbol]();
   const { data: markPrice } = useMarkPrice(order.symbol);
@@ -7609,16 +8123,23 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
     if (!isEditing || !options?.defaultOrder)
       return;
     const trigger_prices = findTPSLFromOrder(options.defaultOrder);
+    const order2 = {};
     if (trigger_prices.tp_trigger_price) {
-      setOrderValue("tp_trigger_price", trigger_prices.tp_trigger_price, {
-        ignoreValidate: true
-      });
+      order2.tp_trigger_price = trigger_prices.tp_trigger_price;
     }
     if (trigger_prices.sl_trigger_price) {
-      setOrderValue("sl_trigger_price", trigger_prices.sl_trigger_price, {
-        ignoreValidate: true
-      });
+      order2.sl_trigger_price = trigger_prices.sl_trigger_price;
+    }
+    const order_prices = findTPSLOrderPriceFromOrder(options.defaultOrder);
+    if (order_prices.tp_order_price && order_prices.tp_order_price !== OrderType.MARKET) {
+      order2.tp_order_type = OrderType.LIMIT;
+      order2.tp_order_price = order_prices.tp_order_price;
     }
+    if (order_prices.sl_order_price && order_prices.sl_order_price !== OrderType.MARKET) {
+      order2.sl_order_type = OrderType.LIMIT;
+      order2.sl_order_price = order_prices.sl_order_price;
+    }
+    setValues(order2);
   }, []);
   const _setOrderValue = (key, value, options2) => {
     setOrder((prev) => {
@@ -7629,7 +8150,8 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
           value,
           entryPrice: position.average_open_price,
           qty: side === OrderSide.BUY ? Number(prev.quantity) : -Number(prev.quantity),
-          orderSide: side
+          orderSide: side,
+          values: prev
         },
         {
           symbol: symbolInfo
@@ -7650,11 +8172,21 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
           ignoreValidate: true
         });
       }
+      if (typeof order.sl_order_price !== "undefined") {
+        _setOrderValue("sl_order_price", order.sl_order_price, {
+          ignoreValidate: true
+        });
+      }
       if (typeof order.tp_trigger_price !== "undefined") {
         _setOrderValue("tp_trigger_price", order.tp_trigger_price, {
           ignoreValidate: true
         });
       }
+      if (typeof order.tp_order_price !== "undefined") {
+        _setOrderValue("tp_order_price", order.tp_order_price, {
+          ignoreValidate: true
+        });
+      }
       _setOrderValue(key, value, options2);
       return;
     }
@@ -7669,6 +8201,9 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
     requestAnimationFrame(() => {
       if (order.ignoreValidate)
         return;
+      if (!order.quantity) {
+        return;
+      }
       const orderCreator = getOrderCreator2();
       orderCreator.validate(order, valueConfig).then((errors2) => {
         setErrors(errors2);
@@ -7715,7 +8250,7 @@ var useTaskProfitAndStopLossInternal = (position, options) => {
       return OrderFactory.create(AlgoOrderRootType.TP_SL);
     }
     return OrderFactory.create(
-      compare() ? AlgoOrderRootType.POSITIONAL_TP_SL : AlgoOrderRootType.TP_SL
+      options?.positionType === PositionType.FULL ? AlgoOrderRootType.POSITIONAL_TP_SL : AlgoOrderRootType.TP_SL
     );
   };
   const submit = async (params) => {
@@ -7953,7 +8488,7 @@ var useStatisticsDaily = (params, options) => {
     return { vol: vol.toNumber(), pnl: pnl.toNumber(), roi: roi.toNumber() };
   }, [data]);
   return [
-    data || [],
+    data || EMPTY_LIST,
     {
       aggregateValue
     }
@@ -8043,7 +8578,7 @@ var useDistributionHistory = (parmas) => {
 var useTransferHistory = (parmas) => {
   const { dataRange, page, size, side, fromId, toId, main_sub_only } = parmas;
   const infos = useSymbolsInfo();
-  const memoizedQueryKey = React.useMemo(() => {
+  const memoizedQueryKey = React2.useMemo(() => {
     const search = new URLSearchParams();
     search.set("page", page.toString());
     search.set("size", size.toString());
@@ -8066,7 +8601,7 @@ var useTransferHistory = (parmas) => {
       errorRetryCount: 3
     }
   );
-  const parsedData = React.useMemo(() => {
+  const parsedData = React2.useMemo(() => {
     if (!Array.isArray(data?.rows) || !data?.rows.length || infos.isNil) {
       return [];
     }
@@ -8385,6 +8920,12 @@ var useMarketStore = create(
     }
   })
 );
+var useMarketList = () => {
+  return useMarketStore((state) => state.market);
+};
+var useMarketMap = () => {
+  return useMarketStore((state) => state.marketMap);
+};
 
 // src/orderly/usePublicDataObserver.ts
 var publicQueryOptions = {
@@ -8398,7 +8939,7 @@ var usePublicDataObserver = () => {
   );
   const { updateMarket } = useMarketStore((state) => state.actions);
   const setTokensInfo = useTokensInfoStore((state) => state.setTokensInfo);
-  const { dataAdapter } = useContext(OrderlyContext);
+  const { dataAdapter } = useOrderlyContext();
   const resolveList = typeof dataAdapter?.symbolList === "function" ? dataAdapter.symbolList : (oriVal) => oriVal;
   useQuery(`/v1/public/info`, {
     ...publicQueryOptions,
@@ -8480,10 +9021,6 @@ function getEstFundingRate(data) {
   }
   return est_funding_rate;
 }
-var DataCenterContext = createContext(
-  {}
-);
-var useDataCenterContext = () => useContext(DataCenterContext);
 var DataCenterProvider = ({
   children
 }) => {
@@ -8497,94 +9034,26 @@ var DataCenterProvider = ({
       return getKeyHandlerMapRef.current;
     }
   });
+  const memoizedValue = useMemo(() => {
+    return {
+      registerKeyHandler: (key, fun) => {
+        getKeyHandlerMapRef.current.set(key, fun);
+      },
+      unregisterKeyHandler: (key) => {
+        getKeyHandlerMapRef.current.delete(key);
+      }
+    };
+  }, [getKeyHandlerMapRef.current]);
   if (error) {
     return /* @__PURE__ */ jsx("div", { children: "Data load failed" });
   }
   if (!done) {
     return null;
   }
-  return /* @__PURE__ */ jsx(
-    DataCenterContext.Provider,
-    {
-      value: {
-        registerKeyHandler: (key, fun) => {
-          getKeyHandlerMapRef.current.set(key, fun);
-        },
-        unregisterKeyHandler: (key) => {
-          getKeyHandlerMapRef.current.delete(key);
-        }
-      },
-      children
-    }
-  );
-};
-var ProxyConfigStore = class {
-  constructor(_originConfigStore) {
-    this._originConfigStore = _originConfigStore;
-    windowGuard(() => {
-      this._proxyConfigStore = window.__ORDERLY_CONFIG_STORE__ || _originConfigStore;
-    });
-  }
-  get(key) {
-    const value = this._proxyConfigStore?.get(key);
-    if (typeof value === "undefined") {
-      return this._originConfigStore.get(key);
-    }
-    return value;
-  }
-  getOr(key, defaultValue) {
-    return (this._proxyConfigStore ?? this._originConfigStore).getOr(
-      key,
-      defaultValue
-    );
-  }
-  set(key, value) {
-    (this._proxyConfigStore ?? this._originConfigStore).set(key, value);
-  }
-  clear() {
-    throw new SDKError("Method not implemented.");
-  }
-  getFromOrigin(key) {
-    return this._originConfigStore.get(key);
-  }
-  getOrFromOrigin(key, defaultValue) {
-    return this._originConfigStore.getOr(key, defaultValue);
-  }
-  setToOrigin(key, value) {
-    this._originConfigStore.set(key, value);
-  }
-  clearOrigin() {
-    this._originConfigStore.clear();
-  }
-};
-var ExtendedConfigStore = class extends DefaultConfigStore {
-  constructor(init2) {
-    super(init2);
-  }
-  get(key) {
-    if (key === MarketsStorageKey) {
-      const jsonStr = localStorage.getItem(MarketsStorageKey);
-      if (!jsonStr) {
-        const oldJsonStr = localStorage.getItem(
-          MarketsStorageKey.replace("orderly_", "")
-        );
-        return oldJsonStr ? JSON.parse(oldJsonStr) : "";
-      }
-      return JSON.parse(jsonStr);
-    }
-    return super.get(key);
-  }
-  set(key, value) {
-    if (key === MarketsStorageKey) {
-      const jsonStr = JSON.stringify(value);
-      localStorage.setItem(MarketsStorageKey, jsonStr);
-      return;
-    }
-    super.set(key, value);
-  }
+  return /* @__PURE__ */ jsx(DataCenterContext.Provider, { value: memoizedValue, children });
 };
 var OrderlyConfigProvider = (props) => {
-  const [account9, setAccount] = React.useState(null);
+  const [account9, setAccount] = React2.useState(null);
   const {
     configStore,
     keyStore,
@@ -8598,7 +9067,8 @@ var OrderlyConfigProvider = (props) => {
     customChains,
     enableSwapDeposit = false,
     chainTransformer,
-    dataAdapter
+    dataAdapter,
+    notification
   } = props;
   if (typeof configStore !== "undefined" && !configStore.get("brokerId")) {
     throw new SDKError(
@@ -8660,7 +9130,8 @@ var OrderlyConfigProvider = (props) => {
       enableSwapDeposit,
       defaultOrderbookTickSizes,
       chainTransformer,
-      dataAdapter
+      dataAdapter,
+      notification
     };
   }, [
     innerConfigStore,
@@ -8672,6 +9143,7 @@ var OrderlyConfigProvider = (props) => {
     enableSwapDeposit,
     defaultOrderbookTickSizes,
     dataAdapter,
+    notification,
     chainTransformer
   ]);
   if (!account9) {
@@ -8724,7 +9196,6 @@ function orderTypeHandle(inputs) {
   if (value === OrderType.MARKET || value === OrderType.LIMIT) {
     values2.trigger_price = void 0;
   }
-  if (value === OrderType.MARKET || value === OrderType.STOP_MARKET) ;
   return [values2, input, value, markPrice, config];
 }
 function orderEntityFormatHandle(baseTick, quoteTick) {
@@ -8785,8 +9256,7 @@ function quantityInputHandle(inputs) {
     const price = markPrice;
     values2.order_price = "";
     values2.total = quantity.mul(price).todp(2).toString();
-  }
-  if (values2.order_type === OrderType.LIMIT || values2.order_type === OrderType.STOP_LIMIT) {
+  } else if (values2.order_type === OrderType.LIMIT || values2.order_type === OrderType.STOP_LIMIT) {
     if (values2.order_price) {
       const price = Number(values2.order_price);
       const total = quantity.mul(price);
@@ -8794,6 +9264,8 @@ function quantityInputHandle(inputs) {
     } else {
       values2.total = "";
     }
+  } else if (values2.order_type === OrderType.SCALED && markPrice) {
+    values2.total = quantity.mul(markPrice).todp(config.quote_dp).toString();
   }
   return [
     {
@@ -8852,8 +9324,9 @@ function tpslInputHandle(inputs) {
       entryPrice: price,
       // order price or mark price
       qty: values2.side === OrderSide.BUY ? Number(values2.order_quantity) : Number(values2.order_quantity) * -1,
-      orderSide: values2.side
+      orderSide: values2.side,
       // values: newValues,
+      values: values2
     },
     {
       symbol: config
@@ -8877,6 +9350,7 @@ var getCalculateHandler = (fieldName) => {
     case "total": {
       return totalInputHandle;
     }
+    case "tp_enable":
     case "tp_pnl":
     case "sl_pnl":
     case "tp_trigger_price":
@@ -8885,6 +9359,11 @@ var getCalculateHandler = (fieldName) => {
     case "sl_offset":
     case "tp_offset_percentage":
     case "sl_offset_percentage":
+    case "tp_order_price":
+    case "tp_order_type":
+    case "sl_enable":
+    case "sl_order_type":
+    case "sl_order_price":
       return tpslInputHandle;
     default:
       return otherInputHandle;
@@ -10045,7 +10524,7 @@ __export(utils_exports, {
   fetcher: () => fetcher,
   findPositionTPSLFromOrders: () => findPositionTPSLFromOrders,
   findTPSLFromOrder: () => findTPSLFromOrder,
-  findTPSLFromOrders: () => findTPSLFromOrders,
+  findTPSLOrderPriceFromOrder: () => findTPSLOrderPriceFromOrder,
   formatNumber: () => formatNumber,
   getPositionBySymbol: () => getPositionBySymbol,
   priceToPnl: () => priceToPnl
@@ -10410,9 +10889,9 @@ var useReferralInfo = () => {
     []
   );
   const getFirstRefCode = useCallback(() => {
-    if (!data?.referrer_info.referral_codes)
+    if (!data?.referrer_info?.referral_codes)
       return void 0;
-    const referralCodes = [...data?.referrer_info.referral_codes];
+    const referralCodes = [...data?.referrer_info?.referral_codes];
     const pinedItems = [];
     for (let i = 0; i < pinCodes.length; i++) {
       const code = pinCodes[i];
@@ -15626,21 +16105,155 @@ function getQueryParamsFromObject(obj) {
   }
   return queryParams.toString();
 }
+var getCreateOrderUrl = (order) => {
+  const isAlgoOrder = order?.order_type === OrderType.STOP_LIMIT || order?.order_type === OrderType.STOP_MARKET || order?.order_type === OrderType.CLOSE_POSITION || order.algo_type && order.algo_type === AlgoOrderRootType.BRACKET || isBracketOrder(order);
+  if (order.order_type === OrderType.SCALED) {
+    return "/v1/batch-order";
+  }
+  return isAlgoOrder ? "/v1/algo/order" : "/v1/order";
+};
+var getOrderCreator = (order) => {
+  let type;
+  if (isBracketOrder(order)) {
+    type = `${AlgoOrderRootType.BRACKET}:${order.order_type}`;
+  } else if (order.order_type === OrderType.LIMIT) {
+    type = order.order_type_ext || order.order_type;
+  } else {
+    type = order.order_type;
+  }
+  return OrderFactory.create(type);
+};
+var tpslFields = [
+  "tp_trigger_price",
+  "sl_trigger_price",
+  "tp_pnl",
+  "sl_pnl",
+  "tp_offset",
+  "sl_offset",
+  "tp_offset_percentage",
+  "sl_offset_percentage"
+];
+var isBracketOrder = (order) => {
+  if (order.sl_enable || order.tp_enable) {
+    return true;
+  }
+  return !!order.tp_trigger_price || !!order.sl_trigger_price;
+};
+var hasTPSL = (order) => {
+  return tpslFields.some((field) => !!order[field]);
+};
+var getPriceAndQty = (order, symbolInfo, askAndBid) => {
+  let quantity = Number(order.order_quantity);
+  const orderPrice = Number(order.order_price);
+  if (isNaN(quantity) || quantity <= 0) {
+    return null;
+  }
+  if (askAndBid.length === 0) {
+    return null;
+  }
+  if ((order.order_type === OrderType.LIMIT || order.order_type === OrderType.STOP_LIMIT) && isNaN(orderPrice)) {
+    return null;
+  }
+  let price;
+  if (order.order_type === OrderType.SCALED) {
+    price = calcScaledOrderAvgPrice(order, symbolInfo, askAndBid);
+    const orders = calcScaledOrderBatchBody(order, symbolInfo);
+    const sumQtys = orders.reduce((acc, order2) => {
+      return acc.plus(new Decimal(order2.order_quantity));
+    }, zero);
+    quantity = sumQtys.todp(symbolInfo.base_dp).toNumber();
+    if (!quantity || isNaN(quantity)) {
+      return null;
+    }
+  } else {
+    price = getOrderPrice(order, askAndBid);
+  }
+  if (!price || isNaN(price)) {
+    return null;
+  }
+  if (order.side === OrderSide.SELL) {
+    quantity = -quantity;
+  }
+  return { price, quantity };
+};
+var calcEstLiqPrice = (order$1, askAndBid, inputs) => {
+  const { symbolInfo } = inputs;
+  const result = getPriceAndQty(order$1, symbolInfo, askAndBid);
+  if (!result)
+    return null;
+  const { price, quantity } = result;
+  if (!price || !quantity)
+    return null;
+  const {
+    symbol,
+    imr_factor,
+    markPrice,
+    totalCollateral,
+    futures_taker_fee_rate,
+    positions: positions3
+  } = inputs;
+  const orderFee = order.orderFee({
+    qty: quantity,
+    price,
+    futuresTakeFeeRate: Number(futures_taker_fee_rate) / 1e4
+  });
+  const liqPrice = order.estLiqPrice({
+    markPrice,
+    baseIMR: symbolInfo.base_imr,
+    baseMMR: symbolInfo.base_mmr,
+    totalCollateral,
+    positions: positions3 == null ? [] : positions3,
+    IMR_Factor: imr_factor,
+    orderFee,
+    newOrder: {
+      qty: quantity,
+      price,
+      symbol
+    }
+  });
+  if (liqPrice <= 0)
+    return null;
+  return liqPrice;
+};
+var calcEstLeverage = (order$1, askAndBid, inputs) => {
+  const { totalCollateral, positions: positions3, symbol, symbolInfo } = inputs;
+  const result = getPriceAndQty(order$1, symbolInfo, askAndBid);
+  if (!result)
+    return null;
+  const { price, quantity } = result;
+  if (!price || !quantity)
+    return null;
+  return order.estLeverage({
+    totalCollateral,
+    positions: positions3,
+    newOrder: {
+      symbol,
+      qty: result.quantity,
+      price: result.price
+    }
+  });
+};
+function isBBOOrder(options) {
+  const { order_type, order_type_ext } = options;
+  return order_type === OrderType.LIMIT && [OrderType.ASK, OrderType.BID].includes(order_type_ext);
+}
 var initialOrderState = {
   order_price: "",
   order_quantity: "",
   trigger_price: "",
   tp_trigger_price: "",
   sl_trigger_price: "",
+  tp_order_type: OrderType.MARKET,
   tp_pnl: "",
   sl_pnl: "",
   tp_offset_percentage: "",
   sl_offset_percentage: "",
   tp_offset: "",
   sl_offset: "",
+  sl_order_type: OrderType.MARKET,
   total: "",
-  min_price: "",
-  max_price: "",
+  start_price: "",
+  end_price: "",
   totalOrders: "",
   distribution_type: "",
   skew: ""
@@ -16304,9 +16917,9 @@ var useOrderEntry2 = (symbol, options = {}) => {
       validate: validateOrder
     },
     freeCollateral,
-    setValue,
-    setValues,
-    symbolInfo: symbolInfo || {},
+    setValue: useMemoizedFn(setValue),
+    setValues: useMemoizedFn(setValues),
+    symbolInfo: symbolInfo || EMPTY_OBJECT,
     metaState: meta,
     isMutating,
     markPrice
@@ -16639,6 +17252,6 @@ var usePositionClose = (options) => {
   };
 };
 
-export { DefaultLayoutConfig, DistributionId, ENVType2 as ENVType, EpochStatus, ExtendedConfigStore, MaintenanceStatus, MarketsStorageKey, MarketsType, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, StatusContext, StatusProvider, TWType, WalletConnectorContext, WsNetworkStatus, checkNotional, cleanStringStyle, fetcher, getMinNotional, parseJSON, useAccount, useAccountInfo2 as useAccountInfo, useAccountInstance, useAccountRewardsHistory, useAllBrokers, useApiKeyManager, useAssetsHistory, useBalanceSubscription, useBalanceTopic, useBoolean, useChain, useChains, useCheckReferralCode, useCollateral, useCommission, useComputedLTV, useConfig, useConvert, useCurEpochEstimate, useDaily, useDeposit, useDistribution, useDistributionHistory, useEpochInfo, useEventEmitter, useFundingDetails, useFundingFeeHistory, useFundingRate, useFundingRateHistory, useFundingRates, useFundingRatesStore, useGetClaimed, useGetEnv, useGetReferralCode, useHoldingStream, useIndexPrice, useIndexPricesStream, useInfiniteQuery, useKeyStore, useLazyQuery, useLeverage, useLocalStorage, useMaintenanceStatus, useMarginRatio, useMarkPrice, useMarkPriceBySymbol, useMarkPricesStream, useMarket, useMarketTradeStream, useMarkets, useMarketsStore, useMarketsStream, useMaxQty, useMediaQuery, useMemoizedFn, useMutation, useNetworkInfo, useOdosQuote, useOrderEntity, useOrderEntry2 as useOrderEntry, useOrderEntry as useOrderEntry_deprecated, useOrderStore2 as useOrderStore, useOrderStream, useOrderbookStream, usePositionActions, usePositionClose, usePositionStream, usePoster, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useRefereeHistory, useRefereeInfo, useRefereeRebateSummary, useReferralInfo, useReferralRebateSummary, useRestrictedInfo, useSessionStorage, useSettleSubscription, useSimpleDI, useStatisticsDaily, useStorageChain, useStorageLedgerAddress, useSubAccountDataObserver, useSubAccountMaxWithdrawal, useSubAccountMutation, useSubAccountQuery, useSubAccountWS, useSymbolLeverage, useSymbolPriceRange, useSymbolsInfo, useSymbolsInfoStore, useTPSLOrder, useTickerStream, useTokenInfo, useTokensInfo, useTrack, useTrackingInstance, useTradingRewardsStatus, useTransfer, useTransferHistory, useUpdatedRef, useWS, useWalletConnector, useWalletRewardsHistory, useWalletSubscription, useWalletTopic, useWithdraw, useWsStatus, utils_exports as utils, version_default as version };
+export { DefaultLayoutConfig, DistributionId, ENVType2 as ENVType, EpochStatus, ExtendedConfigStore, MaintenanceStatus, MarketsStorageKey, MarketsType, OrderlyConfigProvider, OrderlyContext, OrderlyProvider, StatusProvider, TWType, WalletConnectorContext, WsNetworkStatus, checkNotional, cleanStringStyle, fetcher, findPositionTPSLFromOrders, findTPSLFromOrder, findTPSLOrderPriceFromOrder, getMinNotional, parseJSON, useAccount, useAccountInfo2 as useAccountInfo, useAccountInstance, useAccountRewardsHistory, useAllBrokers, useApiKeyManager, useAssetsHistory, useAudioPlayer, useBalanceSubscription, useBalanceTopic, useBoolean, useChain, useChains, useCheckReferralCode, useCollateral, useCommission, useComputedLTV, useConfig, useConvert, useCurEpochEstimate, useDaily, useDeposit, useDistribution, useDistributionHistory, useEpochInfo, useEventEmitter, useFundingDetails, useFundingFeeHistory, useFundingRate, useFundingRateHistory, useFundingRates, useFundingRatesStore, useGetClaimed, useGetEnv, useGetReferralCode, useHoldingStream, useIndexPrice, useIndexPricesStream, useInfiniteQuery, useKeyStore, useLazyQuery, useLeverage, useLocalStorage, useMaintenanceStatus, useMarginRatio, useMarkPrice, useMarkPriceBySymbol, useMarkPricesStream, useMarket, useMarketList, useMarketMap, useMarketTradeStream, useMarkets, useMarketsStore, useMarketsStream, useMaxQty, useMediaQuery, useMemoizedFn, useMutation, useNetworkInfo, useOdosQuote, useOrderEntity, useOrderEntry2 as useOrderEntry, useOrderEntry as useOrderEntry_deprecated, useOrderStore2 as useOrderStore, useOrderStream, useOrderbookStream, useOrderlyContext, usePositionActions, usePositionClose, usePositionStream, usePoster, usePreLoadData, usePrivateDataObserver, usePrivateInfiniteQuery, usePrivateQuery, useQuery, useRefereeHistory, useRefereeInfo, useRefereeRebateSummary, useReferralInfo, useReferralRebateSummary, useRestrictedInfo, useSessionStorage, useSettleSubscription, useSimpleDI, useStatisticsDaily, useStorageChain, useStorageLedgerAddress, useSubAccountDataObserver, useSubAccountMaxWithdrawal, useSubAccountMutation, useSubAccountQuery, useSubAccountWS, useSymbolLeverage, useSymbolPriceRange, useSymbolsInfo, useSymbolsInfoStore, useTPSLOrder, useTickerStream, useTokenInfo, useTokensInfo, useTrack, useTrackingInstance, useTradingRewardsStatus, useTransfer, useTransferHistory, useUpdatedRef, useWS, useWalletConnector, useWalletRewardsHistory, useWalletSubscription, useWalletTopic, useWithdraw, useWsStatus, utils_exports as utils, version_default as version };
 //# sourceMappingURL=out.js.map
 //# sourceMappingURL=index.mjs.map