From ed8aa08255cd4041ee642e5ee28f0abeea526fa4 Mon Sep 17 00:00:00 2001
From: Jack Short <john.short.tj@gmail.com>
Date: Fri, 30 Sep 2022 11:04:16 -0400
Subject: [PATCH] chore: remove extra decimals on cards (#4757)

* chore: removing decimals

* only on cards

* slight fix

* updating across app
---
 .../components/collection/CollectionAsset.tsx |  2 +-
 src/nft/components/explore/Cells/Cells.tsx    |  4 ++--
 src/nft/utils/currency.ts                     | 21 ++++++++++---------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/nft/components/collection/CollectionAsset.tsx b/src/nft/components/collection/CollectionAsset.tsx
index 997b64ae8e..4a4f7416b2 100644
--- a/src/nft/components/collection/CollectionAsset.tsx
+++ b/src/nft/components/collection/CollectionAsset.tsx
@@ -110,7 +110,7 @@ export const CollectionAsset = ({
           <Card.SecondaryRow>
             <Card.SecondaryDetails>
               <Card.SecondaryInfo>
-                {notForSale ? '' : `${formatWeiToDecimal(asset.currentEthPrice)} ETH`}
+                {notForSale ? '' : `${formatWeiToDecimal(asset.currentEthPrice, true)} ETH`}
               </Card.SecondaryInfo>
               {(asset.marketplace === Markets.NFTX || asset.marketplace === Markets.NFT20) && <Card.Pool />}
             </Card.SecondaryDetails>
diff --git a/src/nft/components/explore/Cells/Cells.tsx b/src/nft/components/explore/Cells/Cells.tsx
index 28efd34958..b8452f4fd2 100644
--- a/src/nft/components/explore/Cells/Cells.tsx
+++ b/src/nft/components/explore/Cells/Cells.tsx
@@ -35,7 +35,7 @@ export const WithCommaCell = ({ value }: CellProps) => <span>{value.value ? putC
 
 export const EthCell = ({ value }: { value: number }) => (
   <Row justifyContent="flex-end" color="textPrimary">
-    {value ? <>{formatWeiToDecimal(value.toString())} ETH</> : '-'}
+    {value ? <>{formatWeiToDecimal(value.toString(), true)} ETH</> : '-'}
   </Row>
 )
 
@@ -66,7 +66,7 @@ export const EthWithDayChange = ({ value }: CellProps) => (
 export const WeiWithDayChange = ({ value }: CellProps) => (
   <Column gap="4">
     <Row justifyContent="flex-end" color="textPrimary">
-      {value && value.value ? <>{formatWeiToDecimal(value.value.toString())} ETH</> : '-'}
+      {value && value.value ? <>{formatWeiToDecimal(value.value.toString(), true)} ETH</> : '-'}
     </Row>
     {value.change ? (
       <Box
diff --git a/src/nft/utils/currency.ts b/src/nft/utils/currency.ts
index 0df5cacbbd..8bca0468ce 100644
--- a/src/nft/utils/currency.ts
+++ b/src/nft/utils/currency.ts
@@ -41,7 +41,11 @@ export const numberToWei = (amount: number) => {
   return parseEther(amount.toString())
 }
 
-export const ethNumberStandardFormatter = (amount: string | number | undefined, includeDollarSign = false): string => {
+export const ethNumberStandardFormatter = (
+  amount: string | number | undefined,
+  includeDollarSign = false,
+  removeZeroes = false
+): string => {
   if (!amount) return '-'
 
   const amountInDecimals = parseFloat(amount.toString())
@@ -49,16 +53,13 @@ export const ethNumberStandardFormatter = (amount: string | number | undefined,
 
   if (amountInDecimals < 0.0001) return `< ${conditionalDollarSign}0.00001`
   if (amountInDecimals < 1) return `${conditionalDollarSign}${amountInDecimals.toFixed(3)}`
-  return (
-    conditionalDollarSign +
-    amountInDecimals
-      .toFixed(2)
-      .toString()
-      .replace(/\B(?=(\d{3})+(?!\d))/g, ',')
-  )
+  const formattedPrice = (removeZeroes ? parseFloat(amountInDecimals.toFixed(2)) : amountInDecimals.toFixed(2))
+    .toString()
+    .replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return conditionalDollarSign + formattedPrice
 }
 
-export const formatWeiToDecimal = (amount: string) => {
+export const formatWeiToDecimal = (amount: string, removeZeroes = false) => {
   if (!amount) return '-'
-  return ethNumberStandardFormatter(formatEther(amount))
+  return ethNumberStandardFormatter(formatEther(amount), false, removeZeroes)
 }