From 090935f90aa3c2589fee7bc038c8f4fcf77da03c Mon Sep 17 00:00:00 2001 From: Frances Pangilinan Date: Wed, 14 Dec 2016 12:55:41 -0800 Subject: Create a TxManager --- app/scripts/background.js | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'app/scripts/background.js') diff --git a/app/scripts/background.js b/app/scripts/background.js index 7cb25d8bf..854b679da 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -23,7 +23,7 @@ const controller = new MetamaskController({ loadData, }) const keyringController = controller.keyringController - +const txManager = controller.txManager function triggerUi () { if (!popupIsOpen) notification.show() } @@ -97,12 +97,11 @@ function setupControllerConnection (stream) { // plugin badge text // -keyringController.on('update', updateBadge) +txManager.on('update', updateBadge) function updateBadge () { var label = '' - var unconfTxs = controller.configManager.unconfirmedTxs() - var unconfTxLen = Object.keys(unconfTxs).length + var unconfTxLen = controller.txManager.unConftxCount var unconfMsgs = messageManager.unconfirmedMsgs() var unconfMsgLen = Object.keys(unconfMsgs).length var count = unconfTxLen + unconfMsgLen @@ -113,6 +112,25 @@ function updateBadge () { extension.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) } +// txManger :: tx approvals and rejection cb's + +txManager.on('signed', function (txId) { + var approvalCb = this._unconfTxCbs[txId] + + approvalCb(null, true) + // clean up + delete this._unconfTxCbs[txId] +}) + +txManager.on('rejected', function (txId) { + var approvalCb = this._unconfTxCbs[txId] + approvalCb(null, false) + // clean up + delete this._unconfTxCbs[txId] +}) + +// data :: setters/getters + function loadData () { var oldData = getOldStyleData() var newData -- cgit v1.2.3 From da9349fe63de70d29a13b6c7d94eb40dc5fcb127 Mon Sep 17 00:00:00 2001 From: Frances Pangilinan Date: Wed, 14 Dec 2016 15:04:33 -0800 Subject: Clean up and comment functions --- app/scripts/background.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'app/scripts/background.js') diff --git a/app/scripts/background.js b/app/scripts/background.js index 854b679da..f476e89e4 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -115,18 +115,11 @@ function updateBadge () { // txManger :: tx approvals and rejection cb's txManager.on('signed', function (txId) { - var approvalCb = this._unconfTxCbs[txId] - - approvalCb(null, true) - // clean up - delete this._unconfTxCbs[txId] + this.execOnTxDoneCb(txId, true) }) txManager.on('rejected', function (txId) { - var approvalCb = this._unconfTxCbs[txId] - approvalCb(null, false) - // clean up - delete this._unconfTxCbs[txId] + this.execOnTxDoneCb(txId, false) }) // data :: setters/getters -- cgit v1.2.3 From 6e78494846c9032fbf1264a0225c0df4df0867cb Mon Sep 17 00:00:00 2001 From: Frances Pangilinan Date: Fri, 16 Dec 2016 10:33:36 -0800 Subject: First pass at revision requests --- app/scripts/background.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'app/scripts/background.js') diff --git a/app/scripts/background.js b/app/scripts/background.js index f476e89e4..a7e525999 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -17,7 +17,7 @@ const controller = new MetamaskController({ // User confirmation callbacks: showUnconfirmedMessage: triggerUi, unlockAccountMessage: triggerUi, - showUnconfirmedTx: triggerUi, + showUnapprovedTx: triggerUi, // Persistence Methods: setData, loadData, @@ -101,7 +101,7 @@ txManager.on('update', updateBadge) function updateBadge () { var label = '' - var unconfTxLen = controller.txManager.unConftxCount + var unconfTxLen = controller.txManager.unconfTxCount var unconfMsgs = messageManager.unconfirmedMsgs() var unconfMsgLen = Object.keys(unconfMsgs).length var count = unconfTxLen + unconfMsgLen @@ -112,16 +112,6 @@ function updateBadge () { extension.browserAction.setBadgeBackgroundColor({ color: '#506F8B' }) } -// txManger :: tx approvals and rejection cb's - -txManager.on('signed', function (txId) { - this.execOnTxDoneCb(txId, true) -}) - -txManager.on('rejected', function (txId) { - this.execOnTxDoneCb(txId, false) -}) - // data :: setters/getters function loadData () { -- cgit v1.2.3 From 1ebcbe296b060c9cf431d485d7bb84f696edbdf5 Mon Sep 17 00:00:00 2001 From: Frances Pangilinan Date: Tue, 20 Dec 2016 13:12:14 -0800 Subject: Migrate all tx mutation code out of keyring controller and Fix up txManager to reflect code review requests --- app/scripts/background.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/scripts/background.js') diff --git a/app/scripts/background.js b/app/scripts/background.js index a7e525999..d05ec989f 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -101,10 +101,10 @@ txManager.on('update', updateBadge) function updateBadge () { var label = '' - var unconfTxLen = controller.txManager.unconfTxCount + var unapprovedTxCount = controller.txManager.unapprovedTxCount var unconfMsgs = messageManager.unconfirmedMsgs() var unconfMsgLen = Object.keys(unconfMsgs).length - var count = unconfTxLen + unconfMsgLen + var count = unapprovedTxCount + unconfMsgLen if (count) { label = String(count) } -- cgit v1.2.3 From fde69ea0baf32b5d2a6932b73f4772e983aef552 Mon Sep 17 00:00:00 2001 From: Frankie Date: Fri, 23 Dec 2016 12:34:12 -0800 Subject: fix some minor spelling mistakes and clean up code --- app/scripts/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/scripts/background.js') diff --git a/app/scripts/background.js b/app/scripts/background.js index d05ec989f..ca2efc114 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -97,7 +97,7 @@ function setupControllerConnection (stream) { // plugin badge text // -txManager.on('update', updateBadge) +txManager.on('updateBadge', updateBadge) function updateBadge () { var label = '' -- cgit v1.2.3