diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-19 13:58:46 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-19 13:58:46 +0800 |
| commit | c8c773d6416f92c520a509a9811d73f68aa00fc0 (patch) | |
| tree | 495a798eeb4a5272c80d93725f5146a6fbcf85c8 /ui/app/components/transaction-list-item.js | |
| parent | 5bdee96e73f65a0b369277e9c56b0afe5159e65b (diff) | |
| parent | de1da7d1b215ade650fc644adf63384a401dc240 (diff) | |
| download | tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.gz tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.tar.zst tangerine-wallet-browser-c8c773d6416f92c520a509a9811d73f68aa00fc0.zip | |
Merge branch 'NewUI-flat' into merge
Diffstat (limited to 'ui/app/components/transaction-list-item.js')
| -rw-r--r-- | ui/app/components/transaction-list-item.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js index 891d5e227..21f2b8236 100644 --- a/ui/app/components/transaction-list-item.js +++ b/ui/app/components/transaction-list-item.js @@ -148,6 +148,12 @@ function renderErrorOrWarning (transaction) { if (status === 'rejected') { return h('span.error', ' (Rejected)') } + if (transaction.err || transaction.warning) { + const { err, warning = {} } = transaction + const errFirst = !!((err && warning) || err) + const message = errFirst ? err.message : warning.message + + errFirst ? err.message : warning.message // show error if (err) { |