diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-06-04 06:40:41 +0800 |
---|---|---|
committer | kumavis <kumavis@users.noreply.github.com> | 2016-06-04 06:40:41 +0800 |
commit | b3520ee0ef9e36e8b62e10ae1547c18623234783 (patch) | |
tree | b094a08b9ebe437f5b61d8d0749ff6fd995e908f /ui/app/app.js | |
parent | 6dec937c2a3b72cd5863edef1ced818fe32e43f0 (diff) | |
parent | b2b4b4dd25da0ac27fe2bcdb745ead9b193b6d9c (diff) | |
download | tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar.gz tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar.bz2 tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar.lz tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar.xz tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.tar.zst tangerine-wallet-browser-b3520ee0ef9e36e8b62e10ae1547c18623234783.zip |
Merge pull request #245 from MetaMask/display_network
Display network
Diffstat (limited to 'ui/app/app.js')
-rw-r--r-- | ui/app/app.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index 094cae76c..7d5d2108a 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -28,6 +28,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) @@ -47,6 +48,7 @@ function mapStateToProps(state) { unconfTxs: state.metamask.unconfTxs, unconfMsgs: state.metamask.unconfMsgs, menuOpen: state.appState.menuOpen, + network: state.metamask.network, } } @@ -109,16 +111,10 @@ App.prototype.renderAppBar = function(){ }, }, state.isUnlocked && [ - // mini logo - 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, |