diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-01-19 08:45:39 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-01-19 08:45:39 +0800 |
| commit | 5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c (patch) | |
| tree | 4e6077ee705d894bbe33945c57ede27403aeb1e0 /ui/app/reducers | |
| parent | 9126652f2e8b5b612f894bbb6c46fb1ef7861d06 (diff) | |
| download | tangerine-wallet-browser-5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c.tar.gz 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/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index ae91272cc..6a2c93f78 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -386,6 +386,7 @@ function reduceApp (state, action) { case actions.SHOW_LOADING: return extend(appState, { isLoading: true, + loadingMessage: action.value, }) case actions.HIDE_LOADING: |