aboutsummaryrefslogtreecommitdiffstats
path: root/mock-dev.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-21 00:49:49 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-21 00:49:49 +0800
commit331bb735c7e9db0aa3af66e4a994e6eb9762af81 (patch)
tree6d51948907cbfc0c002bfdc4698ec99fe100e831 /mock-dev.js
parent94f25543691b1a26f1b33a9074ba65cb722eff48 (diff)
parent12698b946221c1145d1fe966406adb7265e6b9d2 (diff)
downloadtangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar.gz
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar.bz2
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar.lz
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar.xz
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.tar.zst
tangerine-wallet-browser-331bb735c7e9db0aa3af66e4a994e6eb9762af81.zip
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'mock-dev.js')
-rw-r--r--mock-dev.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/mock-dev.js b/mock-dev.js
index 99b846e51..d3f364d69 100644
--- a/mock-dev.js
+++ b/mock-dev.js
@@ -107,7 +107,7 @@ function getOldStyleData () {
return result
}
-actions._setAccountManager(controller.getApi())
+actions._setKeyringController(controller.getApi())
actions.update = function(stateName) {
selectedView = stateName
updateQueryParams(stateName)