From cc23158bfee2b723e8e80e0d25cbca2c2c6406a3 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Tue, 18 Oct 2016 13:51:50 -0700 Subject: Wait for first metamask data to establish ping-pong stream. Prevents infinite reload loops when dapps take too long to load. Fixes #746. --- CHANGELOG.md | 2 ++ app/scripts/inpage.js | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f6e82e94..eac50a0b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,13 @@ ## Current Master - Increase default max gas to `100000` over the RPC's `estimateGas` response. +- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops. ## 2.13.4 2016-10-17 - Add custom transaction fee field to send form. - Fix bug where web3 was being injected into XML files. +- Fix bug where changing network would not reload current Dapps. ## 2.13.3 2016-10-4 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) -- cgit