diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
| commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
| tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /app/scripts/inpage.js | |
| parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
| parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
| download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.bz2 tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.lz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.xz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip | |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index 7d43bd20e..42332d92e 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -43,6 +43,7 @@ reloadStream.once('data', triggerReload) // var pingChannel = inpageProvider.multiStream.createStream('pingpong') // var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse + // disable pingStream until https://github.com/MetaMask/metamask-plugin/issues/746 is resolved more gracefully // metamaskStream.once('data', function(){ // pingStream.pipe(pingChannel).pipe(pingStream) @@ -51,7 +52,7 @@ reloadStream.once('data', triggerReload) // set web3 defaultAcount inpageProvider.publicConfigStore.subscribe(function (state) { - web3.eth.defaultAccount = state.selectedAddress + web3.eth.defaultAccount = state.selectedAccount }) // |