Add menu carrat next to network searching indicator

feature/default_network_editable
Dan Finlay 8 years ago
parent fa533469cb
commit 4e4d6cea40
  1. 8
      ui/app/app.js
  2. 17
      ui/app/components/network.js

@ -136,7 +136,7 @@ App.prototype.renderAppBar = function () {
}, },
}, [ }, [
h('div', { h('div.left-menu-section', {
style: { style: {
display: 'flex', display: 'flex',
flexDirection: 'row', flexDirection: 'row',
@ -151,11 +151,6 @@ App.prototype.renderAppBar = function () {
src: '/images/icon-128.png', src: '/images/icon-128.png',
}), }),
h('#network-spacer.flex-center', {
style: {
marginRight: '-72px',
},
}, [
h(NetworkIndicator, { h(NetworkIndicator, {
network: this.props.network, network: this.props.network,
provider: this.props.provider, provider: this.props.provider,
@ -166,7 +161,6 @@ App.prototype.renderAppBar = function () {
}, },
}), }),
]), ]),
]),
// metamask name // metamask name
props.isUnlocked && h('h1', { props.isUnlocked && h('h1', {

@ -22,15 +22,24 @@ Network.prototype.render = function () {
let iconName, hoverText let iconName, hoverText
if (networkNumber === 'loading') { if (networkNumber === 'loading') {
return h('img.network-indicator', { return h('span', {
title: 'Attempting to connect to blockchain.', style: {
display: 'flex',
alignItems: 'center',
flexDirection: 'row',
},
onClick: (event) => this.props.onClick(event), onClick: (event) => this.props.onClick(event),
}, [
h('img', {
title: 'Attempting to connect to blockchain.',
style: { style: {
width: '27px', width: '27px',
marginRight: '-27px',
}, },
src: 'images/loading.svg', src: 'images/loading.svg',
}) }),
h('i.fa.fa-sort-desc'),
])
} else if (providerName === 'mainnet') { } else if (providerName === 'mainnet') {
hoverText = 'Main Ethereum Network' hoverText = 'Main Ethereum Network'
iconName = 'ethereum-network' iconName = 'ethereum-network'

Loading…
Cancel
Save