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

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

Browse Source
This commit is contained in:
Dan Finlay 2017-12-07 03:02:20 -05:00
commit 706a07d0e9
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/app/components/transaction-list-item.js
View File

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

4
ui/app/css/index.css
View File

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