aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-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/metamask-controller.js
parentb81f00849d53ee780bf26d4d6f79aef4ebdba34c (diff)
downloadtangerine-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
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js8
1 files changed, 4 insertions, 4 deletions
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),