fix #52: hideZeroBalanceTokens is not working

starcoinorg · Mar 1, 2022 · 9342fb1 · 9342fb1
1 parent 3ccd249
commit 9342fb1
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 14 deletions.
diff --git a/ui/app/helpers/utils/confirm-tx.util.js b/ui/app/helpers/utils/confirm-tx.util.js
@@ -111,7 +111,7 @@ export function formatCurrency(value, currencyCode) {
 
 export function stringifyBalance(balance, decimals, currency, numberOfDecimals) {
   const multiplier = Math.pow(10, Number(decimals || 0));
-  const value = conversionUtil(balance, {
+  let value = conversionUtil(balance, {
     // fromCurrency,
     toCurrency: currency,
     fromNumericBase: 'hex',
@@ -120,6 +120,18 @@ export function stringifyBalance(balance, decimals, currency, numberOfDecimals)
     conversionRate: multiplier,
     invertConversionRate: true,
   });
+  // avoid disply 0 while hideZeroBalanceTokens = true
+  if (Number(value) === 0 && balance !== '0x0') {
+    value = conversionUtil(balance, {
+      // fromCurrency,
+      toCurrency: currency,
+      fromNumericBase: 'hex',
+      toNumericBase: 'dec',
+      decimals,
+      conversionRate: multiplier,
+      invertConversionRate: true,
+    });
+  }
   return formatCurrency(value, currency);
 }
 

diff --git a/ui/app/hooks/useTokenTracker.js b/ui/app/hooks/useTokenTracker.js
@@ -39,19 +39,22 @@ export function useTokenTracker(
     });
   }
   // added to wallet but not enabled accept_tokens ones
-  const unAcceptTokens = tokens.filter((token) => currentAssets && !currentAssets[token.code]);
-  unAcceptTokens.map(({ code, decimals, symbol }) => {
-    const numberOfDecimals = decimals <= 9 ? 4 : 9;
-    const token = {
-      code,
-      balance: currentAssets[code],
-      symbol,
-      decimals,
-      string: stringifyBalance(currentAssets[code], decimals, symbol, numberOfDecimals),
-      accepted: false,
-    };
-    tokensWithBalances.push(token);
-  });
+  if (!hideZeroBalanceTokens) {
+    const unAcceptTokens = tokens.filter((token) => currentAssets && !currentAssets[token.code]);
+    unAcceptTokens.map(({ code, decimals, symbol }) => {
+      console.log('unAcceptTokens', code, currentAssets[code])
+      const numberOfDecimals = decimals <= 9 ? 4 : 9;
+      const token = {
+        code,
+        balance: currentAssets[code],
+        symbol,
+        decimals,
+        string: stringifyBalance(currentAssets[code], decimals, symbol, numberOfDecimals),
+        accepted: false,
+      };
+      tokensWithBalances.push(token);
+    });
+  }
   const loading = false;
   const error = null;
   return { loading, tokensWithBalances, error };