m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 01:39:44 +01:00
Code

Merge branch 'master' into FixLogoPasswordFollow

Browse Source
This commit is contained in:
Kevin Serrano 2016-09-09 09:40:35 -07:00 committed by GitHub
commit 69aa2ed25f
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
- Block negative values from transactions. - Block negative values from transactions.
- Fixed a memory leak. - Fixed a memory leak.
- MetaMask logo now renders as super lightweight SVG, improving compatibility and performance. - 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 ## 2.10.2 2016-09-02

2
ui/app/actions.js
View File

@ -162,8 +162,10 @@ function goHome () {
function tryUnlockMetamask (password) { function tryUnlockMetamask (password) {
return (dispatch) => { return (dispatch) => {
dispatch(actions.showLoadingIndication())
dispatch(actions.unlockInProgress()) dispatch(actions.unlockInProgress())
_accountManager.submitPassword(password, (err, selectedAccount) => { _accountManager.submitPassword(password, (err, selectedAccount) => {
dispatch(actions.hideLoadingIndication())
if (err) { if (err) {
dispatch(actions.unlockFailed()) dispatch(actions.unlockFailed())
} else { } else {