diff options
| author | kumavis <aaron@kumavis.me> | 2017-02-02 08:38:09 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-02-02 08:38:09 +0800 |
| commit | 4c0cb9d92e7d00da8219c82f24337e0a776e14f8 (patch) | |
| tree | cb9dd12b5e27975f1127c10e9a3ff16186f67875 /app | |
| parent | bcff47d9aa06f865802747a79adec2dc500d502c (diff) | |
| download | tangerine-wallet-browser-4c0cb9d92e7d00da8219c82f24337e0a776e14f8.tar.gz tangerine-wallet-browser-4c0cb9d92e7d00da8219c82f24337e0a776e14f8.tar.zst tangerine-wallet-browser-4c0cb9d92e7d00da8219c82f24337e0a776e14f8.zip | |
metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index e2752831a..d1d706165 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -82,7 +82,6 @@ class KeyringController extends EventEmitter { keyrings: memState.keyrings, // configManager seedWords: this.configManager.getSeedWords(), - isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), } return result } diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index fb5234c24..a56203a88 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -189,6 +189,7 @@ module.exports = class MetamaskController extends EventEmitter { currentFiat: this.configManager.getCurrentFiat(), conversionRate: this.configManager.getConversionRate(), conversionDate: this.configManager.getConversionDate(), + isDisclaimerConfirmed: this.configManager.getConfirmedDisclaimer(), } ) } |