aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/background.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2016-05-05 02:11:37 +0800
committerkumavis <kumavis@users.noreply.github.com>2016-05-05 02:11:37 +0800
commit95582f8bde3abda5b6b7cf0e027bc7913e5953ce (patch)
tree6409dd6ea4aee0f58e243959568a4dca3fd0e63d /app/scripts/background.js
parentdcbf17af2d547ce676178bf78328d5c01135e31a (diff)
parent9c6ec054b13f24e88b78ca4124b0d3a46234b1d7 (diff)
downloadtangerine-wallet-browser-95582f8bde3abda5b6b7cf0e027bc7913e5953ce.tar.gz
tangerine-wallet-browser-95582f8bde3abda5b6b7cf0e027bc7913e5953ce.tar.zst
tangerine-wallet-browser-95582f8bde3abda5b6b7cf0e027bc7913e5953ce.zip
Merge pull request #169 from MetaMask/ImplementEthSign
implement eth_sign
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r--app/scripts/background.js8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 3c46f4693..0f9ecc1c9 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -10,6 +10,7 @@ const IdentityStore = require('./lib/idStore')
const createTxNotification = require('./lib/notifications.js').createTxNotification
const createMsgNotification = require('./lib/notifications.js').createMsgNotification
const configManager = require('./lib/config-manager-singleton')
+const messageManager = require('./lib/message-manager')
const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
const HostStore = require('./lib/remote-store.js').HostStore
const Web3 = require('web3')
@@ -175,6 +176,8 @@ function setupControllerConnection(stream){
setSelectedAddress: idStore.setSelectedAddress.bind(idStore),
approveTransaction: idStore.approveTransaction.bind(idStore),
cancelTransaction: idStore.cancelTransaction.bind(idStore),
+ signMessage: idStore.signMessage.bind(idStore),
+ cancelMessage: idStore.cancelMessage.bind(idStore),
setLocked: idStore.setLocked.bind(idStore),
clearSeedWordCache: idStore.clearSeedWordCache.bind(idStore),
exportAccount: idStore.exportAccount.bind(idStore),
@@ -206,7 +209,10 @@ idStore.on('update', updateBadge)
function updateBadge(state){
var label = ''
var unconfTxs = configManager.unconfirmedTxs()
- var count = Object.keys(unconfTxs).length
+ var unconfTxLen = Object.keys(unconfTxs).length
+ var unconfMsgs = messageManager.unconfirmedMsgs()
+ var unconfMsgLen = Object.keys(unconfMsgs).length
+ var count = unconfTxLen + unconfMsgLen
if (count) {
label = String(count)
}