dev-getBalance-change-priority

Models/Balance.ts

@@ -42,8 +42,8 @@ export type Gas = {
 }
 
 export type BalanceProvider = {
-    getBalance: ({ network, token, address }: BalanceProps) => Promise<Balance | undefined | null> | Balance | undefined | void,
-    getNetworkBalances: (props: NetworkBalancesProps) => Promise<Balance[] | undefined> | Balance[] | undefined | void,
-    getGas?: (props: GasProps) => Promise<Gas[] | undefined> | undefined | void,
+    getBalance: ({ network, token, address }: BalanceProps) => Promise<Balance | undefined | null> | Balance | undefined,
+    getNetworkBalances: (props: NetworkBalancesProps) => Promise<Balance[] | undefined> | Balance[] | undefined,
+    getGas?: (props: GasProps) => Promise<Gas[] | undefined> | undefined,
     supportedNetworks: string[],
 }

components/Input/dynamic/MinMax.tsx

@@ -7,6 +7,9 @@ import useBalance from "../../../hooks/useBalance";
 import { useFee } from "../../../context/feeContext";
 import { useBalancesState } from "../../../context/balances";
 import { useQueryState } from "../../../context/query";
+import { Token } from "../../../Models/Network";
+import { QueryParams } from "../../../Models/QueryParams";
+import { Balance } from "../../../Models/Balance";
 
 const MinMax = ({ onAddressGet }: { onAddressGet: (address: string) => void }) => {
 
@@ -21,7 +24,7 @@ const MinMax = ({ onAddressGet }: { onAddressGet: (address: string) => void }) =
         return from && getProvider(from)
     }, [from, getProvider])
 
-    const { fetchNetworkBalances, fetchGas } = useBalance()
+    const { fetchBalance, fetchGas } = useBalance()
 
     const wallet = provider?.getConnectedWallet()
 
@@ -33,37 +36,18 @@ const MinMax = ({ onAddressGet }: { onAddressGet: (address: string) => void }) =
     const walletBalance = wallet && balances[wallet.address]?.find(b => b?.network === from?.name && b?.token === fromCurrency?.symbol)
     const native_currency = from?.token
 
-    let maxAllowedAmount: number | null = maxAmountFromApi || 0
-    if (query.balances && fromCurrency) {
-        try {
-            const balancesFromQueries = new URL(window.location.href.replaceAll('"', '"')).searchParams.get('balances');
-            const parsedBalances = balancesFromQueries && JSON.parse(balancesFromQueries)
-            let balancesTyped = parsedBalances
-            if (balancesTyped && balancesTyped[fromCurrency.symbol] && balancesTyped[fromCurrency.symbol] > Number(minAllowedAmount)) {
-                maxAllowedAmount = Math.min(maxAllowedAmount, balancesTyped[fromCurrency.symbol]);
-            }
-        }
-        // in case the query parameter had bad formatting just ignoe
-        catch { }
-    } else if (walletBalance && (walletBalance.amount >= Number(minAllowedAmount) && walletBalance.amount <= Number(maxAmountFromApi))) {
-        if (((native_currency?.symbol === fromCurrency?.symbol) || !native_currency) && ((walletBalance.amount - gasAmount) >= Number(minAllowedAmount) && (walletBalance.amount - gasAmount) <= Number(maxAmountFromApi))) {
-            maxAllowedAmount = walletBalance.amount - gasAmount
-        }
-        else maxAllowedAmount = walletBalance.amount
-    }
-    else {
-        maxAllowedAmount = Number(maxAmountFromApi) || 0
-    }
+    const maxAllowedAmount = calculateMaxAmount(maxAmountFromApi, query, fromCurrency, minAllowedAmount, walletBalance, gasAmount, native_currency)
 
     const handleSetMaxAmount = useCallback(async () => {
-        setFieldValue('amount', maxAllowedAmount);
-        from && fetchNetworkBalances(from);
+        const balance = from && native_currency && await fetchBalance(from, native_currency);
+        const maxAmount = calculateMaxAmount(maxAmountFromApi, query, fromCurrency, minAllowedAmount, balance, gasAmount, native_currency)
+        setFieldValue('amount', maxAmount);
 
         from &&
             fromCurrency &&
             amount && fetchGas(from, fromCurrency, destination_address || "");
 
-    }, [from, fromCurrency, destination_address, maxAllowedAmount])
+    }, [from, fromCurrency, destination_address, minAllowedAmount, fetchBalance, fetchGas, setFieldValue, amount, query, gasAmount, native_currency])
 
     useEffect(() => {
         wallet?.address && onAddressGet(wallet.address)
@@ -85,4 +69,32 @@ const MinMax = ({ onAddressGet }: { onAddressGet: (address: string) => void }) =
     )
 }
 
+
+const calculateMaxAmount = (maxAmountFromApi: number | undefined, query: QueryParams, fromCurrency: Token | undefined, minAllowedAmount: number | undefined, walletBalance: Balance | undefined | null, gasAmount: number, native_currency: Token | undefined) => {
+    let maxAllowedAmount: number | null = maxAmountFromApi || 0
+
+    if (query.balances && fromCurrency) {
+        try {
+            const balancesFromQueries = new URL(window.location.href.replaceAll('&quot;', '"')).searchParams.get('balances');
+            const parsedBalances = balancesFromQueries && JSON.parse(balancesFromQueries)
+            let balancesTyped = parsedBalances
+            if (balancesTyped && balancesTyped[fromCurrency.symbol] && balancesTyped[fromCurrency.symbol] > Number(minAllowedAmount)) {
+                maxAllowedAmount = Math.min(maxAllowedAmount, balancesTyped[fromCurrency.symbol]);
+            }
+        }
+        // in case the query parameter had bad formatting just ignoe
+        catch { }
+    } else if (walletBalance && (walletBalance.amount >= Number(minAllowedAmount) && walletBalance.amount <= Number(maxAmountFromApi))) {
+        if (((native_currency?.symbol === fromCurrency?.symbol) || !native_currency) && ((walletBalance.amount - gasAmount) >= Number(minAllowedAmount) && (walletBalance.amount - gasAmount) <= Number(maxAmountFromApi))) {
+            maxAllowedAmount = walletBalance.amount - gasAmount
+        }
+        else maxAllowedAmount = walletBalance.amount
+    }
+    else {
+        maxAllowedAmount = Number(maxAmountFromApi) || 0
+    }
+
+    return maxAllowedAmount
+}
+
 export default MinMax

hooks/useBalance.ts

@@ -83,10 +83,12 @@ export default function useBalanceProvider() {
                 network: network,
                 address: address,
                 token
-            }) || []
+            })
 
-            setAllBalances((data) => ({ ...data, [address]: filteredBalances?.concat(balance) }))
+            setAllBalances((data) => ({ ...data, [address]: filteredBalances?.concat(balance || []) }))
             setIsBalanceLoading(false)
+
+            return balance
         }
     }