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

Adds error handler in Importer // Import AddressBook #2885

Browse Source
This commit is contained in:
Nicolas Gotchac
2016-11-14 18:34:05 +01:00
parent 5127b997eb
commit 134622ea3a
4 changed files with 146 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,11 +28,12 @@ class IdentityName extends Component {
tokens: PropTypes.object,
empty: PropTypes.bool,
shorten: PropTypes.bool,
unknown: PropTypes.bool
unknown: PropTypes.bool,
name: PropTypes.string
}
render () {
const { address, accountsInfo, tokens, empty, shorten, unknown, className } = this.props;
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);
@@ -43,13 +44,14 @@ class IdentityName extends Component {
const addressFallback = shorten ? this.formatHash(address) : address;
const fallback = unknown ? defaultName : addressFallback;
const isUuid = hasAccount && account.name === account.uuid;
const name = hasAccount && !isUuid
const displayName = (name && name.toUpperCase().trim()) ||
(hasAccount && !isUuid
? account.name.toUpperCase().trim()
: fallback;
: fallback);
return (
<span className={ className }>
{ name && name.length ? name : fallback }
{ displayName && displayName.length ? displayName : fallback }
</span>
);
}