aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/account-detail.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-07-26 09:22:31 +0800
committerDan Finlay <dan@danfinlay.com>2017-07-26 09:25:56 +0800
commit0ea6749dbc923a6e796b1de4bbd301d931739b9d (patch)
tree451348ed8b04fae821140db73dacc8ddb4e65ee8 /ui/app/account-detail.js
parent4d218ac57a5db8c4d3d446fbfaa5ef8488c2a6d5 (diff)
downloadtangerine-wallet-browser-0ea6749dbc923a6e796b1de4bbd301d931739b9d.tar.gz
tangerine-wallet-browser-0ea6749dbc923a6e796b1de4bbd301d931739b9d.tar.zst
tangerine-wallet-browser-0ea6749dbc923a6e796b1de4bbd301d931739b9d.zip
Lots of flex rearrangement on account detail view
Includes removal of ReactCssTransitionGroup for a simpler UI refactor.
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r--ui/app/account-detail.js25
1 files changed, 4 insertions, 21 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 18c867153..24561c32e 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -4,7 +4,6 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('react-redux').connect
const actions = require('./actions')
-const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
const valuesFor = require('./util').valuesFor
const Identicon = require('./components/identicon')
const EthBalance = require('./components/eth-balance')
@@ -51,14 +50,9 @@ AccountDetailScreen.prototype.render = function () {
return (
- h('.account-detail-section', {
- style: {
- height: '100%',
- maxWidth: '850px',
- },
- }, [
+ h('.account-detail-section.full-flex-height', [
- // identicon, label, balance, etc
+ // identicon, label, balance, etc
h('.account-data-subsection', {
style: {
margin: '0 20px',
@@ -205,14 +199,7 @@ AccountDetailScreen.prototype.render = function () {
]),
// subview (tx history, pk export confirm, buy eth warning)
- h(ReactCSSTransitionGroup, {
- className: 'css-transition-group',
- transitionName: 'main',
- transitionEnterTimeout: 300,
- transitionLeaveTimeout: 300,
- }, [
- this.subview(),
- ]),
+ this.subview(),
])
)
@@ -240,11 +227,7 @@ AccountDetailScreen.prototype.subview = function () {
AccountDetailScreen.prototype.tabSections = function () {
const { currentAccountTab } = this.props
- return h('section.tabSection', {
- style: {
- height: '100%',
- },
- }, [
+ return h('section.tabSection.full-flex-height.grow-tenx', [
h(TabBar, {
tabs: [