diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | mascara/src/lib/setup-iframe.js | 4 | ||||
| -rw-r--r-- | mascara/src/proxy.js | 4 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | ui/app/components/token-list.js | 2 | ||||
| -rw-r--r-- | ui/app/info.js | 2 | ||||
| -rw-r--r-- | ui/app/reducers.js | 5 | ||||
| -rw-r--r-- | ui/lib/account-link.js | 10 |
8 files changed, 20 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a0fe916dd..e6835e7bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Make eth_sign deprecation warning less noisy - 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/mascara/src/lib/setup-iframe.js b/mascara/src/lib/setup-iframe.js index db67163df..dcf404574 100644 --- a/mascara/src/lib/setup-iframe.js +++ b/mascara/src/lib/setup-iframe.js @@ -1,5 +1,5 @@ const Iframe = require('iframe') -const IframeStream = require('iframe-stream').IframeStream +const createIframeStream = require('iframe-stream').IframeStream module.exports = setupIframe @@ -13,7 +13,7 @@ function setupIframe(opts) { }) var iframe = frame.iframe iframe.style.setProperty('display', 'none') - var iframeStream = new IframeStream(iframe) + var iframeStream = createIframeStream(iframe) return iframeStream } diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index eabc547b4..5b95175f1 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -1,4 +1,4 @@ -const ParentStream = require('iframe-stream').ParentStream +const createParentStream = require('iframe-stream').ParentStream const SWcontroller = require('client-sw-ready-event/lib/sw-client.js') const SwStream = require('sw-stream/lib/sw-stream.js') const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js') @@ -11,7 +11,7 @@ const background = new SWcontroller({ intervalDelay, }) -const pageStream = new ParentStream() +const pageStream = createParentStream() background.on('ready', (_) => { let swStream = SwStream({ serviceWorker: background.controller, diff --git a/package.json b/package.json index 9a09e6305..9afc181a3 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.5.4", "react-testutils-additions": "^15.2.0", - "sinon": "^2.3.8", + "sinon": "^3.2.0", "tape": "^4.5.1", "testem": "^1.10.3", "uglifyify": "^4.0.2", diff --git a/ui/app/components/token-list.js b/ui/app/components/token-list.js index 2346568bc..998ec901d 100644 --- a/ui/app/components/token-list.js +++ b/ui/app/components/token-list.js @@ -95,7 +95,7 @@ TokenList.prototype.renderTokenStatusBar = function () { let msg if (tokens.length === 1) { msg = `You own 1 token` - } else if (tokens.length === 1) { + } else if (tokens.length > 1) { msg = `You own ${tokens.length} tokens` } else { msg = `No tokens found` 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/app/reducers.js b/ui/app/reducers.js index 36045772f..6a2f44534 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -42,7 +42,10 @@ function rootReducer (state, action) { } window.logState = function () { - var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, removeSeedWords, 2) + let state = window.METAMASK_CACHED_LOG_STATE + const version = global.platform.getVersion() + state.version = version + let stateString = JSON.stringify(state, removeSeedWords, 2) return stateString } 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 = '' |