aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/home.html12
-rw-r--r--app/manifest.json2
-rw-r--r--app/popup.html5
-rw-r--r--app/scripts/controllers/blacklist.js5
-rw-r--r--app/scripts/lib/nodeify.js3
5 files changed, 21 insertions, 6 deletions
diff --git a/app/home.html b/app/home.html
new file mode 100644
index 000000000..cfb4b00a0
--- /dev/null
+++ b/app/home.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
+ <title>MetaMask Plugin</title>
+ </head>
+ <body>
+ <div id="app-content"></div>
+ <script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script>
+ </body>
+</html>
diff --git a/app/manifest.json b/app/manifest.json
index 1eaf6f26a..3b9194eb9 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,7 +1,7 @@
{
"name": "MetaMask",
"short_name": "Metamask",
- "version": "3.9.2",
+ "version": "3.9.5",
"manifest_version": 2,
"author": "https://metamask.io",
"description": "Ethereum Browser Extension",
diff --git a/app/popup.html b/app/popup.html
index 6d85a9811..d09b09315 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -2,10 +2,11 @@
<html>
<head>
<meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
<title>MetaMask Plugin</title>
</head>
- <body>
+ <body style="width:357px; height:500px;">
<div id="app-content"></div>
<script src="./scripts/popup.js" type="text/javascript" charset="utf-8"></script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js
index 7e01fa386..dd671943f 100644
--- a/app/scripts/controllers/blacklist.js
+++ b/app/scripts/controllers/blacklist.js
@@ -4,8 +4,8 @@ const PhishingDetector = require('eth-phishing-detect/src/detector')
// compute phishing lists
const PHISHING_DETECTION_CONFIG = require('eth-phishing-detect/src/config.json')
-// every ten minutes
-const POLLING_INTERVAL = 10 * 60 * 1000
+// every four minutes
+const POLLING_INTERVAL = 4 * 60 * 1000
class BlacklistController {
@@ -41,6 +41,7 @@ class BlacklistController {
scheduleUpdates () {
if (this._phishingUpdateIntervalRef) return
+ this.updatePhishingList()
this._phishingUpdateIntervalRef = setInterval(() => {
this.updatePhishingList()
}, POLLING_INTERVAL)
diff --git a/app/scripts/lib/nodeify.js b/app/scripts/lib/nodeify.js
index 299bfe624..832d6c6d3 100644
--- a/app/scripts/lib/nodeify.js
+++ b/app/scripts/lib/nodeify.js
@@ -1,9 +1,10 @@
const promiseToCallback = require('promise-to-callback')
-module.exports = function(fn, context) {
+module.exports = function nodeify (fn, context) {
return function(){
const args = [].slice.call(arguments)
const callback = args.pop()
+ if (typeof callback !== 'function') throw new Error('callback is not a function')
promiseToCallback(fn.apply(context, args))(callback)
}
}