diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-10-26 08:00:19 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-10-26 08:00:19 +0800 |
| commit | 6c469a1826754d65a6845c8b6507fc96b56fb816 (patch) | |
| tree | 89a13a2aace95c7ee8e4be53dbe15e1f813a4981 /app/scripts/lib | |
| parent | f9ff6cb55e35f29e95cab3b2157b58e602e6a35c (diff) | |
| parent | b3cb3e9ec67a138767bb2d6833c9056a66d46b92 (diff) | |
| download | tangerine-wallet-browser-6c469a1826754d65a6845c8b6507fc96b56fb816.tar.gz 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/lib')
| -rw-r--r-- | app/scripts/lib/config-manager.js | 15 | ||||
| -rw-r--r-- | app/scripts/lib/idStore.js | 1 |
2 files changed, 0 insertions, 16 deletions
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(), |