m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #4509 from whymarrh/wallet-view-assertion

Browse Source 
Add explicit selectedAddress assertion to the wallet view
This commit is contained in:
kumavis 2018-06-05 12:57:24 -07:00 committed by GitHub
commit c2e3194dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/components/wallet-view.js
View File

@ -36,7 +36,6 @@ function mapStateToProps (state) {
tokens: state.metamask.tokens, tokens: state.metamask.tokens,
keyrings: state.metamask.keyrings, keyrings: state.metamask.keyrings,
selectedAddress: selectors.getSelectedAddress(state), selectedAddress: selectors.getSelectedAddress(state),
selectedIdentity: selectors.getSelectedIdentity(state),
selectedAccount: selectors.getSelectedAccount(state), selectedAccount: selectors.getSelectedAccount(state),
selectedTokenAddress: state.metamask.selectedTokenAddress, selectedTokenAddress: state.metamask.selectedTokenAddress,
} }
@ -99,21 +98,24 @@ WalletView.prototype.render = function () {
const { const {
responsiveDisplayClassname, responsiveDisplayClassname,
selectedAddress, selectedAddress,
selectedIdentity,
keyrings, keyrings,
showAccountDetailModal, showAccountDetailModal,
sidebarOpen, sidebarOpen,
hideSidebar, hideSidebar,
history, history,
identities,
} = this.props } = this.props
// temporary logs + fake extra wallets // temporary logs + fake extra wallets
// console.log('walletview, selectedAccount:', selectedAccount) // console.log('walletview, selectedAccount:', selectedAccount)
const checksummedAddress = checksumAddress(selectedAddress) const checksummedAddress = checksumAddress(selectedAddress)
if (!selectedAddress) {
throw new Error('selectedAddress should not be ' + String(selectedAddress))
}
const keyring = keyrings.find((kr) => { const keyring = keyrings.find((kr) => {
return kr.accounts.includes(selectedAddress) || return kr.accounts.includes(selectedAddress)
kr.accounts.includes(selectedIdentity.address)
}) })
const type = keyring.type const type = keyring.type
@ -145,7 +147,7 @@ WalletView.prototype.render = function () {
h('span.account-name', { h('span.account-name', {
style: {}, style: {},
}, [ }, [
selectedIdentity.name, identities[selectedAddress].name,
]), ]),
h('button.btn-clear.wallet-view__details-button.allcaps', this.context.t('details')), h('button.btn-clear.wallet-view__details-button.allcaps', this.context.t('details')),