diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-01-19 09:24:12 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-01-19 09:24:12 +0800 |
| commit | 9f1884145ad03eaf3faf3475c0f69f3d7b1ef128 (patch) | |
| tree | ee884fe5fe4cf40c3ce55c85059b05ff87172db9 /app | |
| parent | 5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c (diff) | |
| parent | 29cbfd1ea28e4408dd79cb1b2769b53ba01913c4 (diff) | |
| download | tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar.gz tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar.bz2 tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar.lz tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar.xz tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.tar.zst tangerine-wallet-browser-9f1884145ad03eaf3faf3475c0f69f3d7b1ef128.zip | |
Merge branch 'dev' into i715-AddJsonImport
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/transaction-manager.js | 2 |
2 files changed, 2 insertions, 2 deletions
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 |