diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-10-19 04:51:50 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-10-19 04:51:50 +0800 |
| commit | cc23158bfee2b723e8e80e0d25cbca2c2c6406a3 (patch) | |
| tree | e94017049824bffffdaa3bea9450adb4e29c708d | |
| parent | 0f0951ba549c294222421ef8508294165e9b5fdd (diff) | |
| download | tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar.gz tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar.bz2 tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar.lz tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar.xz tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.tar.zst tangerine-wallet-browser-cc23158bfee2b723e8e80e0d25cbca2c2c6406a3.zip | |
Wait for first metamask data to establish ping-pong stream.
Prevents infinite reload loops when dapps take too long to load.
Fixes #746.
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 2 |
2 files changed, 3 insertions, 1 deletions
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) |