From 86693af15653c5966ee7d5842bcc905e2867e925 Mon Sep 17 00:00:00 2001
From: Dan Finlay <542863+danfinlay@users.noreply.github.com>
Date: Tue, 3 Apr 2018 20:33:19 -0700
Subject: [PATCH 1/7] Add webby awards to web3 block list.
---
app/scripts/contentscript.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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++) {
From 502011019a028258305abcb415cdba1b2530b5ad Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 4 Apr 2018 08:59:03 -0700
Subject: [PATCH 2/7] tx - txParams - allow chainId to be a hex string
---
app/scripts/lib/tx-state-manager.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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})`)
From 6be7365dd1d41a455daf8963a35d9f75a76e9e9d Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 4 Apr 2018 09:01:19 -0700
Subject: [PATCH 3/7] changelog - add note on txParams.chainId validation
change
---
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 479e422f2..20651dbad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- Fix overly strict validation where transactions were rejected with hex encoded "chainId"
+
## 4.5.1 Tue Apr 03 2018
- Fix default network (should be mainnet not Rinkeby)
From 222f207b7842734b5eea79e68391ef9e19bec1fa Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 4 Apr 2018 09:10:33 -0700
Subject: [PATCH 4/7] 4.5.2
---
CHANGELOG.md | 2 ++
app/manifest.json | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20651dbad..95aebf37d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+## 4.5.2 Wed Apr 04 2018
+
- Fix overly strict validation where transactions were rejected with hex encoded "chainId"
## 4.5.1 Tue Apr 03 2018
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__",
From 40bbca5d0d08bd8121712656989e0464104e6903 Mon Sep 17 00:00:00 2001
From: Dan <danjm.com@gmail.com>
Date: Wed, 4 Apr 2018 15:45:29 -0230
Subject: [PATCH 5/7] Don't prevent user from setting an eth address in to
field if there is no ens support.
---
ui/app/components/ens-input.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js
index 1f3946817..feb0a7037 100644
--- a/ui/app/components/ens-input.js
+++ b/ui/app/components/ens-input.js
@@ -32,10 +32,10 @@ EnsInput.prototype.render = function () {
const network = this.props.network
const networkHasEnsSupport = getNetworkEnsSupport(network)
- if (!networkHasEnsSupport) return
-
props.onChange(recipient)
+ if (!networkHasEnsSupport) return
+
if (recipient.match(ensRE) === null) {
return this.setState({
loadingEns: false,
From 3de1873126fa4241b2b149ac35ce7eb4da506ee2 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 4 Apr 2018 13:56:39 -0700
Subject: [PATCH 6/7] hot-fix new-ui - default to an object if identities is
undefined
---
ui/app/components/pending-tx/confirm-send-ether.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/app/components/pending-tx/confirm-send-ether.js b/ui/app/components/pending-tx/confirm-send-ether.js
index d007e6661..7bf20bced 100644
--- a/ui/app/components/pending-tx/confirm-send-ether.js
+++ b/ui/app/components/pending-tx/confirm-send-ether.js
@@ -237,6 +237,7 @@ ConfirmSendEther.prototype.getData = function () {
const { identities } = this.props
const txMeta = this.gatherTxMeta()
const txParams = txMeta.txParams || {}
+ const account = identities ? identities[txParams.from] || {} : {}
const { FIAT: gasFeeInFIAT, ETH: gasFeeInETH, gasFeeInHex } = this.getGasFee()
const { FIAT: amountInFIAT, ETH: amountInETH } = this.getAmount()
@@ -252,7 +253,7 @@ ConfirmSendEther.prototype.getData = function () {
return {
from: {
address: txParams.from,
- name: identities[txParams.from].name,
+ name: account.name,
},
to: {
address: txParams.to,
From 632a0db89b0f5f1563b9e0f3f36ea9ddcf2a6cb3 Mon Sep 17 00:00:00 2001
From: frankiebee <frankie.diamond@gmail.com>
Date: Wed, 4 Apr 2018 13:58:35 -0700
Subject: [PATCH 7/7] add to CHANGELOG.md
---
CHANGELOG.md | 2 ++
1 file changed, 2 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95aebf37d..2efd01147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## Current Master
+- new ui: fix the confirm transaction screen
+
## 4.5.2 Wed Apr 04 2018
- Fix overly strict validation where transactions were rejected with hex encoded "chainId"