diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-07 09:21:19 +0800 |
| commit | c651212025ab7cd0309d96be6687c1eba35ab9fa (patch) | |
| tree | fa5a6020daae332c5df47bdee3492e8a079375e3 /ui/app/components/wallet-view.js | |
| parent | 9c1b2108f69334884473eb95758e2d1c02c984d6 (diff) | |
| parent | 7f944923d170d6e7e04f6e238d2fd5f80abe3161 (diff) | |
| download | tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.gz tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.tar.zst tangerine-wallet-browser-c651212025ab7cd0309d96be6687c1eba35ab9fa.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/wallet-view.js')
| -rw-r--r-- | ui/app/components/wallet-view.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/components/wallet-view.js b/ui/app/components/wallet-view.js index 8a7cb0f8d..e050e0ee6 100644 --- a/ui/app/components/wallet-view.js +++ b/ui/app/components/wallet-view.js @@ -7,7 +7,7 @@ const { compose } = require('recompose') const inherits = require('util').inherits const classnames = require('classnames') const { checksumAddress } = require('../util') -const Identicon = require('./identicon') +import Identicon from './identicon' // const AccountDropdowns = require('./dropdowns/index.js').AccountDropdowns const Tooltip = require('./tooltip-v2.js').default const copyToClipboard = require('copy-to-clipboard') @@ -127,7 +127,6 @@ WalletView.prototype.render = function () { identities, } = this.props // temporary logs + fake extra wallets - // console.log('walletview, selectedAccount:', selectedAccount) const checksummedAddress = checksumAddress(selectedAddress) |