aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-09-10 00:35:41 +0800
committerGitHub <noreply@github.com>2016-09-10 00:35:41 +0800
commit348f1fb79720446dacdaa84717a2c73090d779f7 (patch)
tree3f154ea80992a99d359e1e42e60ff2f5838e21a3
parentc97aef2b997e32aeab61d2a81a6513f237c66a31 (diff)
parent7b6c018c3978f11d05fe3854a1f4072d3446b4b2 (diff)
downloadtangerine-wallet-browser-348f1fb79720446dacdaa84717a2c73090d779f7.tar.gz
tangerine-wallet-browser-348f1fb79720446dacdaa84717a2c73090d779f7.tar.zst
tangerine-wallet-browser-348f1fb79720446dacdaa84717a2c73090d779f7.zip
Merge pull request #631 from MetaMask/i599-LoginLoadingIndication
Show loading indication during unlocking.
-rw-r--r--CHANGELOG.md1
-rw-r--r--ui/app/actions.js2
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 {