From 84277736ec60af758ef4ff678a97cdc54f052a6b Mon Sep 17 00:00:00 2001
From: saml33 <slam.uke@gmail.com>
Date: Tue, 24 Jan 2023 13:09:14 +1100
Subject: [PATCH] add to other amoutwithvalue components

---
 components/BorrowForm.tsx           | 45 +++++++++--------------------
 components/DepositForm.tsx          | 19 ++++--------
 components/RepayForm.tsx            | 19 ++++--------
 components/WithdrawForm.tsx         | 19 ++++--------
 components/shared/BalancesTable.tsx | 26 ++++-------------
 components/stats/TokenStats.tsx     | 12 +++-----
 6 files changed, 39 insertions(+), 101 deletions(-)

diff --git a/components/BorrowForm.tsx b/components/BorrowForm.tsx
index b8a37a9a..ee0c7fe3 100644
--- a/components/BorrowForm.tsx
+++ b/components/BorrowForm.tsx
@@ -21,11 +21,7 @@ import {
   INPUT_TOKEN_DEFAULT,
 } from './../utils/constants'
 import { notify } from './../utils/notifications'
-import {
-  floorToDecimal,
-  formatDecimal,
-  formatFixedDecimals,
-} from './../utils/numbers'
+import { floorToDecimal, formatDecimal } from './../utils/numbers'
 import ActionTokenList from './account/ActionTokenList'
 import ButtonGroup from './forms/ButtonGroup'
 import Label from './forms/Label'
@@ -332,46 +328,33 @@ function BorrowForm({ onSuccess, token }: BorrowFormProps) {
                   <p>{t('withdraw-amount')}</p>
                   {isBorrow ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(tokenBalance),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
-                        bank.uiPrice * tokenBalance.toNumber(),
-                        true
-                      )}
+                      amount={tokenBalance}
+                      amountDecimals={bank.mintDecimals}
+                      value={bank.uiPrice * tokenBalance.toNumber()}
                     />
                   ) : inputAmount ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(inputAmount),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
-                        bank.uiPrice * parseFloat(inputAmount),
-                        true
-                      )}
+                      amount={inputAmount}
+                      amountDecimals={bank.mintDecimals}
+                      value={bank.uiPrice * parseFloat(inputAmount)}
                     />
                   ) : (
-                    <AmountWithValue amount="0" value="$0.00" />
+                    <AmountWithValue amount="0" amountDecimals={0} value={0} />
                   )}
                 </div>
                 <div className="flex justify-between">
                   <p>{t('borrow-amount')}</p>
                   {isBorrow ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(inputAmount) - Number(tokenBalance),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
+                      amount={Number(inputAmount) - Number(tokenBalance)}
+                      amountDecimals={bank.mintDecimals}
+                      value={
                         bank.uiPrice *
-                          (parseFloat(inputAmount) - tokenBalance.toNumber()),
-                        true
-                      )}
+                        (parseFloat(inputAmount) - tokenBalance.toNumber())
+                      }
                     />
                   ) : (
-                    <AmountWithValue amount="0" value="$0.00" />
+                    <AmountWithValue amount="0" amountDecimals={0} value={0} />
                   )}
                 </div>
                 <div className="flex justify-between">
diff --git a/components/DepositForm.tsx b/components/DepositForm.tsx
index 54c34963..1c44290f 100644
--- a/components/DepositForm.tsx
+++ b/components/DepositForm.tsx
@@ -19,11 +19,7 @@ import {
   INPUT_TOKEN_DEFAULT,
 } from './../utils/constants'
 import { notify } from './../utils/notifications'
-import {
-  floorToDecimal,
-  formatDecimal,
-  formatFixedDecimals,
-} from './../utils/numbers'
+import { floorToDecimal, formatFixedDecimals } from './../utils/numbers'
 import { TokenAccount } from './../utils/tokens'
 import ActionTokenList from './account/ActionTokenList'
 import ButtonGroup from './forms/ButtonGroup'
@@ -338,17 +334,12 @@ function DepositForm({ onSuccess, token }: DepositFormProps) {
                   <p>{t('deposit-amount')}</p>
                   {inputAmount ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(inputAmount),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
-                        bank.uiPrice * Number(inputAmount),
-                        true
-                      )}
+                      amount={inputAmount}
+                      amountDecimals={bank.mintDecimals}
+                      value={bank.uiPrice * Number(inputAmount)}
                     />
                   ) : (
-                    <AmountWithValue amount="0" value="$0.00" />
+                    <AmountWithValue amount="0" amountDecimals={0} value={0} />
                   )}
                 </div>
                 {/* <div className="flex justify-between">
diff --git a/components/RepayForm.tsx b/components/RepayForm.tsx
index ad4a2c03..b0980468 100644
--- a/components/RepayForm.tsx
+++ b/components/RepayForm.tsx
@@ -13,11 +13,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import NumberFormat, { NumberFormatValues } from 'react-number-format'
 import mangoStore from '@store/mangoStore'
 import { notify } from './../utils/notifications'
-import {
-  floorToDecimal,
-  formatDecimal,
-  formatFixedDecimals,
-} from './../utils/numbers'
+import { floorToDecimal, formatDecimal } from './../utils/numbers'
 import ActionTokenList from './account/ActionTokenList'
 import ButtonGroup from './forms/ButtonGroup'
 import Label from './forms/Label'
@@ -306,17 +302,12 @@ function RepayForm({ onSuccess, token }: RepayFormProps) {
                   <p>{t('repayment-amount')}</p>
                   {inputAmount ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(inputAmount),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
-                        bank.uiPrice * Number(inputAmount),
-                        true
-                      )}
+                      amount={inputAmount}
+                      amountDecimals={bank.mintDecimals}
+                      value={bank.uiPrice * Number(inputAmount)}
                     />
                   ) : (
-                    <AmountWithValue amount="0" value="$0.00" />
+                    <AmountWithValue amount="0" amountDecimals={0} value={0} />
                   )}
                 </div>
                 <div className="flex justify-between">
diff --git a/components/WithdrawForm.tsx b/components/WithdrawForm.tsx
index c7ac3734..e9a29a13 100644
--- a/components/WithdrawForm.tsx
+++ b/components/WithdrawForm.tsx
@@ -18,11 +18,7 @@ import {
   INPUT_TOKEN_DEFAULT,
 } from './../utils/constants'
 import { notify } from './../utils/notifications'
-import {
-  floorToDecimal,
-  formatDecimal,
-  formatFixedDecimals,
-} from './../utils/numbers'
+import { floorToDecimal } from './../utils/numbers'
 import ActionTokenList from './account/ActionTokenList'
 import ButtonGroup from './forms/ButtonGroup'
 import Label from './forms/Label'
@@ -295,17 +291,12 @@ function WithdrawForm({ onSuccess, token }: WithdrawFormProps) {
                   <p>{t('withdraw-amount')}</p>
                   {inputAmount ? (
                     <AmountWithValue
-                      amount={formatDecimal(
-                        Number(inputAmount),
-                        bank.mintDecimals
-                      )}
-                      value={formatFixedDecimals(
-                        bank.uiPrice * Number(inputAmount),
-                        true
-                      )}
+                      amount={inputAmount}
+                      amountDecimals={bank.mintDecimals}
+                      value={bank.uiPrice * Number(inputAmount)}
                     />
                   ) : (
-                    <AmountWithValue amount="0" value="$0.00" />
+                    <AmountWithValue amount="0" amountDecimals={0} value={0} />
                   )}
                 </div>
               </div>
diff --git a/components/shared/BalancesTable.tsx b/components/shared/BalancesTable.tsx
index dcdc7982..394bc6c3 100644
--- a/components/shared/BalancesTable.tsx
+++ b/components/shared/BalancesTable.tsx
@@ -119,31 +119,17 @@ const BalancesTable = () => {
                 </Td>
                 <Td className="text-right">
                   <AmountWithValue
-                    amount={
-                      inOrders
-                        ? formatDecimal(Number(inOrders), bank.mintDecimals)
-                        : '0'
-                    }
-                    value={formatFixedDecimals(
-                      inOrders * bank.uiPrice,
-                      true,
-                      true
-                    )}
+                    amount={inOrders}
+                    amountDecimals={bank.mintDecimals}
+                    value={inOrders * bank.uiPrice}
                     stacked
                   />
                 </Td>
                 <Td className="text-right">
                   <AmountWithValue
-                    amount={
-                      unsettled
-                        ? formatDecimal(Number(unsettled), bank.mintDecimals)
-                        : '0'
-                    }
-                    value={formatFixedDecimals(
-                      unsettled * bank.uiPrice,
-                      true,
-                      true
-                    )}
+                    amount={unsettled}
+                    amountDecimals={bank.mintDecimals}
+                    value={unsettled * bank.uiPrice}
                     stacked
                   />
                 </Td>
diff --git a/components/stats/TokenStats.tsx b/components/stats/TokenStats.tsx
index 72bcab2d..06eadb0e 100644
--- a/components/stats/TokenStats.tsx
+++ b/components/stats/TokenStats.tsx
@@ -243,12 +243,8 @@ const TokenStats = () => {
                         {t('total-deposits')}
                       </p>
                       <AmountWithValue
-                        amount={formatFixedDecimals(deposits)}
-                        value={formatFixedDecimals(
-                          deposits * price,
-                          true,
-                          true
-                        )}
+                        amount={deposits}
+                        value={deposits * price}
                         stacked
                       />
                     </div>
@@ -257,8 +253,8 @@ const TokenStats = () => {
                         {t('total-borrows')}
                       </p>
                       <AmountWithValue
-                        amount={formatFixedDecimals(borrows)}
-                        value={formatFixedDecimals(borrows * price, true, true)}
+                        amount={borrows}
+                        value={borrows * price}
                         stacked
                       />
                     </div>