@orderly.network/hooks 2.5.2 → 2.5.3-alpha.0

package/dist/index.d.mts

@@ -32,7 +32,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.5.2";
+declare const _default: "2.5.3-alpha.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -866,13 +866,13 @@ declare const useChain: (token: string) => {
     isLoading: boolean;
 };
 
-type UseWithdrawOptions$1 = {
+type UseWithdrawOptions = {
     srcChainId?: number;
     token?: string;
     /** orderly token decimals */
     decimals?: number;
 };
-declare const useWithdraw: (options: UseWithdrawOptions$1) => {
+declare const useWithdraw: (options: UseWithdrawOptions) => {
     dst: {
         symbol: string;
         decimals: number;
@@ -886,7 +886,6 @@ declare const useWithdraw: (options: UseWithdrawOptions$1) => {
         amount: string;
         allowCrossChainWithdraw: boolean;
     }) => Promise<any>;
-    isLoading: boolean;
     maxAmount: number;
     unsettledPnL: number;
     availableBalance: number;
@@ -936,10 +935,10 @@ declare const useDeposit: (options: DepositOptions) => {
     setQuantity: react.Dispatch<react.SetStateAction<string>>;
 };
 
-interface UseWithdrawOptions {
+interface ConvertOptions {
     token?: string;
 }
-declare const useConvert: (options: UseWithdrawOptions) => {
+declare const useConvert: (options: ConvertOptions) => {
     maxAmount: number;
     convert: (inputs: {
         amount: number;

package/dist/index.d.ts

@@ -32,7 +32,7 @@ declare global {
         };
     }
 }
-declare const _default: "2.5.2";
+declare const _default: "2.5.3-alpha.0";
 
 declare const fetcher: (url: string, init: RequestInit | undefined, queryOptions: useQueryOptions<any>) => Promise<any>;
 type useQueryOptions<T> = SWRConfiguration & {
@@ -866,13 +866,13 @@ declare const useChain: (token: string) => {
     isLoading: boolean;
 };
 
-type UseWithdrawOptions$1 = {
+type UseWithdrawOptions = {
     srcChainId?: number;
     token?: string;
     /** orderly token decimals */
     decimals?: number;
 };
-declare const useWithdraw: (options: UseWithdrawOptions$1) => {
+declare const useWithdraw: (options: UseWithdrawOptions) => {
     dst: {
         symbol: string;
         decimals: number;
@@ -886,7 +886,6 @@ declare const useWithdraw: (options: UseWithdrawOptions$1) => {
         amount: string;
         allowCrossChainWithdraw: boolean;
     }) => Promise<any>;
-    isLoading: boolean;
     maxAmount: number;
     unsettledPnL: number;
     availableBalance: number;
@@ -936,10 +935,10 @@ declare const useDeposit: (options: DepositOptions) => {
     setQuantity: react.Dispatch<react.SetStateAction<string>>;
 };
 
-interface UseWithdrawOptions {
+interface ConvertOptions {
     token?: string;
 }
-declare const useConvert: (options: UseWithdrawOptions) => {
+declare const useConvert: (options: ConvertOptions) => {
     maxAmount: number;
     convert: (inputs: {
         amount: number;

package/dist/index.js

@@ -61,9 +61,9 @@ 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.2";
+  window.__ORDERLY_VERSION__["@orderly.network/hooks"] = "2.5.3-alpha.0";
 }
-var version_default = "2.5.2";
+var version_default = "2.5.3-alpha.0";
 var fetcher = (url, init2 = {}, queryOptions) => net.get(url, init2, queryOptions?.formatter);
 var OrderlyContext = React.createContext({
   // configStore: new MemoryConfigStore(),
@@ -320,7 +320,7 @@ var useWS = () => {
         if ((nextState.status === types.AccountStatusEnum.EnableTrading || nextState.status === types.AccountStatusEnum.EnableTradingWithoutConnected) && account9.accountId) {
           websocketClient.openPrivate(account9.accountId);
         } else {
-          websocketClient.closePrivate(1e3, "switch account");
+          websocketClient.closePrivate(3887, "switch account");
         }
       });
       if (typeof window !== "undefined") {
@@ -374,7 +374,7 @@ var useAccount = () => {
   const ws = useWS();
   const switchAccount = React.useCallback(
     async (accountId) => {
-      ws.closePrivate(1e3, "switch account");
+      ws.closePrivate(3887, "switch account");
       return account9.switchAccount(accountId);
     },
     [account9]
@@ -774,8 +774,10 @@ function useWsStatus() {
         }
       }
     });
-    return () => ws.off("websocket:status", () => {
-    });
+    return () => {
+      ws.off("status:change", () => {
+      });
+    };
   }, []);
   return wsStatus;
 }
@@ -4582,13 +4584,15 @@ var useHoldingStream = () => {
 
 // src/orderly/useMaxWithdrawal.ts
 var { maxWithdrawalUSDC, maxWithdrawalOtherCollateral, collateralRatio: collateralRatio2 } = perp.account;
-function useMaxWithdrawal(token) {
+var useMaxWithdrawal = (token) => {
   const { unsettledPnL, freeCollateral } = useCollateral();
   const tokenInfo = useTokenInfo(token);
   const { data: indexPrices } = useIndexPricesStream();
   const { usdc, data: holdings = [] } = useHoldingStream();
   const holding = React.useMemo(() => {
-    return holdings?.find((item) => item?.token === token);
+    return holdings.find(
+      (item) => item.token?.toUpperCase() === token.toUpperCase()
+    );
   }, [holdings, token]);
   const usdcBalance = usdc?.holding ?? 0;
   const indexPrice = React.useMemo(() => {
@@ -4608,8 +4612,11 @@ function useMaxWithdrawal(token) {
       collateralCap: tokenInfo?.user_max_qty ?? holdingQty,
       indexPrice
     });
-  }, [holdings, tokenInfo, indexPrice, token, holding]);
+  }, [tokenInfo, indexPrice, holding]);
   const maxAmount = React.useMemo(() => {
+    if (!token) {
+      return 0;
+    }
     if (token === "USDC") {
       return maxWithdrawalUSDC({
         USDCBalance: usdcBalance,
@@ -4628,19 +4635,17 @@ function useMaxWithdrawal(token) {
     freeCollateral,
     unsettledPnL,
     memoizedCollateralRatio,
-    holdings,
     indexPrice,
     token,
     holding
   ]);
   return maxAmount;
-}
+};
 
 // src/orderly/useWithdraw.ts
 var useWithdraw = (options) => {
-  const { srcChainId, token, decimals } = options;
+  const { srcChainId, token = "", decimals } = options;
   const { account: account9, state } = useAccount();
-  const [isLoading, setIsLoading] = React.useState(false);
   const { unsettledPnL, availableBalance, freeCollateral } = useCollateral();
   const networkId = useConfig("networkId");
   const [_, { findByChainId }] = useChains(void 0);
@@ -4700,12 +4705,16 @@ var useWithdraw = (options) => {
         throw err;
       });
     },
-    [state, targetChain, state, decimals]
+    [
+      account9.assetsManager,
+      decimals,
+      state?.connectWallet?.name,
+      targetChain?.network_infos.name
+    ]
   );
   return {
     dst,
     withdraw,
-    isLoading,
     maxAmount,
     unsettledPnL,
     availableBalance,
@@ -4723,6 +4732,7 @@ var useDeposit = (options) => {
   const [depositFeeRevalidating, setDepositFeeRevalidating] = React.useState(false);
   const [balance, setBalance] = React.useState("0");
   const [allowance, setAllowance] = React.useState("0");
+  const balanceRef = React.useRef("");
   const { account: account9, state } = useAccount();
   const { track: track2 } = useTrack();
   const prevAddress = React.useRef();
@@ -4771,19 +4781,6 @@ var useDeposit = (options) => {
     },
     []
   );
-  const fetchBalance = React.useCallback(
-    async (address, decimals) => {
-      if (!address)
-        return;
-      try {
-        const balance2 = await fetchBalanceHandler(address, decimals);
-        setBalance(() => balance2);
-      } catch (e) {
-        setBalance(() => "0");
-      }
-    },
-    [state]
-  );
   const fetchBalances = React.useCallback(async (tokens) => {
     const tasks = [];
     for (const token of tokens) {
@@ -4851,7 +4848,8 @@ var useDeposit = (options) => {
   ]);
   const queryBalance = useDebounce.useDebouncedCallback(
     (address, decimals) => {
-      fetchBalance(address, decimals).finally(() => {
+      fetchBalanceHandler(address, decimals).then((balance2) => {
+        setBalance(balance2);
         setBalanceRevalidating(false);
       });
     },
@@ -4996,11 +4994,14 @@ var useDeposit = (options) => {
     isNativeToken,
     vaultAddress
   ]);
-  const loopGetBalance = async () => {
+  const loopGetBalance = async (timeout) => {
     if (getBalanceListener.current) {
       clearTimeout(getBalanceListener.current);
     }
-    const time = account9.walletAdapter?.chainNamespace === types.ChainNamespace.solana ? 1e4 : 3e3;
+    const time = timeout ?? (account9.walletAdapter?.chainNamespace === types.ChainNamespace.solana ? 1e4 : 3e3);
+    if (balanceRef.current === "") {
+      setBalanceRevalidating(true);
+    }
     getBalanceListener.current = setTimeout(async () => {
       try {
         const balance2 = await fetchBalanceHandler(
@@ -5008,8 +5009,14 @@ var useDeposit = (options) => {
           options.decimals
         );
         setBalance(balance2);
+        balanceRef.current = balance2;
         loopGetBalance();
       } catch (err) {
+        loopGetBalance(1e3);
+      } finally {
+        if (balanceRef.current !== "") {
+          setBalanceRevalidating(false);
+        }
       }
     }, time);
   };
@@ -5049,7 +5056,7 @@ var useDeposit = (options) => {
     if (!options.address) {
       return;
     }
-    loopGetBalance();
+    loopGetBalance(0);
     return () => {
       if (getBalanceListener.current) {
         clearTimeout(getBalanceListener.current);
@@ -5165,7 +5172,7 @@ var useSubAccountMutation = (url, method = "POST", options) => {
 
 // src/orderly/useTransfer.ts
 var useTransfer = (options) => {
-  const { fromAccountId, token } = options || {};
+  const { fromAccountId, token = "" } = options || {};
   const { unsettledPnL, holding } = useCollateral();
   const [doTransfer, { isMutating: submitting }] = useSubAccountMutation(
     "/v1/internal_transfer",
@@ -7031,7 +7038,7 @@ var useSubAccountWS = (options) => {
       websocketClient.current.openPrivate(accountId);
     }
     return () => {
-      websocketClient.current.closePrivate(1e3, "switch account");
+      websocketClient.current.closePrivate(3887, "switch account");
     };
   }, [accountId, state.status]);
   return websocketClient.current;