diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-09-10 00:40:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-10 00:40:35 +0800 |
| commit | 69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d (patch) | |
| tree | 71965b86d921474ea73c147027b85e38e56b70a5 | |
| parent | a4e4c854534a73caeb857cffb321b3b8f98f395a (diff) | |
| parent | 348f1fb79720446dacdaa84717a2c73090d779f7 (diff) | |
| download | tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar.gz tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar.bz2 tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar.lz tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar.xz tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.tar.zst tangerine-wallet-browser-69aa2ed25fa860ea9d1d0afea8656de6ddb32e3d.zip | |
Merge branch 'master' into FixLogoPasswordFollow
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | ui/app/actions.js | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dee1089c..19628ce3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Block negative values from transactions. - Fixed a memory leak. - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance. +- Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks. ## 2.10.2 2016-09-02 diff --git a/ui/app/actions.js b/ui/app/actions.js index d49223e71..57c2bf3e8 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -162,8 +162,10 @@ function goHome () { function tryUnlockMetamask (password) { return (dispatch) => { + dispatch(actions.showLoadingIndication()) dispatch(actions.unlockInProgress()) _accountManager.submitPassword(password, (err, selectedAccount) => { + dispatch(actions.hideLoadingIndication()) if (err) { dispatch(actions.unlockFailed()) } else { |