diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-11-30 04:31:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-30 04:31:52 +0800 |
| commit | 23a5ea9321e4046338323e9df9e64d230d057df1 (patch) | |
| tree | d39040d64de7b02e57096a2aa32e3d9b619c09af /app/scripts/metamask-controller.js | |
| parent | 4d6bae774a22487f9861225e6fc00a73829a51ee (diff) | |
| parent | 327651e7fbed9fab2e243412bbf5437c97e1caa4 (diff) | |
| download | tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar.gz tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar.bz2 tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar.lz tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar.xz tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.tar.zst tangerine-wallet-browser-23a5ea9321e4046338323e9df9e64d230d057df1.zip | |
Merge pull request #2627 from MetaMask/reload-fix
Fix dapp reload via obs-store@3
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a4c77e468..f9b7b4182 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -3,6 +3,7 @@ const extend = require('xtend') const pump = require('pump') const Dnode = require('dnode') const ObservableStore = require('obs-store') +const asStream = require('obs-store/lib/asStream') const AccountTracker = require('./lib/account-tracker') const EthQuery = require('eth-query') const RpcEngine = require('json-rpc-engine') @@ -456,7 +457,7 @@ module.exports = class MetamaskController extends EventEmitter { setupPublicConfig (outStream) { pump( - this.publicConfigStore, + asStream(this.publicConfigStore), outStream, (err) => { if (err) log.error(err) |