Merge pull request #968 from bobanetwork/fix/boba-bnb-withdrawal-check

Fix/boba bnb withdrawal check

Author: sk-enya

pnpm-lock.yaml

@@ -100,6 +100,10 @@ export function useClassicWithdrawal() {
     if (!address) {
       throw new Error(`${ERROR_CODE}: Wallet not connected`)
     }
+    if (!Number(amount)) {
+      throw new Error(`${ERROR_CODE}: Invalid amount ${amount}`)
+    }
+
     if (!bridgeContracts?.l2BillingContract?.address) {
       throw new Error(`${ERROR_CODE}: Invalid l2BillingContract fee contract address`)
     }
@@ -128,8 +132,6 @@ export function useClassicWithdrawal() {
         functionName: 'exitFee',
       })
 
-      console.log(`ExitFee!!`, exitFee)
-
       // Handle allowance approval for erc20 token not boba 
       if (!isAddressEqual(token.address!, bridgeContracts.l2BOBA.address)) {
         const tokenAllownce: bigint = await provider.readContract({

src/hooks/bridge/useClassicWithdrawal.ts

@@ -21,7 +21,10 @@ export function useExitCostEstimate() {
     amount: string,
     decimals: number
   ) => {
-    if (!isActiveNetworkBnb || !chainId || !address) {
+    if (!isActiveNetworkBnb
+      || !chainId
+      || !address
+      || !Number(amount)) {
       setClassicExitCost(null);
       return;
     }

src/hooks/bridge/useExitCostEstimate.ts

@@ -92,7 +92,12 @@ export function useTokenBalance({
     const tokenAddress = resolveTokenAddress(tokens, chainId);
     const { data: tokenBalance, isLoading, isError, error } = useBalance({
       address: userAddress,
-      token: tokenAddress as any
+      token: tokenAddress as any,
+      query: {
+        enabled: !!userAddress,
+        refetchOnWindowFocus: true,
+        staleTime: 0, // Consider data stale immediately
+      }
     });
 
     return {
@@ -124,12 +129,19 @@ export function useTokenBalance({
   const { data: nativeBalance } = useBalance({
     address: userAddress,
     query: {
-      enabled: !!userAddress
+      enabled: !!userAddress,
+      refetchOnWindowFocus: true,
+      staleTime: 0, // Consider data stale immediately
     }
   })
 
-  const { data: balances, isLoading, isError } = useReadContracts({
+  const { data: balances, isLoading, isError, error } = useReadContracts({
     contracts: contractReads as any[],
+    query: {
+      enabled: !!userAddress && contractReads.length > 0,
+      refetchOnWindowFocus: true,
+      staleTime: 0, // Consider data stale immediately
+    }
   });
 
   return tokenAddresses.map((address, index) => {
@@ -150,7 +162,7 @@ export function useTokenBalance({
       address,
       isLoading,
       isError,
-      error: null
+      error: error
     };
   });
 }

src/hooks/common/useTokenBalances.ts

@@ -40,10 +40,9 @@ export const TokenPickerContent: React.FC<TokenPickerContentProps> = ({ onClose
     if (!chainId) return []
     return TOKEN_REGISTRY[chainId] || []
   }, [chainId])
-
   // Fetch all token balances at once
   const tokenBalances = useTokenBalance({
-    tokens: availableTokens.map(token => ({ address: token.address! })),
+    tokens: availableTokens.map(token => ({ address: token.address! }))
   }) as Array<{
     balance: string
     symbol: string

src/layout/bridge/TokenPickerModal.tsx

@@ -312,8 +312,8 @@ const BridgeConfirmModalContent = () => {
                   <NetworkIcon chainId={fromNetwork!} />
                   <Text variant="small"  >{networkDetails[fromNetwork!].name}</Text>
                   <Text variant="small" className="text-blue-500 hover:underline">
-                    <a href={`${networkDetails[fromNetwork!]?.explorer}/tx/${depositTxHash || teleportTxHash || withdrawalTxHash}`} target="_blank" rel="noopener noreferrer">
-                      <IconLink size="20" /> {shortenString(depositTxHash || teleportTxHash || withdrawalTxHash || ''!, '...', 4)}
+                    <a href={`${networkDetails[fromNetwork!]?.explorer}/tx/${depositTxHash || teleportTxHash}`} target="_blank" rel="noopener noreferrer">
+                      <IconLink size="20" /> {shortenString(depositTxHash || teleportTxHash || ''!, '...', 4)}
                     </a>
                   </Text>
                 </div>
@@ -324,8 +324,8 @@ const BridgeConfirmModalContent = () => {
                   <NetworkIcon chainId={toNetwork!} />
                   <Text variant="small"  >{networkDetails[toNetwork!].name}</Text>
                   <Text variant="small" className="text-blue-500 hover:underline">
-                    <a href={`${networkDetails[toNetwork!]?.explorer}/tx/${depositTxHash || teleportTxHash || withdrawalTxHash}`} target="_blank" rel="noopener noreferrer">
-                      <IconLink size="20" /> {shortenString(depositTxHash || teleportTxHash || withdrawalTxHash || ''!, '...', 4)}
+                    <a href={`${networkDetails[toNetwork!]?.explorer}/tx/${teleportTxHash || withdrawalTxHash}`} target="_blank" rel="noopener noreferrer">
+                      <IconLink size="20" /> {shortenString(teleportTxHash || withdrawalTxHash || ''!, '...', 4)}
                     </a>
                   </Text>
                 </div>