diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-05-16 14:25:21 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 14:25:20 +0800 |
commit | 9560de80a0576cfd775f247c51ebac6a709f4864 (patch) | |
tree | e7769d67e754bf3e630a31b87ee9abc06df6da21 /ui/app/conf-tx.js | |
parent | 687dfc87bdfbdbde58a247a6ae8ab49b2a324da8 (diff) | |
parent | e28e0acaa8fb690a7fe5ac45597837f20d2079e1 (diff) | |
download | tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar.gz tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar.bz2 tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar.lz tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar.xz tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.tar.zst tangerine-wallet-browser-9560de80a0576cfd775f247c51ebac6a709f4864.zip |
Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxForm
Add test around conf-tx view's gas editing.
Diffstat (limited to 'ui/app/conf-tx.js')
-rw-r--r-- | ui/app/conf-tx.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js index 83ac5a4fd..c4df66931 100644 --- a/ui/app/conf-tx.js +++ b/ui/app/conf-tx.js @@ -27,6 +27,7 @@ function mapStateToProps (state) { warning: state.appState.warning, network: state.metamask.network, provider: state.metamask.provider, + conversionRate: state.metamask.conversionRate, } } @@ -38,7 +39,7 @@ function ConfirmTxScreen () { ConfirmTxScreen.prototype.render = function () { const props = this.props const { network, provider, unapprovedTxs, - unapprovedMsgs, unapprovedPersonalMsgs } = props + unapprovedMsgs, unapprovedPersonalMsgs, conversionRate } = props var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network) @@ -102,6 +103,7 @@ ConfirmTxScreen.prototype.render = function () { selectedAddress: props.selectedAddress, accounts: props.accounts, identities: props.identities, + conversionRate, // Actions buyEth: this.buyEth.bind(this, txParams.from || props.selectedAddress), sendTransaction: this.sendTransaction.bind(this, txData), |