fix display status not available if receipt not available

pull/1/head
yann300 7 years ago
parent ecceea1082
commit 4814d86d7b
  1. 30
      src/app/execution/txLogger.js

@ -49,6 +49,8 @@ var css = csjs`
.failed { .failed {
color: ${styles.terminal.icon_Color_Log_Failed}; color: ${styles.terminal.icon_Color_Log_Failed};
} }
.notavailable {
}
.call { .call {
font-size: 7px; font-size: 7px;
background-color: ${styles.terminal.icon_BackgroundColor_Log_Call}; background-color: ${styles.terminal.icon_BackgroundColor_Log_Call};
@ -282,7 +284,7 @@ function renderUnknownTransaction (self, data) {
var tx = yo` var tx = yo`
<span id="tx${data.tx.hash}"> <span id="tx${data.tx.hash}">
<div class="${css.log}" onclick=${e => txDetails(e, tx, data, obj)}> <div class="${css.log}" onclick=${e => txDetails(e, tx, data, obj)}>
${checkTxStatus(data.tx, txType)} ${checkTxStatus(data.receipt || data.tx, txType)}
${context(self, {from, to, data})} ${context(self, {from, to, data})}
<div class=${css.buttons}> <div class=${css.buttons}>
<div class=${css.debug} onclick=${(e) => debug(e, data, self)}>Debug</div> <div class=${css.debug} onclick=${(e) => debug(e, data, self)}>Debug</div>
@ -307,8 +309,10 @@ function checkTxStatus (tx, type) {
} }
if (type === 'call' || type === 'unknownCall') { if (type === 'call' || type === 'unknownCall') {
return yo`<i class="${css.txStatus} ${css.call}">call</i>` return yo`<i class="${css.txStatus} ${css.call}">call</i>`
} else { } else if (tx.status === '0x0') {
return yo`<i class="${css.txStatus} ${css.failed} fa fa-times-circle"></i>` return yo`<i class="${css.txStatus} ${css.failed} fa fa-times-circle"></i>`
} else {
return yo`<i class="${css.txStatus} ${css.notavailable} fa fa-circle-thin" title='Status not available' ></i>`
} }
} }
@ -407,18 +411,22 @@ function txDetails (e, tx, data, obj) {
function createTable (opts) { function createTable (opts) {
var table = yo`<table class="${css.txTable}" id="txTable"></table>` var table = yo`<table class="${css.txTable}" id="txTable"></table>`
if (opts.status) { if (!opts.isCall) {
var msg = '' var msg = ''
if (opts.status === '0x0') { if (opts.status) {
msg = ' Transaction mined but execution failed' if (opts.status === '0x0') {
} else if (opts.status === '0x1') { msg = ' Transaction mined but execution failed'
msg = ' Transaction mined and execution succeed' } else if (opts.status === '0x1') {
msg = ' Transaction mined and execution succeed'
}
} else {
msg = ' Status not available at the moment'
} }
table.appendChild(yo` table.appendChild(yo`
<tr class="${css.tr}"> <tr class="${css.tr}">
<td class="${css.td}"> status </td> <td class="${css.td}"> status </td>
<td class="${css.td}">${opts.status}${msg}</td> <td class="${css.td}">${opts.status}${msg}</td>
</tr>`) </tr>`)
} }
var transactionHash = yo` var transactionHash = yo`

Loading…
Cancel
Save