Merge branch 'dev' into i715-AddJsonImport

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
 

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",

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

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',