m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into Version-3.1.0

Browse Source
This commit is contained in:
Dan Finlay 2017-01-18 12:25:35 -08:00 committed by GitHub
commit 0e01abdf71
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
## 3.0.1 2017-1-17 ## 3.0.1 2017-1-17
- Fixed bug that prevented eth.sign from working. - 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 ## 3.0.0 2017-1-16

2
app/scripts/transaction-manager.js
View File

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

2
ui/app/components/transaction-list-item-icon.js
View File

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