mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Merge pull request #1024 from MetaMask/fixSignedVsSubmitted
Fix the dissplay for submitted transactions...
This commit is contained in:
commit
9ab7ce370b
@ -2,6 +2,8 @@
|
||||
|
||||
## Current Master
|
||||
|
||||
- Fix the displaying of transactions that have been submitted to the network in Transaction History
|
||||
|
||||
## 3.0.0 2017-1-16
|
||||
|
||||
- Fix seed word account generation (https://medium.com/metamask/metamask-3-migration-guide-914b79533cdd#.t4i1qmmsz).
|
||||
|
@ -297,7 +297,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…
Reference in New Issue
Block a user