aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/account-detail.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2016-08-23 05:36:21 +0800
committerDan Finlay <dan@danfinlay.com>2016-08-23 05:36:21 +0800
commitf57cbe59fc9e0d3cfb3ee54da749470248fe2b8b (patch)
treee7d702905f2c92cb987148de8247ead5ead31a00 /ui/app/account-detail.js
parentc223ba2e00ff80913c5b1fe3a339167d4489ec6a (diff)
downloadtangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar.gz
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar.bz2
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar.lz
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar.xz
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.tar.zst
tangerine-wallet-browser-f57cbe59fc9e0d3cfb3ee54da749470248fe2b8b.zip
Removed view more button, added account info button.
Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r--ui/app/account-detail.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index e00a34c4a..4316ff54e 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -4,6 +4,7 @@ const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('react-redux').connect
const CopyButton = require('./components/copyButton')
+const AccountInfoLink = require('./components/account-info-link')
const actions = require('./actions')
const ReactCSSTransitionGroup = require('react-addons-css-transition-group')
const valuesFor = require('./util').valuesFor
@@ -44,6 +45,7 @@ AccountDetailScreen.prototype.render = function () {
var selected = props.address || Object.keys(props.accounts)[0]
var identity = props.identities[selected]
var account = props.accounts[selected]
+ const { network } = props
return (
@@ -127,6 +129,9 @@ AccountDetailScreen.prototype.render = function () {
bottom: '15px',
},
}, [
+
+ h(AccountInfoLink, { selected, network }),
+
h(CopyButton, {
value: ethUtil.toChecksumAddress(selected),
}),
@@ -136,16 +141,15 @@ AccountDetailScreen.prototype.render = function () {
}, [
h('div', {
style: {
- margin: '5px',
- },
+ display: 'flex',
+ alignItems: 'center',
+ }
}, [
h('img.cursor-pointer.color-orange', {
src: 'images/key-32.png',
onClick: () => this.requestAccountExport(selected),
style: {
- margin: '0px 5px',
- width: '20px',
- height: '20px',
+ height: '19px',
},
}),
]),