aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorEsteban MIno <efmino@uc.cl>2018-07-04 01:23:15 +0800
committerEsteban MIno <efmino@uc.cl>2018-07-04 01:23:15 +0800
commit0494b2fc8a84a533227d25e869a95226f99734af (patch)
treeda39134cf8d82c4e208f9461a9f4391b8f47fd28 /app/scripts/metamask-controller.js
parent03fd4355af8ceae9a1d2cad04e12a4f86a9f36b7 (diff)
parent1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff)
downloadtangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.gz
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.bz2
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.lz
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.xz
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.zst
tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.zip
Merge branch 'develop' into detectTokenFeature
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 7b60a6c6f..9a93cf584 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -412,7 +412,6 @@ module.exports = class MetamaskController extends EventEmitter {
}
-
//=============================================================================
// VAULT / KEYRING RELATED METHODS
//=============================================================================
@@ -969,7 +968,7 @@ module.exports = class MetamaskController extends EventEmitter {
* Allows a user to begin the seed phrase recovery process.
* @param {Function} cb - A callback function called when complete.
*/
- markPasswordForgotten(cb) {
+ markPasswordForgotten (cb) {
this.configManager.setPasswordForgotten(true)
this.sendUpdate()
cb()
@@ -979,7 +978,7 @@ module.exports = class MetamaskController extends EventEmitter {
* Allows a user to end the seed phrase recovery process.
* @param {Function} cb - A callback function called when complete.
*/
- unMarkPasswordForgotten(cb) {
+ unMarkPasswordForgotten (cb) {
this.configManager.setPasswordForgotten(false)
this.sendUpdate()
cb()