diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-02-03 08:22:44 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-02-03 08:22:44 +0800 |
| commit | 9b6a06e679e85e6567673313a09cba97f204802f (patch) | |
| tree | 750d9362d3e3897879966b0fcacbee04c48b351c /app | |
| parent | 88882f547ea2935bd0810710ed2f8f035fc9fef7 (diff) | |
| parent | 6df15177c8ea2029dc169ee18b5b54be0b66f97b (diff) | |
| download | tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar.gz tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar.bz2 tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar.lz tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar.xz tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.tar.zst tangerine-wallet-browser-9b6a06e679e85e6567673313a09cba97f204802f.zip | |
Merge branch 'dev' into notice-management
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 1 | ||||
| -rw-r--r-- | app/scripts/lib/message-manager.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index e2752831a..d1d706165 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -82,7 +82,6 @@ class KeyringController extends EventEmitter { keyrings: memState.keyrings, // configManager seedWords: this.configManager.getSeedWords(), - isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), } return result } diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js index 4a0017342..18bf54ae1 100644 --- a/app/scripts/lib/message-manager.js +++ b/app/scripts/lib/message-manager.js @@ -103,6 +103,7 @@ module.exports = class MessageManager extends EventEmitter{ } _saveMsgList (msgList) { + this.emit('updateBadge') this.memStore.updateState({ messages: msgList }) } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index fb5234c24..a56203a88 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter { currentFiat: this.configManager.getCurrentFiat(), conversionRate: this.configManager.getConversionRate(), conversionDate: this.configManager.getConversionDate(), + isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), } ) } |