diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | ui/app/actions.js | 2 | ||||
| -rw-r--r-- | ui/app/components/mascot.js | 3 |
4 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index be65b95d0..4548480ec 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. - Now only initially creates one wallet when restoring a vault, to reduce some users' confusion. ## 2.10.2 2016-09-02 diff --git a/package.json b/package.json index 4b7be8265..1fc9a5f7d 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "inject-css": "^0.1.1", "jazzicon": "^1.1.3", "menu-droppo": "^1.1.0", - "metamask-logo": "^2.1.1", + "metamask-logo": "^2.1.2", "mississippi": "^1.2.0", "multiplex": "^6.7.0", "once": "^1.3.3", 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 { diff --git a/ui/app/components/mascot.js b/ui/app/components/mascot.js index ae998406b..f015d0c4d 100644 --- a/ui/app/components/mascot.js +++ b/ui/app/components/mascot.js @@ -15,7 +15,7 @@ function Mascot () { width: 200, height: 200, }) - if (!this.logo.webGLSupport) return + this.refollowMouse = debounce(this.logo.setFollowMouse.bind(this.logo, true), 1000) this.unfollowMouse = this.logo.setFollowMouse.bind(this.logo, false) } @@ -53,7 +53,6 @@ Mascot.prototype.handleAnimationEvents = function () { } Mascot.prototype.lookAt = function (target) { - if (!this.logo.webGLSupport) return this.unfollowMouse() this.logo.lookAt(target) this.refollowMouse() |