diff options
author | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2017-01-14 07:51:36 +0800 |
commit | d06c54e0b7eb7803798e31d8d035b648e9da0421 (patch) | |
tree | 0dc1e906dbc2e460090f86e4e3f8171e8e2960ea /app/scripts/keyring-controller.js | |
parent | d755b66e204277ac6a904ba432f7b10a340c9288 (diff) | |
parent | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (diff) | |
download | tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.gz tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.tar.zst tangerine-wallet-browser-d06c54e0b7eb7803798e31d8d035b648e9da0421.zip |
Merge branch 'bug-submitTx' of github.com:MetaMask/metamask-plugin into bug-submitTx
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r-- | app/scripts/keyring-controller.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index df2910187..79cfe6fbd 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, |