DDW-427 Issues on redeem rewards screen - fixing formatters for lovel…

…ace values
input-output-hk · Dec 2, 2020 · ddd7e4a · ddd7e4a
1 parent 74ce1f8
commit ddd7e4a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/source/renderer/app/api/api.js b/source/renderer/app/api/api.js
@@ -181,7 +181,7 @@ import { getNewsHash } from './news/requests/getNewsHash';
 import { deleteTransaction } from './transactions/requests/deleteTransaction';
 import { WALLET_BYRON_KINDS } from '../config/walletRestoreConfig';
 import ApiError from '../domains/ApiError';
-import { formattedAdaAmountToLovelace } from '../utils/formatters';
+import { formattedAmountToLovelace } from '../utils/formatters';
 
 const { isIncentivizedTestnet } = global;
 
@@ -1349,8 +1349,8 @@ export default class AdaApi {
       availableAmount: availableBalance,
     } = wallet;
     const minRewardsReceiverBalance = new BigNumber(MIN_REWARDS_REDEMPTION_RECEIVER_BALANCE);
-    const amount = walletBalance.lessThan(minRewardsReceiverBalance.mul(MIN_REWARDS_REDEMPTION_RECEIVER_BALANCE * 3)) ?
-      formattedAdaAmountToLovelace(walletBalance) :
+    const amount = walletBalance.lessThan(minRewardsReceiverBalance.times(MIN_REWARDS_REDEMPTION_RECEIVER_BALANCE * 3)) ?
+      formattedAmountToLovelace(walletBalance.toString()) :
       REDEEM_ITN_REWARDS_AMOUNT;
     const payload = {
       address,

diff --git a/source/renderer/app/utils/formatters.js b/source/renderer/app/utils/formatters.js
@@ -92,10 +92,7 @@ export const toFixedUserFormat = (number: number, digits: number) => {
 };
 
 export const formattedAmountToLovelace = (amount: string): number =>
-  parseInt(formattedAmountToBigNumber(amount).times(LOVELACES_PER_ADA), 10);
-
-export const formattedAdaAmountToLovelace = (adaAmount: BigNumber): number =>
-  adaAmount.mul(LOVELACES_PER_ADA).toNumber();
+  parseInt(formattedAmountToBigNumber(amount).times(LOVELACES_PER_ADA).toString(), 10);
 
 export const formattedLovelaceToAmount = (lovelace: number): number =>
   formattedAmountToBigNumber(String(lovelace))