aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/background.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-21 10:01:04 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-21 10:06:17 +0800
commit9560ae93ee66cd9466c95c98b6853c2062f21235 (patch)
tree13af9714f17dfcdc266cce06f71ce69ff803139c /app/scripts/background.js
parent957b7a72b55be864320a346108673d02448caefd (diff)
downloadtangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar.gz
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar.bz2
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar.lz
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar.xz
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.tar.zst
tangerine-wallet-browser-9560ae93ee66cd9466c95c98b6853c2062f21235.zip
Added tx and msg signing to keychain & controller
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r--app/scripts/background.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 652acc113..f05760ac3 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -21,7 +21,7 @@ const controller = new MetamaskController({
setData,
loadData,
})
-const idStore = controller.idStore
+const keyringController = controller.keyringController
function triggerUi () {
if (!popupIsOpen) notification.show()
@@ -82,7 +82,7 @@ function setupControllerConnection (stream) {
// push updates to popup
controller.ethStore.on('update', controller.sendUpdate.bind(controller))
controller.listeners.push(remote)
- idStore.on('update', controller.sendUpdate.bind(controller))
+ keyringController.on('update', controller.sendUpdate.bind(controller))
// teardown on disconnect
eos(stream, () => {
@@ -96,9 +96,9 @@ function setupControllerConnection (stream) {
// plugin badge text
//
-idStore.on('update', updateBadge)
+keyringController.on('update', updateBadge)
-function updateBadge (state) {
+function updateBadge () {
var label = ''
var unconfTxs = controller.configManager.unconfirmedTxs()
var unconfTxLen = Object.keys(unconfTxs).length