From 6445a7ac3501d73f42ea1c6b372a2bedd2fa1a57 Mon Sep 17 00:00:00 2001 From: ninabreznik Date: Sun, 29 Apr 2018 03:29:55 +0100 Subject: [PATCH 1/2] Fix open/close for tx logs in terminal from network --- src/app/execution/txLogger.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index c5a2349c3e..4bc16605e6 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -237,8 +237,8 @@ function renderUnknownTransaction (self, data) { var obj = {from, to} var tx = yo` -
txDetails(e, tx, data, obj)}> + ${context(self, {from, to, data})}
debug(e, data, self)}>Debug
@@ -264,7 +264,7 @@ function context (self, opts) { var val = data.tx.value var hash = data.tx.hash ? helper.shortenHexData(data.tx.hash) : '' var input = data.tx.input ? helper.shortenHexData(data.tx.input) : '' - var logs = data.logs && data.logs.decoded ? data.logs.decoded.length : 0 + var logs = data.logs && data.logs.decoded && data.logs.decoded.length ? data.logs.decoded.length : 0 var block = data.tx.blockNumber || '' var i = data.tx.transactionIndex var value = val ? typeConversion.toInt(val) : 0 @@ -299,7 +299,6 @@ function context (self, opts) { hash = helper.shortenHexData(data.tx.blockHash) return yo`
- [block:${block} txIndex:${i}]
from: ${from}
@@ -318,8 +317,13 @@ function txDetails (e, tx, data, obj) { var table = document.querySelector(`#${tx.id} [class^="txTable"]`) var from = obj.from var to = obj.to - var log = document.querySelector(`#${tx.id} [class^='log']`) - var caret = document.querySelector(`#${tx.id} [class^='caret']`) + var log = e.currentTarget + for (var i = 0; i < log.children.length; i++) { + if (~log.children[i].className.indexOf('caret')) { + var caret = log.children[i] + break + } + } var caretDown = yo`` var caretRight = yo`` if (table && table.parentNode) { From 14b23864418c16b457070101f57f4d18591f06f0 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 30 Apr 2018 13:42:46 +0200 Subject: [PATCH 2/2] rollback uneeded change --- src/app/execution/txLogger.js | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 4bc16605e6..5a7c7e9994 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -317,13 +317,8 @@ function txDetails (e, tx, data, obj) { var table = document.querySelector(`#${tx.id} [class^="txTable"]`) var from = obj.from var to = obj.to - var log = e.currentTarget - for (var i = 0; i < log.children.length; i++) { - if (~log.children[i].className.indexOf('caret')) { - var caret = log.children[i] - break - } - } + var log = document.querySelector(`#${tx.id} [class^='log']`) + var caret = document.querySelector(`#${tx.id} [class^='caret']`) var caretDown = yo`` var caretRight = yo`` if (table && table.parentNode) {