aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <somniac@me.com>2016-12-20 08:01:01 +0800
committerGitHub <noreply@github.com>2016-12-20 08:01:01 +0800
commitead8329877c5441f32ab389adb41689086a38608 (patch)
tree6ddf346b7627ea0556db2e94a8164dfa5a34e6ae /app/scripts/keyring-controller.js
parentf7eec0b282de511d54fd50f2c75d7371ca6f399d (diff)
parent9c8345467c871b29193263a13e8e8d3ebb47c7fb (diff)
downloadtangerine-wallet-browser-ead8329877c5441f32ab389adb41689086a38608.tar.gz
tangerine-wallet-browser-ead8329877c5441f32ab389adb41689086a38608.tar.zst
tangerine-wallet-browser-ead8329877c5441f32ab389adb41689086a38608.zip
Merge pull request #937 from MetaMask/i900-forgot-password-flow
I900 forgot password flow
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 40c9695dd..ca4c306be 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -73,7 +73,7 @@ module.exports = class KeyringController extends EventEmitter {
// or accept a state-resolving promise to consume their results.
//
// Not all methods end with this, that might be a nice refactor.
- fullUpdate() {
+ fullUpdate () {
this.emit('update')
return Promise.resolve(this.getState())
}
@@ -586,7 +586,6 @@ module.exports = class KeyringController extends EventEmitter {
// Attempts to sign the provided @object msgParams.
signMessage (msgParams, cb) {
try {
-
const msgId = msgParams.metamaskId
delete msgParams.metamaskId
const approvalCb = this._unconfMsgCbs[msgId] || noop