mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 01:39:44 +01:00
Merge pull request #4509 from whymarrh/wallet-view-assertion
Add explicit selectedAddress assertion to the wallet view
This commit is contained in:
commit
c2e3194dbf
@ -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')),
|
||||
|
Loading…
Reference in New Issue
Block a user