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

Ignore meta.deleted for account name display

Browse Source
This commit is contained in:
Jaco Greeff 2016-12-07 11:51:48 +01:00
parent f7586109df
commit 5bdb6e4f22
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,11 +27,11 @@ export function personalAccountsInfo (accountsInfo) {
Object.keys(accountsInfo || {}) Object.keys(accountsInfo || {})
.map((address) => Object.assign({}, accountsInfo[address], { address })) .map((address) => Object.assign({}, accountsInfo[address], { address }))
.filter((account) => account.uuid || !account.meta.deleted)
.forEach((account) => { .forEach((account) => {
if (account.uuid) { if (account.uuid) {
accounts[account.address] = account; accounts[account.address] = account;
} else if (!account.meta.deleted) { } else if (account.meta.wallet) {
if (account.meta.wallet) {
account.wallet = true; account.wallet = true;
wallets[account.address] = account; wallets[account.address] = account;
} else if (account.meta.contract) { } else if (account.meta.contract) {
@ -39,7 +39,6 @@ export function personalAccountsInfo (accountsInfo) {
} else { } else {
contacts[account.address] = account; contacts[account.address] = account;
} }
}
}); });
return (dispatch) => { return (dispatch) => {

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

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