aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-10-26 08:00:19 +0800
committerDan Finlay <dan@danfinlay.com>2016-10-26 08:00:19 +0800
commit6c469a1826754d65a6845c8b6507fc96b56fb816 (patch)
tree89a13a2aace95c7ee8e4be53dbe15e1f813a4981 /app/scripts/keyring-controller.js
parentf9ff6cb55e35f29e95cab3b2157b58e602e6a35c (diff)
parentb3cb3e9ec67a138767bb2d6833c9056a66d46b92 (diff)
downloadtangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.gz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.bz2
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.lz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.xz
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.zst
tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.zip
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 28c920d22..5e7900b10 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -39,7 +39,6 @@ module.exports = class KeyringController extends EventEmitter {
isInitialized: !!this.configManager.getVault(),
isUnlocked: !!this.key,
isConfirmed: true, // AUDIT this.configManager.getConfirmed(),
- isEthConfirmed: this.configManager.getShouldntShowWarning(),
unconfTxs: this.configManager.unconfirmedTxs(),
transactions: this.configManager.getTxList(),
unconfMsgs: messageManager.unconfirmedMsgs(),