round usd conversions in transaction summary

rsksmart · Feb 7, 2024 · 61cff1a · 61cff1a
1 parent 9ea49ff
commit 61cff1a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 24 deletions.
diff --git a/src/screens/activity/ActivityRow.tsx b/src/screens/activity/ActivityRow.tsx
@@ -80,8 +80,11 @@ export const ActivityBasicRow = ({
   // USD Balance
   const usdBalance = roundBalance(price, 2)
 
-  const txSummary: TransactionSummaryScreenProps = useMemo(
-    () => ({
+  const txSummary: TransactionSummaryScreenProps = useMemo(() => {
+    const feeUsd = roundBalance(Number(fee.usdValue), 2)
+    const totalUsd = Number(price) + Number(fee.usdValue)
+
+    return {
       transaction: {
         tokenValue: {
           symbol,
@@ -91,18 +94,18 @@ export const ActivityBasicRow = ({
         usdValue: {
           symbol: usdBalance || !price ? '$' : '<',
           symbolType: 'usd',
-          balance: price ? usdBalance || '0.01' : '0.00',
+          balance: price ? usdBalance.toFixed(2) || '0.01' : '0.00',
         },
         totalToken:
           symbol === fee.symbol
             ? Number(value) + Number(fee.tokenValue)
             : Number(value),
-        totalUsd: Number(value) + Number(fee.usdValue),
+        totalUsd: roundBalance(totalUsd, 2).toFixed(2),
         status,
         fee: {
-          ...fee,
+          tokenValue: fee.tokenValue,
           symbol: fee.symbol || symbol,
-          usdValue: fee.usdValue,
+          usdValue: feeUsd.toFixed(2),
         },
         amIReceiver,
         from,
@@ -111,22 +114,22 @@ export const ActivityBasicRow = ({
         hashId: id,
       },
       contact: contact || { address },
-    }),
-    [
-      address,
-      amIReceiver,
-      contact,
-      fee,
-      from,
-      to,
-      status,
-      symbol,
-      timeHumanFormatted,
-      usdBalance,
-      value,
-      id,
-    ],
-  )
+    }
+  }, [
+    fee,
+    symbol,
+    value,
+    usdBalance,
+    price,
+    status,
+    amIReceiver,
+    from,
+    to,
+    timeHumanFormatted,
+    id,
+    contact,
+    address,
+  ])
 
   const amount = useMemo(() => {
     if (symbol.startsWith('BTC')) {

diff --git a/src/screens/transactionSummary/index.tsx b/src/screens/transactionSummary/index.tsx
@@ -26,7 +26,7 @@ export interface TransactionSummaryScreenProps {
     fee: TokenFeeValueObject
     time: string
     totalToken: number
-    totalUsd: number
+    totalUsd: string
     hashId?: string
     status?: TransactionStatus
     amIReceiver?: boolean

diff --git a/src/shared/utils/index.ts b/src/shared/utils/index.ts
@@ -46,7 +46,7 @@ export const formatSmallNumbers = (smallNumber: string | number) => {
     return formatWithDigits(smallNumber)
   }
 
-  return asNumber !== 0 ? `< ${tiniestAmount}` : '0.00'
+  return asNumber !== 0 ? `<${tiniestAmount}` : '0.00'
 }
 
 // this needs to be here because of the failing tests