1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Merge branch 'master' into new-currency-test

This commit is contained in:
Kevin Serrano 2017-09-05 09:01:05 -07:00
commit 162aedb30b
No known key found for this signature in database
GPG Key ID: BF999DEFC7371BA1
8 changed files with 20 additions and 13 deletions

View File

@ -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

View File

@ -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
}

View File

@ -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,

View File

@ -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",

View File

@ -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`

View File

@ -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'),
]),

View File

@ -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
}

View File

@ -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 = ''