From 54bbf8d8590014b92e7857f30bdc2d8f3779431a Mon Sep 17 00:00:00 2001 From: Dan Date: Wed, 13 Sep 2017 23:50:13 -0230 Subject: Handle transaction totals in WEI in tx-list, send and pending. --- ui/app/send.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ui/app/send.js') diff --git a/ui/app/send.js b/ui/app/send.js index 4e7fdb705..b14c48e56 100644 --- a/ui/app/send.js +++ b/ui/app/send.js @@ -400,15 +400,16 @@ SendTransactionScreen.prototype.onSubmit = function (event) { this.props.dispatch(addToAddressBook(recipient, nickname)) // TODO: need a clean way to integrate this into conversionUtil - const sendConversionRate = this.props.currentCurrency === 'ETH' + const sendConversionRate = state.activeCurrency === 'ETH' ? this.props.conversionRate : new BigNumber(1.0).div(this.props.conversionRate) const sendAmount = conversionUtil(this.state.newTx.amount, { fromNumericBase: 'dec', toNumericBase: 'hex', - fromCurrency: this.props.currentCurrency, + fromCurrency: state.activeCurrency, toCurrency: 'ETH', + toDenomination: 'WEI', conversionRate: sendConversionRate, }) -- cgit v1.2.3