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 pull request #4815 from MetaMask/i4783-retry

Browse Source 
Increase clickable area and padding of Retry Transaction bar
This commit is contained in:
Alexander Tseung 2018-07-17 10:41:32 -07:00 committed by GitHub
commit 89911dda17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/lib/tx-list-items.js
View File

@ -31,8 +31,8 @@ async function runTxListItemsTest (assert, done) {
assert.equal($(unapprovedTx).hasClass('tx-list-pending-item-container'), true, 'unapprovedTx has the correct class') assert.equal($(unapprovedTx).hasClass('tx-list-pending-item-container'), true, 'unapprovedTx has the correct class')
const retryTx = txListItems[1] const retryTx = txListItems[1]
const retryTxLink = await findAsync($(retryTx), '.tx-list-item-retry-link') const retryTxLink = await findAsync($(retryTx), '.tx-list-item-retry-container span')
assert.equal(retryTxLink[0].textContent, 'Increase the gas price on your transaction', 'retryTx has expected link') assert.equal(retryTxLink[0].textContent, 'Taking too long? Increase the gas price on your transaction', 'retryTx has expected link')
const approvedTx = txListItems[2] const approvedTx = txListItems[2]
const approvedTxRenderedStatus = await findAsync($(approvedTx), '.tx-list-status') const approvedTxRenderedStatus = await findAsync($(approvedTx), '.tx-list-status')

24
ui/app/components/tx-list-item.js
View File

@ -307,20 +307,16 @@ TxListItem.prototype.render = function () {
]), ]),
]), ]),
this.showRetryButton() && h('div.tx-list-item-retry-container', [ this.showRetryButton() && h('.tx-list-item-retry-container', {
onClick: (event) => {
h('span.tx-list-item-retry-copy', 'Taking too long?'), event.stopPropagation()
if (isTokenTx) {
h('span.tx-list-item-retry-link', { this.setSelectedToken(txParams.to)
onClick: (event) => { }
event.stopPropagation() this.resubmit()
if (isTokenTx) { },
this.setSelectedToken(txParams.to) }, [
} h('span', 'Taking too long? Increase the gas price on your transaction'),
this.resubmit()
},
}, 'Increase the gas price on your transaction'),
]), ]),
]), // holding on icon from design ]), // holding on icon from design

10
ui/app/css/itcss/components/transaction-list.scss
View File

@ -129,12 +129,14 @@
.tx-list-item-retry-container { .tx-list-item-retry-container {
background: #d1edff; background: #d1edff;
width: 100%; width: 100%;
border-radius: 4px; border-radius: 12px;
font-size: 0.8em; font-size: .75rem;
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-left: 44px; margin-left: 44px;
width: calc(100% - 44px); width: calc(100% - 44px);
padding: 4px;
cursor: pointer;
@media screen and (min-width: 576px) and (max-width: 679px) { @media screen and (min-width: 576px) and (max-width: 679px) {
flex-flow: column; flex-flow: column;
@ -151,10 +153,6 @@
} }
} }
.tx-list-item-retry-copy {
font-family: Roboto;
}
.tx-list-item-retry-link { .tx-list-item-retry-link {
text-decoration: underline; text-decoration: underline;
margin-left: 6px; margin-left: 6px;