@orderly.network/hooks 0.0.32 → 0.0.34

package/dist/index.d.mts

@@ -1,12 +1,12 @@
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
 export { SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
-import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter, WSMessage } from '@orderly.network/core';
+import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';
 import react__default, { FC, PropsWithChildren } from 'react';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
-import { OrderSide, OrderEntity, API } from '@orderly.network/types';
+import { OrderSide, OrderEntity, API, WSMessage } from '@orderly.network/types';
 import * as swr__internal from 'swr/_internal';
 import * as swr_subscription from 'swr/subscription';
 

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 import useSWR, { SWRConfiguration, SWRResponse } from 'swr';
 export { SWRConfiguration, default as useSWR } from 'swr';
 import { SWRMutationConfiguration } from 'swr/mutation';
-import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter, WSMessage } from '@orderly.network/core';
+import { Account, AccountState, ConfigStore, OrderlyKeyStore, WalletAdapter, IContract, EventEmitter } from '@orderly.network/core';
 import * as react from 'react';
 import react__default, { FC, PropsWithChildren } from 'react';
 export { default as useConstant } from 'use-constant';
 import { WS } from '@orderly.network/net';
-import { OrderSide, OrderEntity, API } from '@orderly.network/types';
+import { OrderSide, OrderEntity, API, WSMessage } from '@orderly.network/types';
 import * as swr__internal from 'swr/_internal';
 import * as swr_subscription from 'swr/subscription';
 

package/dist/index.js

@@ -186,7 +186,8 @@ var signatureMiddleware = (useSWRNext) => {
   const { apiBaseUrl } = React2.useContext(OrderlyContext);
   return (key, fetcher4, config) => {
     try {
-      const extendedFetcher = (url) => __async(void 0, null, function* () {
+      const extendedFetcher = (args) => __async(void 0, null, function* () {
+        let url = Array.isArray(args) ? args[0] : args;
         let account5 = core.SimpleDI.get("account");
         let fullUrl = `${apiBaseUrl}${url}`;
         const signer = account5.signer;
@@ -280,7 +281,7 @@ var usePrivateQuery = (query, options) => {
   const account5 = useAccount();
   const middleware = Array.isArray(options == null ? void 0 : options.use) ? (_b = options == null ? void 0 : options.use) != null ? _b : [] : [];
   return useSWR__default.default(
-    () => account5.state.status >= types.AccountStatusEnum.EnableTrading ? query : null,
+    () => account5.state.status >= types.AccountStatusEnum.EnableTrading ? [query, account5.state.accountId] : null,
     // query,
     (url, init) => {
       return fetcher(url, init, { formatter });
@@ -687,6 +688,8 @@ var mergeItems = (data, update) => {
       const [price, quantity] = item;
       const index = data.findIndex(([p], index2) => p === price);
       if (index === -1) {
+        if (quantity === 0)
+          continue;
         data.push(item);
       } else {
         if (quantity === 0) {
@@ -1020,6 +1023,7 @@ var parseHolding = (holding, markPrices) => {
 var usePositionStream = (symbol, options) => {
   var _a;
   const symbolInfo = useSymbolsInfo();
+  useAccount();
   const { data: accountInfo } = usePrivateQuery("/v1/client/info");
   const { data: holding } = usePrivateQuery(
     "/v1/client/holding",
@@ -1033,7 +1037,9 @@ var usePositionStream = (symbol, options) => {
   const { data, error } = usePrivateQuery(`/v1/positions`, __spreadProps(__spreadValues({
     // revalidateOnFocus: false,
     // revalidateOnReconnect: false,
-    dedupingInterval: 5e3
+    dedupingInterval: 5e3,
+    keepPreviousData: false,
+    revalidateIfStale: true
   }, options), {
     formatter: (data2) => data2,
     onError: (err) => {
@@ -1044,10 +1050,8 @@ var usePositionStream = (symbol, options) => {
   const formatedPositions = React2.useMemo(() => {
     if (!(data == null ? void 0 : data.rows) || !symbolInfo || !accountInfo)
       return null;
-    const filteredData = typeof symbol === "undefined" || symbol === "" ? data.rows.filter((item) => {
-      return item.position_qty !== 0;
-    }) : data.rows.filter((item) => {
-      return item.symbol === symbol && item.position_qty !== 0;
+    const filteredData = typeof symbol === "undefined" || symbol === "" ? data.rows : data.rows.filter((item) => {
+      return item.symbol === symbol;
     });
     let unrealPnL_total = utils.zero, notional_total = utils.zero, unsettlementPnL_total = utils.zero;
     const formatted = filteredData.map((item) => {
@@ -1123,7 +1127,7 @@ var usePositionStream = (symbol, options) => {
     if (!symbolInfo || !accountInfo)
       return formatedPositions[0];
     const total = totalCollateral.toNumber();
-    return formatedPositions[0].map((item) => {
+    return formatedPositions[0].filter((item) => item.position_qty !== 0).map((item) => {
       const info = symbolInfo == null ? void 0 : symbolInfo[item.symbol];
       const MMR = futures.positions.MMR({
         baseMMR: info("base_mmr"),