diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-10-20 05:57:30 +0800 |
| commit | afbc4c832ba86fcb94b612c93796a5ffa422b457 (patch) | |
| tree | dbdaa16920fd175171603b182d332dbf87655bd4 /app/scripts/inpage.js | |
| parent | ad3fa24a28c0ec45dca43a257005626a4027487a (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.gz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.bz2 tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.lz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.xz tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.tar.zst tangerine-wallet-browser-afbc4c832ba86fcb94b612c93796a5ffa422b457.zip | |
Git merge resolution.
Diffstat (limited to 'app/scripts/inpage.js')
| -rw-r--r-- | app/scripts/inpage.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ef199946c..85dd70b4d 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload) var pingChannel = inpageProvider.multiStream.createStream('pingpong') var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse -metamaskStream.once('data', function(){ +metamaskStream.once('_data', function(){ pingStream.pipe(pingChannel).pipe(pingStream) }) endOfStream(pingStream, triggerReload) |