diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-11-30 03:41:13 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-11-30 04:05:23 +0800 |
| commit | 4b6b1db4f0fddfe3a640656311a58429ed48753c (patch) | |
| tree | 4157320bdd9128c2661b5e0e08410a69d2e83413 | |
| parent | b81f00849d53ee780bf26d4d6f79aef4ebdba34c (diff) | |
| download | tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.gz tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.bz2 tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.lz tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.xz tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.tar.zst tangerine-wallet-browser-4b6b1db4f0fddfe3a640656311a58429ed48753c.zip | |
Ordered keyringController methods the same in metamask-controller
| -rw-r--r-- | app/scripts/keyring-controller.js | 6 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 8 |
2 files changed, 9 insertions, 5 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) => { diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 1a872a3ab..ae761c753 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -63,17 +63,17 @@ module.exports = class MetamaskController { setGasMultiplier: this.setGasMultiplier.bind(this), // forward directly to keyringController - placeSeedWords: nodeify(keyringController.placeSeedWords).bind(keyringController), createNewVaultAndKeychain: nodeify(keyringController.createNewVaultAndKeychain).bind(keyringController), createNewVaultAndRestore: nodeify(keyringController.createNewVaultAndRestore).bind(keyringController), + placeSeedWords: nodeify(keyringController.placeSeedWords).bind(keyringController), clearSeedWordCache: nodeify(keyringController.clearSeedWordCache).bind(keyringController), + setLocked: nodeify(keyringController.setLocked).bind(keyringController), + submitPassword: nodeify(keyringController.submitPassword).bind(keyringController), addNewKeyring: nodeify(keyringController.addNewKeyring).bind(keyringController), addNewAccount: nodeify(keyringController.addNewAccount).bind(keyringController), - submitPassword: nodeify(keyringController.submitPassword).bind(keyringController), setSelectedAccount: nodeify(keyringController.setSelectedAccount).bind(keyringController), - exportAccount: nodeify(keyringController.exportAccount).bind(keyringController), saveAccountLabel: nodeify(keyringController.saveAccountLabel).bind(keyringController), - setLocked: nodeify(keyringController.setLocked).bind(keyringController), + exportAccount: nodeify(keyringController.exportAccount).bind(keyringController), // signing methods approveTransaction: keyringController.approveTransaction.bind(keyringController), |