Merge branch 'master' of github.com:MetaMask/metamask-plugin into notif2

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Fixed bug where MetaMask interfered with PDF loading.
 - Moved switch account icon into menu bar.
+- Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions.
 
 ## 2.4.4 2016-06-23
 

ui/app/components/transaction-list-item-icon.js

@@ -15,7 +15,7 @@ TransactionIcon.prototype.render = function () {
   const { transaction, txParams, isMsg } = this.props
 
   if (transaction.status === 'rejected') {
-    return h('i.fa.fa-exclamation-triangle.fa-lg.error', {
+    return h('i.fa.fa-exclamation-triangle.fa-lg.warning', {
       style: {
         width: '24px',
       },

ui/app/components/transaction-list-item.js

@@ -57,7 +57,7 @@ TransactionListItem.prototype.render = function () {
 
       // large identicon
       h('.identicon-wrapper.flex-column.flex-center.select-none', [
-        transaction.status === 'unconfirmed' ? h('.red-dot', ' ')
+        transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
          : h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
       ]),
 

ui/app/css/index.css

@@ -171,6 +171,11 @@ app sections
 .error {
   color: #E20202;
 }
+
+.warning {
+  color: #FFAE00;
+}
+
 .lock {
   width: 50px;
   height: 50px;