diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2019-08-06 10:14:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-06 10:14:59 +0800 |
| commit | 291516b0db7320db8980fe0685b66ac4df0005e2 (patch) | |
| tree | 799942adb842bee9017f63f9c4a9bd4a45e784ed | |
| parent | 165f44d3a487adc580cc4b68580d3ac42a34bcd0 (diff) | |
| parent | bf00f42252147bb5a746b30de5ce853d5ad597f6 (diff) | |
| download | tangerine-wallet-browser-291516b0db7320db8980fe0685b66ac4df0005e2.tar.gz tangerine-wallet-browser-291516b0db7320db8980fe0685b66ac4df0005e2.tar.zst tangerine-wallet-browser-291516b0db7320db8980fe0685b66ac4df0005e2.zip | |
Merge pull request #6962 from MetaMask/develop-master-parity
Develop master parity
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | development/states/send-edit.json | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3570bbdcc..f1056c2c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - [#6828](https://github.com/MetaMask/metamask-extension/pull/6828): Capitalized speed up label to match rest of UI - [#6833](https://github.com/MetaMask/metamask-extension/pull/6833): Fix "npm install" failing due to pinned sub-dependency +## 6.7.3 Thu Jul 18 2019 + +- [#6888](https://github.com/MetaMask/metamask-extension/pull/6888): Fix bug with resubmitting unsigned transactions. + ## 6.7.2 Mon Jul 01 2019 - [#6713](https://github.com/MetaMask/metamask-extension/pull/6713): * Normalize and Validate txParams in TransactionStateManager.addTx too diff --git a/app/manifest.json b/app/manifest.json index d14149d81..17c12493f 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "6.7.2", + "version": "6.7.3", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", diff --git a/development/states/send-edit.json b/development/states/send-edit.json index 3775515a3..1b33e6edc 100644 --- a/development/states/send-edit.json +++ b/development/states/send-edit.json @@ -182,7 +182,9 @@ "warnings": {} }, "confirmTransaction": { - "txData": {}, + "txData": { + "id": 4768706228115573 + }, "tokenData": {}, "methodData": {}, "tokenProps": { |