mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Add missing changes. Create unique style for rinkeby icon.
This commit is contained in:
parent
d764e46a50
commit
242dc1e99f
@ -1,7 +1,7 @@
|
|||||||
const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
|
const MAINET_RPC_URL = 'https://mainnet.infura.io/metamask'
|
||||||
const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
|
const TESTNET_RPC_URL = 'https://ropsten.infura.io/metamask'
|
||||||
const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
|
const KOVAN_RPC_URL = 'https://kovan.infura.io/metamask'
|
||||||
const RINKEBY_RPC_URL = 'https://rinkeby.infura.io'
|
const RINKEBY_RPC_URL = 'https://rinkeby.infura.io/metamask'
|
||||||
const DEFAULT_RPC_URL = TESTNET_RPC_URL
|
const DEFAULT_RPC_URL = TESTNET_RPC_URL
|
||||||
|
|
||||||
global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
|
global.METAMASK_DEBUG = 'GULP_METAMASK_DEBUG'
|
||||||
|
@ -11,9 +11,13 @@ function getBuyEthUrl({ network, amount, address }){
|
|||||||
url = 'https://faucet.metamask.io/'
|
url = 'https://faucet.metamask.io/'
|
||||||
break
|
break
|
||||||
|
|
||||||
|
case '4':
|
||||||
|
url = 'https://www.rinkeby.io/'
|
||||||
|
break
|
||||||
|
|
||||||
case '42':
|
case '42':
|
||||||
url = 'https://github.com/kovan-testnet/faucet'
|
url = 'https://github.com/kovan-testnet/faucet'
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
return url
|
return url
|
||||||
}
|
}
|
||||||
|
@ -268,7 +268,7 @@ App.prototype.renderNetworkDropdown = function () {
|
|||||||
label: 'Rinkeby Test Network',
|
label: 'Rinkeby Test Network',
|
||||||
closeMenu: () => this.setState({ isNetworkMenuOpen: false}),
|
closeMenu: () => this.setState({ isNetworkMenuOpen: false}),
|
||||||
action: () => props.dispatch(actions.setProviderType('rinkeby')),
|
action: () => props.dispatch(actions.setProviderType('rinkeby')),
|
||||||
icon: h('.menu-icon.hollow-diamond'),
|
icon: h('.menu-icon.golden-square'),
|
||||||
activeNetworkRender: props.network,
|
activeNetworkRender: props.network,
|
||||||
provider: props.provider,
|
provider: props.provider,
|
||||||
}),
|
}),
|
||||||
|
@ -152,13 +152,19 @@ BuyButtonSubview.prototype.formVersionSubview = function () {
|
|||||||
marginBottom: '15px',
|
marginBottom: '15px',
|
||||||
},
|
},
|
||||||
}, 'In order to access this feature, please switch to the Main Network'),
|
}, 'In order to access this feature, please switch to the Main Network'),
|
||||||
((network === '3') || (network === '42')) ? h('h3.text-transform-uppercase', 'or go to the') : null,
|
((network === '3') || (network === '4') || (network === '42')) ? h('h3.text-transform-uppercase', 'or go to the') : null,
|
||||||
(network === '3') ? h('button.text-transform-uppercase', {
|
(network === '3') ? h('button.text-transform-uppercase', {
|
||||||
onClick: () => this.props.dispatch(actions.buyEth({ network })),
|
onClick: () => this.props.dispatch(actions.buyEth({ network })),
|
||||||
style: {
|
style: {
|
||||||
marginTop: '15px',
|
marginTop: '15px',
|
||||||
},
|
},
|
||||||
}, 'Ropsten Test Faucet') : null,
|
}, 'Ropsten Test Faucet') : null,
|
||||||
|
(network === '4') ? h('button.text-transform-uppercase', {
|
||||||
|
onClick: () => this.props.dispatch(actions.buyEth({ network })),
|
||||||
|
style: {
|
||||||
|
marginTop: '15px',
|
||||||
|
},
|
||||||
|
}, 'Rinkeby Test Faucet') : null,
|
||||||
(network === '42') ? h('button.text-transform-uppercase', {
|
(network === '42') ? h('button.text-transform-uppercase', {
|
||||||
onClick: () => this.props.dispatch(actions.buyEth({ network })),
|
onClick: () => this.props.dispatch(actions.buyEth({ network })),
|
||||||
style: {
|
style: {
|
||||||
|
@ -87,7 +87,7 @@ Network.prototype.render = function () {
|
|||||||
])
|
])
|
||||||
case 'rinkeby-test-network':
|
case 'rinkeby-test-network':
|
||||||
return h('.network-indicator', [
|
return h('.network-indicator', [
|
||||||
h('.menu-icon.hollow-diamond'),
|
h('.menu-icon.golden-square'),
|
||||||
h('.network-name', {
|
h('.network-name', {
|
||||||
style: {
|
style: {
|
||||||
color: '#550077',
|
color: '#550077',
|
||||||
|
@ -27,7 +27,7 @@ TransactionListItem.prototype.render = function () {
|
|||||||
|
|
||||||
let isLinkable = false
|
let isLinkable = false
|
||||||
const numericNet = parseInt(network)
|
const numericNet = parseInt(network)
|
||||||
isLinkable = numericNet === 1 || numericNet === 3 || numericNet === 42
|
isLinkable = numericNet === 1 || numericNet === 3 || numericNet === 4 || numericNet === 42
|
||||||
|
|
||||||
var isMsg = ('msgParams' in transaction)
|
var isMsg = ('msgParams' in transaction)
|
||||||
var isTx = ('txParams' in transaction)
|
var isTx = ('txParams' in transaction)
|
||||||
|
@ -191,6 +191,10 @@ hr.horizontal-line {
|
|||||||
border: 3px solid #690496;
|
border: 3px solid #690496;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.golden-square {
|
||||||
|
background: #EBB33F;
|
||||||
|
}
|
||||||
|
|
||||||
.pending-dot {
|
.pending-dot {
|
||||||
background: red;
|
background: red;
|
||||||
left: 14px;
|
left: 14px;
|
||||||
|
@ -11,6 +11,9 @@ module.exports = function (address, network) {
|
|||||||
case 3: // ropsten test net
|
case 3: // ropsten test net
|
||||||
link = `http://ropsten.etherscan.io/address/${address}`
|
link = `http://ropsten.etherscan.io/address/${address}`
|
||||||
break
|
break
|
||||||
|
case 4: // rinkeby test net
|
||||||
|
link = `http://rinkeby.etherscan.io/address/${address}`
|
||||||
|
break
|
||||||
case 42: // kovan test net
|
case 42: // kovan test net
|
||||||
link = `http://kovan.etherscan.io/address/${address}`
|
link = `http://kovan.etherscan.io/address/${address}`
|
||||||
break
|
break
|
||||||
|
@ -8,6 +8,9 @@ module.exports = function (hash, network) {
|
|||||||
case 3: // ropsten test net
|
case 3: // ropsten test net
|
||||||
prefix = 'ropsten.'
|
prefix = 'ropsten.'
|
||||||
break
|
break
|
||||||
|
case 4: // rinkeby test net
|
||||||
|
prefix = 'rinkeby.'
|
||||||
|
break
|
||||||
case 42: // kovan test net
|
case 42: // kovan test net
|
||||||
prefix = 'kovan.'
|
prefix = 'kovan.'
|
||||||
break
|
break
|
||||||
|
Loading…
Reference in New Issue
Block a user