aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-01-19 08:45:39 +0800
committerDan Finlay <dan@danfinlay.com>2017-01-19 08:45:39 +0800
commit5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c (patch)
tree4e6077ee705d894bbe33945c57ede27403aeb1e0 /ui/app/actions.js
parent9126652f2e8b5b612f894bbb6c46fb1ef7861d06 (diff)
downloadtangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.gz
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.bz2
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.lz
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.xz
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.zst
tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.zip
Add ability to import v3 JSON wallets
There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r--ui/app/actions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index 36efa4bc6..bf3617310 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -267,7 +267,7 @@ function addNewKeyring (type, opts) {
function importNewAccount (strategy, args) {
return (dispatch) => {
- dispatch(actions.showLoadingIndication())
+ dispatch(actions.showLoadingIndication('This may take a while, be patient.'))
background.importAccountWithStrategy(strategy, args, (err, newState) => {
dispatch(actions.hideLoadingIndication())
if (err) return dispatch(actions.displayWarning(err.message))
@@ -630,9 +630,10 @@ function useEtherscanProvider () {
}
}
-function showLoadingIndication () {
+function showLoadingIndication (message) {
return {
type: actions.SHOW_LOADING,
+ value: message,
}
}