diff options
author | frankiebee <frankie.diamond@gmail.com> | 2017-05-23 07:48:10 +0800 |
---|---|---|
committer | frankiebee <frankie.diamond@gmail.com> | 2017-05-23 07:48:10 +0800 |
commit | 13a41f3129299844c908965a25996ec5cd190eb1 (patch) | |
tree | a2b0241aa0db2732cb1afe680831768731e9d49a /ui/app/conf-tx.js | |
parent | f87ea49b5ac2d66d8f281f08f42e8cfd2d701ba7 (diff) | |
parent | c7fd9f424087b20bfc356d360d2a2246ca0e5ad7 (diff) | |
download | tangerine-wallet-browser-13a41f3129299844c908965a25996ec5cd190eb1.tar.gz tangerine-wallet-browser-13a41f3129299844c908965a25996ec5cd190eb1.tar.zst tangerine-wallet-browser-13a41f3129299844c908965a25996ec5cd190eb1.zip |
Merge branch 'master' into networkController
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 83ac5a4fd..008627ce6 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -27,6 +27,8 @@ function mapStateToProps (state) { warning: state.appState.warning, network: state.metamask.network, provider: state.metamask.provider, + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, } } @@ -37,8 +39,8 @@ function ConfirmTxScreen () { ConfirmTxScreen.prototype.render = function () { const props = this.props - const { network, provider, unapprovedTxs, - unapprovedMsgs, unapprovedPersonalMsgs } = props + const { network, provider, unapprovedTxs, currentCurrency, + unapprovedMsgs, unapprovedPersonalMsgs, conversionRate } = props var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network) @@ -102,9 +104,11 @@ ConfirmTxScreen.prototype.render = function () { selectedAddress: props.selectedAddress, accounts: props.accounts, identities: props.identities, + conversionRate, + currentCurrency, // Actions buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress), - sendTransaction: this.sendTransaction.bind(this, txData), + sendTransaction: this.sendTransaction.bind(this), cancelTransaction: this.cancelTransaction.bind(this, txData), signMessage: this.signMessage.bind(this, txData), signPersonalMessage: this.signPersonalMessage.bind(this, txData), |