m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 18:00:18 +01:00
Code

Merge pull request #419 from MetaMask/ConfirmationStyle

Browse Source 
Tx Confirmation - fixes
This commit is contained in:
kumavis 2016-07-07 17:36:28 -07:00 committed by GitHub
commit 6d44eaefcb
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/app/components/eth-balance.js
View File

@ -54,18 +54,22 @@ EthBalanceComponent.prototype.renderBalance = function (value) {
textRendering: 'geometricPrecision',
},
}, [
h(tagName, {
style: {
fontSize: props.fontSize || '12px',
},
}, balance + ' '),
h(tagName, {
style: {
color: props.labelColor || '#AEAEAE',
fontSize: props.fontSize || '12px',
},
}, label),
}, [
h('div', balance),
h('div', {
style: {
color: '#AEAEAE',
fontSize: '12px',
},
}, label),
]),
]),
])
)
}

53
ui/app/components/pending-tx-details.js
View File

@ -1,6 +1,7 @@
const Component = require('react').Component
const h = require('react-hyperscript')
const inherits = require('util').inherits
const carratInline = require('fs').readFileSync('./images/forward-carrat.svg', 'utf8')
const MiniAccountPanel = require('./mini-account-panel')
const EtherBalance = require('./eth-balance')
@ -37,6 +38,8 @@ PTXP.render = function () {
var maxCost = ((new BN(txValue, 16)).add(new BN(gasCost, 16))).toString(16)
var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
return (
h('div', [
@ -48,7 +51,7 @@ PTXP.render = function () {
h(MiniAccountPanel, {
imageSeed: address,
imageifyIdenticons: props.imageifyIdenticons,
imageifyIdenticons: imageify,
picOrder: 'right',
}, [
h('span.font-small', {
@ -66,20 +69,17 @@ PTXP.render = function () {
style: {
fontFamily: 'Montserrat Light, Montserrat, sans-serif',
},
}, h(EtherBalance, {
value: balance,
inline: true,
})),
}, [
h(EtherBalance, {
value: balance,
inline: true,
labelColor: '#F7861C',
}),
]),
]),
h('img', {
src: 'images/forward-carrat.svg',
style: {
padding: '5px 6px 0px 10px',
height: '37px',
},
}),
forwardCarrat(imageify),
this.miniAccountPanelForRecipient(),
]),
@ -222,3 +222,32 @@ PTXP.warnIfNeeded = function () {
h('span', ' Your identity may be used in other contracts!'),
])
}
function forwardCarrat(imageify){
if (imageify) {
return (
h('img', {
src: 'images/forward-carrat.svg',
style: {
padding: '5px 6px 0px 10px',
height: '37px',
},
})
)
} else {
return (
h('div', {
dangerouslySetInnerHTML: { __html: carratInline },
style: {
padding: '0px 6px 0px 10px',
height: '45px',
},
})
)
}
}