aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-01-19 03:24:53 +0800
committerFrankie <frankie.diamond@gmail.com>2017-01-19 03:24:53 +0800
commit460cbb985f4190220b9f5dc0e5b0cf80bfa08941 (patch)
treedd8b93528cb19d2c433858636d4a61f36a6e912e
parent86c0eaa5a430c1837f9ae203e3f0cadb88d0b777 (diff)
downloadtangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar.gz
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar.bz2
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar.lz
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar.xz
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.tar.zst
tangerine-wallet-browser-460cbb985f4190220b9f5dc0e5b0cf80bfa08941.zip
Fix the dissplay for submitted transactions and the listner wating to hear when tx's were included in a block
-rw-r--r--app/scripts/transaction-manager.js2
-rw-r--r--ui/app/components/transaction-list-item-icon.js2
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',