@orderly.network/hooks 1.1.4-experimental.0 → 1.1.4-experimental.2

package/esm/index.d.ts

@@ -11,6 +11,7 @@ export { usePreLoadData } from "./usePreloadData";
 export { useEventEmitter } from "./useEventEmitter";
 export { useSessionStorage } from "./useSessionStorage";
 export { useLocalStorage } from "./useLocalStorage";
+export { parseJSON } from "./utils/json";
 export { default as useConstant } from "use-constant";
 export { useWS } from "./useWS";
 export { useConfig } from "./useConfig";

package/esm/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAGvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/esm/index.js

@@ -11,6 +11,7 @@ export { usePreLoadData } from "./usePreloadData";
 export { useEventEmitter } from "./useEventEmitter";
 export { useSessionStorage } from "./useSessionStorage";
 export { useLocalStorage } from "./useLocalStorage";
+export { parseJSON } from "./utils/json";
 export { default as useConstant } from "use-constant";
 export { useWS } from "./useWS";
 export { useConfig } from "./useConfig";

package/esm/orderly/useDeposit.d.ts

@@ -28,7 +28,7 @@ export declare const useDeposit: (options?: useDepositOptions) => {
     depositFee: bigint;
     /** enquiring depositFee status on chain */
     depositFeeRevalidating: boolean;
-    approve: (amount?: string) => Promise<any>;
+    approve: (amount?: string) => Promise<void | undefined>;
     deposit: () => Promise<any>;
     fetchBalances: (tokens: API.TokenInfo[]) => Promise<void>;
     fetchBalance: (address: string, decimals?: number) => Promise<string>;

package/esm/orderly/useDeposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeposit.d.ts","sourceRoot":"","sources":["../../src/orderly/useDeposit.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,GAAG,EAMH,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAMhC,MAAM,MAAM,iBAAiB,GAAG;IAE9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,iBAAiB;IAoTlD,gCAAgC;;;;;;;;;;;;;IAOhC,oBAAoB;;IAEpB,qCAAqC;;IAErC,2CAA2C;;uBA3H3B,MAAM;;4BAjGyB,IAAI,SAAS,EAAE;4BAvC9C,MAAM,aAAa,MAAM;IAyQzC,yBAAyB;;CAG5B,CAAC"}
+{"version":3,"file":"useDeposit.d.ts","sourceRoot":"","sources":["../../src/orderly/useDeposit.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,GAAG,EAMH,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAMhC,MAAM,MAAM,iBAAiB,GAAG;IAE9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,iBAAiB;IA4TlD,gCAAgC;;;;;;;;;;;;;IAOhC,oBAAoB;;IAEpB,qCAAqC;;IAErC,2CAA2C;;uBApI3B,MAAM;;4BAhGyB,IAAI,SAAS,EAAE;4BAvC9C,MAAM,aAAa,MAAM;IAiRzC,yBAAyB;;CAG5B,CAAC"}

package/esm/orderly/useDeposit.js

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useAccount } from "../useAccount";
-import { ARBITRUM_MAINNET_CHAINID, ARBITRUM_TESTNET_CHAINID, AccountStatusEnum, DEPOSIT_FEE_RATE, MaxUint256, isNativeTokenChecker, } from "@orderly.network/types";
+import { ARBITRUM_MAINNET_CHAINID, ARBITRUM_TESTNET_CHAINID, AccountStatusEnum, DEPOSIT_FEE_RATE, isNativeTokenChecker, } from "@orderly.network/types";
 import { Decimal } from "@orderly.network/utils";
 import { useChains } from "./useChains";
 import { useConfig } from "../useConfig";
@@ -159,22 +159,33 @@ export const useDeposit = (options) => {
         return account.assetsManager
             .approve(options.address, amount)
             .then((result) => {
-            if (typeof amount !== "undefined") {
-                setAllowance((value) => new Decimal(value).add(amount || MaxUint256.toString()).toString());
-            }
-            return result;
+            return account.walletClient
+                ?.pollTransactionReceiptWithBackoff(result.hash)
+                .then((receipt) => {
+                if (receipt.status === 1) {
+                    account.assetsManager
+                        .getAllowance(options.address)
+                        .then((allowance) => {
+                        setAllowance(() => allowance);
+                    });
+                }
+            });
         });
-    }, [account, getAllowance, options?.address]);
+    }, [account, getAllowance, options, dst]);
     const deposit = useCallback(async () => {
         // only support orderly deposit
         return account.assetsManager
             .deposit(quantity, depositFee)
             .then((res) => {
-            setAllowance((value) => new Decimal(value).sub(quantity).toString());
+            account.assetsManager
+                .getAllowance(options?.address)
+                .then((allowance) => {
+                setAllowance(() => allowance);
+            });
             setBalance((value) => new Decimal(value).sub(quantity).toString());
             return res;
         });
-    }, [account, fetchBalance, getAllowance, quantity, depositFee]);
+    }, [account, fetchBalance, quantity, depositFee]);
     const loopGetBalance = async () => {
         getBalanceListener.current && clearTimeout(getBalanceListener.current);
         getBalanceListener.current = setTimeout(async () => {

package/esm/orderly/useOrderEntry.d.ts

@@ -35,20 +35,29 @@ export type UseOrderEntryReturn = {
     metaState: UseOrderEntryMetaState;
     symbolConfig: API.SymbolExt;
 };
-export type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">> & {};
+export type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">>;
 /**
  * Create Order
  * @example
  * ```tsx
+ * import { useOrderEntry } from "@orderly.network/hooks";
+ * import {OrderSide, OrderType} from '@orderly.network/types';
+ *
  * const { formattedOrder, onSubmit, helper } = useOrderEntry({
  *  symbol: "PERP_ETH_USDC",
  *  side: OrderSide.BUY,
  *  order_type: OrderType.LIMIT,
  *  order_price: 10000,
  *  order_quantity: 1,
+ * },{
+ *  // **Note:** it's required
+ *  watchOrderbook: true,
  * });
  * ```
  */
 export declare function useOrderEntry(order: OrderParams, options?: UseOrderEntryOptions): UseOrderEntryReturn;
+/**
+ * @deprecated
+ */
 export declare function useOrderEntry(symbol: string, side: OrderSide, reduceOnly: boolean): UseOrderEntryReturn;
 //# sourceMappingURL=useOrderEntry.d.ts.map

package/esm/orderly/useOrderEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderEntry.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderEntry.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,WAAW,EACX,SAAS,EAGV,MAAM,wBAAwB,CAAC;AAkBhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,WAAW,KACd;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,MAAM;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EACF;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE;KAAE,GAChE,IAAI,GACJ,SAAS,CAAC;IACd,KAAK,EAAE;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAIF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,EAAE;QACN,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5B,KAAK,EAAE,MAAM,WAAW,EACxB,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC;KAGlD,CAAC;IAEF,SAAS,EAAE,sBAAsB,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC,CACpD,GACC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC,GAAG,EAE9D,CAAC;AAEJ;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,mBAAmB,CAAC;AACvB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,OAAO,GAClB,mBAAmB,CAAC"}
+{"version":3,"file":"useOrderEntry.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderEntry.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,WAAW,EACX,SAAS,EAGV,MAAM,wBAAwB,CAAC;AAkBhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,WAAW,KACd;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,MAAM;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EACF;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE;KAAE,GAChE,IAAI,GACJ,SAAS,CAAC;IACd,KAAK,EAAE;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,EAAE;QACN,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5B,KAAK,EAAE,MAAM,WAAW,EACxB,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC;KAGlD,CAAC;IAEF,SAAS,EAAE,sBAAsB,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC,CACpD,GACC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC;AAE/D;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,mBAAmB,CAAC;AACvB;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,OAAO,GAClB,mBAAmB,CAAC"}

package/esm/orderly/useOrderEntry.js

@@ -12,10 +12,11 @@ import { useMarkPrice } from "./useMarkPrice";
 import { order } from "@orderly.network/perp";
 import { useEventEmitter } from "../useEventEmitter";
 import { useDebouncedCallback } from "use-debounce";
-const TIEMSTAMP = "timestamp";
 export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
-    // console.log("+++++++", symbolOrOrder);
+    // if symbolOrOrder is string, then it's deprecated
+    let isNewVersion = false;
     if (typeof symbolOrOrder === "object") {
+        isNewVersion = true;
         if (!symbolOrOrder.symbol) {
             throw new SDKError("symbol is required");
         }
@@ -25,21 +26,12 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
         if (!symbolOrOrder.order_type) {
             throw new SDKError("order_type is required");
         }
-        // if (typeof symbolOrOrder[TIEMSTAMP] === "undefined") {
-        //   console.warn(
-        //     "The timestamp is not set, the order status may be out of sync."
-        //   );
-        // }
-        // add timestamp to order, fix the issue of the same order
-        // symbolOrOrder[TIEMSTAMP] = Date.now();
     }
-    // console.log("+++++++", symbolOrOrder);
     const prevOrderData = useRef(null);
     // Cache data from the last calculate
     const orderDataCache = useRef(null);
     //
     const notSupportData = useRef({});
-    const [doCreateOrder, { data, error, reset, isMutating }] = useMutation(orderDataCache?.current?.isStopOrder ? "/v1/algo/order" : "/v1/order");
     const [errors, setErrors] = useState(null);
     const ee = useEventEmitter();
     const fieldDirty = useRef({});
@@ -186,7 +178,10 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
         needParse?.symbol,
         needParse?.reduce_only,
         needParse?.side,
+        needParse?.visible_quantity,
     ]);
+    const isStopOrder = parsedData?.order_type === OrderType.STOP_LIMIT || parsedData?.order_type === OrderType.STOP_MARKET;
+    const [doCreateOrder, { data, error, reset, isMutating }] = useMutation(isStopOrder ? "/v1/algo/order" : "/v1/order");
     // const maxQty = 3;
     const createOrder = (values) => {
         if (!values.symbol) {
@@ -340,8 +335,16 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
     ]);
     //====== update orderbook ask0/bid0 ======
     useEffect(() => {
-        if (!optionsValue?.watchOrderbook)
-            return;
+        if (isNewVersion) {
+            if (!optionsValue?.watchOrderbook) {
+                throw new SDKError("In order to calculate the estimated liquidation price, the `options.watchOrderbook` parameter must be set to true.");
+            }
+        }
+        else {
+            if (!optionsValue?.watchOrderbook) {
+                return;
+            }
+        }
         ee.on("orderbook:update", onOrderbookUpdate);
         return () => {
             ee.off("orderbook_update", onOrderbookUpdate);
@@ -354,8 +357,12 @@ export function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options)
     const getPriceAndQty = (symbolOrOrder) => {
         let quantity = Number(symbolOrOrder.order_quantity);
         const orderPrice = Number(symbolOrOrder.order_price);
-        if (isNaN(quantity) || quantity <= 0 || askAndBid.current.length === 0)
+        if (isNaN(quantity) || quantity <= 0) {
             return null;
+        }
+        if (!!options?.watchOrderbook && askAndBid.current.length === 0) {
+            throw new SDKError("Please check if you are using the `useOrderbookStream` hook or if the orderBook has data.");
+        }
         if ((symbolOrOrder.order_type === OrderType.LIMIT ||
             symbolOrOrder.order_type === OrderType.STOP_LIMIT) &&
             isNaN(orderPrice))

package/esm/orderly/useOrderbookStream.d.ts

@@ -9,13 +9,20 @@ export type OrderbookData = {
  * @param level
  * @param data
  */
-export declare const reduceOrderbook: (depth: number | undefined, level: number, data: OrderbookData) => OrderbookData;
+export declare const reduceOrderbook: (depth: number | undefined, level: number, padding: boolean, data: OrderbookData) => OrderbookData;
 export declare const mergeOrderbook: (data: OrderbookData, update: OrderbookData) => {
     asks: OrderBookItem[];
     bids: OrderBookItem[];
 };
+/**
+ * Configuration for the Order Book
+ * @level Indicates the number of data entries to return for ask/bid, default is 10
+ * @padding Whether to fill in when the actual data entries are less than the level. If filled, it will add [nan, nan, nan, nan]
+ *          default is true
+ */
 export type OrderbookOptions = {
     level?: number;
+    padding?: boolean;
 };
 /**
  * @name useOrderbookStream

package/esm/orderly/useOrderbookStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,QACP,aAAa,KAClB,aA+CF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BA0HgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,WACJ,OAAO,QACV,aAAa,KAClB,aAqDF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BA2HgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/esm/orderly/useOrderbookStream.js

@@ -7,7 +7,7 @@ import { useSymbolsInfo } from "./useSymbolsInfo";
 import { Decimal } from "@orderly.network/utils";
 import { min } from "ramda";
 import { SDKError } from "@orderly.network/types";
-const paddingFn = (len) => Array(len).fill([Number.NaN, Number.NaN, Number.NaN]);
+const paddingFn = (len) => Array(len).fill([Number.NaN, Number.NaN, Number.NaN, Number.NaN]);
 const asksSortFn = (a, b) => a[0] - b[0];
 const bidsSortFn = (a, b) => b[0] - a[0];
 // const commonSortFn = (a: OrderBookItem, b: OrderBookItem) => b[0] - a[0];
@@ -78,28 +78,37 @@ const reduceItems = (depth, level, data, asks = false) => {
  * @param level
  * @param data
  */
-export const reduceOrderbook = (depth, level, data) => {
+export const reduceOrderbook = (depth, level, padding, data) => {
     let asks = reduceItems(depth, level, data.asks, true);
     let bids = reduceItems(depth, level, data.bids);
     /// not empty and asks.price <= bids.price
     if (asks.length !== 0 && bids.length !== 0 && asks[0][0] <= bids[0][0]) {
         if (asks.length === 1) {
-            const [price, qty, newQuantity] = asks[0];
+            const [price, qty, newQuantity, newAmount] = asks[0];
             asks.shift();
-            asks.push([price + (depth === undefined ? 0 : depth), qty, newQuantity]);
+            asks.push([price + (depth === undefined ? 0 : depth), qty, newQuantity, newAmount]);
         }
         else {
             const [bidPrice] = bids[0];
             while (asks.length > 0) {
-                const [askPrice, askQty, newQuantity] = asks[0];
+                const [askPrice, askQty, newQuantity, newAmount] = asks[0];
                 if (askPrice <= bidPrice) {
+                    // console.log("xxxxxxxxxxx reset ask list begin", [...asks], { ...asks[0] });
                     asks.shift();
+                    // let logStr = "";
                     for (let index = 0; index < asks.length; index++) {
                         if (index === 0) {
-                            asks[index][1] += askQty;
+                            const quantity = asks[index][1] + askQty;
+                            asks[index][1] = quantity;
+                            asks[index][2] = quantity;
+                            asks[index][3] += newAmount;
                         }
-                        asks[index][2] += newQuantity;
+                        else {
+                            asks[index][3] += newAmount;
+                        }
+                        // logStr += `index: ${index} ${asks[index]}\n`;
                     }
+                    // console.log("xxxxxxxxxxx reset ask list end", logStr);
                 }
                 else {
                     break;
@@ -108,15 +117,12 @@ export const reduceOrderbook = (depth, level, data) => {
         }
     }
     asks = asks.reverse();
-    asks =
-        asks.length < level ? paddingFn(level - asks.length).concat(asks) : asks;
-    bids =
-        bids.length < level ? bids.concat(paddingFn(level - bids.length)) : bids;
-    // add max qty for asks/bids
-    // let maxAskQty = asks.reduce((a,b) => Math.max(a, b[1]),0);
-    // let maxBidQty = bids.reduce((a,b) => Math.max(a, b[1]),0);
-    // asks = asks.map((item) => [...item, maxAskQty]);
-    // bids = bids.map((item) => [...item, maxBidQty]);
+    if (padding) {
+        asks =
+            asks.length < level ? paddingFn(level - asks.length).concat(asks) : asks;
+        bids =
+            bids.length < level ? bids.concat(paddingFn(level - bids.length)) : bids;
+    }
     return {
         asks: asks,
         bids: bids,
@@ -171,6 +177,7 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
         throw new SDKError("useOrderbookStream requires a symbol");
     }
     const level = options?.level ?? 10;
+    const padding = options?.padding ?? true;
     const [requestData, setRequestData] = useState(null);
     const [data, setData] = useState(initial);
     const [isLoading, setIsLoading] = useState(true);
@@ -225,7 +232,7 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
             // clean the data;
             setData(INIT_DATA);
         };
-    }, [symbol, depth]);
+    }, [symbol]);
     // const {data:markPrices} = useMarkPricesStream();
     const { data: markPrice } = useMarkPrice(symbol);
     useEffect(() => {
@@ -279,17 +286,17 @@ export const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
     useEffect(() => {
         prevMiddlePrice.current = middlePrice;
     }, [middlePrice]);
-    const reducedData = reduceOrderbook(depth, level, {
+    const reducedData = reduceOrderbook(depth, level, padding, {
         asks: [...data.asks],
         bids: [...data.bids],
     });
     // emit the asks0 and bids0
     useEffect(() => {
         eventEmitter.emit("orderbook:update", [
-            reducedData.asks[0][0],
-            reducedData.bids[0][0],
+            reducedData.asks?.[0]?.[0],
+            reducedData.bids?.[0]?.[0],
         ]);
-    }, [reducedData.asks[0][0], reducedData.bids[0][0]]);
+    }, [reducedData.asks?.[0]?.[0], reducedData.bids?.[0]?.[0]]);
     return [
         {
             asks: reducedData.asks.slice(-level),

package/esm/orderly/usePositionStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YACnB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}
+{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}

package/esm/orderly/usePositionStream.js

@@ -9,7 +9,11 @@ import { pathOr, propOr } from "ramda";
 import { parseHolding } from "../utils/parseHolding";
 import { zero } from "@orderly.network/utils";
 import { useMarketsStream } from "./useMarketsStream";
-export const usePositionStream = (symbol, options) => {
+export const usePositionStream = (
+/**
+ * If symbol is passed, only the position of that symbol will be returned.
+ */
+symbol, options) => {
     const symbolInfo = useSymbolsInfo();
     const { data: accountInfo } = usePrivateQuery("/v1/client/info");
     const { data: holding } = usePrivateQuery("/v1/client/holding", {

package/esm/useWS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWS.d.ts","sourceRoot":"","sources":["../src/useWS.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAO1C,eAAO,MAAM,KAAK,UAoDjB,CAAC"}
+{"version":3,"file":"useWS.d.ts","sourceRoot":"","sources":["../src/useWS.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAO1C,eAAO,MAAM,KAAK,UAyDjB,CAAC"}

package/esm/useWS.js

@@ -7,6 +7,7 @@ import { OrderlyContext } from "./orderlyContext";
 const WS_NAME = "nativeWebsocketClient";
 export const useWS = () => {
     const { configStore } = useContext(OrderlyContext);
+    // const prevAccountState = useRef<AccountState | null>(null);
     const ws = useConstant(() => {
         let websocketClient = SimpleDI.get(WS_NAME);
         const account = SimpleDI.get(Account.instanceName);
@@ -29,11 +30,14 @@ export const useWS = () => {
             }
             // open the pirvate websocket when user login
             account.on("change:status", (nextState) => {
-                //
                 if (nextState.status === AccountStatusEnum.EnableTrading &&
                     nextState.accountId) {
                     websocketClient.openPrivate(nextState.accountId);
                 }
+                else {
+                    websocketClient.closePrivate(1000, "switch account");
+                }
+                // prevAccountState.current = nextState;
             });
             if (typeof window !== "undefined") {
                 window["__Orderly_WS"] = websocketClient;

package/esm/utils/createOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createOrder.d.ts","sourceRoot":"","sources":["../../src/utils/createOrder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createOrder.d.ts","sourceRoot":"","sources":["../../src/utils/createOrder.ts"],"names":[],"mappings":"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"}

package/esm/utils/createOrder.js

@@ -182,6 +182,8 @@ export class StopLimitOrderCreator extends LimitOrderCreator {
         delete order["order_quantity"];
         delete order["order_price"];
         // @ts-ignore
+        delete order["order_type"];
+        // @ts-ignore
         delete order["isStopOrder"];
         delete order['total'];
         return order;
@@ -240,17 +242,19 @@ export class StopMarketOrderCreator extends LimitOrderCreator {
     create(values, _) {
         const result = {
             ...this.baseOrder(values),
-            order_price: values.order_price,
+            // order_price: values.order_price,
             trigger_price: values.trigger_price,
             algo_type: "STOP",
             type: "MARKET",
             quantity: values["order_quantity"],
-            price: values["order_price"],
+            // price: values["order_price"],
             trigger_price_type: "MARK_PRICE",
         };
         delete result["order_quantity"];
         delete result["order_price"];
         // @ts-ignore
+        delete result["order_type"];
+        // @ts-ignore
         delete result["isStopOrder"];
         delete result['total'];
         console.log("result is", result);

package/esm/utils/orderEntryHelper.d.ts

@@ -13,6 +13,7 @@ type orderEntryInputs = [
 type orderEntryInputHandle = (inputs: orderEntryInputs) => orderEntryInputs;
 export declare const cleanStringStyle: (str: string | number) => string;
 export declare function baseInputHandle(inputs: orderEntryInputs): orderEntryInputs;
+export declare function orderTypeHandle(inputs: orderEntryInputs): orderEntryInputs;
 /**
  * digital precision processing
  * @param inputs

package/esm/utils/orderEntryHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orderEntryHelper.d.ts","sourceRoot":"","sources":["../../src/utils/orderEntryHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAGhE,MAAM,MAAM,cAAc,GAAG,MAAM,WAAW,GAAG,MAAM,CAAC;AAGxD,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,WAAW,CAAC;IAEpB,MAAM,WAAW;IACjB,GAAG;IACH,MAAM;IACN;QACE,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB;CACF,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,gBAAgB,CAAC;AAU5E,eAAO,MAAM,gBAAgB,QAAS,MAAM,GAAG,MAAM,KAAG,MAavD,CAAC;AAEF,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CA0B1E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kDA8B1E;AA2KD,eAAO,MAAM,mBAAmB,cACnB,MAAM,KAChB,qBAcF,CAAC"}
+{"version":3,"file":"orderEntryHelper.d.ts","sourceRoot":"","sources":["../../src/utils/orderEntryHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAGhE,MAAM,MAAM,cAAc,GAAG,MAAM,WAAW,GAAG,MAAM,CAAC;AAGxD,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,WAAW,CAAC;IAEpB,MAAM,WAAW;IACjB,GAAG;IACH,MAAM;IACN;QACE,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB;CACF,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,gBAAgB,CAAC;AAU5E,eAAO,MAAM,gBAAgB,QAAS,MAAM,GAAG,MAAM,KAAG,MAavD,CAAC;AAEF,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CA0B1E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAU1E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kDA8B1E;AA2KD,eAAO,MAAM,mBAAmB,cACnB,MAAM,KAChB,qBAgBF,CAAC"}

package/esm/utils/orderEntryHelper.js

@@ -43,6 +43,15 @@ export function baseInputHandle(inputs) {
     ];
     //   return [values, input, value, markPrice];
 }
+export function orderTypeHandle(inputs) {
+    const [values, input, value, markPrice, config] = inputs;
+    if (value === OrderType.LIMIT || value === OrderType.STOP_LIMIT) {
+        if (values.order_price === "") {
+            values.total = "";
+        }
+    }
+    return [values, input, value, markPrice, config];
+}
 /**
  * digital precision processing
  * @param inputs
@@ -216,6 +225,8 @@ function otherInputHandle(inputs) {
 }
 export const getCalculateHandler = (fieldName) => {
     switch (fieldName) {
+        case "order_type":
+            return orderTypeHandle;
         case "order_quantity": {
             return quantityInputHandle;
         }

package/esm/version.d.ts

@@ -5,6 +5,6 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.4-experimental.0";
+declare const _default: "1.1.4-experimental.2";
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/esm/version.js

@@ -1,6 +1,6 @@
 if (typeof window !== 'undefined') {
     window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.4-experimental.0";
+    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.4-experimental.2";
 }
 ;
-export default "1.1.4-experimental.0";
+export default "1.1.4-experimental.2";

package/lib/index.d.ts

@@ -11,6 +11,7 @@ export { usePreLoadData } from "./usePreloadData";
 export { useEventEmitter } from "./useEventEmitter";
 export { useSessionStorage } from "./useSessionStorage";
 export { useLocalStorage } from "./useLocalStorage";
+export { parseJSON } from "./utils/json";
 export { default as useConstant } from "use-constant";
 export { useWS } from "./useWS";
 export { useConfig } from "./useConfig";

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAEvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EACL,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAElC,cAAc,wBAAwB,CAAC;AAGvC,OAAO,MAAM,EAAE,EAAE,KAAK,gBAAgB,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,gBAAgB,EAAE,CAAC;AAEpD,cAAc,cAAc,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,cAAc,wBAAwB,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC"}

package/lib/index.js

@@ -29,7 +29,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanStringStyle = exports.useMediaQuery = exports.SWRConfig = exports.useSWR = exports.useWalletConnector = exports.WalletConnectorContext = exports.OrderlyConfigProvider = exports.WsNetworkStatus = exports.useWsStatus = exports.useConfig = exports.useWS = exports.useConstant = exports.useLocalStorage = exports.useSessionStorage = exports.useEventEmitter = exports.usePreLoadData = exports.useAccountInstance = exports.useAccount = exports.useBoolean = exports.usePrivateInfiniteQuery = exports.usePrivateQuery = exports.useMutation = exports.useLazyQuery = exports.useQuery = exports.version = void 0;
+exports.cleanStringStyle = exports.useMediaQuery = exports.SWRConfig = exports.useSWR = exports.useWalletConnector = exports.WalletConnectorContext = exports.OrderlyConfigProvider = exports.WsNetworkStatus = exports.useWsStatus = exports.useConfig = exports.useWS = exports.useConstant = exports.parseJSON = exports.useLocalStorage = exports.useSessionStorage = exports.useEventEmitter = exports.usePreLoadData = exports.useAccountInstance = exports.useAccount = exports.useBoolean = exports.usePrivateInfiniteQuery = exports.usePrivateQuery = exports.useMutation = exports.useLazyQuery = exports.useQuery = exports.version = void 0;
 var version_1 = require("./version");
 Object.defineProperty(exports, "version", { enumerable: true, get: function () { return __importDefault(version_1).default; } });
 var useQuery_1 = require("./useQuery");
@@ -56,6 +56,8 @@ var useSessionStorage_1 = require("./useSessionStorage");
 Object.defineProperty(exports, "useSessionStorage", { enumerable: true, get: function () { return useSessionStorage_1.useSessionStorage; } });
 var useLocalStorage_1 = require("./useLocalStorage");
 Object.defineProperty(exports, "useLocalStorage", { enumerable: true, get: function () { return useLocalStorage_1.useLocalStorage; } });
+var json_1 = require("./utils/json");
+Object.defineProperty(exports, "parseJSON", { enumerable: true, get: function () { return json_1.parseJSON; } });
 var use_constant_1 = require("use-constant");
 Object.defineProperty(exports, "useConstant", { enumerable: true, get: function () { return __importDefault(use_constant_1).default; } });
 var useWS_1 = require("./useWS");

package/lib/orderly/useDeposit.d.ts

@@ -28,7 +28,7 @@ export declare const useDeposit: (options?: useDepositOptions) => {
     depositFee: bigint;
     /** enquiring depositFee status on chain */
     depositFeeRevalidating: boolean;
-    approve: (amount?: string) => Promise<any>;
+    approve: (amount?: string) => Promise<void | undefined>;
     deposit: () => Promise<any>;
     fetchBalances: (tokens: API.TokenInfo[]) => Promise<void>;
     fetchBalance: (address: string, decimals?: number) => Promise<string>;

package/lib/orderly/useDeposit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useDeposit.d.ts","sourceRoot":"","sources":["../../src/orderly/useDeposit.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,GAAG,EAMH,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAMhC,MAAM,MAAM,iBAAiB,GAAG;IAE9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,iBAAiB;IAoTlD,gCAAgC;;;;;;;;;;;;;IAOhC,oBAAoB;;IAEpB,qCAAqC;;IAErC,2CAA2C;;uBA3H3B,MAAM;;4BAjGyB,IAAI,SAAS,EAAE;4BAvC9C,MAAM,aAAa,MAAM;IAyQzC,yBAAyB;;CAG5B,CAAC"}
+{"version":3,"file":"useDeposit.d.ts","sourceRoot":"","sources":["../../src/orderly/useDeposit.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,GAAG,EAMH,SAAS,EAEV,MAAM,wBAAwB,CAAC;AAMhC,MAAM,MAAM,iBAAiB,GAAG;IAE9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,eAAO,MAAM,UAAU,aAAc,iBAAiB;IA4TlD,gCAAgC;;;;;;;;;;;;;IAOhC,oBAAoB;;IAEpB,qCAAqC;;IAErC,2CAA2C;;uBApI3B,MAAM;;4BAhGyB,IAAI,SAAS,EAAE;4BAvC9C,MAAM,aAAa,MAAM;IAiRzC,yBAAyB;;CAG5B,CAAC"}

package/lib/orderly/useDeposit.js

@@ -162,22 +162,33 @@ const useDeposit = (options) => {
         return account.assetsManager
             .approve(options.address, amount)
             .then((result) => {
-            if (typeof amount !== "undefined") {
-                setAllowance((value) => new utils_1.Decimal(value).add(amount || types_1.MaxUint256.toString()).toString());
-            }
-            return result;
+            return account.walletClient
+                ?.pollTransactionReceiptWithBackoff(result.hash)
+                .then((receipt) => {
+                if (receipt.status === 1) {
+                    account.assetsManager
+                        .getAllowance(options.address)
+                        .then((allowance) => {
+                        setAllowance(() => allowance);
+                    });
+                }
+            });
         });
-    }, [account, getAllowance, options?.address]);
+    }, [account, getAllowance, options, dst]);
     const deposit = (0, react_1.useCallback)(async () => {
         // only support orderly deposit
         return account.assetsManager
             .deposit(quantity, depositFee)
             .then((res) => {
-            setAllowance((value) => new utils_1.Decimal(value).sub(quantity).toString());
+            account.assetsManager
+                .getAllowance(options?.address)
+                .then((allowance) => {
+                setAllowance(() => allowance);
+            });
             setBalance((value) => new utils_1.Decimal(value).sub(quantity).toString());
             return res;
         });
-    }, [account, fetchBalance, getAllowance, quantity, depositFee]);
+    }, [account, fetchBalance, quantity, depositFee]);
     const loopGetBalance = async () => {
         getBalanceListener.current && clearTimeout(getBalanceListener.current);
         getBalanceListener.current = setTimeout(async () => {

package/lib/orderly/useOrderEntry.d.ts

@@ -35,20 +35,29 @@ export type UseOrderEntryReturn = {
     metaState: UseOrderEntryMetaState;
     symbolConfig: API.SymbolExt;
 };
-export type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">> & {};
+export type OrderParams = Required<Pick<OrderEntity, "side" | "order_type" | "symbol">> & Partial<Omit<OrderEntity, "side" | "symbol" | "order_type">>;
 /**
  * Create Order
  * @example
  * ```tsx
+ * import { useOrderEntry } from "@orderly.network/hooks";
+ * import {OrderSide, OrderType} from '@orderly.network/types';
+ *
  * const { formattedOrder, onSubmit, helper } = useOrderEntry({
  *  symbol: "PERP_ETH_USDC",
  *  side: OrderSide.BUY,
  *  order_type: OrderType.LIMIT,
  *  order_price: 10000,
  *  order_quantity: 1,
+ * },{
+ *  // **Note:** it's required
+ *  watchOrderbook: true,
  * });
  * ```
  */
 export declare function useOrderEntry(order: OrderParams, options?: UseOrderEntryOptions): UseOrderEntryReturn;
+/**
+ * @deprecated
+ */
 export declare function useOrderEntry(symbol: string, side: OrderSide, reduceOnly: boolean): UseOrderEntryReturn;
 //# sourceMappingURL=useOrderEntry.d.ts.map

package/lib/orderly/useOrderEntry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderEntry.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderEntry.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,WAAW,EACX,SAAS,EAGV,MAAM,wBAAwB,CAAC;AAkBhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,WAAW,KACd;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,MAAM;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EACF;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE;KAAE,GAChE,IAAI,GACJ,SAAS,CAAC;IACd,KAAK,EAAE;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAIF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,EAAE;QACN,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5B,KAAK,EAAE,MAAM,WAAW,EACxB,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC;KAGlD,CAAC;IAEF,SAAS,EAAE,sBAAsB,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC,CACpD,GACC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC,GAAG,EAE9D,CAAC;AAEJ;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,mBAAmB,CAAC;AACvB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,OAAO,GAClB,mBAAmB,CAAC"}
+{"version":3,"file":"useOrderEntry.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderEntry.ts"],"names":[],"mappings":"AACA,OAAO,EACL,GAAG,EACH,WAAW,EACX,SAAS,EAGV,MAAM,wBAAwB,CAAC;AAkBhC,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,EAAE,CACT,IAAI,EAAE,WAAW,KACd;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,MAAM;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EACF;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,CAAA;SAAE;KAAE,GAChE,IAAI,GACJ,SAAS,CAAC;IACd,KAAK,EAAE;SAAG,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE,OAAO;KAAE,GAAG,IAAI,GAAG,SAAS,CAAC;IACjE,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAEhC,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5B,QAAQ,EAAE,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/C,MAAM,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAEnC,UAAU,EAAE,OAAO,CAAC;IACpB,cAAc,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IACrC,MAAM,EAAE;QACN,SAAS,EAAE,CACT,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,EAC5B,KAAK,EAAE,MAAM,WAAW,EACxB,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,WAAW,CAAC,CAAC;QAC1B,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC;KAGlD,CAAC;IAEF,SAAS,EAAE,sBAAsB,CAAC;IAClC,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,YAAY,GAAG,QAAQ,CAAC,CACpD,GACC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC;AAE/D;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,mBAAmB,CAAC;AACvB;;GAEG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,SAAS,EACf,UAAU,EAAE,OAAO,GAClB,mBAAmB,CAAC"}

package/lib/orderly/useOrderEntry.js

@@ -15,10 +15,11 @@ const useMarkPrice_1 = require("./useMarkPrice");
 const perp_1 = require("@orderly.network/perp");
 const useEventEmitter_1 = require("../useEventEmitter");
 const use_debounce_1 = require("use-debounce");
-const TIEMSTAMP = "timestamp";
 function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
-    // console.log("+++++++", symbolOrOrder);
+    // if symbolOrOrder is string, then it's deprecated
+    let isNewVersion = false;
     if (typeof symbolOrOrder === "object") {
+        isNewVersion = true;
         if (!symbolOrOrder.symbol) {
             throw new types_1.SDKError("symbol is required");
         }
@@ -28,21 +29,12 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
         if (!symbolOrOrder.order_type) {
             throw new types_1.SDKError("order_type is required");
         }
-        // if (typeof symbolOrOrder[TIEMSTAMP] === "undefined") {
-        //   console.warn(
-        //     "The timestamp is not set, the order status may be out of sync."
-        //   );
-        // }
-        // add timestamp to order, fix the issue of the same order
-        // symbolOrOrder[TIEMSTAMP] = Date.now();
     }
-    // console.log("+++++++", symbolOrOrder);
     const prevOrderData = (0, react_1.useRef)(null);
     // Cache data from the last calculate
     const orderDataCache = (0, react_1.useRef)(null);
     //
     const notSupportData = (0, react_1.useRef)({});
-    const [doCreateOrder, { data, error, reset, isMutating }] = (0, useMutation_1.useMutation)(orderDataCache?.current?.isStopOrder ? "/v1/algo/order" : "/v1/order");
     const [errors, setErrors] = (0, react_1.useState)(null);
     const ee = (0, useEventEmitter_1.useEventEmitter)();
     const fieldDirty = (0, react_1.useRef)({});
@@ -189,7 +181,10 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
         needParse?.symbol,
         needParse?.reduce_only,
         needParse?.side,
+        needParse?.visible_quantity,
     ]);
+    const isStopOrder = parsedData?.order_type === types_1.OrderType.STOP_LIMIT || parsedData?.order_type === types_1.OrderType.STOP_MARKET;
+    const [doCreateOrder, { data, error, reset, isMutating }] = (0, useMutation_1.useMutation)(isStopOrder ? "/v1/algo/order" : "/v1/order");
     // const maxQty = 3;
     const createOrder = (values) => {
         if (!values.symbol) {
@@ -343,8 +338,16 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     ]);
     //====== update orderbook ask0/bid0 ======
     (0, react_1.useEffect)(() => {
-        if (!optionsValue?.watchOrderbook)
-            return;
+        if (isNewVersion) {
+            if (!optionsValue?.watchOrderbook) {
+                throw new types_1.SDKError("In order to calculate the estimated liquidation price, the `options.watchOrderbook` parameter must be set to true.");
+            }
+        }
+        else {
+            if (!optionsValue?.watchOrderbook) {
+                return;
+            }
+        }
         ee.on("orderbook:update", onOrderbookUpdate);
         return () => {
             ee.off("orderbook_update", onOrderbookUpdate);
@@ -357,8 +360,12 @@ function useOrderEntry(symbolOrOrder, sideOrOptions, reduceOnly, options) {
     const getPriceAndQty = (symbolOrOrder) => {
         let quantity = Number(symbolOrOrder.order_quantity);
         const orderPrice = Number(symbolOrOrder.order_price);
-        if (isNaN(quantity) || quantity <= 0 || askAndBid.current.length === 0)
+        if (isNaN(quantity) || quantity <= 0) {
             return null;
+        }
+        if (!!options?.watchOrderbook && askAndBid.current.length === 0) {
+            throw new types_1.SDKError("Please check if you are using the `useOrderbookStream` hook or if the orderBook has data.");
+        }
         if ((symbolOrOrder.order_type === types_1.OrderType.LIMIT ||
             symbolOrOrder.order_type === types_1.OrderType.STOP_LIMIT) &&
             isNaN(orderPrice))

package/lib/orderly/useOrderbookStream.d.ts

@@ -9,13 +9,20 @@ export type OrderbookData = {
  * @param level
  * @param data
  */
-export declare const reduceOrderbook: (depth: number | undefined, level: number, data: OrderbookData) => OrderbookData;
+export declare const reduceOrderbook: (depth: number | undefined, level: number, padding: boolean, data: OrderbookData) => OrderbookData;
 export declare const mergeOrderbook: (data: OrderbookData, update: OrderbookData) => {
     asks: OrderBookItem[];
     bids: OrderBookItem[];
 };
+/**
+ * Configuration for the Order Book
+ * @level Indicates the number of data entries to return for ask/bid, default is 10
+ * @padding Whether to fill in when the actual data entries are less than the level. If filled, it will add [nan, nan, nan, nan]
+ *          default is true
+ */
 export type OrderbookOptions = {
     level?: number;
+    padding?: boolean;
 };
 /**
  * @name useOrderbookStream

package/lib/orderly/useOrderbookStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,QACP,aAAa,KAClB,aA+CF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BA0HgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}
+{"version":3,"file":"useOrderbookStream.d.ts","sourceRoot":"","sources":["../../src/orderly/useOrderbookStream.ts"],"names":[],"mappings":"AAUA,MAAM,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAErC,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,aAAa,EAAE,CAAC;IACtB,IAAI,EAAE,aAAa,EAAE,CAAC;CACvB,CAAC;AAyFF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,UACnB,MAAM,GAAG,SAAS,SAClB,MAAM,WACJ,OAAO,QACV,aAAa,KAClB,aAqDF,CAAC;AAgCF,eAAO,MAAM,cAAc,SAAU,aAAa,UAAU,aAAa;;;CAWxE,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAIF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,WACrB,MAAM,YACL,aAAa,YACZ,gBAAgB;;;;;;;;;;;2BA2HgB,MAAM;;;;;;;;;IAmDjD,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC"}

package/lib/orderly/useOrderbookStream.js

@@ -10,7 +10,7 @@ const useSymbolsInfo_1 = require("./useSymbolsInfo");
 const utils_1 = require("@orderly.network/utils");
 const ramda_1 = require("ramda");
 const types_1 = require("@orderly.network/types");
-const paddingFn = (len) => Array(len).fill([Number.NaN, Number.NaN, Number.NaN]);
+const paddingFn = (len) => Array(len).fill([Number.NaN, Number.NaN, Number.NaN, Number.NaN]);
 const asksSortFn = (a, b) => a[0] - b[0];
 const bidsSortFn = (a, b) => b[0] - a[0];
 // const commonSortFn = (a: OrderBookItem, b: OrderBookItem) => b[0] - a[0];
@@ -81,28 +81,37 @@ const reduceItems = (depth, level, data, asks = false) => {
  * @param level
  * @param data
  */
-const reduceOrderbook = (depth, level, data) => {
+const reduceOrderbook = (depth, level, padding, data) => {
     let asks = reduceItems(depth, level, data.asks, true);
     let bids = reduceItems(depth, level, data.bids);
     /// not empty and asks.price <= bids.price
     if (asks.length !== 0 && bids.length !== 0 && asks[0][0] <= bids[0][0]) {
         if (asks.length === 1) {
-            const [price, qty, newQuantity] = asks[0];
+            const [price, qty, newQuantity, newAmount] = asks[0];
             asks.shift();
-            asks.push([price + (depth === undefined ? 0 : depth), qty, newQuantity]);
+            asks.push([price + (depth === undefined ? 0 : depth), qty, newQuantity, newAmount]);
         }
         else {
             const [bidPrice] = bids[0];
             while (asks.length > 0) {
-                const [askPrice, askQty, newQuantity] = asks[0];
+                const [askPrice, askQty, newQuantity, newAmount] = asks[0];
                 if (askPrice <= bidPrice) {
+                    // console.log("xxxxxxxxxxx reset ask list begin", [...asks], { ...asks[0] });
                     asks.shift();
+                    // let logStr = "";
                     for (let index = 0; index < asks.length; index++) {
                         if (index === 0) {
-                            asks[index][1] += askQty;
+                            const quantity = asks[index][1] + askQty;
+                            asks[index][1] = quantity;
+                            asks[index][2] = quantity;
+                            asks[index][3] += newAmount;
                         }
-                        asks[index][2] += newQuantity;
+                        else {
+                            asks[index][3] += newAmount;
+                        }
+                        // logStr += `index: ${index} ${asks[index]}\n`;
                     }
+                    // console.log("xxxxxxxxxxx reset ask list end", logStr);
                 }
                 else {
                     break;
@@ -111,15 +120,12 @@ const reduceOrderbook = (depth, level, data) => {
         }
     }
     asks = asks.reverse();
-    asks =
-        asks.length < level ? paddingFn(level - asks.length).concat(asks) : asks;
-    bids =
-        bids.length < level ? bids.concat(paddingFn(level - bids.length)) : bids;
-    // add max qty for asks/bids
-    // let maxAskQty = asks.reduce((a,b) => Math.max(a, b[1]),0);
-    // let maxBidQty = bids.reduce((a,b) => Math.max(a, b[1]),0);
-    // asks = asks.map((item) => [...item, maxAskQty]);
-    // bids = bids.map((item) => [...item, maxBidQty]);
+    if (padding) {
+        asks =
+            asks.length < level ? paddingFn(level - asks.length).concat(asks) : asks;
+        bids =
+            bids.length < level ? bids.concat(paddingFn(level - bids.length)) : bids;
+    }
     return {
         asks: asks,
         bids: bids,
@@ -176,6 +182,7 @@ const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
         throw new types_1.SDKError("useOrderbookStream requires a symbol");
     }
     const level = options?.level ?? 10;
+    const padding = options?.padding ?? true;
     const [requestData, setRequestData] = (0, react_1.useState)(null);
     const [data, setData] = (0, react_1.useState)(initial);
     const [isLoading, setIsLoading] = (0, react_1.useState)(true);
@@ -230,7 +237,7 @@ const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
             // clean the data;
             setData(INIT_DATA);
         };
-    }, [symbol, depth]);
+    }, [symbol]);
     // const {data:markPrices} = useMarkPricesStream();
     const { data: markPrice } = (0, useMarkPrice_1.useMarkPrice)(symbol);
     (0, react_1.useEffect)(() => {
@@ -284,17 +291,17 @@ const useOrderbookStream = (symbol, initial = INIT_DATA, options) => {
     (0, react_1.useEffect)(() => {
         prevMiddlePrice.current = middlePrice;
     }, [middlePrice]);
-    const reducedData = (0, exports.reduceOrderbook)(depth, level, {
+    const reducedData = (0, exports.reduceOrderbook)(depth, level, padding, {
         asks: [...data.asks],
         bids: [...data.bids],
     });
     // emit the asks0 and bids0
     (0, react_1.useEffect)(() => {
         eventEmitter.emit("orderbook:update", [
-            reducedData.asks[0][0],
-            reducedData.bids[0][0],
+            reducedData.asks?.[0]?.[0],
+            reducedData.bids?.[0]?.[0],
         ]);
-    }, [reducedData.asks[0][0], reducedData.bids[0][0]]);
+    }, [reducedData.asks?.[0]?.[0], reducedData.bids?.[0]?.[0]]);
     return [
         {
             asks: reducedData.asks.slice(-level),

package/lib/orderly/usePositionStream.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YACnB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}
+{"version":3,"file":"usePositionStream.d.ts","sourceRoot":"","sources":["../../src/orderly/usePositionStream.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,KAAK,CAAC;AAI5C,OAAO,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK/D,OAAO,EAAE,OAAO,EAAQ,MAAM,wBAAwB,CAAC;AAIvD,KAAK,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC;AAE3C,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,CACL,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,YAAY,GAAG,aAAa,GAAG,MAAM,CAAC,KAC5D,IAAI,CAAC;CACX;AAED,eAAO,MAAM,iBAAiB,YAInB,MAAM,YACL,gBAAgB,GAAG;IAAE,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE;;;;;;;;;;EAiRtD,CAAC;AAEF,eAAO,MAAM,yBAAyB,sBAIpC,CAAC"}

package/lib/orderly/usePositionStream.js

@@ -12,7 +12,11 @@ const ramda_1 = require("ramda");
 const parseHolding_1 = require("../utils/parseHolding");
 const utils_1 = require("@orderly.network/utils");
 const useMarketsStream_1 = require("./useMarketsStream");
-const usePositionStream = (symbol, options) => {
+const usePositionStream = (
+/**
+ * If symbol is passed, only the position of that symbol will be returned.
+ */
+symbol, options) => {
     const symbolInfo = (0, useSymbolsInfo_1.useSymbolsInfo)();
     const { data: accountInfo } = (0, usePrivateQuery_1.usePrivateQuery)("/v1/client/info");
     const { data: holding } = (0, usePrivateQuery_1.usePrivateQuery)("/v1/client/holding", {

package/lib/useWS.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useWS.d.ts","sourceRoot":"","sources":["../src/useWS.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAO1C,eAAO,MAAM,KAAK,UAoDjB,CAAC"}
+{"version":3,"file":"useWS.d.ts","sourceRoot":"","sources":["../src/useWS.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAO1C,eAAO,MAAM,KAAK,UAyDjB,CAAC"}

package/lib/useWS.js

@@ -13,6 +13,7 @@ const orderlyContext_1 = require("./orderlyContext");
 const WS_NAME = "nativeWebsocketClient";
 const useWS = () => {
     const { configStore } = (0, react_1.useContext)(orderlyContext_1.OrderlyContext);
+    // const prevAccountState = useRef<AccountState | null>(null);
     const ws = (0, use_constant_1.default)(() => {
         let websocketClient = core_1.SimpleDI.get(WS_NAME);
         const account = core_1.SimpleDI.get(core_1.Account.instanceName);
@@ -35,11 +36,14 @@ const useWS = () => {
             }
             // open the pirvate websocket when user login
             account.on("change:status", (nextState) => {
-                //
                 if (nextState.status === types_1.AccountStatusEnum.EnableTrading &&
                     nextState.accountId) {
                     websocketClient.openPrivate(nextState.accountId);
                 }
+                else {
+                    websocketClient.closePrivate(1000, "switch account");
+                }
+                // prevAccountState.current = nextState;
             });
             if (typeof window !== "undefined") {
                 window["__Orderly_WS"] = websocketClient;

package/lib/utils/createOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createOrder.d.ts","sourceRoot":"","sources":["../../src/utils/createOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,GAAG,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAK1E,MAAM,MAAM,YAAY,GAAG;KACxB,CAAC,IAAI,MAAM,WAAW,CAAC,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;CAC7D,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,IAAI,CAChC,WAAW,EACX,aAAa,GAAG,gBAAgB,GAAG,OAAO,CAC3C,CAAC;AAEF,KAAK,eAAe,GAAG;IAErB,MAAM,EAAE,GAAG,CAAC,SAAS,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,KAAK,WAAW,CAAC;IACvE,QAAQ,EAAE,CACR,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,KACrB,OAAO,CAAC,YAAY,CAAC,CAAC;CAC5B;AAID,8BAAsB,gBAAiB,YAAW,YAAY;IAC5D,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,WAAW;IAC1E,QAAQ,CAAC,QAAQ,CACf,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,YAAY,CAAC;IAExB,SAAS,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW;IAsBzC,YAAY,CACV,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC;IAqExB,gBAAgB,CACd,KAAK,EAAE,OAAO,CAAC,WAAW,CAAC,EAC3B,MAAM,EAAE,eAAe,GACtB,WAAW;CAaf;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;IACrD,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,WAAW;IAgBjE,QAAQ,CACN,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,YAAY,CAAC;CAuDzB;AAED,qBAAa,kBAAmB,SAAQ,gBAAgB;IACtD,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IAYxC,QAAQ,CACN,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC;CAGzB;AAED,qBAAa,oBAAqB,SAAQ,iBAAiB;CAAI;AAE/D,qBAAa,eAAgB,SAAQ,iBAAiB;CAAI;AAC1D,qBAAa,eAAgB,SAAQ,iBAAiB;CAAI;AAE1D,qBAAa,qBAAsB,SAAQ,iBAAiB;IAC1D,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,eAAe,GAAG,WAAW;IAoBjE,QAAQ,CACN,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,YAAY,CAAC;CA+DzB;AACD,qBAAa,sBAAuB,SAAQ,iBAAiB;IAC3D,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC,EAAE,eAAe,GAAG,WAAW;IAoB5D,QAAQ,CACN,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,YAAY,CAAC;CAgBzB;AAED,qBAAa,mBAAoB,SAAQ,gBAAgB;IACvD,MAAM,CAAC,IAAI,EAAE,WAAW,GAAG,WAAW;IAOtC,QAAQ,CACN,MAAM,EAAE,eAAe,EACvB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,YAAY,CAAC;CAGzB;AAED,eAAO,MAAM,mBAAmB,aAQ/B,CAAC;AAEF,qBAAa,YAAY;IACvB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,GAAG,YAAY,GAAG,IAAI;CA0BpD"}
+{"version":3,"file":"createOrder.d.ts","sourceRoot":"","sources":["../../src/utils/createOrder.ts"],"names":[],"mappings":"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"}

package/lib/utils/createOrder.js

@@ -191,6 +191,8 @@ class StopLimitOrderCreator extends LimitOrderCreator {
         delete order["order_quantity"];
         delete order["order_price"];
         // @ts-ignore
+        delete order["order_type"];
+        // @ts-ignore
         delete order["isStopOrder"];
         delete order['total'];
         return order;
@@ -250,17 +252,19 @@ class StopMarketOrderCreator extends LimitOrderCreator {
     create(values, _) {
         const result = {
             ...this.baseOrder(values),
-            order_price: values.order_price,
+            // order_price: values.order_price,
             trigger_price: values.trigger_price,
             algo_type: "STOP",
             type: "MARKET",
             quantity: values["order_quantity"],
-            price: values["order_price"],
+            // price: values["order_price"],
             trigger_price_type: "MARK_PRICE",
         };
         delete result["order_quantity"];
         delete result["order_price"];
         // @ts-ignore
+        delete result["order_type"];
+        // @ts-ignore
         delete result["isStopOrder"];
         delete result['total'];
         console.log("result is", result);

package/lib/utils/orderEntryHelper.d.ts

@@ -13,6 +13,7 @@ type orderEntryInputs = [
 type orderEntryInputHandle = (inputs: orderEntryInputs) => orderEntryInputs;
 export declare const cleanStringStyle: (str: string | number) => string;
 export declare function baseInputHandle(inputs: orderEntryInputs): orderEntryInputs;
+export declare function orderTypeHandle(inputs: orderEntryInputs): orderEntryInputs;
 /**
  * digital precision processing
  * @param inputs

package/lib/utils/orderEntryHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orderEntryHelper.d.ts","sourceRoot":"","sources":["../../src/utils/orderEntryHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAGhE,MAAM,MAAM,cAAc,GAAG,MAAM,WAAW,GAAG,MAAM,CAAC;AAGxD,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,WAAW,CAAC;IAEpB,MAAM,WAAW;IACjB,GAAG;IACH,MAAM;IACN;QACE,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB;CACF,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,gBAAgB,CAAC;AAU5E,eAAO,MAAM,gBAAgB,QAAS,MAAM,GAAG,MAAM,KAAG,MAavD,CAAC;AAEF,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CA0B1E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kDA8B1E;AA2KD,eAAO,MAAM,mBAAmB,cACnB,MAAM,KAChB,qBAcF,CAAC"}
+{"version":3,"file":"orderEntryHelper.d.ts","sourceRoot":"","sources":["../../src/utils/orderEntryHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAa,MAAM,wBAAwB,CAAC;AAGhE,MAAM,MAAM,cAAc,GAAG,MAAM,WAAW,GAAG,MAAM,CAAC;AAGxD,KAAK,gBAAgB,GAAG;IACtB,OAAO,CAAC,WAAW,CAAC;IAEpB,MAAM,WAAW;IACjB,GAAG;IACH,MAAM;IACN;QACE,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB;CACF,CAAC;AAEF,KAAK,qBAAqB,GAAG,CAAC,MAAM,EAAE,gBAAgB,KAAK,gBAAgB,CAAC;AAU5E,eAAO,MAAM,gBAAgB,QAAS,MAAM,GAAG,MAAM,KAAG,MAavD,CAAC;AAEF,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CA0B1E;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,CAU1E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kDA8B1E;AA2KD,eAAO,MAAM,mBAAmB,cACnB,MAAM,KAChB,qBAgBF,CAAC"}

package/lib/utils/orderEntryHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCalculateHandler = exports.orderEntityFormatHandle = exports.baseInputHandle = exports.cleanStringStyle = void 0;
+exports.getCalculateHandler = exports.orderEntityFormatHandle = exports.orderTypeHandle = exports.baseInputHandle = exports.cleanStringStyle = void 0;
 const types_1 = require("@orderly.network/types");
 const utils_1 = require("@orderly.network/utils");
 const needNumberOnlyFields = [
@@ -48,6 +48,16 @@ function baseInputHandle(inputs) {
     //   return [values, input, value, markPrice];
 }
 exports.baseInputHandle = baseInputHandle;
+function orderTypeHandle(inputs) {
+    const [values, input, value, markPrice, config] = inputs;
+    if (value === types_1.OrderType.LIMIT || value === types_1.OrderType.STOP_LIMIT) {
+        if (values.order_price === "") {
+            values.total = "";
+        }
+    }
+    return [values, input, value, markPrice, config];
+}
+exports.orderTypeHandle = orderTypeHandle;
 /**
  * digital precision processing
  * @param inputs
@@ -222,6 +232,8 @@ function otherInputHandle(inputs) {
 }
 const getCalculateHandler = (fieldName) => {
     switch (fieldName) {
+        case "order_type":
+            return orderTypeHandle;
         case "order_quantity": {
             return quantityInputHandle;
         }

package/lib/version.d.ts

@@ -5,6 +5,6 @@ declare global {
         };
     }
 }
-declare const _default: "1.1.4-experimental.0";
+declare const _default: "1.1.4-experimental.2";
 export default _default;
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 if (typeof window !== 'undefined') {
     window.__ORDERLY_VERSION__ = window.__ORDERLY_VERSION__ || {};
-    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.4-experimental.0";
+    window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "1.1.4-experimental.2";
 }
 ;
-exports.default = "1.1.4-experimental.0";
+exports.default = "1.1.4-experimental.2";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orderly.network/hooks",
-  "version": "1.1.4-experimental.0",
+  "version": "1.1.4-experimental.2",
   "description": "",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -27,19 +27,18 @@
     "tsup": "^7.1.0",
     "typedoc": "^0.24.8",
     "typescript": "^5.1.6",
-    "tsconfig": "0.1.4-experimental.0"
+    "tsconfig": "0.1.4-experimental.2"
   },
   "dependencies": {
-    "@layerzerolabs/scan-client": "^0.0.6",
     "ramda": "^0.29.0",
     "swr": "^2.2.4",
     "use-constant": "^1.1.1",
     "use-debounce": "^9.0.4",
-    "@orderly.network/net": "1.1.4-experimental.0",
-    "@orderly.network/perp": "2.0.4-experimental.0",
-    "@orderly.network/utils": "0.1.4-experimental.0",
-    "@orderly.network/types": "0.2.4-experimental.0",
-    "@orderly.network/core": "0.2.4-experimental.0"
+    "@orderly.network/net": "1.1.4-experimental.2",
+    "@orderly.network/core": "0.2.4-experimental.2",
+    "@orderly.network/utils": "0.1.4-experimental.2",
+    "@orderly.network/types": "0.2.4-experimental.2",
+    "@orderly.network/perp": "2.0.4-experimental.2"
   },
   "publishConfig": {
     "access": "public"