diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-01-11 03:52:25 +0800 |
---|---|---|
committer | Frankie <frankie.diamond@gmail.com> | 2017-01-12 04:16:37 +0800 |
commit | 0fae263a9acb1f4023070b37ee1b91815e34de86 (patch) | |
tree | 06ce3969f56a2b6d2c5d4316dc6367b79540cb44 /app/scripts/keyring-controller.js | |
parent | af312bdc90139f99a9a08f9d0f67d63e005e2a20 (diff) | |
download | tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.gz tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.bz2 tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.lz tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.xz tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.zst tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.zip |
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index c58be0aae..a457a2560 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -95,7 +95,6 @@ module.exports = class KeyringController extends EventEmitter { isInitialized: (!!wallet || !!vault), isUnlocked: Boolean(this.password), isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), - transactions: this.configManager.getTxList(), unconfMsgs: messageManager.unconfirmedMsgs(), messages: messageManager.getMsgList(), selectedAccount: address, @@ -273,6 +272,7 @@ module.exports = class KeyringController extends EventEmitter { setSelectedAccount (address) { var addr = normalize(address) this.configManager.setSelectedAccount(addr) + this.emit('update') return Promise.resolve(addr) } |