Fix CHANGELOG.md and restructure onClick events

2 files changed, 13 insertions, 18 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e6feb1ed..c1483b7cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,10 @@
 # Changelog
 
 ## Current Master
-- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient
 
 - Add a link to the transaction in history that goes to https://metamask.github.io/eth-tx-viz
 too help visualize transactions and to where they are going.
+- Show "Buy Ether" button and warning on tx confirmation when sender balance is insufficient
 
 ## 2.12.1 2016-09-14
 
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),