From 6d13ef691f4162caad6b8742a21d0b75f8baccca Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Fri, 16 Dec 2016 10:04:57 -0800 Subject: Revert "Interface enhancements" --- ui/app/account-detail.js | 44 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 9 deletions(-) (limited to 'ui/app/account-detail.js') diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index d456d125a..c41ba61fd 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -70,43 +70,54 @@ AccountDetailScreen.prototype.render = function () { // large identicon and addresses h('.identicon-wrapper.select-none', [ h(Identicon, { - diameter: 48, + diameter: 62, address: selected, }), ]), h('flex-column', { style: { - width: '100%', lineHeight: '10px', marginLeft: '15px', }, }, [ h(EditableLabel, { textValue: identity ? identity.name : '', + state: { + isEditingLabel: false, + }, saveText: (text) => { props.dispatch(actions.saveAccountLabel(selected, text)) }, }, [ // What is shown when not editing + edit text: + h('label.editing-label', [h('.edit-text', 'edit')]), h('h2.font-medium.color-forest', {name: 'edit'}, identity && identity.name), ]), h('.flex-row', { style: { - width: '100%', + width: '15em', justifyContent: 'space-between', alignItems: 'baseline', }, }, [ - // balance - h(EthBalance, { - value: account && account.balance, + // address + + h('div', { style: { - lineHeight: '7px', + overflow: 'hidden', + textOverflow: 'ellipsis', + paddingTop: '3px', + width: '5em', + fontSize: '13px', + fontFamily: 'Montserrat Light', + textRendering: 'geometricPrecision', marginTop: '10px', + marginBottom: '15px', + color: '#AEAEAE', }, - }), + }, ethUtil.toChecksumAddress(selected)), // copy and export @@ -160,18 +171,33 @@ AccountDetailScreen.prototype.render = function () { ]), ]), ]), + + // account ballence + ]), ]), h('.flex-row', { style: { - justifyContent: 'flex-end', + justifyContent: 'space-between', + alignItems: 'flex-start', }, }, [ + + 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'), -- cgit