m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix saving/sending of amounts in USD

Browse Source
This commit is contained in:
Dan 2017-09-13 11:15:50 -02:30 committed by Chi Kei Chan
parent 55d62190e3
commit 09a4491bb1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/send.js
View File

@ -21,6 +21,7 @@ const {
const { stripHexPrefix, addHexPrefix } = require('ethereumjs-util')
const { isHex, numericBalance } = require('./util')
const { conversionUtil } = require('./conversion-util')
const BigNumber = require('bignumber.js')
const ARAGON = '960b236A07cf122663c4303350609A66A7B288C0'
@ -243,7 +244,7 @@ SendTransactionScreen.prototype.render = function () {
]),
h('input.large-input.send-screen-input', {
placeholder: '0 ETH',
placeholder: `0 ${currentCurrency}`,
type: 'number',
onChange: (event) => {
this.setState({
@ -667,14 +668,19 @@ SendTransactionScreen.prototype.onSubmit = function () {
this.props.dispatch(addToAddressBook(recipient, nickname))
// TODO: need a clean way to integrate this into conversionUtil
const sendConversionRate = this.props.currentCurrency === '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,
toCurrency: 'ETH',
conversionRate: this.props.conversionRate,
conversionRate: sendConversionRate,
})
var txParams = {
from: this.state.newTx.from,
to: this.state.newTx.to,