diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-08-08 04:24:58 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-08 04:24:58 +0800 |
| commit | f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578 (patch) | |
| tree | cba6f24fd72a137c2ebe5589261a73447be186be /app | |
| parent | e7f838e626ff1ce29490a081d7ee3f917745dd62 (diff) | |
| parent | 57abc58d623b66a091987a944d8c45737f4feabe (diff) | |
| download | tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar.gz tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar.bz2 tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar.lz tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar.xz tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.tar.zst tangerine-wallet-browser-f3b42f1e3389253c4f5b4e78fa20ae8c80ef3578.zip | |
Merge branch 'master' into transactionControllerRefractor
Diffstat (limited to 'app')
| -rw-r--r-- | app/home.html | 12 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/popup.html | 5 | ||||
| -rw-r--r-- | app/scripts/controllers/blacklist.js | 5 |
4 files changed, 19 insertions, 5 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 6c02120c1..3b9194eb9 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.9.3", + "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) |