aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
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
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')
-rw-r--r--app/scripts/keyring-controller.js1
-rw-r--r--app/scripts/lib/config-manager.js15
-rw-r--r--app/scripts/lib/idStore.js1
-rw-r--r--app/scripts/metamask-controller.js10
4 files changed, 0 insertions, 27 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(),
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index ae4a84082..abe5dfc87 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -368,21 +368,6 @@ ConfigManager.prototype.getConversionDate = function () {
return (('conversionDate' in data) && data.conversionDate) || 'N/A'
}
-ConfigManager.prototype.setShouldntShowWarning = function () {
- var data = this.getData()
- if (data.isEthConfirmed) {
- data.isEthConfirmed = !data.isEthConfirmed
- } else {
- data.isEthConfirmed = true
- }
- this.setData(data)
-}
-
-ConfigManager.prototype.getShouldntShowWarning = function () {
- var data = this.getData()
- return ('isEthConfirmed' in data) && data.isEthConfirmed
-}
-
ConfigManager.prototype.getShapeShiftTxList = function () {
var data = this.getData()
var shapeShiftTxList = data.shapeShiftTxList ? data.shapeShiftTxList : []
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js
index 236de3fd2..14f25dd1d 100644
--- a/app/scripts/lib/idStore.js
+++ b/app/scripts/lib/idStore.js
@@ -103,7 +103,6 @@ IdentityStore.prototype.getState = function () {
isUnlocked: this._isUnlocked(),
seedWords: seedWords,
isConfirmed: configManager.getConfirmed(),
- isEthConfirmed: configManager.getShouldntShowWarning(),
unconfTxs: configManager.unconfirmedTxs(),
transactions: configManager.getTxList(),
unconfMsgs: messageManager.unconfirmedMsgs(),
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index c0da7cdaa..9c89d752b 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -54,7 +54,6 @@ module.exports = class MetamaskController {
agreeToDisclaimer: this.agreeToDisclaimer.bind(this),
resetDisclaimer: this.resetDisclaimer.bind(this),
setCurrentFiat: this.setCurrentFiat.bind(this),
- agreeToEthWarning: this.agreeToEthWarning.bind(this),
setTOSHash: this.setTOSHash.bind(this),
checkTOSChange: this.checkTOSChange.bind(this),
setGasMultiplier: this.setGasMultiplier.bind(this),
@@ -334,15 +333,6 @@ module.exports = class MetamaskController {
}, 300000)
}
- agreeToEthWarning (cb) {
- try {
- this.configManager.setShouldntShowWarning()
- cb()
- } catch (e) {
- cb(e)
- }
- }
-
// called from popup
setRpcTarget (rpcTarget) {
this.configManager.setRpcTarget(rpcTarget)