diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-08-21 09:51:15 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-08-21 09:51:35 +0800 |
| commit | ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32 (patch) | |
| tree | d0e54e987f7ee42d21dd8a5aeb582c4a2c72e02c /ui/app/components/wallet-view.js | |
| parent | 6e813db47309b7773d430fecc6a467be66f6f16b (diff) | |
| parent | 887cad973f25f43d2d4502ff31657f156a44b188 (diff) | |
| download | tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.tar.gz tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.tar.zst tangerine-wallet-browser-ab7eb73ecc9e1eac8a5934a59c186e9f92a0bb32.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/wallet-view.js')
| -rw-r--r-- | ui/app/components/wallet-view.js | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 20c2be0f1..8e092364c 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -118,8 +118,18 @@ WalletView.prototype.render = function () { return kr.accounts.includes(selectedAddress) }) - const type = keyring.type - const isLoose = type !== 'HD Key Tree' + let label = '' + let type + if (keyring) { + type = keyring.type + if (type !== 'HD Key Tree') { + if (type.toLowerCase().search('hardware') !== -1) { + label = this.context.t('hardware') + } else { + label = this.context.t('imported') + } + } + } return h('div.wallet-view.flex-column' + (responsiveDisplayClassname || ''), { style: {}, @@ -133,7 +143,7 @@ WalletView.prototype.render = function () { onClick: hideSidebar, }), - h('div.wallet-view__keyring-label.allcaps', isLoose ? this.context.t('imported') : ''), + h('div.wallet-view__keyring-label.allcaps', label), h('div.flex-column.flex-center.wallet-view__name-container', { style: { margin: '0 auto' }, |