diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-05-26 15:19:24 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-05-26 15:43:14 +0800 |
commit | d8c94fca75ca2aed11387c0b1d4c6064bead447e (patch) | |
tree | 55469f52c02d8e71719c6fc289b8d15671902eac /app/scripts | |
parent | 8f9a230d8d2c8351cd325bddf3c2ca04f06c9619 (diff) | |
download | tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar.gz tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar.bz2 tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar.lz tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar.xz tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.tar.zst tangerine-wallet-browser-d8c94fca75ca2aed11387c0b1d4c6064bead447e.zip |
Add address image map to icon factory
Deriving from the new address image map repository I've added here:
https://github.com/MetaMask/ethereum-contract-icons
With this PR, images for addresses added to that repository will be shown instead of jazzicons in MetaMask.
Diffstat (limited to 'app/scripts')
-rw-r--r-- | app/scripts/inpage.js | 4 | ||||
-rw-r--r-- | app/scripts/lib/inpage-provider.js | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ec764535e..10e5ea39b 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -1,6 +1,6 @@ /*global Web3*/ cleanContextForImports() -require('web3/dist/web3.min.js') +require('web3') const LocalMessageDuplexStream = require('post-message-stream') // const PingStream = require('ping-pong-stream/ping') // const endOfStream = require('end-of-stream') @@ -30,7 +30,7 @@ var web3 = new Web3(inpageProvider) web3.setProvider = function () { console.log('MetaMask - overrode web3.setProvider') } -console.log('MetaMask - injected web3') +console.log('MetaMask - injected modified web3') // export global web3, with usage-detection setupDappAutoReload(web3, inpageProvider.publicConfigStore) diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index 8b8623974..5206adc82 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -39,6 +39,8 @@ function MetamaskInpageProvider (connectionStream) { self.idMap = {} // handle sendAsync requests via asyncProvider self.sendAsync = function (payload, cb) { + console.trace('sending async ' + payload.method) + console.dir(payload) // rewrite request ids var request = eachJsonMessage(payload, (message) => { var newId = createRandomId() |