From 7b6c018c3978f11d05fe3854a1f4072d3446b4b2 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 8 Sep 2016 19:53:54 -0700
Subject: [PATCH] Show loading indication during unlocking.

---
 CHANGELOG.md      | 1 +
 ui/app/actions.js | 2 ++
 2 files changed, 3 insertions(+)

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 {