From e9c7475d27e7bcc80b138c0ca4440d044f733f64 Mon Sep 17 00:00:00 2001 From: George Lima Date: Wed, 9 Jan 2019 10:14:02 -0300 Subject: [PATCH] feature: use bignumber.js --- app/containers/send.js | 5 +++-- app/containers/transactions.js | 3 ++- app/views/send.js | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/containers/send.js b/app/containers/send.js index 3ca81b1..fad3971 100644 --- a/app/containers/send.js +++ b/app/containers/send.js @@ -1,6 +1,7 @@ // @flow import { connect } from 'react-redux'; import eres from 'eres'; +import { BigNumber } from 'bignumber.js'; import rpc from '../../services/api'; import { SendView } from '../views/send'; @@ -49,12 +50,12 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({ [ filterObjectNullKeys({ address: to, - amount: Number.parseFloat(amount), + amount: new BigNumber(amount).toNumber(), memo, }), ], 1, - Number.parseFloat(String(fee)), + new BigNumber(fee).toNumber(), ), ); diff --git a/app/containers/transactions.js b/app/containers/transactions.js index b4caeab..7160e49 100644 --- a/app/containers/transactions.js +++ b/app/containers/transactions.js @@ -4,6 +4,7 @@ import eres from 'eres'; import flow from 'lodash.flow'; import groupBy from 'lodash.groupby'; import dateFns from 'date-fns'; +import { BigNumber } from 'bignumber.js'; import { TransactionsView } from '../views/transactions'; import { @@ -46,7 +47,7 @@ const mapDispatchToProps = (dispatch: Dispatch) => ({ type: transaction.category, date: new Date(transaction.time * 1000).toISOString(), address: transaction.address, - amount: Math.abs(transaction.amount), + amount: new BigNumber(transaction.amount).absoluteValue().toNumber(), })), arr => groupBy(arr, obj => dateFns.format(obj.date, 'MMM DD, YYYY')), obj => Object.keys(obj).map(day => ({ diff --git a/app/views/send.js b/app/views/send.js index 2e6ed1a..71a9128 100644 --- a/app/views/send.js +++ b/app/views/send.js @@ -1,6 +1,7 @@ // @flow import React, { PureComponent } from 'react'; import styled from 'styled-components'; +import { BigNumber } from 'bignumber.js'; import FEES from '../constants/fees'; @@ -158,15 +159,15 @@ export class SendView extends PureComponent { const zecBalance = formatNumber({ value: balance, append: 'ZEC ' }); const zecBalanceInUsd = formatNumber({ - value: balance * zecPrice, + value: new BigNumber(balance).multipliedBy(zecPrice).toNumber(), append: 'USD $', }); const valueSent = formatNumber({ - value: Number.parseFloat(amount), + value: new BigNumber(amount).toNumber(), append: 'ZEC ', }); const valueSentInUsd = formatNumber({ - value: Number.parseFloat(amount) * zecPrice, + value: new BigNumber(amount).multipliedBy(zecPrice).toNumber(), append: 'USD $', });