chore(synapse-interface): format portfolio balances (#2832)

* Format dust amounts in Portfolio * Format available gas balance * Format gas token balance * Remove log --------- Co-authored-by: abtestingalpha <[email protected]>
synapsecns · Jul 17, 2024 · 67e255f · 67e255f
1 parent 8331a12
commit 67e255f
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 13 deletions.
diff --git a/packages/synapse-interface/components/Portfolio/components/GasTokenAsset.tsx b/packages/synapse-interface/components/Portfolio/components/GasTokenAsset.tsx
@@ -2,7 +2,8 @@ import React from 'react'
 import Image from 'next/image'
 import { Token } from '@/utils/types'
 import { getParsedBalance } from '@/utils/getParsedBalance'
-import { HoverTooltip } from '../../HoverTooltip'
+import { HoverTooltip } from '@/components/HoverTooltip'
+import { formatAmount } from '@/utils/formatAmount'
 import GasIcon from '@/components/icons/GasIcon'
 
 export const GasTokenAsset = ({
@@ -13,8 +14,7 @@ export const GasTokenAsset = ({
   balance: bigint
 }) => {
   const { icon, symbol, decimals } = token
-  const parsedBalance = getParsedBalance(balance, decimals as number, 3)
-  const parsedBalanceLong = getParsedBalance(balance, decimals as number, 8)
+  const parsedBalance = getParsedBalance(balance, decimals as number)
 
   return (
     <div
@@ -34,12 +34,12 @@ export const GasTokenAsset = ({
         <HoverTooltip
           hoverContent={
             <div className="whitespace-nowrap">
-              {parsedBalanceLong} {symbol}
+              {parsedBalance} {symbol}
             </div>
           }
         >
           <div>
-            {parsedBalance} {symbol}
+            {formatAmount(parsedBalance)} {symbol}
           </div>
         </HoverTooltip>
         <HoverTooltip

diff --git a/packages/synapse-interface/components/Portfolio/components/PortfolioTokenVisualizer.tsx b/packages/synapse-interface/components/Portfolio/components/PortfolioTokenVisualizer.tsx
@@ -1,11 +1,15 @@
 import Image from 'next/image'
 import { TokenAndBalance } from '@/utils/actions/fetchPortfolioBalances'
-import { HoverTooltip } from '../../HoverTooltip'
+import { HoverTooltip } from '@/components/HoverTooltip'
+import { getParsedBalance } from '@/utils/getParsedBalance'
+import { formatAmount } from '@/utils/formatAmount'
 
 export const PortfolioTokenVisualizer = ({
   portfolioTokens,
+  portfolioChainId,
 }: {
   portfolioTokens: TokenAndBalance[]
+  portfolioChainId: number
 }) => {
   const hasNoTokens: boolean =
     !portfolioTokens || (portfolioTokens && portfolioTokens.length === 0)
@@ -18,6 +22,15 @@ export const PortfolioTokenVisualizer = ({
   const hasOnlyOneToken: boolean =
     portfolioTokens && portfolioTokens.length === 1
 
+  const firstTokenBalance = getParsedBalance(
+    portfolioTokens?.[0]?.balance,
+    portfolioTokens?.[0]?.token?.decimals[portfolioChainId]
+  )
+  const secondTokenBalance = getParsedBalance(
+    portfolioTokens?.[1]?.balance,
+    portfolioTokens?.[1]?.token?.decimals[portfolioChainId]
+  )
+
   if (hasNoTokens) {
     return (
       <div
@@ -28,6 +41,7 @@ export const PortfolioTokenVisualizer = ({
       </div>
     )
   }
+
   return (
     <div
       id="portfolio-token-visualizer"
@@ -38,7 +52,7 @@ export const PortfolioTokenVisualizer = ({
           <HoverTooltip
             hoverContent={
               <div className="whitespace-nowrap">
-                {portfolioTokens[0]?.parsedBalance}{' '}
+                {formatAmount(firstTokenBalance)}{' '}
                 {portfolioTokens[0]?.token.symbol}
               </div>
             }
@@ -55,7 +69,7 @@ export const PortfolioTokenVisualizer = ({
 
       {hasOnlyOneToken && (
         <div className="text-white whitespace-nowrap">
-          {portfolioTokens[0].parsedBalance} {portfolioTokens[0].token.symbol}
+          {formatAmount(firstTokenBalance)} {portfolioTokens[0].token.symbol}
         </div>
       )}
 
@@ -64,7 +78,7 @@ export const PortfolioTokenVisualizer = ({
           <HoverTooltip
             hoverContent={
               <div className="whitespace-nowrap">
-                {portfolioTokens[1]?.parsedBalance}{' '}
+                {formatAmount(secondTokenBalance)}{' '}
                 {portfolioTokens[1]?.token.symbol}
               </div>
             }
@@ -86,10 +100,13 @@ export const PortfolioTokenVisualizer = ({
               (token: TokenAndBalance, key: number) => {
                 if (key > 1) {
                   const tokenSymbol = token.token.symbol
-                  const balance = token.parsedBalance
+                  const parsedBalance = getParsedBalance(
+                    token.balance,
+                    token.token.decimals[portfolioChainId]
+                  )
                   return (
                     <div className="whitespace-nowrap" key={key}>
-                      {balance} {tokenSymbol}
+                      {formatAmount(parsedBalance)} {tokenSymbol}
                     </div>
                   )
                 }

diff --git a/packages/synapse-interface/components/Portfolio/components/SingleNetworkPortfolio.tsx b/packages/synapse-interface/components/Portfolio/components/SingleNetworkPortfolio.tsx
@@ -87,7 +87,10 @@ export const SingleNetworkPortfolio = ({
           />
         }
         collapsedProps={
-          <PortfolioTokenVisualizer portfolioTokens={sortedTokens} />
+          <PortfolioTokenVisualizer
+            portfolioTokens={sortedTokens}
+            portfolioChainId={portfolioChainId}
+          />
         }
       >
         {isUnsupportedChain && (

diff --git a/packages/synapse-interface/components/StateManagedBridge/AvailableBalance.tsx b/packages/synapse-interface/components/StateManagedBridge/AvailableBalance.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { joinClassNames } from '@/utils/joinClassNames'
+import { formatAmount } from '@/utils/formatAmount'
 
 export const AvailableBalance = ({
   balance,
@@ -35,7 +36,7 @@ export const AvailableBalance = ({
     return (
       <label className={labelClassName} htmlFor="inputRow">
         <span className="text-zinc-500 dark:text-zinc-400">Available: </span>
-        {maxBridgeableBalance?.toFixed(4) ?? balance ?? '0.0'}
+        {formatAmount(maxBridgeableBalance?.toString()) ?? balance ?? '0.0'}
       </label>
     )
   }