diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-07-08 07:33:06 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-07-08 07:33:06 +0800 |
commit | 86b7cc6637edefd2f628238a2abff540c82e1a78 (patch) | |
tree | a6126d8b83ec7b66cd2a138c670863beedbefba1 /ui/app/components/account-panel.js | |
parent | 9a9c1f2cd48235be47e65b42c84bd9bf55ecbec4 (diff) | |
parent | 44a45f38be5251eacd2c43ebbc55acf34f65084c (diff) | |
download | tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.gz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.bz2 tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.lz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.xz tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.tar.zst tangerine-wallet-browser-86b7cc6637edefd2f628238a2abff540c82e1a78.zip |
Resolve merge conflict.
Diffstat (limited to 'ui/app/components/account-panel.js')
-rw-r--r-- | ui/app/components/account-panel.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/components/account-panel.js b/ui/app/components/account-panel.js index d50522fa2..abaaf8163 100644 --- a/ui/app/components/account-panel.js +++ b/ui/app/components/account-panel.js @@ -22,7 +22,7 @@ AccountPanel.prototype.render = function () { var panelState = { key: `accountPanel${identity.address}`, identiconKey: identity.address, - identiconLabel: identity.name, + identiconLabel: identity.name || '', attributes: [ { key: 'ADDRESS', |