diff options
| author | Frances Pangilinan <frankie.diamond@gmail.com> | 2016-12-17 02:33:36 +0800 |
|---|---|---|
| committer | Frances Pangilinan <frankie.diamond@gmail.com> | 2016-12-22 05:41:32 +0800 |
| commit | 6e78494846c9032fbf1264a0225c0df4df0867cb (patch) | |
| tree | 0d3b2cdc463d5c8380f4af92ed9ec94fc15d1164 /app/scripts/background.js | |
| parent | da9349fe63de70d29a13b6c7d94eb40dc5fcb127 (diff) | |
| download | tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar.gz tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar.bz2 tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar.lz tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar.xz tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.tar.zst tangerine-wallet-browser-6e78494846c9032fbf1264a0225c0df4df0867cb.zip | |
First pass at revision requests
Diffstat (limited to 'app/scripts/background.js')
| -rw-r--r-- | app/scripts/background.js | 14 |
1 files changed, 2 insertions, 12 deletions
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 () { |