aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-04-22 13:23:45 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-04-22 13:23:45 +0800
commit477b74124d24c9497fafb0c976eba27712c69d79 (patch)
tree8d4911513d5059b6df0f725e8e5030b37837facb /app
parent4544d57f2632ce5a00dc8780a7b360ab9b2657c3 (diff)
downloadtangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar.gz
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar.bz2
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar.lz
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar.xz
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.tar.zst
tangerine-wallet-browser-477b74124d24c9497fafb0c976eba27712c69d79.zip
Revert "Fix UI getting stuck in Reveal Seed screen"
This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de.
Diffstat (limited to 'app')
-rw-r--r--app/scripts/lib/config-manager.js22
-rw-r--r--app/scripts/metamask-controller.js2
2 files changed, 1 insertions, 23 deletions
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 63d27c40e..34b603b96 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -102,6 +102,7 @@ ConfigManager.prototype.setShowSeedWords = function (should) {
this.setData(data)
}
+
ConfigManager.prototype.getShouldShowSeedWords = function () {
var data = this.getData()
return data.showSeedWords
@@ -117,27 +118,6 @@ ConfigManager.prototype.getSeedWords = function () {
var data = this.getData()
return data.seedWords
}
-
-/**
- * Called to set the isRevealingSeedWords flag. This happens only when the user chooses to reveal
- * the seed words and not during the first time flow.
- * @param {boolean} reveal - Value to set the isRevealingSeedWords flag.
- */
-ConfigManager.prototype.setIsRevealingSeedWords = function (reveal = false) {
- const data = this.getData()
- data.isRevealingSeedWords = reveal
- this.setData(data)
-}
-
-/**
- * Returns the isRevealingSeedWords flag.
- * @returns {boolean|undefined}
- */
-ConfigManager.prototype.getIsRevealingSeedWords = function () {
- const data = this.getData()
- return data.isRevealingSeedWords
-}
-
ConfigManager.prototype.setRpcTarget = function (rpcUrl) {
var config = this.getConfig()
config.provider = {
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 782bc50ac..a12b6776e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -308,7 +308,6 @@ module.exports = class MetamaskController extends EventEmitter {
lostAccounts: this.configManager.getLostAccounts(),
seedWords: this.configManager.getSeedWords(),
forgottenPassword: this.configManager.getPasswordForgotten(),
- isRevealingSeedWords: Boolean(this.configManager.getIsRevealingSeedWords()),
},
}
}
@@ -348,7 +347,6 @@ 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),