aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-04-19 02:44:14 +0800
committerGitHub <noreply@github.com>2018-04-19 02:44:14 +0800
commit0a14cedaf1b63a334da5384c2c9cd3c6a91f877a (patch)
treee6ab38bd8113495c732cca746963f3b01b41e407 /app/scripts/metamask-controller.js
parent40f0a40edfdb928f824f08ed0ba39a707825e2d3 (diff)
parent2c8156ebe91941309d49e8f8f1ed8e9d740bb9de (diff)
downloadtangerine-wallet-browser-0a14cedaf1b63a334da5384c2c9cd3c6a91f877a.tar.gz
tangerine-wallet-browser-0a14cedaf1b63a334da5384c2c9cd3c6a91f877a.tar.zst
tangerine-wallet-browser-0a14cedaf1b63a334da5384c2c9cd3c6a91f877a.zip
Merge pull request #4004 from MetaMask/i3955-reveal-seed
Fix UI getting stuck in Reveal Seed screen
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index a12b6776e..782bc50ac 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -308,6 +308,7 @@ module.exports = class MetamaskController extends EventEmitter {
lostAccounts: this.configManager.getLostAccounts(),
seedWords: this.configManager.getSeedWords(),
forgottenPassword: this.configManager.getPasswordForgotten(),
+ isRevealingSeedWords: Boolean(this.configManager.getIsRevealingSeedWords()),
},
}
}
@@ -347,6 +348,7 @@ module.exports = class MetamaskController extends EventEmitter {
clearSeedWordCache: this.clearSeedWordCache.bind(this),
resetAccount: nodeify(this.resetAccount, this),
importAccountWithStrategy: this.importAccountWithStrategy.bind(this),
+ setIsRevealingSeedWords: this.configManager.setIsRevealingSeedWords.bind(this.configManager),
// vault management
submitPassword: nodeify(keyringController.submitPassword, keyringController),