diff options
author | Frankie <frankie.diamond@gmail.com> | 2018-02-01 03:57:38 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-01 03:57:38 +0800 |
commit | 201e0579a57d4638c8c61e99c63b7c26821a0f2a (patch) | |
tree | 275bc04ea86f48b2c5f9109c69c7b21b93c744bf /app/scripts/metamask-controller.js | |
parent | 7e144680134e1bf87727f5dd048e846996e8367a (diff) | |
parent | f16535619692dd7f1c24bcc07875d60804d50ee2 (diff) | |
download | tangerine-wallet-browser-201e0579a57d4638c8c61e99c63b7c26821a0f2a.tar.gz tangerine-wallet-browser-201e0579a57d4638c8c61e99c63b7c26821a0f2a.tar.zst tangerine-wallet-browser-201e0579a57d4638c8c61e99c63b7c26821a0f2a.zip |
Merge branch 'master' into localStorage-clean-up
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 15058188d..63815ab65 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -341,6 +341,7 @@ module.exports = class MetamaskController extends EventEmitter { addNewAccount: nodeify(this.addNewAccount, this), placeSeedWords: this.placeSeedWords.bind(this), clearSeedWordCache: this.clearSeedWordCache.bind(this), + resetAccount: this.resetAccount.bind(this), importAccountWithStrategy: this.importAccountWithStrategy.bind(this), // vault management @@ -597,6 +598,13 @@ module.exports = class MetamaskController extends EventEmitter { cb(null, this.preferencesController.getSelectedAddress()) } + resetAccount (cb) { + const selectedAddress = this.preferencesController.getSelectedAddress() + this.txController.wipeTransactions(selectedAddress) + cb(null, selectedAddress) + } + + importAccountWithStrategy (strategy, args, cb) { accountImporter.importAccount(strategy, args) .then((privateKey) => { |