diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-19 09:23:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 09:23:41 +0800 |
| commit | 29cbfd1ea28e4408dd79cb1b2769b53ba01913c4 (patch) | |
| tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 | |
| parent | 28212d167cbd201f78e0253cf9c6fb676d71cb7a (diff) | |
| parent | 25e57939920d4685a20b4e7b3a14060e9d3314c7 (diff) | |
| download | tangerine-wallet-browser-29cbfd1ea28e4408dd79cb1b2769b53ba01913c4.tar.gz tangerine-wallet-browser-29cbfd1ea28e4408dd79cb1b2769b53ba01913c4.tar.zst tangerine-wallet-browser-29cbfd1ea28e4408dd79cb1b2769b53ba01913c4.zip | |
Merge pull request #1030 from MetaMask/master
Merge master into dev
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/transaction-manager.js | 2 | ||||
| -rw-r--r-- | ui/app/components/transaction-list-item-icon.js | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ea70e966..51bea159c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,15 @@ ## Current Master +## 3.1.0 2017-1-18 + - Add ability to import accounts by private key. - Fixed bug that returned the wrong transaction hashes on private networks that had not implemented EIP 155 replay protection (like TestRPC). ## 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 diff --git a/app/manifest.json b/app/manifest.json index a13b43ca7..2f1ae9b25 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.0.1", + "version": "3.1.0", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index 9261bb54a..6d0121afd 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -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 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', |