aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/send.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-08-29 06:50:40 +0800
committerDan <danjm.com@gmail.com>2017-08-29 22:56:32 +0800
commitdc72c4cc918934b8dafc253ca5e7c9674551aa51 (patch)
tree549b8aa8e4fe02f8cf5c193b4d2b71edbc67d160 /ui/app/send.js
parentaf6e30b8baaed258381fd050b98452de0844d9c6 (diff)
downloadtangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar.gz
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar.bz2
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar.lz
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar.xz
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.tar.zst
tangerine-wallet-browser-dc72c4cc918934b8dafc253ca5e7c9674551aa51.zip
Using eth balance component to ensure proper rounding.
Diffstat (limited to 'ui/app/send.js')
-rw-r--r--ui/app/send.js17
1 files changed, 13 insertions, 4 deletions
diff --git a/ui/app/send.js b/ui/app/send.js
index f54a76926..ae779790d 100644
--- a/ui/app/send.js
+++ b/ui/app/send.js
@@ -58,7 +58,6 @@ function SendTransactionScreen () {
amount: '0.0001', // see L544
gasPrice: '0x19',
gas: '0x7b0d',
- gasFee: ((parseInt('0x7b0d', 16) * parseInt('0x19', 16)) / 1000000000).toFixed(6),
txData: null,
memo: '',
},
@@ -276,7 +275,19 @@ SendTransactionScreen.prototype.render = function () {
lineHeight: '22.4px'
}
})
- : h('div', {}, [`${this.state.newTx.gasFee} ETH`]),
+ : h(EthBalance, {
+ value: this.getTxFeeBn(this.state.newTx.gas.toString(16), this.state.newTx.gasPrice.toString(16)).toString(16),
+ currentCurrency,
+ conversionRate,
+ showFiat: false,
+ hideTooltip: true,
+ styleOveride: {
+ color: '#5d5d5d',
+ fontSize: '16px',
+ fontFamily: 'DIN OT',
+ lineHeight: '22.4px'
+ }
+ }),
h('div.send-screen-gas-input-customize', {
onClick: () => this.toggleTooltip.bind(this)(!this.state.tooltipIsOpen),
}, [
@@ -294,8 +305,6 @@ SendTransactionScreen.prototype.render = function () {
newTx: Object.assign(
this.state.newTx,
{
- // TODO: determine how prices are rounded on master
- gasFee: ((gasPrice / 1000000000) * gasLimit).toFixed(6),
gas: gasLimit,
gasPrice,
}