aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Iván Cuende <me@luisivan.net>2016-12-15 02:03:56 +0800
committerLuis Iván Cuende <me@luisivan.net>2016-12-15 02:03:56 +0800
commit4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc (patch)
tree8cf26be733dae29057587ba828dba8dd33935e5e
parentc65db9290dd02b762c0260fe98945f63162f285d (diff)
downloadtangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar.gz
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar.bz2
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar.lz
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar.xz
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.tar.zst
tangerine-wallet-browser-4a8bc63c8d8cd4191bbfc0e13077f2356ea7cfbc.zip
Better account details view
-rw-r--r--ui/app/account-detail.js38
-rw-r--r--ui/app/app.js8
-rw-r--r--ui/app/components/editable-label.js5
-rw-r--r--ui/app/components/tooltip.js2
-rw-r--r--ui/app/components/transaction-list.js3
5 files changed, 14 insertions, 42 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index a700df52e..d456d125a 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -76,6 +76,7 @@ AccountDetailScreen.prototype.render = function () {
]),
h('flex-column', {
style: {
+ width: '100%',
lineHeight: '10px',
marginLeft: '15px',
},
@@ -92,28 +93,20 @@ AccountDetailScreen.prototype.render = function () {
]),
h('.flex-row', {
style: {
- width: '15em',
+ width: '100%',
justifyContent: 'space-between',
alignItems: 'baseline',
},
}, [
- // address
-
- h('div', {
+ // balance
+ h(EthBalance, {
+ value: account && account.balance,
style: {
- overflow: 'hidden',
- textOverflow: 'ellipsis',
- paddingTop: '3px',
- width: '5em',
- fontSize: '13px',
- fontFamily: 'Montserrat Light',
- textRendering: 'geometricPrecision',
+ lineHeight: '7px',
marginTop: '10px',
- marginBottom: '15px',
- color: '#AEAEAE',
},
- }, ethUtil.toChecksumAddress(selected)),
+ }),
// copy and export
@@ -167,33 +160,18 @@ AccountDetailScreen.prototype.render = function () {
]),
]),
]),
-
- // account ballence
-
]),
]),
h('.flex-row', {
style: {
- justifyContent: 'space-between',
- alignItems: 'flex-start',
+ justifyContent: 'flex-end',
},
}, [
-
- h(EthBalance, {
- value: account && account.balance,
- style: {
- lineHeight: '7px',
- marginTop: '10px',
- },
- }),
-
h('button', {
onClick: () => props.dispatch(actions.buyEthView(selected)),
style: {
marginBottom: '20px',
marginRight: '8px',
- position: 'absolute',
- left: '219px',
},
}, 'BUY'),
diff --git a/ui/app/app.js b/ui/app/app.js
index d870cec4a..ba891f1cf 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -126,14 +126,6 @@ App.prototype.renderAppBar = function () {
alignItems: 'center',
},
}, [
-
- // mini logo
- h('img', {
- height: 24,
- width: 24,
- src: '/images/icon-128.png',
- }),
-
h(NetworkIndicator, {
network: this.props.network,
provider: this.props.provider,
diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js
index bc0f9a5b2..14c0294a2 100644
--- a/ui/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
@@ -13,7 +13,10 @@ function EditableLabel () {
EditableLabel.prototype.render = function () {
return h('div.name-label', {
contentEditable: true,
- style: { outline: 'none' },
+ style: {
+ outline: 'none',
+ marginTop: '0.5rem',
+ },
onInput: (event) => this.saveText(),
}, this.props.children)
}
diff --git a/ui/app/components/tooltip.js b/ui/app/components/tooltip.js
index edbc074bb..efab2c497 100644
--- a/ui/app/components/tooltip.js
+++ b/ui/app/components/tooltip.js
@@ -17,6 +17,6 @@ Tooltip.prototype.render = function () {
return h(ReactTooltip, {
position: position || 'left',
title,
- fixed: false,
+ fixed: true,
}, children)
}
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index 7e1bedb05..f6a4ed07e 100644
--- a/ui/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
@@ -79,10 +79,9 @@ TransactionList.prototype.render = function () {
height: '100%',
},
}, [
- 'No transaction history.',
+ 'No transaction history',
]),
]),
])
)
}
-