aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/index.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-05-16 14:25:21 +0800
committerGitHub <noreply@github.com>2017-05-16 14:25:20 +0800
commit9560de80a0576cfd775f247c51ebac6a709f4864 (patch)
treee7769d67e754bf3e630a31b87ee9abc06df6da21 /ui/app/accounts/index.js
parent687dfc87bdfbdbde58a247a6ae8ab49b2a324da8 (diff)
parente28e0acaa8fb690a7fe5ac45597837f20d2079e1 (diff)
downloadtangerine-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/accounts/index.js')
-rw-r--r--ui/app/accounts/index.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 9584ebad9..5105c214b 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -23,6 +23,7 @@ function mapStateToProps (state) {
scrollToBottom: state.appState.scrollToBottom,
pending,
keyrings: state.metamask.keyrings,
+ conversionRate: state.metamask.conversionRate,
}
}
@@ -33,7 +34,7 @@ function AccountsScreen () {
AccountsScreen.prototype.render = function () {
const props = this.props
- const { keyrings } = props
+ const { keyrings, conversionRate } = props
const identityList = valuesFor(props.identities)
const unapprovedTxList = valuesFor(props.unapprovedTxs)
@@ -81,6 +82,7 @@ AccountsScreen.prototype.render = function () {
key: `acct-panel-${identity.address}`,
identity,
selectedAddress: this.props.selectedAddress,
+ conversionRate,
accounts: this.props.accounts,
onShowDetail: this.onShowDetail.bind(this),
pending,