aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-01-19 07:17:08 +0800
committerDan Finlay <dan@danfinlay.com>2017-01-19 07:20:48 +0800
commitb52346388b8d4518ffb2eb34236c6d17579085f3 (patch)
treed5748386adc015b8ab1d9e28d1b5c68fab5c728e /ui/app/accounts
parent28212d167cbd201f78e0253cf9c6fb676d71cb7a (diff)
downloadtangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar.gz
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar.bz2
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar.lz
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar.xz
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.tar.zst
tangerine-wallet-browser-b52346388b8d4518ffb2eb34236c6d17579085f3.zip
Added new modular private key import system
Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
Diffstat (limited to 'ui/app/accounts')
-rw-r--r--ui/app/accounts/import/private-key.js3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/accounts/import/private-key.js b/ui/app/accounts/import/private-key.js
index 6b988a76b..b139a0374 100644
--- a/ui/app/accounts/import/private-key.js
+++ b/ui/app/accounts/import/private-key.js
@@ -2,7 +2,6 @@ const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('react-redux').connect
-const type = 'Simple Key Pair'
const actions = require('../../actions')
module.exports = connect(mapStateToProps)(PrivateKeyImportView)
@@ -64,6 +63,6 @@ PrivateKeyImportView.prototype.createKeyringOnEnter = function (event) {
PrivateKeyImportView.prototype.createNewKeychain = function () {
const input = document.getElementById('private-key-box')
const privateKey = input.value
- this.props.dispatch(actions.addNewKeyring(type, [ privateKey ]))
+ this.props.dispatch(actions.importNewAccount('Private Key', [ privateKey ]))
}