aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/wallet-view.js
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-08-18 02:26:38 +0800
committerGitHub <noreply@github.com>2018-08-18 02:26:38 +0800
commitc7f5436143a87369ab29c019a1c988c20a98d810 (patch)
treea92c329bc53f99f88fdd0a72e522dc94f4dfb83e /ui/app/components/wallet-view.js
parent755369e4e48e71b04b4dbb9cb702353c09b66e28 (diff)
parentbd904c86f6f27eb50e0633f46af6831869b99893 (diff)
downloadtangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar.gz
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar.bz2
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar.lz
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar.xz
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.tar.zst
tangerine-wallet-browser-c7f5436143a87369ab29c019a1c988c20a98d810.zip
Merge pull request #5050 from MetaMask/ledger-support
Add Ledger hardware wallet support
Diffstat (limited to 'ui/app/components/wallet-view.js')
-rw-r--r--ui/app/components/wallet-view.js16
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' },