diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-04-03 16:03:31 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-04-03 16:03:31 +0800 |
| commit | 35875863d2feafc1f653e17e0f58efc2f18ddc46 (patch) | |
| tree | 5d40581a08201b3f37c7b31fe2aab4675d827f6b /ui/app/components/tx-list.js | |
| parent | 516c1869b0f366a42282a66e14185ce630f883dd (diff) | |
| parent | c14ec4191741c444dcf5b7c3e177c17a10374c16 (diff) | |
| download | tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.gz tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.tar.zst tangerine-wallet-browser-35875863d2feafc1f653e17e0f58efc2f18ddc46.zip | |
Fix merge conflicts. Modify send workflow
Diffstat (limited to 'ui/app/components/tx-list.js')
| -rw-r--r-- | ui/app/components/tx-list.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index 70643aa36..554febcff 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -82,9 +82,9 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa const props = { dateString: formatDate(transaction.time), - address: transaction.txParams.to, + address: transaction.txParams && transaction.txParams.to, transactionStatus: transaction.status, - transactionAmount: transaction.txParams.value, + transactionAmount: transaction.txParams && transaction.txParams.value, transactionId: transaction.id, transactionHash: transaction.hash, transactionNetworkId: transaction.metamaskNetworkId, @@ -106,6 +106,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa const opts = { key: transactionId || transactionHash, txParams: transaction.txParams, + isMsg: Boolean(transaction.msgParams), transactionStatus, transactionId, dateString, |