diff options
| -rw-r--r-- | ui/app/account-detail.js | 6 | ||||
| -rw-r--r-- | ui/app/actions.js | 1 | ||||
| -rw-r--r-- | ui/app/app.js | 3 | ||||
| -rw-r--r-- | ui/app/css/transitions.css | 1 | ||||
| -rw-r--r-- | ui/app/reducers/app.js | 2 |
5 files changed, 10 insertions, 3 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 208ecc63a..c93eef4fd 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -39,7 +39,11 @@ AccountDetailScreen.prototype.render = function() { return ( - h('.account-detail-section.flex-column.flex-grow', [ + h('.account-detail-section.flex-column.flex-grow', { + style: { + width: '330px', + }, + }, [ // subtitle and nav h('.section-title.flex-row.flex-center', [ 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/app.js b/ui/app/app.js index 94c72a3c8..a4ce40881 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -65,7 +65,7 @@ App.prototype.render = function() { h('.flex-column.flex-grow.full-height', { style: { // Windows was showing a vertical scroll bar: - overflowY: 'hidden', + overflow: 'hidden', } }, [ @@ -82,6 +82,7 @@ App.prototype.render = function() { h('.app-primary.flex-grow' + (transForward ? '.from-right' : '.from-left'), { style: { height: '380px', + width: '360px', } }, [ h(ReactCSSTransitionGroup, { diff --git a/ui/app/css/transitions.css b/ui/app/css/transitions.css index 3d0bf46a1..e2225a98d 100644 --- a/ui/app/css/transitions.css +++ b/ui/app/css/transitions.css @@ -19,6 +19,7 @@ position: absolute; width: 100%; transition: transform 300ms ease-in-out; + overflow-x: hidden; } /* final positions */ diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 35ddf6759..309351956 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -112,7 +112,9 @@ function reduceApp(state, action) { case actions.UNLOCK_METAMASK: return extend(appState, { currentView: {}, + detailView: {}, transForward: true, + isLoading: false, warning: null, }) |