aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pending-tx.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-05-17 02:34:53 +0800
committerDan Finlay <dan@danfinlay.com>2017-05-17 02:36:21 +0800
commitb4e6ea9db787cbf7839d9caad6e1ea0385cc588e (patch)
treea476d521bc8d17f9598b8e1fdc98e51dded88cbf /ui/app/components/pending-tx.js
parentd165f3a2b6f55cd1f4d4809c61ab3a4af5f8b070 (diff)
downloadtangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.gz
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.bz2
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.lz
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.xz
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.tar.zst
tangerine-wallet-browser-b4e6ea9db787cbf7839d9caad6e1ea0385cc588e.zip
Fix fiat rendering
Fixes #1439. When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter. This now passes it in wherever it's used.
Diffstat (limited to 'ui/app/components/pending-tx.js')
-rw-r--r--ui/app/components/pending-tx.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index b084a1d2a..0d1f06ba6 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -31,6 +31,8 @@ function PendingTx () {
PendingTx.prototype.render = function () {
const props = this.props
+ const { currentCurrency } = props
+
const conversionRate = props.conversionRate
const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {}
@@ -104,6 +106,7 @@ PendingTx.prototype.render = function () {
h(EthBalance, {
value: balance,
conversionRate,
+ currentCurrency,
inline: true,
labelColor: '#F7861C',
}),
@@ -141,7 +144,7 @@ PendingTx.prototype.render = function () {
// in the way that gas and gasLimit currently are.
h('.row', [
h('.cell.label', 'Amount'),
- h(EthBalance, { value: txParams.value }),
+ h(EthBalance, { value: txParams.value, currentCurrency, conversionRate }),
]),
// Gas Limit (customizable)
@@ -189,7 +192,7 @@ PendingTx.prototype.render = function () {
// Max Transaction Fee (calculated)
h('.cell.row', [
h('.cell.label', 'Max Transaction Fee'),
- h(EthBalance, { value: txFeeBn.toString(16) }),
+ h(EthBalance, { value: txFeeBn.toString(16), currentCurrency, conversionRate }),
]),
h('.cell.row', {
@@ -208,6 +211,8 @@ PendingTx.prototype.render = function () {
}, [
h(EthBalance, {
value: maxCost.toString(16),
+ currentCurrency,
+ conversionRate,
inline: true,
labelColor: 'black',
fontSize: '16px',