diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-02-02 09:44:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 09:44:06 +0800 |
| commit | 6df15177c8ea2029dc169ee18b5b54be0b66f97b (patch) | |
| tree | 7f240dbe772618a83f7c1ce795390c7c4afbdd3c /app/scripts | |
| parent | 2d99fc95280954d6464e66e87e0a9077718c2827 (diff) | |
| parent | dacbf16fe2b2a865fcbb1fd15236efdba525c015 (diff) | |
| download | tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar.gz tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar.bz2 tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar.lz tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar.xz tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.tar.zst tangerine-wallet-browser-6df15177c8ea2029dc169ee18b5b54be0b66f97b.zip | |
Merge pull request #1079 from MetaMask/kumavis-refactor5
Refactor round 5
Diffstat (limited to 'app/scripts')
| -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(), } ) } |