grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3732 from ethcore/jg-duplicate-accounts

Browse Source 
Give accounts precedence over address_book entries
This commit is contained in:
Robert Habermeier
2016-12-08 12:27:26 +01:00
committed by GitHub
parent 15ec63750e 5bdb6e4f22
commit de4715bc67
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/redux/providers/personalActions.js
View File

@@ -27,7 +27,7 @@ export function personalAccountsInfo (accountsInfo) {
Object.keys(accountsInfo || {})
.map((address) => Object.assign({}, accountsInfo[address], { address }))
.filter((account) => !account.meta.deleted)
.filter((account) => account.uuid || !account.meta.deleted)
.forEach((account) => {
if (account.uuid) {
accounts[account.address] = account;

2
js/src/ui/IdentityName/identityName.js
View File

@@ -37,7 +37,7 @@ class IdentityName extends Component {
render () {
const { address, accountsInfo, tokens, empty, name, shorten, unknown, className } = this.props;
const account = accountsInfo[address] || tokens[address];
const hasAccount = account && (!account.meta || !account.meta.deleted);
const hasAccount = account && (account.uuid || !account.meta || !account.meta.deleted);
if (!hasAccount && empty) {
return null;