Implement tx confirmation style refinements

feature/default_network_editable
Dan Finlay 8 years ago
parent 97b60caac0
commit 2a204624f5
  1. 46
      ui/app/components/pending-tx-details.js
  2. 8
      ui/app/components/pending-tx.js
  3. 4
      ui/app/conf-tx.js
  4. 4
      ui/app/css/index.css

@ -3,6 +3,7 @@ const h = require('react-hyperscript')
const inherits = require('util').inherits const inherits = require('util').inherits
const MiniAccountPanel = require('./mini-account-panel') const MiniAccountPanel = require('./mini-account-panel')
const EtherBalance = require('./eth-balance')
const addressSummary = require('../util').addressSummary const addressSummary = require('../util').addressSummary
const formatBalance = require('../util').formatBalance const formatBalance = require('../util').formatBalance
const nameForAddress = require('../../lib/contract-namer') const nameForAddress = require('../../lib/contract-namer')
@ -52,7 +53,7 @@ PTXP.render = function () {
}, [ }, [
h('span.font-small', { h('span.font-small', {
style: { style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif', fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
}, },
}, identity.name), }, identity.name),
h('span.font-small', { h('span.font-small', {
@ -65,7 +66,10 @@ PTXP.render = function () {
style: { style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif', fontFamily: 'Montserrat Light, Montserrat, sans-serif',
}, },
}, formatBalance(balance)), }, h(EtherBalance, {
value: balance,
inline: true,
})),
]), ]),
@ -73,7 +77,7 @@ PTXP.render = function () {
src: 'images/forward-carrat.svg', src: 'images/forward-carrat.svg',
style: { style: {
padding: '5px 6px 0px 10px', padding: '5px 6px 0px 10px',
height: '48px', height: '37px',
}, },
}), }),
@ -82,7 +86,8 @@ PTXP.render = function () {
h('style', ` h('style', `
.table-box { .table-box {
margin: 7px 6px 0px 6px; margin: 7px 0px 0px 0px;
width: 100%;
} }
.table-box .row { .table-box .row {
margin: 0px; margin: 0px;
@ -91,7 +96,10 @@ PTXP.render = function () {
justify-content: space-between; justify-content: space-between;
font-family: Montserrat Light, sans-serif; font-family: Montserrat Light, sans-serif;
font-size: 13px; font-size: 13px;
padding: 5px 15px; padding: 5px 25px;
}
.table-box .row .value {
font-family: Montserrat Regular;
} }
`), `),
@ -110,11 +118,24 @@ PTXP.render = function () {
h('.cell.row', { h('.cell.row', {
style: { style: {
fontFamily: 'Montserrat Regular', fontFamily: 'Montserrat Regular',
background: 'rgb(216,216,216)', background: 'white',
padding: '10px 25px',
}, },
}, [ }, [
h('.cell.label', 'Max Total'), h('.cell.label', 'Max Total'),
h('.cell.value', formatBalance(maxCost)), h('.cell.value', {
style: {
display: 'flex',
alignItems: 'center',
},
}, [
h(EtherBalance, {
value: maxCost,
inline: true,
labelColor: 'black',
fontSize: '16px',
}),
]),
]), ]),
h('.cell.row', { h('.cell.row', {
@ -124,7 +145,12 @@ PTXP.render = function () {
}, },
}, [ }, [
h('.cell.label'), h('.cell.label'),
h('.cell.value', `Data included: ${dataLength} bytes`), h('.cell.value', {
style: {
fontFamily: 'Montserrat Light',
fontSize: '11px',
},
}, `Data included: ${dataLength} bytes`),
]), ]),
]), // End of Table ]), // End of Table
@ -149,7 +175,7 @@ PTXP.miniAccountPanelForRecipient = function () {
}, [ }, [
h('span.font-small', { h('span.font-small', {
style: { style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif', fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
}, },
}, nameForAddress(txParams.to)), }, nameForAddress(txParams.to)),
h('span.font-small', { h('span.font-small', {
@ -167,7 +193,7 @@ PTXP.miniAccountPanelForRecipient = function () {
h('span.font-small', { h('span.font-small', {
style: { style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif', fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
}, },
}, 'New Contract'), }, 'New Contract'),

@ -21,14 +21,6 @@ PendingTx.prototype.render = function () {
key: txData.id, key: txData.id,
}, [ }, [
// header
h('h3', {
style: {
fontWeight: 'bold',
textAlign: 'center',
},
}, 'Submit Transaction'),
// tx info // tx info
h(PendingTxDetails, state), h(PendingTxDetails, state),

@ -39,14 +39,14 @@ ConfirmTxScreen.prototype.render = function () {
return ( return (
h('.unconftx-section.flex-column.flex-grow', [ h('.flex-column.flex-grow', [
// subtitle and nav // subtitle and nav
h('.section-title.flex-row.flex-center', [ h('.section-title.flex-row.flex-center', [
h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', { h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
onClick: this.goHome.bind(this), onClick: this.goHome.bind(this),
}), }),
h('h2.page-subtitle', 'Confirmation'), h('h2.page-subtitle', 'Confirm Transaction'),
]), ]),
h('h3', { h('h3', {

@ -411,10 +411,6 @@ input.large-input {
} }
/* tx confirm */ /* tx confirm */
.unconftx-section {
margin: 0 20px;
}
.unconftx-section input[type=password] { .unconftx-section input[type=password] {
height: 22px; height: 22px;
padding: 2px; padding: 2px;

Loading…
Cancel
Save