diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-04-20 02:49:11 +0800 |
| commit | c20c97ce625207c7afcd48a12f6e7891d582ae99 (patch) | |
| tree | b5e063ee7cfd0d0e99fcdb0409fe3106c010bf79 /ui/lib | |
| parent | eeb9390de81ce6fc92247d5c499e991dce8330bd (diff) | |
| parent | 00efcf9e8ba34d448b628c98d32ad12d5be2ffc9 (diff) | |
| download | tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.gz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.bz2 tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.lz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.xz tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.tar.zst tangerine-wallet-browser-c20c97ce625207c7afcd48a12f6e7891d582ae99.zip | |
Merge branch 'master' into tx-controller-rewrite-v3
Diffstat (limited to 'ui/lib')
| -rw-r--r-- | ui/lib/icon-factory.js | 4 | ||||
| -rw-r--r-- | ui/lib/tx-helper.js | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/lib/icon-factory.js b/ui/lib/icon-factory.js index 31498a3a9..7fadbceff 100644 --- a/ui/lib/icon-factory.js +++ b/ui/lib/icon-factory.js @@ -1,6 +1,6 @@ var iconFactory const isValidAddress = require('ethereumjs-util').isValidAddress -const toChecksumAddress = require('ethereumjs-util').toChecksumAddress +const { checksumAddress } = require('../app/util') const contractMap = require('eth-contract-metadata') module.exports = function (jazzicon) { @@ -16,7 +16,7 @@ function IconFactory (jazzicon) { } IconFactory.prototype.iconForAddress = function (address, diameter) { - const addr = toChecksumAddress(address) + const addr = checksumAddress(address) if (iconExistsFor(addr)) { return imageElFor(addr) } diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js index de3f00d2d..0a6f55a63 100644 --- a/ui/lib/tx-helper.js +++ b/ui/lib/tx-helper.js @@ -1,4 +1,5 @@ const valuesFor = require('../app/util').valuesFor +const log = require('loglevel') module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMessages, network) { log.debug('tx-helper called with params:') |