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

ui - tx history - simplify error+warning display code

Browse Source
This commit is contained in:
kumavis 2017-10-02 15:39:44 -07:00
parent 062eaa6a82
commit 2113d83489
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ui/app/components/transaction-list-item.js
View File

@ -133,7 +133,7 @@ function recipientField (txParams, transaction, isTx, isMsg) {
}, },
}, [ }, [
message, message,
failIfFailed(transaction), renderErrorOrWarning(transaction),
]) ])
} }
@ -141,25 +141,35 @@ function formatDate (date) {
return vreme.format(new Date(date), 'March 16 2014 14:30') return vreme.format(new Date(date), 'March 16 2014 14:30')
} }
function failIfFailed (transaction) { function renderErrorOrWarning (transaction) {
if (transaction.status === 'rejected') { const { status, err, warning } = transaction
// show rejected
if (status === 'rejected') {
return h('span.error', ' (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) {
const message = err.message || ''
return (
h(Tooltip, {
title: message,
position: 'bottom',
}, [
h(`span.error`, ` (Failed)`),
])
)
}
// show warning
if (warning) {
const message = warning.message
return h(Tooltip, { return h(Tooltip, {
title: message, title: message,
position: 'bottom', position: 'bottom',
}, [ }, [
h(`span.${errFirst ? 'error' : 'warning'}`, h(`span.warning`, ` (Warning)`),
` (${errFirst ? 'Failed' : 'Warning'})`
),
]) ])
} }
} }