aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/tx-list.js
diff options
context:
space:
mode:
authorThomas Huang <tmashuang@users.noreply.github.com>2018-03-21 00:59:21 +0800
committerGitHub <noreply@github.com>2018-03-21 00:59:21 +0800
commit1079d57f8cd0513e9571457b00eb3e9b44c26215 (patch)
tree929ddf8387cecc78ef26dbb85461fe5e0d925d8a /ui/app/components/tx-list.js
parent4af1003b0efa8329718f5a95826976a54194d49b (diff)
parentd9160ac6da48bfead4cf47a5d9dc142432c52e0c (diff)
downloadtangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.gz
tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.tar.zst
tangerine-wallet-browser-1079d57f8cd0513e9571457b00eb3e9b44c26215.zip
Merge pull request #3489 from MetaMask/retry-tx-refractor
Retry tx refractor
Diffstat (limited to 'ui/app/components/tx-list.js')
-rw-r--r--ui/app/components/tx-list.js13
1 files changed, 8 insertions, 5 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js
index 34dc837ae..08e37ebc8 100644
--- a/ui/app/components/tx-list.js
+++ b/ui/app/components/tx-list.js
@@ -75,9 +75,10 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
address: transaction.txParams.to,
transactionStatus: transaction.status,
transactionAmount: transaction.txParams.value,
- transActionId: transaction.id,
+ transactionId: transaction.id,
transactionHash: transaction.hash,
transactionNetworkId: transaction.metamaskNetworkId,
+ transactionSubmittedTime: transaction.submittedTime,
}
const {
@@ -85,29 +86,31 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa
transactionStatus,
transactionAmount,
dateString,
- transActionId,
+ transactionId,
transactionHash,
transactionNetworkId,
+ transactionSubmittedTime,
} = props
const { showConfTxPage } = this.props
const opts = {
- key: transActionId || transactionHash,
+ key: transactionId || transactionHash,
txParams: transaction.txParams,
transactionStatus,
- transActionId,
+ transactionId,
dateString,
address,
transactionAmount,
transactionHash,
conversionRate,
tokenInfoGetter: this.tokenInfoGetter,
+ transactionSubmittedTime,
}
const isUnapproved = transactionStatus === 'unapproved'
if (isUnapproved) {
- opts.onClick = () => showConfTxPage({id: transActionId})
+ opts.onClick = () => showConfTxPage({id: transactionId})
opts.transactionStatus = t('Not Started')
} else if (transactionHash) {
opts.onClick = () => this.view(transactionHash, transactionNetworkId)