diff options
author | PhyrexTsai <x01ep23i@hotmail.com> | 2018-07-04 09:06:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-04 09:06:10 +0800 |
commit | f38dc03b27a457733315cbb16d59d0ea339505da (patch) | |
tree | 77cfdf13c0e83c8e6d87099bfedddc3d58667de1 /ui/app/components/wallet-view.js | |
parent | 11736e6318182ab5b43430410a46059e5f46ad52 (diff) | |
parent | 13b03ec090df70512d43e0d6acbe6bf60040a892 (diff) | |
download | tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.gz tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.zst tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.zip |
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
Diffstat (limited to 'ui/app/components/wallet-view.js')
-rw-r--r-- | ui/app/components/wallet-view.js | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 3b29dacac..da142fad8 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -36,7 +36,6 @@ function mapStateToProps (state) { tokens: state.metamask.tokens, keyrings: state.metamask.keyrings, selectedAddress: selectors.getSelectedAddress(state), - selectedIdentity: selectors.getSelectedIdentity(state), selectedAccount: selectors.getSelectedAccount(state), selectedTokenAddress: state.metamask.selectedTokenAddress, } @@ -99,21 +98,24 @@ WalletView.prototype.render = function () { const { responsiveDisplayClassname, selectedAddress, - selectedIdentity, keyrings, showAccountDetailModal, sidebarOpen, hideSidebar, history, + identities, } = this.props // temporary logs + fake extra wallets // console.log('walletview, selectedAccount:', selectedAccount) const checksummedAddress = checksumAddress(selectedAddress) + if (!selectedAddress) { + throw new Error('selectedAddress should not be ' + String(selectedAddress)) + } + const keyring = keyrings.find((kr) => { - return kr.accounts.includes(selectedAddress) || - kr.accounts.includes(selectedIdentity.address) + return kr.accounts.includes(selectedAddress) }) const type = keyring.type @@ -145,7 +147,7 @@ WalletView.prototype.render = function () { h('span.account-name', { style: {}, }, [ - selectedIdentity.name, + identities[selectedAddress].name, ]), h('button.btn-clear.wallet-view__details-button.allcaps', this.context.t('details')), |