Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction

feature/default_network_editable
Dan Finlay 7 years ago
commit 706a07d0e9
  1. 8
      ui/app/components/transaction-list-item.js
  2. 4
      ui/app/css/index.css

@ -28,6 +28,12 @@ function TransactionListItem () {
Component.call(this)
}
TransactionListItem.prototype.showRetryButton = function () {
const { transaction = {} } = this.props
const { status, time } = transaction
return status === 'submitted' && Date.now() - time > 30000
}
TransactionListItem.prototype.render = function () {
const { transaction, network, conversionRate, currentCurrency } = this.props
const { status } = transaction
@ -114,7 +120,7 @@ TransactionListItem.prototype.render = function () {
}) : h('.flex-column'),
]),
transaction.status === 'submitted' && h('.transition-list-item__retry', {
this.showRetryButton() && h('.transition-list-item__retry.grow-on-hover', {
onClick: event => {
event.stopPropagation()
this.resubmit()

@ -108,6 +108,10 @@ button:not([disabled]):active, input[type="submit"]:not([disabled]):active {
transform: scale(0.95);
}
.grow-on-hover:hover {
transform: scale(1.05);
}
a {
text-decoration: none;
color: inherit;

Loading…
Cancel
Save