diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-08-30 07:36:19 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-08-30 07:36:19 +0800 |
| commit | ae8486d5cfa2c1d173e0c675408cc6bc00729bd3 (patch) | |
| tree | ec01718a70d72e7961953556c03b24855474cacd /app/scripts/lib/inpage-provider.js | |
| parent | 056276af02c5717684e36eeeaf6a8787ea4a39e6 (diff) | |
| parent | 71de68fc13d83934e8bc81ba43574a946bc32159 (diff) | |
| download | tangerine-wallet-browser-ae8486d5cfa2c1d173e0c675408cc6bc00729bd3.tar.gz tangerine-wallet-browser-ae8486d5cfa2c1d173e0c675408cc6bc00729bd3.tar.zst tangerine-wallet-browser-ae8486d5cfa2c1d173e0c675408cc6bc00729bd3.zip | |
Merge branch 'master' into new-currency-test
Diffstat (limited to 'app/scripts/lib/inpage-provider.js')
| -rw-r--r-- | app/scripts/lib/inpage-provider.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/scripts/lib/inpage-provider.js b/app/scripts/lib/inpage-provider.js index fd032a673..7c74a62d3 100644 --- a/app/scripts/lib/inpage-provider.js +++ b/app/scripts/lib/inpage-provider.js @@ -27,7 +27,7 @@ function MetamaskInpageProvider (connectionStream) { ) // ignore phishing warning message (handled elsewhere) - multiStream.ignoreStream('phishing') + multiStream.ignoreStream('phishing') // connect to async provider const asyncProvider = self.asyncProvider = new StreamProvider() @@ -80,7 +80,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': @@ -90,7 +90,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 |