Merge pull request #2714 from ethereum/terminalP

src/app/ui/txLogger.js

@@ -348,13 +348,21 @@ module.exports = TxLogger
 // helpers
 
 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 arrow = document.querySelector(`#${tx.id} [class^='arrow']`)
-  var arrowUp = yo`<i class="${css.arrow} fas fa-angle-up"></i>`
-  var arrowDown = yo`<i class="${css.arrow} fas fa-angle-down"></i>`
+  const from = obj.from
+  const to = obj.to
+  const arrowUp = yo`<i class="${css.arrow} fas fa-angle-up"></i>`
+  const arrowDown = yo`<i class="${css.arrow} fas fa-angle-down"></i>`
+
+  let blockElement = e.target
+  while (true) { // get the parent block element
+    if (blockElement.className.startsWith('block')) break
+    else blockElement = blockElement.parentElement
+  }
+
+  let table = blockElement.querySelector(`#${tx.id} [class^="txTable"]`)
+  const log = blockElement.querySelector(`#${tx.id} [class^='log']`)
+  const arrow = blockElement.querySelector(`#${tx.id} [class^='arrow']`)
+
   if (table && table.parentNode) {
     tx.removeChild(table)
     log.removeChild(arrow)