m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-22 17:33:23 +01:00
Code

Add to change log

Browse Source
This commit is contained in:
Frankie 2016-06-29 16:31:27 -07:00
parent e0daea35a9
commit 0b3737edb4
4 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## Current Master
- Added a network indicator mark in dropdown menu
- Added network name next to network indicator
- Fixed bug where MetaMask interfered with PDF loading. - Fixed bug where MetaMask interfered with PDF loading.
- Moved switch account icon into menu bar. - Moved switch account icon into menu bar.
- Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions. - Changed status shapes to be a yellow warning sign for failure and ellipsis for pending transactions.

2
ui/app/app.js
View File

@ -383,7 +383,7 @@ App.prototype.renderCustomOption = function (rpcTarget) {
label: `${rpcTarget}`, label: `${rpcTarget}`,
closeMenu: () => this.setState({ isNetworkMenuOpen: false }), closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }), icon: h('i.fa.fa-question-circle.fa-lg', { ariaHidden: true }),
activeNetworkRender: 'custom' activeNetworkRender: 'custom',
}) })
} }
} }

3
ui/app/components/drop-menu-item.js
View File

@ -31,7 +31,7 @@ DropMenuItem.prototype.render = function () {
DropMenuItem.prototype.activeNetworkRender = function () { DropMenuItem.prototype.activeNetworkRender = function () {
var activeNetwork = this.props.activeNetworkRender var activeNetwork = this.props.activeNetworkRender
if( activeNetwork === undefined) return if (activeNetwork === undefined) return
switch (this.props.label) { switch (this.props.label) {
case 'Main Ethereum Network': case 'Main Ethereum Network':
@ -41,7 +41,6 @@ DropMenuItem.prototype.activeNetworkRender = function () {
if (activeNetwork === '2') return h('.check', ' ✓') if (activeNetwork === '2') return h('.check', ' ✓')
break break
case 'Localhost 8545': case 'Localhost 8545':
debugger
if (activeNetwork === 'http://localhost:8545') return h('.check', ' ✓') if (activeNetwork === 'http://localhost:8545') return h('.check', ' ✓')
break break
default: default:

36
ui/app/components/network.js
View File

@ -47,25 +47,25 @@ Network.prototype.render = function () {
(function () { (function () {
switch (iconName) { switch (iconName) {
case 'ethereum-network': case 'ethereum-network':
return h('.network-indicator',[ return h('.network-indicator', [
h('.menu-icon.diamond'), h('.menu-icon.diamond'),
h('.network-name',{ h('.network-name', {
style: { style: {
color: '#039396', color: '#039396',
}}, }},
'Etherum Main Net') 'Etherum Main Net'),
]) ])
case 'morden-test-network': case 'morden-test-network':
return h('.network-indicator',[ return h('.network-indicator', [
h('.menu-icon.red-dot'), h('.menu-icon.red-dot'),
h('.network-name',{ h('.network-name', {
style: { style: {
color: '#ff6666', color: '#ff6666',
}}, }},
'Morden Test Net') 'Morden Test Net'),
]) ])
default: default:
return h('.network-indicator',[ return h('.network-indicator', [
h('i.fa.fa-question-circle.fa-lg', { h('i.fa.fa-question-circle.fa-lg', {
ariaHidden: true, ariaHidden: true,
style: { style: {
@ -74,7 +74,7 @@ Network.prototype.render = function () {
}, },
}), }),
h('.network-name',{ h('.network-name', {
style: { style: {
color: '#AEAEAE', color: '#AEAEAE',
}}, }},