aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevin.serrano@consensys.net>2018-05-22 05:36:21 +0800
committerKevin Serrano <kevin.serrano@consensys.net>2018-05-22 05:36:21 +0800
commit610fa8f6b32888665e3548aecfeba71d86109c83 (patch)
treef118edc2ef18a722535366cbb8087a4819a11e5a
parent4ac233b1fd40d2746b02e5e8d96557f36c97d023 (diff)
parent2c8d1c0e51dbc072b6505b3bb80e2259d0599af8 (diff)
downloadtangerine-wallet-browser-610fa8f6b32888665e3548aecfeba71d86109c83.tar.gz
tangerine-wallet-browser-610fa8f6b32888665e3548aecfeba71d86109c83.tar.zst
tangerine-wallet-browser-610fa8f6b32888665e3548aecfeba71d86109c83.zip
It tried to get away, but justice must be served.
-rw-r--r--app/scripts/contentscript.js3
-rw-r--r--package-lock.json8
-rw-r--r--package.json2
-rw-r--r--ui/app/css/itcss/components/modal.scss2
-rw-r--r--ui/app/css/itcss/components/request-signature.scss2
5 files changed, 7 insertions, 10 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index ddf1a9432..555902ddf 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -166,7 +166,7 @@ function documentElementCheck () {
/**
* Checks if the current domain is blacklisted
- *
+ *
* @returns {boolean} {@code true} if the current domain is blacklisted
*/
function blacklistedDomainCheck () {
@@ -175,6 +175,7 @@ function blacklistedDomainCheck () {
'dropbox.com',
'webbyawards.com',
'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
+ 'adyen.com',
]
var currentUrl = window.location.href
var currentRegex
diff --git a/package-lock.json b/package-lock.json
index c0cf49d0a..263454b5a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9154,13 +9154,13 @@
"resolved": "https://registry.npmjs.org/extension-link-enabler/-/extension-link-enabler-1.0.0.tgz",
"integrity": "sha1-V7kZru7fOL6XJwuYmM7nimN+RvM=",
"requires": {
- "extensionizer": "1.0.0"
+ "extensionizer": "1.0.1"
}
},
"extensionizer": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/extensionizer/-/extensionizer-1.0.0.tgz",
- "integrity": "sha1-AcIJu+ptnArLp3Epw6pKmpj8NTg="
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/extensionizer/-/extensionizer-1.0.1.tgz",
+ "integrity": "sha512-UES5CSOYqshNsWFrpORcQR47+ph6UvQK25mguD44IyeMemt40CG+LTZrH1PgpGUHX3w7ACtNQnmM0J+qEe8G0Q=="
},
"external-editor": {
"version": "2.1.0",
diff --git a/package.json b/package.json
index 011230f7d..2749eccef 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
"ethjs-query": "^0.3.4",
"express": "^4.15.5",
"extension-link-enabler": "^1.0.0",
- "extensionizer": "^1.0.0",
+ "extensionizer": "^1.0.1",
"fast-json-patch": "^2.0.4",
"fast-levenshtein": "^2.0.6",
"file-loader": "^1.1.11",
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index f972c0f7a..74658f656 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -566,7 +566,6 @@
padding: 30px;
font-size: 22px;
color: $nile-blue;
- height: 79px;
}
&__message {
@@ -832,7 +831,6 @@
padding: 30px;
font-size: 22px;
color: $nile-blue;
- height: 79px;
}
.notification-modal-message {
diff --git a/ui/app/css/itcss/components/request-signature.scss b/ui/app/css/itcss/components/request-signature.scss
index 8bba6c98e..e6916c418 100644
--- a/ui/app/css/itcss/components/request-signature.scss
+++ b/ui/app/css/itcss/components/request-signature.scss
@@ -43,8 +43,6 @@
}
&__header__text {
- height: 29px;
- width: 179px;
color: #5B5D67;
font-family: Roboto;
font-size: 22px;