Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu

1 files changed, 5 insertions, 1 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index c6377a2cf..67c78b31c 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -20,7 +20,7 @@ const NoticeScreen = require('./components/notice')
 const generateLostAccountsNotice = require('../lib/lost-accounts-notice')
 // other views
 const ConfigScreen = require('./config')
-const Import = require('./import')
+const Import = require('./accounts/import')
 const InfoScreen = require('./info')
 const LoadingIndicator = require('./components/loading')
 const SandwichExpando = require('sandwich-expando')
@@ -33,6 +33,7 @@ const QrView = require('./components/qr-code')
 const HDCreateVaultComplete = require('./keychains/hd/create-vault-complete')
 const HDRestoreVaultScreen = require('./keychains/hd/restore-vault')
 const RevealSeedConfirmation = require('./keychains/hd/recover-seed/confirmation')
+const AddAccountScreen = require('./accounts/add')
 
 module.exports = connect(mapStateToProps)(App)
 
@@ -407,6 +408,9 @@ App.prototype.renderPrimary = function () {
     case 'accountDetail':
       return h(AccountDetailScreen, {key: 'account-detail'})
 
+    case 'new-account':
+      return h(AddAccountScreen, {key: 'new-account'})
+
     case 'sendTransaction':
       return h(SendTransactionScreen, {key: 'send-transaction'})