aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2018-05-17 04:02:27 +0800
committerGitHub <noreply@github.com>2018-05-17 04:02:27 +0800
commit4be681f44722c6ca678b48cb009700a7d775aa2a (patch)
treee21f2cc8eb129c46e2fc3a88f2f6e354b1b2cd1f /ui/app/app.js
parentd722aa7f0c6427f8c51a39c5f6a510a80510bdbb (diff)
parent5561937773b4e59e3df9df385693680e17e6b8c0 (diff)
downloadtangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar.gz
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar.bz2
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar.lz
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar.xz
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.tar.zst
tangerine-wallet-browser-4be681f44722c6ca678b48cb009700a7d775aa2a.zip
Merge pull request #4255 from MetaMask/i4233-dropdowns
Fix account and network dropdowns in confirm screen
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js13
1 files changed, 2 insertions, 11 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 5bc571c64..f840cc34e 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -1,7 +1,7 @@
const { Component } = require('react')
const PropTypes = require('prop-types')
const connect = require('react-redux').connect
-const { Route, Switch, withRouter, matchPath } = require('react-router-dom')
+const { Route, Switch, withRouter } = require('react-router-dom')
const { compose } = require('recompose')
const h = require('react-hyperscript')
const actions = require('./actions')
@@ -83,15 +83,6 @@ class App extends Component {
)
}
- renderAppHeader () {
- const { location } = this.props
- const isInitializing = matchPath(location.pathname, {
- path: INITIALIZE_ROUTE, exact: false,
- })
-
- return isInitializing ? null : h(AppHeader)
- }
-
render () {
const {
isLoading,
@@ -128,7 +119,7 @@ class App extends Component {
// global modal
h(Modal, {}, []),
- this.renderAppHeader(),
+ h(AppHeader),
// sidebar
this.renderSidebar(),