aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-07-04 03:42:14 +0800
committerkumavis <aaron@kumavis.me>2018-07-04 03:42:14 +0800
commit77daed5c74aa3c1fdbf1d9c71f544928f47f3993 (patch)
tree4a614dbdfce84b452562dcabccffa53b8393e2b0 /app/scripts/metamask-controller.js
parent2b2cd87e2d6e93dadb3ddd20ebf854ab6f2d2382 (diff)
parente467eda4f720fa89141ded2e709566102402479b (diff)
downloadtangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.gz
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.bz2
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.lz
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.xz
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.tar.zst
tangerine-wallet-browser-77daed5c74aa3c1fdbf1d9c71f544928f47f3993.zip
Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 9abb64900..3d7268395 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -399,7 +399,6 @@ module.exports = class MetamaskController extends EventEmitter {
}
-
//=============================================================================
// VAULT / KEYRING RELATED METHODS
//=============================================================================
@@ -645,7 +644,7 @@ module.exports = class MetamaskController extends EventEmitter {
* @param {Object} msgParams - The params passed to eth_sign.
* @param {Object} req - (optional) the original request, containing the origin
*/
- async newUnapprovedTransaction(txParams, req) {
+ async newUnapprovedTransaction (txParams, req) {
return await this.txController.newUnapprovedTransaction(txParams, req)
}
@@ -931,7 +930,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()
@@ -941,7 +940,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()