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

feature/default_network_editable
kumavis 8 years ago
commit 621e28f6a2
  1. 1
      CHANGELOG.md
  2. 2
      ui/app/components/transaction-list-item-icon.js
  3. 2
      ui/app/components/transaction-list-item.js
  4. 5
      ui/app/css/index.css

@ -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

@ -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',
},

@ -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 }),
]),

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

Loading…
Cancel
Save