aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-11-30 03:41:13 +0800
committerDan Finlay <dan@danfinlay.com>2016-11-30 04:05:23 +0800
commit4b6b1db4f0fddfe3a640656311a58429ed48753c (patch)
tree4157320bdd9128c2661b5e0e08410a69d2e83413 /app/scripts/keyring-controller.js
parentb81f00849d53ee780bf26d4d6f79aef4ebdba34c (diff)
downloadtangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.gz
tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.zst
tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.zip
Ordered keyringController methods the same in metamask-controller
Diffstat (limited to 'app/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 7d29fb5d8..e6a69d9ed 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -611,7 +611,11 @@ module.exports = class KeyringController extends EventEmitter {
// Attempts to sign the provided @object msgParams.
signMessage (msgParams, cb) {
try {
- var approvalCb = this._unconfMsgCbs[msgId] || noop
+
+ const msgId = msgParams.metamaskId
+ delete msgParams.metamaskId
+ const approvalCb = this._unconfMsgCbs[msgId] || noop
+
const address = normalize(msgParams.from)
return this.getKeyringForAccount(address)
.then((keyring) => {