aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/popup.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-04-28 09:04:33 +0800
committerDan Finlay <dan@danfinlay.com>2016-04-28 09:04:33 +0800
commitd017c2844165939f41613e1ae6141c8531422c44 (patch)
treee32920e8885c3ac318e6c535bad44c0de4c189f7 /app/scripts/popup.js
parent29718a82b6bae5957b6f772585419ebdc2c851cb (diff)
downloadtangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.gz
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.bz2
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.lz
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.xz
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.zst
tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.zip
Filter transaction list for current blockchain network
When starting up, we now create a `web3` inside the `background.js` process, which we pass to the `idStore` and ask for the current `network`. We include the `network` on `app.metamask.network` in the state object. We re-request the network when changing provider. We filter the transaction list for transactions that match the current network.
Diffstat (limited to 'app/scripts/popup.js')
-rw-r--r--app/scripts/popup.js9
1 files changed, 1 insertions, 8 deletions
diff --git a/app/scripts/popup.js b/app/scripts/popup.js
index 6a39da661..e9ca7cd71 100644
--- a/app/scripts/popup.js
+++ b/app/scripts/popup.js
@@ -17,7 +17,7 @@ injectCss(css)
async.parallel({
currentDomain: getCurrentDomain,
accountManager: connectToAccountManager,
-}, getNetworkVersion)
+}, setupApp)
function connectToAccountManager(cb){
// setup communication with background
@@ -65,13 +65,6 @@ function getCurrentDomain(cb){
})
}
-function getNetworkVersion(cb, results) {
- web3.version.getNetwork(function(err, result) {
- results.networkVersion = result
- setupApp(err, results)
- })
-}
-
function setupApp(err, opts){
if (err) {
alert(err.stack)