diff options
| author | Dan Finlay <dan@danfinlay.com> | 2016-05-05 11:37:39 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2016-05-05 11:37:39 +0800 |
| commit | d929f8053202dabb866f5aea3fc0238593c474ce (patch) | |
| tree | 0e8f49dbf871638922837295694aa8ccdc473f67 | |
| parent | 95582f8bde3abda5b6b7cf0e027bc7913e5953ce (diff) | |
| download | tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar.gz tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar.bz2 tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar.lz tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar.xz tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.tar.zst tangerine-wallet-browser-d929f8053202dabb866f5aea3fc0238593c474ce.zip | |
Fix routing bug
Where sometimes the account list was shown when first unlocking, after momentarily showing the detail panel.
| -rw-r--r-- | ui/app/actions.js | 1 | ||||
| -rw-r--r-- | ui/app/reducers/app.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index 072139e1a..9a8ba76d1 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -108,7 +108,6 @@ function tryUnlockMetamask(password) { return (dispatch) => { dispatch(this.unlockInProgress()) _accountManager.submitPassword(password, (err, selectedAccount) => { - dispatch(this.hideLoadingIndication()) if (err) { dispatch(this.unlockFailed()) } else { diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 14f92a8c5..d958b6730 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -109,7 +109,9 @@ function reduceApp(state, action) { case actions.UNLOCK_METAMASK: return extend(appState, { currentView: {}, + detailView: {}, transForward: true, + isLoading: false, warning: null, }) |