aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/conf-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/conf-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/conf-tx.js')
-rw-r--r--ui/app/conf-tx.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index c4df66931..0d7c4c1bb 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -28,6 +28,7 @@ function mapStateToProps (state) {
network: state.metamask.network,
provider: state.metamask.provider,
conversionRate: state.metamask.conversionRate,
+ currentCurrency: state.metamask.currentCurrency,
}
}
@@ -38,7 +39,7 @@ function ConfirmTxScreen () {
ConfirmTxScreen.prototype.render = function () {
const props = this.props
- const { network, provider, unapprovedTxs,
+ const { network, provider, unapprovedTxs, currentCurrency,
unapprovedMsgs, unapprovedPersonalMsgs, conversionRate } = props
var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network)
@@ -104,6 +105,7 @@ ConfirmTxScreen.prototype.render = function () {
accounts: props.accounts,
identities: props.identities,
conversionRate,
+ currentCurrency,
// Actions
buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress),
sendTransaction: this.sendTransaction.bind(this, txData),