From 1bbe0ed9e8fb9f9944c27453cb9791686c4d8d9d Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 4 Nov 2016 12:00:56 -0700
Subject: Scaffold new account view

---
 ui/app/app.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui/app/app.js')

diff --git a/ui/app/app.js b/ui/app/app.js
index a2532c153..1651442e9 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -29,6 +29,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 NewAccountScreen = require('./accounts/new')
 
 module.exports = connect(mapStateToProps)(App)
 
@@ -400,6 +401,9 @@ App.prototype.renderPrimary = function () {
     case 'accountDetail':
       return h(AccountDetailScreen, {key: 'account-detail'})
 
+    case 'new-account':
+      return h(NewAccountScreen, {key: 'new-account'})
+
     case 'sendTransaction':
       return h(SendTransactionScreen, {key: 'send-transaction'})
 
-- 
cgit v1.2.3


From 19f7041ba42a5ad806ace8286c6e0675b94ca69a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Fri, 4 Nov 2016 12:27:26 -0700
Subject: Add account adding subview placeholders

---
 ui/app/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ui/app/app.js')

diff --git a/ui/app/app.js b/ui/app/app.js
index 1651442e9..ad56df8db 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -29,7 +29,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 NewAccountScreen = require('./accounts/new')
+const AddAccountScreen = require('./accounts/add')
 
 module.exports = connect(mapStateToProps)(App)
 
@@ -402,7 +402,7 @@ App.prototype.renderPrimary = function () {
       return h(AccountDetailScreen, {key: 'account-detail'})
 
     case 'new-account':
-      return h(NewAccountScreen, {key: 'new-account'})
+      return h(AddAccountScreen, {key: 'new-account'})
 
     case 'sendTransaction':
       return h(SendTransactionScreen, {key: 'send-transaction'})
-- 
cgit v1.2.3


From 77bd010543855fafe21ac37e282bc8137ef7a7d8 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 17 Jan 2017 13:47:30 -0800
Subject: Add "import account" menu item + template view

---
 ui/app/app.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ui/app/app.js')

diff --git a/ui/app/app.js b/ui/app/app.js
index 9efe95874..c6377a2cf 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -20,6 +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 InfoScreen = require('./info')
 const LoadingIndicator = require('./components/loading')
 const SandwichExpando = require('sandwich-expando')
@@ -304,6 +305,13 @@ App.prototype.renderDropdown = function () {
       icon: h('i.fa.fa-gear.fa-lg'),
     }),
 
+    h(DropMenuItem, {
+      label: 'Import Account',
+      closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
+      action: () => this.props.dispatch(actions.showImportPage()),
+      icon: h('i.fa.fa-arrow-circle-o-up.fa-lg'),
+    }),
+
     h(DropMenuItem, {
       label: 'Lock',
       closeMenu: () => this.setState({ isMainMenuOpen: !isOpen }),
@@ -411,6 +419,9 @@ App.prototype.renderPrimary = function () {
     case 'config':
       return h(ConfigScreen, {key: 'config'})
 
+    case 'import-menu':
+      return h(Import, {key: 'import-menu'})
+
     case 'reveal-seed-conf':
       return h(RevealSeedConfirmation, {key: 'reveal-seed-conf'})
 
-- 
cgit v1.2.3


From 693aa50e7f98e6cd1a0f0b463bc7dbbe3a3e13d3 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 17 Jan 2017 16:35:11 -0800
Subject: Remove outdated reference

---
 ui/app/app.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ui/app/app.js')

diff --git a/ui/app/app.js b/ui/app/app.js
index 67c78b31c..0e04c334c 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -33,7 +33,6 @@ 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)
 
@@ -408,9 +407,6 @@ 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'})
 
-- 
cgit v1.2.3