1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge branch 'master' into i675-LoadingBuy

This commit is contained in:
Dan Finlay 2016-09-15 21:05:24 -07:00
commit ed51b91b4a
2 changed files with 17 additions and 4 deletions

View File

@ -2,6 +2,8 @@
## Current Master
- Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz
too help visualize transactions and to where they are going.
- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient
- Show loading indication when selecting ShapeShift as purchasing method.

View File

@ -48,7 +48,7 @@ TransactionListItem.prototype.render = function () {
if (isPending) {
this.props.showTx(transaction.id)
}
event.stopPropagation()
if (!transaction.hash || !isLinkable) return
var url = explorerLink(transaction.hash, parseInt(network))
extension.tabs.create({ url })
@ -58,10 +58,21 @@ TransactionListItem.prototype.render = function () {
},
}, [
// large identicon
h('.identicon-wrapper.flex-column.flex-center.select-none', [
transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
: h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {
style: {
fontSize: '27px',
},
}) : h( '.pop-hover', {
onClick: (event) => {
event.stopPropagation()
if (!isTx || isPending) return
var url = `https://metamask.github.io/eth-tx-viz/?tx=${transaction.hash}`
extension.tabs.create({ url })
},
}, [
h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
]),
]),
h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [