aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-02-10 11:03:22 +0800
committerGitHub <noreply@github.com>2017-02-10 11:03:22 +0800
commit01e43c789c29668dafb718aa68d9eee76788298b (patch)
tree7eb792bc88a6b2c3425c54e56d358c24e7bf7e04 /app/scripts/metamask-controller.js
parent2f6bf1c074fc49fd0354380c24e07eb9aa2a5ec2 (diff)
parentd1a6b8c8ed023671d9d934be26921136f9af3756 (diff)
downloadtangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar.gz
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar.bz2
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar.lz
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar.xz
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.tar.zst
tangerine-wallet-browser-01e43c789c29668dafb718aa68d9eee76788298b.zip
Merge pull request #1101 from MetaMask/i1085-synchronousnet
Allowed net_version to be called synchronously
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index fb2040c63..33c51dc07 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -178,7 +178,7 @@ module.exports = class MetamaskController extends EventEmitter {
// sync publicConfigStore with transform
pipe(
this.store,
- storeTransform(selectPublicState),
+ storeTransform(selectPublicState.bind(this)),
publicConfigStore
)
@@ -186,6 +186,7 @@ module.exports = class MetamaskController extends EventEmitter {
const result = { selectedAddress: undefined }
try {
result.selectedAddress = state.PreferencesController.selectedAddress
+ result.networkVersion = this.getNetworkState()
} catch (_) {}
return result
}