diff options
author | Zac Mitton <zacmitton22@gmail.com> | 2016-06-02 07:30:14 +0800 |
---|---|---|
committer | Zac Mitton <zacmitton22@gmail.com> | 2016-06-02 07:30:14 +0800 |
commit | 924a65c956bc6bea4708a0f58b688e4edbb5d3f2 (patch) | |
tree | 8d1e8625f3fde88bad425dc210e40834078eb983 /ui/app/app.js | |
parent | 1d65160ab41bd1a316277200a98ab0f0173f23f1 (diff) | |
download | tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar.gz tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar.bz2 tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar.lz tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar.xz tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.tar.zst tangerine-wallet-browser-924a65c956bc6bea4708a0f58b688e4edbb5d3f2.zip |
network status getting set upon start-up and showing in title bar but not auto-updating yet
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 7e7ca24ad..34cfef7c0 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -27,6 +27,7 @@ const txHelper = require('../lib/tx-helper') const SandwichExpando = require('sandwich-expando') const MenuDroppo = require('menu-droppo') const DropMenuItem = require('./components/drop-menu-item') +const NetworkIndicator = require('./components/network') module.exports = connect(mapStateToProps)(App) @@ -46,6 +47,7 @@ function mapStateToProps(state) { unconfTxs: state.metamask.unconfTxs, unconfMsgs: state.metamask.unconfMsgs, menuOpen: state.appState.menuOpen, + network: state.metamask.network, } } @@ -109,20 +111,21 @@ App.prototype.renderAppBar = function(){ }, state.isUnlocked && [ // mini logo - h('img', { - height: 24, - width: 24, - src: '/images/icon-128.png', - }), + // h('img', { + // height: 24, + // width: 24, + // src: '/images/icon-128.png', + // }), + h(NetworkIndicator, {network: this.props.network}), // metamask name h('h1', 'MetaMask'), - // hamburger h(SandwichExpando, { width: 16, barHeight: 2, padding: 0, + paddingLeft: '200px', isOpen: state.menuOpen, color: 'rgb(247,146,30)', onClick: (event) => { |