Fix 0 balance, fix undefined symbol (#403)

skip-mev · Nov 1, 2024 · f02e27e · f02e27e
1 parent 8d1df58
commit f02e27e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/packages/widget-v2/src/hooks/useGetSourceBalance.ts b/packages/widget-v2/src/hooks/useGetSourceBalance.ts
@@ -15,6 +15,16 @@ export const useGetSourceBalance = () => {
     const { chainID, denom } = sourceAsset;
     if (!denom || !chainID) return;
 
+    const denomsExists = !!skipBalances?.chains?.[chainID]?.denoms;
+    const sourceBalance = skipBalances?.chains?.[chainID]?.denoms?.[denom];
+
+    if (denomsExists && sourceBalance === undefined) {
+      return {
+        amount: 0,
+        formattedAmount: "0",
+        error: undefined,
+      };
+    }
     return skipBalances?.chains?.[chainID]?.denoms?.[denom];
   }, [sourceAsset, sourceAccount, skipBalances]);
 

diff --git a/packages/widget-v2/src/pages/SwapPage/ConnectedWalletContent.tsx b/packages/widget-v2/src/pages/SwapPage/ConnectedWalletContent.tsx
@@ -28,8 +28,9 @@ export const ConnectedWalletContent = () => {
   const connectedWalletModal = useModal(ConnectedWalletModal);
 
   const formattedBalance = useMemo(() => {
+    const symbol = sourceDetails?.symbol ? ` ${sourceDetails?.symbol}` : "";
     if (sourceBalance?.error?.message) return "--";
-    if (sourceBalance === undefined) return `0 ${sourceDetails?.symbol}`;
+    if (sourceBalance === undefined) return;
 
     const amount = sourceBalance?.amount;
     let formattedBalanceAmount = sourceBalance?.formattedAmount;
@@ -38,7 +39,8 @@ export const ConnectedWalletContent = () => {
       formattedBalanceAmount = amount;
     }
 
-    return `${limitDecimalsDisplayed(formattedBalanceAmount)} ${sourceDetails?.symbol}`;
+    return `${limitDecimalsDisplayed(formattedBalanceAmount)
+      }${symbol}`;
   }, [sourceBalance, sourceDetails?.symbol]);
   if (!sourceAccount) return null;
   return (

diff --git a/packages/widget-v2/src/providers/CosmosProvider.tsx b/packages/widget-v2/src/providers/CosmosProvider.tsx
@@ -13,7 +13,7 @@ export const CosmosProvider: React.FC<CosmosProviderProps> = ({
     <GrazProvider grazOptions={{
       // @ts-expect-error mismatch keplr types version
       chains: mainnetChains,
-      autoReconnect: true,
+      autoReconnect: false,
       walletDefaultOptions: {
         sign: {
           preferNoSetFee: true,