From 460cbb985f4190220b9f5dc0e5b0cf80bfa08941 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 18 Jan 2017 11:24:53 -0800 Subject: [PATCH 1/2] Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block --- app/scripts/transaction-manager.js | 2 +- ui/app/components/transaction-list-item-icon.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index 87f99ce62..cc9082394 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -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 diff --git a/ui/app/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js index eca0d693a..353401099 100644 --- a/ui/app/components/transaction-list-item-icon.js +++ b/ui/app/components/transaction-list-item-icon.js @@ -41,7 +41,7 @@ TransactionIcon.prototype.render = function () { }, }) - case 'signed': + case 'submitted': return h('i.fa.fa-ellipsis-h', { style: { fontSize: '27px', From 9e58505942985cd32878d1fba6496d091deb71a4 Mon Sep 17 00:00:00 2001 From: Frankie Date: Wed, 18 Jan 2017 12:10:49 -0800 Subject: [PATCH 2/2] Add to CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bca599344..c6e8259d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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).