diff options
author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
---|---|---|
committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-05-17 07:28:57 +0800 |
commit | 90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4 (patch) | |
tree | 3739c65edfe8a7c4e7eca455d2f1a522176e3af7 /ui/app/accounts/index.js | |
parent | 44f25cd93c18c57acf993ace3387a4d569d8dcca (diff) | |
parent | 43ea223c9fe8ee593a572b153defc5ddefd72e95 (diff) | |
download | tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.gz tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.tar.zst tangerine-wallet-browser-90bfa3cbcdbe0ace28bb25ecb350b1080a4139d4.zip |
Fix merge conflicts.
Diffstat (limited to 'ui/app/accounts/index.js')
-rw-r--r-- | ui/app/accounts/index.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js index 9584ebad9..ac2615cd7 100644 --- a/ui/app/accounts/index.js +++ b/ui/app/accounts/index.js @@ -23,6 +23,8 @@ function mapStateToProps (state) { scrollToBottom: state.appState.scrollToBottom, pending, keyrings: state.metamask.keyrings, + conversionRate: state.metamask.conversionRate, + currentCurrency: state.metamask.currentCurrency, } } @@ -33,7 +35,7 @@ function AccountsScreen () { AccountsScreen.prototype.render = function () { const props = this.props - const { keyrings } = props + const { keyrings, conversionRate, currentCurrency } = props const identityList = valuesFor(props.identities) const unapprovedTxList = valuesFor(props.unapprovedTxs) @@ -81,6 +83,8 @@ AccountsScreen.prototype.render = function () { key: `acct-panel-${identity.address}`, identity, selectedAddress: this.props.selectedAddress, + conversionRate, + currentCurrency, accounts: this.props.accounts, onShowDetail: this.onShowDetail.bind(this), pending, |