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

Fix logging out of old UI causing infinite spinner (#2914)

Browse Source
This commit is contained in:
Alexander Tseung 2018-01-11 15:49:10 -08:00 committed by Chi Kei Chan
parent 7c97b2f37c
commit b8310ac62e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/app/actions.js
View File

@ -925,9 +925,13 @@ function lockMetamask () {
}) })
.then(newState => { .then(newState => {
dispatch(actions.updateMetamaskState(newState)) dispatch(actions.updateMetamaskState(newState))
dispatch(actions.hideLoadingIndication())
dispatch({ type: actions.LOCK_METAMASK })
})
.catch(() => {
dispatch(actions.hideLoadingIndication())
dispatch({ type: actions.LOCK_METAMASK }) dispatch({ type: actions.LOCK_METAMASK })
}) })
.catch(() => dispatch({ type: actions.LOCK_METAMASK }))
} }
} }

2
ui/app/components/account-menu/index.js
View File

@ -33,7 +33,7 @@ function mapDispatchToProps (dispatch) {
}, },
lockMetamask: () => { lockMetamask: () => {
dispatch(actions.lockMetamask()) dispatch(actions.lockMetamask())
dispatch(actions.displayWarning(null)) dispatch(actions.hideWarning())
dispatch(actions.hideSidebar()) dispatch(actions.hideSidebar())
dispatch(actions.toggleAccountMenu()) dispatch(actions.toggleAccountMenu())
}, },