aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-09-02 02:57:57 +0800
committerGitHub <noreply@github.com>2017-09-02 02:57:57 +0800
commitb47d3735fe13ae512a30c6dc72b5ece41f35e453 (patch)
treedfcf375fd5c22086c01323202e57c6f037bf6a2c
parent48021f4f940b04133821ae98b190271b37bfb659 (diff)
parent01f961976a90fc353bba6afbc8d3b733db9d91e6 (diff)
downloadtangerine-wallet-browser-b47d3735fe13ae512a30c6dc72b5ece41f35e453.tar.gz
tangerine-wallet-browser-b47d3735fe13ae512a30c6dc72b5ece41f35e453.tar.zst
tangerine-wallet-browser-b47d3735fe13ae512a30c6dc72b5ece41f35e453.zip
Merge pull request #2007 from MetaMask/i2005-HttpsLinjs
Use HTTPS links when available
-rw-r--r--CHANGELOG.md2
-rw-r--r--ui/app/info.js2
-rw-r--r--ui/lib/account-link.js10
3 files changed, 8 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43b52e5fa..e6835e7bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@
- Fix bug with network version serialization over synchronous RPC
- Add MetaMask version to state logs.
- Add the total amount of tokens when multiple tokens are added under the token list
+- Use HTTPS links for Etherscan.
+- Update Support center link to new one with HTTPS.
## 3.9.11 2017-8-24
diff --git a/ui/app/info.js b/ui/app/info.js
index 899841c83..c69d83715 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -103,7 +103,7 @@ InfoScreen.prototype.render = function () {
[
h('div.fa.fa-support', [
h('a.info', {
- href: 'http://metamask.consensyssupport.happyfox.com',
+ href: 'https://support.metamask.com',
target: '_blank',
}, 'Visit our Support Center'),
]),
diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js
index d061d0ad1..037d990fa 100644
--- a/ui/lib/account-link.js
+++ b/ui/lib/account-link.js
@@ -3,19 +3,19 @@ module.exports = function (address, network) {
let link
switch (net) {
case 1: // main net
- link = `http://etherscan.io/address/${address}`
+ link = `https://etherscan.io/address/${address}`
break
case 2: // morden test net
- link = `http://morden.etherscan.io/address/${address}`
+ link = `https://morden.etherscan.io/address/${address}`
break
case 3: // ropsten test net
- link = `http://ropsten.etherscan.io/address/${address}`
+ link = `https://ropsten.etherscan.io/address/${address}`
break
case 4: // rinkeby test net
- link = `http://rinkeby.etherscan.io/address/${address}`
+ link = `https://rinkeby.etherscan.io/address/${address}`
break
case 42: // kovan test net
- link = `http://kovan.etherscan.io/address/${address}`
+ link = `https://kovan.etherscan.io/address/${address}`
break
default:
link = ''