aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@users.noreply.github.com>2018-01-12 07:49:10 +0800
committerChi Kei Chan <chikeichan@gmail.com>2018-01-12 07:49:10 +0800
commitb8310ac62e358af9a6a9f3ed1e0ffa25a2a00b8d (patch)
treebab952d67156d4a8a9bc43914b9e4906d5f0bf32 /ui
parent7c97b2f37c0226daef734bae3392b6ade2b2956f (diff)
downloadtangerine-wallet-browser-b8310ac62e358af9a6a9f3ed1e0ffa25a2a00b8d.tar.gz
tangerine-wallet-browser-b8310ac62e358af9a6a9f3ed1e0ffa25a2a00b8d.tar.zst
tangerine-wallet-browser-b8310ac62e358af9a6a9f3ed1e0ffa25a2a00b8d.zip
Fix logging out of old UI causing infinite spinner (#2914)
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js6
-rw-r--r--ui/app/components/account-menu/index.js2
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index bd3aab45a..55773b3b5 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -925,9 +925,13 @@ function lockMetamask () {
})
.then(newState => {
dispatch(actions.updateMetamaskState(newState))
+ dispatch(actions.hideLoadingIndication())
+ dispatch({ type: actions.LOCK_METAMASK })
+ })
+ .catch(() => {
+ dispatch(actions.hideLoadingIndication())
dispatch({ type: actions.LOCK_METAMASK })
})
- .catch(() => dispatch({ type: actions.LOCK_METAMASK }))
}
}
diff --git a/ui/app/components/account-menu/index.js b/ui/app/components/account-menu/index.js
index 286a3b587..1b62b42fb 100644
--- a/ui/app/components/account-menu/index.js
+++ b/ui/app/components/account-menu/index.js
@@ -33,7 +33,7 @@ function mapDispatchToProps (dispatch) {
},
lockMetamask: () => {
dispatch(actions.lockMetamask())
- dispatch(actions.displayWarning(null))
+ dispatch(actions.hideWarning())
dispatch(actions.hideSidebar())
dispatch(actions.toggleAccountMenu())
},