diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-10-06 02:07:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-06 02:07:44 +0800 |
| commit | c8521e49adc253cf3c18812dc062c67075b42fc5 (patch) | |
| tree | 6903e65987812cb443d754d4d0bd869b2ea67aad | |
| parent | 55180a79c8147621c6d684d53610a153f0ba928a (diff) | |
| parent | 0527d02216862fc82d1c229ca9ac5b08178fa564 (diff) | |
| download | tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar.gz tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar.bz2 tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar.lz tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar.xz tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.tar.zst tangerine-wallet-browser-c8521e49adc253cf3c18812dc062c67075b42fc5.zip | |
Merge pull request #5428 from alextsg/i5372-queue-order
Reverse pending transactions order
| -rw-r--r-- | test/integration/lib/tx-list-items.js | 4 | ||||
| -rw-r--r-- | ui/app/selectors/transactions.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/integration/lib/tx-list-items.js b/test/integration/lib/tx-list-items.js index f64a8d7de..ed4f82074 100644 --- a/test/integration/lib/tx-list-items.js +++ b/test/integration/lib/tx-list-items.js @@ -32,7 +32,7 @@ async function runTxListItemsTest (assert, done) { const txListItems = await queryAsync($, '.transaction-list-item') assert.equal(txListItems.length, 8, 'all tx list items are rendered') - const retryTxGrid = await findAsync($(txListItems[1]), '.transaction-list-item__grid') + const retryTxGrid = await findAsync($(txListItems[2]), '.transaction-list-item__grid') retryTxGrid[0].click() const retryTxDetails = await findAsync($, '.transaction-list-item-details') const headerButtons = await findAsync($(retryTxDetails[0]), '.transaction-list-item-details__header-button') @@ -42,7 +42,7 @@ async function runTxListItemsTest (assert, done) { const approvedTxRenderedStatus = await findAsync($(approvedTx), '.transaction-list-item__status') assert.equal(approvedTxRenderedStatus[0].textContent, 'pending', 'approvedTx has correct label') - const unapprovedMsg = txListItems[3] + const unapprovedMsg = txListItems[0] const unapprovedMsgDescription = await findAsync($(unapprovedMsg), '.transaction-list-item__action') assert.equal(unapprovedMsgDescription[0].textContent, 'Signature Request', 'unapprovedMsg has correct description') diff --git a/ui/app/selectors/transactions.js b/ui/app/selectors/transactions.js index 3e9843722..479002794 100644 --- a/ui/app/selectors/transactions.js +++ b/ui/app/selectors/transactions.js @@ -39,7 +39,7 @@ export const transactionsSelector = createSelector( export const pendingTransactionsSelector = createSelector( transactionsSelector, (transactions = []) => ( - transactions.filter(transaction => transaction.status in pendingStatusHash) + transactions.filter(transaction => transaction.status in pendingStatusHash).reverse() ) ) |