aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-03-07 12:13:53 +0800
committerGitHub <noreply@github.com>2018-03-07 12:13:53 +0800
commitabe8bc19a8563520f080f3bea28651343cfc1221 (patch)
treee8664e704f4f42e37d272433c217576be8d1701d /ui/app/components
parent2420ad2477f7b688295a55c038b3473a4516dc52 (diff)
parent5ebdb215ae37d62bd1757c17b58ce08fb833ff8c (diff)
downloadtangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar.gz
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar.bz2
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar.lz
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar.xz
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.tar.zst
tangerine-wallet-browser-abe8bc19a8563520f080f3bea28651343cfc1221.zip
Merge branch 'master' into i18n
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/dropdowns/components/account-dropdowns.js16
1 files changed, 0 insertions, 16 deletions
diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index af29a4792..e5359c1d6 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -135,22 +135,6 @@ class AccountDropdowns extends Component {
]),
]),
-// =======
-// },
-// ),
-// this.indicateIfLoose(keyring),
-// h('span', {
-// style: {
-// marginLeft: '20px',
-// fontSize: '24px',
-// maxWidth: '145px',
-// whiteSpace: 'nowrap',
-// overflow: 'hidden',
-// textOverflow: 'ellipsis',
-// },
-// }, identity.name || ''),
-// h('span', { style: { marginLeft: '20px', fontSize: '24px' } }, isSelected ? h('.check', '✓') : null),
-// >>>>>>> master:ui/app/components/account-dropdowns.js
]
)
})