Merge branch 'master' into Version-3.1.0

feature/default_network_editable
Dan Finlay 8 years ago committed by GitHub
commit 0e01abdf71
  1. 1
      CHANGELOG.md
  2. 2
      app/scripts/transaction-manager.js
  3. 2
      ui/app/components/transaction-list-item-icon.js

@ -10,6 +10,7 @@
## 3.0.1 2017-1-17
- Fixed bug that prevented eth.sign from working.
- Fix the displaying of transactions that have been submitted to the network in Transaction History
## 3.0.0 2017-1-16

@ -296,7 +296,7 @@ module.exports = class TransactionManager extends EventEmitter {
// checks if a signed tx is in a block and
// if included sets the tx status as 'confirmed'
checkForTxInBlock () {
var signedTxList = this.getFilteredTxList({status: 'signed'})
var signedTxList = this.getFilteredTxList({status: 'submitted'})
if (!signedTxList.length) return
signedTxList.forEach((txMeta) => {
var txHash = txMeta.hash

@ -41,7 +41,7 @@ TransactionIcon.prototype.render = function () {
},
})
case 'signed':
case 'submitted':
return h('i.fa.fa-ellipsis-h', {
style: {
fontSize: '27px',

Loading…
Cancel
Save