diff options
| author | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-09-08 13:37:44 +0800 |
| commit | 671dafea9e8d379578c73672ba051205456219e3 (patch) | |
| tree | c733017a12b83d70db21c61d16a07033ddefecbb /app/scripts/lib/inpage-provider.js | |
| parent | 70401626e2544f254ddb06a21b5d3de7fdd7fb82 (diff) | |
| parent | a704e1d14370056a9a1a8af43c702bb00142532d (diff) | |
| download | tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.gz tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.tar.zst tangerine-wallet-browser-671dafea9e8d379578c73672ba051205456219e3.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-leak-fix
Diffstat (limited to 'app/scripts/lib/inpage-provider.js')
| -rw-r--r-- | app/scripts/lib/inpage-provider.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index eb24dfcab..db46e4f17 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -38,8 +38,6 @@ function MetamaskInpageProvider (connectionStream) { streamMiddleware.stream, (err) => logStreamDisconnectWarning('MetaMask RpcProvider', err) ) - // start and stop polling to unblock first block lock - // handle sendAsync requests via dapp-side rpc engine const engine = new RpcEngine() engine.push(createIdRemapMiddleware()) @@ -64,7 +62,7 @@ MetamaskInpageProvider.prototype.send = function (payload) { case 'eth_coinbase': // read from localStorage selectedAddress = self.publicConfigStore.getState().selectedAddress - result = selectedAddress + result = selectedAddress || null break case 'eth_uninstallFilter': @@ -74,7 +72,7 @@ MetamaskInpageProvider.prototype.send = function (payload) { case 'net_version': const networkVersion = self.publicConfigStore.getState().networkVersion - result = networkVersion + result = networkVersion || null break // throw not-supported Error |