diff --git a/js/src/views/Accounts/List/list.js b/js/src/views/Accounts/List/list.js index c2e961bb8d8..4d54b640f69 100644 --- a/js/src/views/Accounts/List/list.js +++ b/js/src/views/Accounts/List/list.js @@ -24,6 +24,7 @@ import styles from './list.css'; export default class List extends Component { static propTypes = { accounts: PropTypes.object, + walletsOwners: PropTypes.object, balances: PropTypes.object, link: PropTypes.string, search: PropTypes.array, @@ -42,7 +43,7 @@ export default class List extends Component { } renderAccounts () { - const { accounts, balances, link, empty, handleAddSearchToken } = this.props; + const { accounts, balances, link, empty, handleAddSearchToken, walletsOwners } = this.props; if (empty) { return ( @@ -60,6 +61,8 @@ export default class List extends Component { const account = accounts[address] || {}; const balance = balances[address] || {}; + const owners = walletsOwners && walletsOwners[address] || null; + return (
); diff --git a/js/src/views/Accounts/Summary/summary.js b/js/src/views/Accounts/Summary/summary.js index 842629c6f91..764f24edfe0 100644 --- a/js/src/views/Accounts/Summary/summary.js +++ b/js/src/views/Accounts/Summary/summary.js @@ -17,8 +17,12 @@ import React, { Component, PropTypes } from 'react'; import { Link } from 'react-router'; import { isEqual } from 'lodash'; +import ReactTooltip from 'react-tooltip'; import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '~/ui'; +import { nullableProptype } from '~/util/proptypes'; + +import styles from '../accounts.css'; export default class Summary extends Component { static contextTypes = { @@ -31,7 +35,8 @@ export default class Summary extends Component { link: PropTypes.string, name: PropTypes.string, noLink: PropTypes.bool, - handleAddSearchToken: PropTypes.func + handleAddSearchToken: PropTypes.func, + owners: nullableProptype(PropTypes.array) }; static defaultProps = { @@ -100,11 +105,41 @@ export default class Summary extends Component { title={ this.renderLink() } byline={ addressComponent } /> + { this.renderOwners() } { this.renderBalance() } ); } + renderOwners () { + const { owners } = this.props; + + if (!owners || owners.length === 0) { + return null; + } + + return ( +