aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js25
1 files changed, 14 insertions, 11 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index c6fce0e47..866801dd5 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -3,6 +3,8 @@ const Component = require('react').Component
const connect = require('react-redux').connect
const h = require('react-hyperscript')
const actions = require('./actions')
+const classnames = require('classnames')
+
// mascara
const MascaraFirstTime = require('../../mascara/src/app/first-time').default
const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
@@ -24,6 +26,7 @@ const WalletView = require('./components/wallet-view')
const Settings = require('./settings')
const AddTokenScreen = require('./add-token')
const Import = require('./accounts/import')
+const NewAccount = require('./accounts/new-account')
const Loading = require('./components/loading')
const NetworkIndicator = require('./components/network')
const Identicon = require('./components/identicon')
@@ -243,7 +246,9 @@ App.prototype.renderAppBar = function () {
}, [
h('.app-header.flex-row.flex-space-between', {
- style: {},
+ className: classnames({
+ 'app-header--initialized': !isOnboarding,
+ }),
}, [
h('div.app-header-contents', {}, [
h('div.left-menu-wrapper', {
@@ -253,19 +258,13 @@ App.prototype.renderAppBar = function () {
}, [
// mini logo
h('img.metafox-icon', {
- height: 29,
- width: 29,
- src: '/images/icon-128.png',
+ height: 42,
+ width: 42,
+ src: '/images/metamask-fox.svg',
}),
// metamask name
- h('h1', {
- style: {
- position: 'relative',
- paddingLeft: '9px',
- color: '#5B5D67',
- },
- }, 'MetaMask'),
+ h('h1', 'MetaMask'),
]),
@@ -437,6 +436,10 @@ App.prototype.renderPrimary = function () {
log.debug('rendering import screen')
return h(Import, {key: 'import-menu'})
+ case 'new-account-page':
+ log.debug('rendering new account screen')
+ return h(NewAccount, {key: 'new-account'})
+
case 'reveal-seed-conf':
log.debug('rendering reveal seed confirmation screen')
return h(RevealSeedConfirmation, {key: 'reveal-seed-conf'})