diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-04-05 05:28:25 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-04-05 05:28:25 +0800 |
| commit | 6ab938546c3b41d188df62f0cc180aa9b6c72cf6 (patch) | |
| tree | 28a7b36371355fe1893cc72ae14f5fbb032b5a1a /app | |
| parent | ef21af29f2df31cdd193823e3dc0762a1ef571b4 (diff) | |
| parent | e1b1da9113e6d2d7adf0096bbfbbc4a807c07613 (diff) | |
| download | tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.gz tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.tar.zst tangerine-wallet-browser-6ab938546c3b41d188df62f0cc180aa9b6c72cf6.zip | |
Merge branch 'master' of https://github.com/MetaMask/metamask-extension into normalize-transactions
Diffstat (limited to 'app')
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/contentscript.js | 6 | ||||
| -rw-r--r-- | app/scripts/lib/tx-state-manager.js | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/manifest.json b/app/manifest.json index 99305f20e..2a18bdb2d 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_appName__", "short_name": "__MSG_appName__", - "version": "4.5.1", + "version": "4.5.2", "manifest_version": 2, "author": "https://metamask.io", "description": "__MSG_appDescription__", diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js index 2098fae27..fe1766273 100644 --- a/app/scripts/contentscript.js +++ b/app/scripts/contentscript.js @@ -131,7 +131,11 @@ function documentElementCheck () { } function blacklistedDomainCheck () { - var blacklistedDomains = ['uscourts.gov', 'dropbox.com'] + var blacklistedDomains = [ + 'uscourts.gov', + 'dropbox.com', + 'webbyawards.com', + ] var currentUrl = window.location.href var currentRegex for (let i = 0; i < blacklistedDomains.length; i++) { diff --git a/app/scripts/lib/tx-state-manager.js b/app/scripts/lib/tx-state-manager.js index 9e597ef37..2ab24d6a0 100644 --- a/app/scripts/lib/tx-state-manager.js +++ b/app/scripts/lib/tx-state-manager.js @@ -143,7 +143,7 @@ module.exports = class TransactionStateManager extends EventEmitter { // validate types switch (key) { case 'chainId': - if (typeof value !== 'number') throw new Error(`${key} in txParams is not a Number. got: (${value})`) + if (typeof value !== 'number' && typeof value !== 'string') throw new Error(`${key} in txParams is not a Number or hex string. got: (${value})`) break default: if (typeof value !== 'string') throw new Error(`${key} in txParams is not a string. got: (${value})`) |