Commit 5f403c03 authored by davidzagi93@gmail.com's avatar davidzagi93@gmail.com

testing

parent fd735d62
...@@ -465,6 +465,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -465,6 +465,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
} }
const checkTxStatus = (tx, type) => { const checkTxStatus = (tx, type) => {
console.log('inside checkTxStatus')
if (tx.status === '0x1' || tx.status === true) { if (tx.status === '0x1' || tx.status === true) {
return (<i className='txStatus succeeded fas fa-check-circle'></i>) return (<i className='txStatus succeeded fas fa-check-circle'></i>)
} }
...@@ -489,18 +490,19 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -489,18 +490,19 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const block = data.receipt ? data.receipt.blockNumber : data.blockNumber || '' const block = data.receipt ? data.receipt.blockNumber : data.blockNumber || ''
const i = data.receipt ? data.transactionIndex : data.transactionIndex const i = data.receipt ? data.transactionIndex : data.transactionIndex
const value = val ? typeConversion.toInt(val) : 0 const value = val ? typeConversion.toInt(val) : 0
console.log('inside context method')
if (blockchain.getProvider() === 'vm') { if (blockchain.getProvider() === 'vm') {
return ( return (
<div> <div>
{console.log('inside context method return')}
<span className='txLog_7Xiho'> <span className='txLog_7Xiho'>
<span className='tx'>[{vm}]</span> <span className='tx'>[{vm}]</span>
{/* <div className='txItem'><span className='txItemTitle'>from:</span> {from}</div> <div className='txItem'><span className='txItemTitle'>from:</span> {from}</div>
<div className='txItem'><span className='txItemTitle'>to:</span> {to}</div> <div className='txItem'><span className='txItemTitle'>to:</span> {to}</div>
<div className='txItem'><span className='txItemTitle'>value:</span> {value} wei</div> <div className='txItem'><span className='txItemTitle'>value:</span> {value} wei</div>
<div className='txItem'><span className='txItemTitle'>data:</span> {input}</div> <div className='txItem'><span className='txItemTitle'>data:</span> {input}</div>
<div className='txItem'><span className='txItemTitle'>logs:</span> {logs}</div> <div className='txItem'><span className='txItemTitle'>logs:</span> {logs}</div>
<div className='txItem'><span className='txItemTitle'>hash:</span> {hash}</div> */} <div className='txItem'><span className='txItemTitle'>hash:</span> {hash}</div>
</span> </span>
</div>) </div>)
} else if (blockchain.getProvider() !== 'vm' && data.resolvedData) { } else if (blockchain.getProvider() !== 'vm' && data.resolvedData) {
...@@ -719,12 +721,14 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -719,12 +721,14 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
const to = tx.to ? tx.to : resolvedData.contractName + '.' + resolvedData.fn const to = tx.to ? tx.to : resolvedData.contractName + '.' + resolvedData.fn
const obj = { from, to } const obj = { from, to }
const txType = resolvedData ? 'knownTx' : 'unknown' + (tx.isCall ? 'Call' : 'Tx') const txType = resolvedData ? 'knownTx' : 'unknown' + (tx.isCall ? 'Call' : 'Tx')
console.log('render unknown transaction ')
return ( return (
<span id={`tx${tx.hash}`} key={index}> <span id={`tx${tx.hash}`} key={index}>
<div className="log" onClick={(event) => txDetails(event, tx, obj)}> <div className="log" onClick={(event) => txDetails(event, tx, obj)}>
{/* onClick={e => txDetails(e, tx, data, obj)} */} {/* onClick={e => txDetails(e, tx, data, obj)} */}
{checkTxStatus(receipt || tx, txType)} {checkTxStatus(receipt || tx, txType)}
{context({ from, to, tx }, props.blockchain)} {context({ from, to, tx }, props.blockchain)}
{ console.log('under context and checkTxStatus')}
<div className='buttons'> <div className='buttons'>
<div className='debug btn btn-primary btn-sm' onClick={(event) => debug(event, tx)}>Debug</div> <div className='debug btn btn-primary btn-sm' onClick={(event) => debug(event, tx)}>Debug</div>
</div> </div>
...@@ -747,6 +751,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => { ...@@ -747,6 +751,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
transactionCost: tx.transactionCost, transactionCost: tx.transactionCost,
executionCost: tx.executionCost executionCost: tx.executionCost
}) : null} }) : null}
{ console.log('end')}
</span> </span>
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment