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

Remove selectedAddress from SelectedAccount component (#8285)

Browse Source
This commit is contained in:
Whymarrh Whitby 2020-04-02 11:49:19 -02:30 committed by GitHub
parent 1b38b4867a
commit 09450fe765
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/components/app/selected-account/selected-account.component.js
View File

@ -15,14 +15,13 @@ class SelectedAccount extends Component {
} }
static propTypes = { static propTypes = {
selectedAddress: PropTypes.string, selectedIdentity: PropTypes.object.isRequired,
selectedIdentity: PropTypes.object,
} }
render () { render () {
const { t } = this.context const { t } = this.context
const { selectedAddress, selectedIdentity } = this.props const { selectedIdentity } = this.props
const checksummedAddress = checksumAddress(selectedAddress) const checksummedAddress = checksumAddress(selectedIdentity.address)
return ( return (
<div className="selected-account"> <div className="selected-account">

3
ui/app/components/app/selected-account/selected-account.container.js
View File

@ -1,11 +1,10 @@
import { connect } from 'react-redux' import { connect } from 'react-redux'
import SelectedAccount from './selected-account.component' import SelectedAccount from './selected-account.component'
import { getSelectedAddress, getSelectedIdentity } from '../../../selectors/selectors' import { getSelectedIdentity } from '../../../selectors/selectors'
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
return { return {
selectedAddress: getSelectedAddress(state),
selectedIdentity: getSelectedIdentity(state), selectedIdentity: getSelectedIdentity(state),
} }
} }

3
ui/app/components/app/selected-account/tests/selected-account-component.test.js
View File

@ -7,8 +7,7 @@ describe('SelectedAccount Component', function () {
it('should render checksummed address', function () { it('should render checksummed address', function () {
const wrapper = render(( const wrapper = render((
<SelectedAccount <SelectedAccount
selectedAddress="0x1b82543566f41a7db9a9a75fc933c340ffb55c9d" selectedIdentity={{ name: 'testName', address: '0x1b82543566f41a7db9a9a75fc933c340ffb55c9d' }}
selectedIdentity={{ name: 'testName' }}
/> />
), { context: { t: () => {} } }) ), { context: { t: () => {} } })
// Checksummed version of address is displayed // Checksummed version of address is displayed