From 77ef71448d32ab125da3b8738c8dd7af915ec596 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.pangilinan@consensys.net>
Date: Thu, 15 Sep 2016 19:35:04 -0700
Subject: Fix CHANGELOG.md and restructure onClick events

---
 ui/app/components/transaction-list-item.js | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 8f96e2942..491e90c7c 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -44,19 +44,28 @@ TransactionListItem.prototype.render = function () {
 
   return (
     h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, {
+      onClick: (event) => {
+        if (isPending) {
+          this.props.showTx(transaction.id)
+        }
+        event.stopPropagation()
+        if (!transaction.hash || !isLinkable) return
+        var url = explorerLink(transaction.hash, parseInt(network))
+        extension.tabs.create({ url })
+      },
       style: {
         padding: '20px 0',
       },
     }, [
 
-      // large identicon
       h('.identicon-wrapper.flex-column.flex-center.select-none', [
         transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {
           style: {
             fontSize: '27px',
           },
         }) : h( '.pop-hover', {
-          onClick: () => {
+          onClick: (event) => {
+            event.stopPropagation()
             if (!isTx || isPending) return
             var url = `https://metamask.github.io/eth-tx-viz/?tx=${transaction.hash}`
             extension.tabs.create({ url })
@@ -66,21 +75,7 @@ TransactionListItem.prototype.render = function () {
         ]),
       ]),
 
-      h('.flex-column', {
-        onClick: (event) => {
-          if (isPending) {
-            this.props.showTx(transaction.id)
-          }
-
-          if (!transaction.hash || !isLinkable) return
-          var url = explorerLink(transaction.hash, parseInt(network))
-          extension.tabs.create({ url })
-        },
-        style: {
-          width: '200px',
-          overflow: 'hidden',
-        },
-      }, [
+      h('.flex-column', {style: {width: '200px', overflow: 'hidden'}}, [
         domainField(txParams),
         h('div', date),
         recipientField(txParams, transaction, isTx, isMsg),
-- 
cgit