aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-12-07 16:02:20 +0800
committerDan Finlay <dan@danfinlay.com>2017-12-07 16:02:20 +0800
commit706a07d0e9f3a7cc443ba6b797bf548e19065496 (patch)
tree185c3e82c54bc5ba9be9a88b10337f71a5add8b1
parentc391b25015b391d2818de067fa17ad3d9a3a9b30 (diff)
parentb9f2f8c2a78332a2522d49baedf25e894273ef38 (diff)
downloadtangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar.gz
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar.bz2
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar.lz
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar.xz
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.tar.zst
tangerine-wallet-browser-706a07d0e9f3a7cc443ba6b797bf548e19065496.zip
Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction
-rw-r--r--ui/app/components/transaction-list-item.js8
-rw-r--r--ui/app/css/index.css4
2 files changed, 11 insertions, 1 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index fa6c5915d..42ef665b1 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -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()
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 0630c4c12..c0bf18c23 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -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;