aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/transaction-list-item.js
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2017-10-27 07:22:08 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2017-10-27 07:22:08 +0800
commit1e9c0a9db2d58e61361bff7430d3a74006ef131c (patch)
tree1d1f09bfe2e1985c42d5a117e8e63d19c71a360b /ui/app/components/transaction-list-item.js
parenta387def701303e56f721fdc7c716e72641bfaf8f (diff)
parent19afb638194a11367250153a710d77011665132a (diff)
downloadtangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.gz
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.bz2
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.lz
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.xz
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.zst
tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.zip
Resolve merge conflicts
Diffstat (limited to 'ui/app/components/transaction-list-item.js')
-rw-r--r--ui/app/components/transaction-list-item.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index a9961f47c..891d5e227 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -4,7 +4,7 @@ const inherits = require('util').inherits
const EthBalance = require('./eth-balance')
const addressSummary = require('../util').addressSummary
-const explorerLink = require('../../lib/explorer-link')
+const explorerLink = require('etherscan-link').createExplorerLink
const CopyButton = require('./copyButton')
const vreme = new (require('vreme'))()
const Tooltip = require('./tooltip')