aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/send
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-10-13 00:42:14 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-10-16 11:09:05 +0800
commita9244f5e426d6572ef135e07ab75a49c00e84942 (patch)
tree7aa7e1d98711ffbb2e27eb068b086c13238f421f /ui/app/components/send
parenta59972dcabc56c3d92f09ba1b88a2ded70ce8c34 (diff)
downloadtangerine-wallet-browser-a9244f5e426d6572ef135e07ab75a49c00e84942.tar.gz
tangerine-wallet-browser-a9244f5e426d6572ef135e07ab75a49c00e84942.tar.zst
tangerine-wallet-browser-a9244f5e426d6572ef135e07ab75a49c00e84942.zip
Customize Gas connected to state
Diffstat (limited to 'ui/app/components/send')
-rw-r--r--ui/app/components/send/gas-fee-display-v2.js6
-rw-r--r--ui/app/components/send/send-v2-container.js4
2 files changed, 9 insertions, 1 deletions
diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js
index 226ae93f8..961d55610 100644
--- a/ui/app/components/send/gas-fee-display-v2.js
+++ b/ui/app/components/send/gas-fee-display-v2.js
@@ -28,7 +28,11 @@ GasFeeDisplay.prototype.render = function () {
? h(CurrencyDisplay, {
primaryCurrency: 'ETH',
convertedCurrency: 'USD',
- value: multiplyCurrencies(gasLimit, gasPrice, { toNumericBase: 'hex' }),
+ value: multiplyCurrencies(gasLimit, gasPrice, {
+ toNumericBase: 'hex',
+ multiplicandBase: 16,
+ multiplierBase: 16,
+ }),
conversionRate,
convertedPrefix: '$',
readOnly: true,
diff --git a/ui/app/components/send/send-v2-container.js b/ui/app/components/send/send-v2-container.js
index 0c8dd5335..c3af1c972 100644
--- a/ui/app/components/send/send-v2-container.js
+++ b/ui/app/components/send/send-v2-container.js
@@ -12,6 +12,8 @@ const {
getSelectedToken,
getSelectedTokenExchangeRate,
getSelectedAddress,
+ getGasPrice,
+ getGasLimit,
} = require('../../selectors')
module.exports = connect(mapStateToProps, mapDispatchToProps)(SendEther)
@@ -49,6 +51,8 @@ function mapStateToProps (state) {
primaryCurrency,
data,
tokenToUSDRate,
+ gasPrice: getGasPrice(state),
+ gasLimit: getGasLimit(state),
}
}