@orderly.network/hooks 0.0.28 → 0.0.30

package/dist/index.d.mts

@@ -225,7 +225,7 @@ declare const useOrderStream: ({ status, symbol, side, size, }?: {
 } | null)[];
 
 interface MarketTradeStreamOptions {
-    level?: number;
+    limit?: number;
 }
 declare const useMarketTradeStream: (symbol: string, options?: MarketTradeStreamOptions) => {
     data: API.Trade[];
@@ -249,7 +249,10 @@ declare const useCollateral: (options?: Options) => CollateralOutputs;
 
 declare const useMaxQty: (symbol: string, side: OrderSide, reduceOnly?: boolean) => number;
 
-declare const useMarginRatio: () => number[];
+declare const useMarginRatio: () => {
+    marginRatio: number;
+    currentLeverage: number;
+};
 
 type inputOptions = {
     filter?: (item: API.Chain) => boolean;

package/dist/index.d.ts

@@ -225,7 +225,7 @@ declare const useOrderStream: ({ status, symbol, side, size, }?: {
 } | null)[];
 
 interface MarketTradeStreamOptions {
-    level?: number;
+    limit?: number;
 }
 declare const useMarketTradeStream: (symbol: string, options?: MarketTradeStreamOptions) => {
     data: API.Trade[];
@@ -249,7 +249,10 @@ declare const useCollateral: (options?: Options) => CollateralOutputs;
 
 declare const useMaxQty: (symbol: string, side: OrderSide, reduceOnly?: boolean) => number;
 
-declare const useMarginRatio: () => number[];
+declare const useMarginRatio: () => {
+    marginRatio: number;
+    currentLeverage: number;
+};
 
 type inputOptions = {
     filter?: (item: API.Chain) => boolean;

package/dist/index.js

@@ -444,7 +444,6 @@ function useLocalStorage(key, initialValue) {
     },
     [storedValue]
   );
-  console.log("storedValue", storedValue);
   React2.useEffect(() => {
     setStoredValue(readValue());
   }, []);
@@ -681,6 +680,7 @@ var reduceOrderbook = (depth, level, data) => {
 var mergeItems = (data, update) => {
   if (data.length === 0)
     return update;
+  data = data.filter(([price]) => !isNaN(price));
   while (update.length > 0) {
     const item = update.shift();
     if (item) {
@@ -733,6 +733,7 @@ var useOrderbookStream = (symbol, initial = { asks: [], bids: [] }, options) =>
     ws.onceSubscribe(
       {
         event: "request",
+        id: `${symbol}@orderbook`,
         params: {
           type: "orderbook",
           symbol
@@ -888,10 +889,10 @@ function quantityInputHandle(inputs) {
     price = Number(values.order_price);
   }
   const total = quantity.mul(price);
-  const totalDP = total.dp();
+  total.dp();
   return [
     __spreadProps(__spreadValues({}, values), {
-      total: total.todp(Math.min(config.quoteDP, totalDP)).toNumber()
+      total: total.todp(2).toNumber()
     }),
     input,
     value,
@@ -1808,29 +1809,48 @@ var useMarketTradeStream = (symbol, options = {}) => {
     throw new Error("useTradeStream: symbol is required");
   }
   const [trades, setTrades] = React2.useState([]);
-  const { level = 20 } = options;
-  const { isLoading } = useQuery(
-    `/v1/public/market_trades?symbol=${symbol}&limit=${level}`,
-    {
-      onSuccess: (data) => {
-        if (Array.isArray(data)) {
+  const [isLoading, setIsLoading] = React2.useState(false);
+  const { limit = 50 } = options;
+  const ws = useWS();
+  React2.useEffect(() => {
+    setIsLoading(true);
+    setTrades(() => []);
+    ws.onceSubscribe(
+      {
+        id: `${symbol}@trade`,
+        event: "request",
+        params: {
+          type: "trade",
+          symbol,
+          limit
+        }
+      },
+      {
+        onMessage: (data) => {
+          setIsLoading(false);
           setTrades(() => data);
         }
-        return data;
       }
-    }
-  );
-  const ws = useWS();
+    );
+  }, [symbol]);
   React2.useEffect(() => {
+    if (trades.length <= 0)
+      return;
     const unsubscript = ws.subscribe(`@${symbol}/@trade`, {
       onMessage: (data) => {
-        console.log("ws: trade", data);
+        setTrades((prev) => {
+          const arr = [data, ...prev];
+          if (arr.length > limit) {
+            arr.pop();
+          }
+          return arr;
+        });
       }
     });
     return () => {
       unsubscript == null ? void 0 : unsubscript();
     };
-  }, []);
+  }, [symbol, trades]);
   return { data: trades, isLoading };
 };
 var useMarginRatio = () => {
@@ -1838,6 +1858,9 @@ var useMarginRatio = () => {
   const { data: markPrices } = useMarkPricesStream();
   const { totalCollateral } = useCollateral();
   const marginRatio = React2.useMemo(() => {
+    if (!rows || !markPrices || !totalCollateral) {
+      return 0;
+    }
     const ratio = futures.account.totalMarginRatio({
       totalCollateral,
       markPrices,
@@ -1848,7 +1871,7 @@ var useMarginRatio = () => {
   const currentLeverage = React2.useMemo(() => {
     return futures.account.currentLeverage(marginRatio);
   }, [marginRatio]);
-  return [marginRatio, currentLeverage];
+  return { marginRatio, currentLeverage };
 };
 var useChains = (networkId, options = {}) => {
   const _a = options, swrOptions = __objRest(_a, ["filter", "pick"]);