diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-11-02 02:25:38 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-11-02 02:30:10 +0800 |
| commit | db356a181a3fde4ad528c699f6da517053171866 (patch) | |
| tree | ba339827fef6685e097d6fc247dae47f3d0a8f70 /app/scripts/metamask-controller.js | |
| parent | e2f67a2cb85552bd8fcf2f7929c14a9d028adccb (diff) | |
| download | tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar.gz tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar.bz2 tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar.lz tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar.xz tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.tar.zst tangerine-wallet-browser-db356a181a3fde4ad528c699f6da517053171866.zip | |
Made progress on parity for MultiVault
- Deleted some unused items
- Renamed files and paths to match with new locations.
- Modified keyring controller logic to separate concerns.
- Fix account naming issues.
- Enable creation of new vault with default HD keyring.
- Formatting issues.
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 48c56d915..7ce22b642 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -59,7 +59,8 @@ module.exports = class MetamaskController { setGasMultiplier: this.setGasMultiplier.bind(this), // forward directly to keyringController - createNewVault: keyringController.createNewVault.bind(keyringController), + createNewVaultAndKeychain: keyringController.createNewVaultAndKeychain.bind(keyringController), + createNewVaultAndRestore: keyringController.createNewVaultAndRestore.bind(keyringController), clearSeedWordCache: keyringController.clearSeedWordCache.bind(keyringController), addNewKeyring: keyringController.addNewKeyring.bind(keyringController), addNewAccount: keyringController.addNewAccount.bind(keyringController), |