aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/popup.js
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-04-28 09:46:12 +0800
committerDan Finlay <somniac@me.com>2016-04-28 09:46:12 +0800
commit9b524b4f28bebbdf8351763b61e897f33021e25b (patch)
treed5b0f23ec9803f6956f42f9bbfbbd993608e1285 /app/scripts/popup.js
parentc66ac13cc93948945912690dffc4940f33fa1dfa (diff)
parentbd660d9aeb5638372605377fb92ce1362c3d8230 (diff)
downloadtangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar.gz
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar.bz2
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar.lz
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar.xz
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.tar.zst
tangerine-wallet-browser-9b524b4f28bebbdf8351763b61e897f33021e25b.zip
Merge pull request #152 from MetaMask/FilterTransactionList
Filter transaction list for 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)