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/reducers/app.js | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 49507eb30..7f4537510 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -106,6 +106,15 @@ function reduceApp (state, action) {
         isLoading: false,
       })
 
+    case actions.NEW_ACCOUNT_SCREEN:
+      return extend(appState, {
+        currentView: {
+          name: 'new-account',
+          context: appState.currentView.context,
+        },
+        transForward: true,
+      })
+
     case actions.SHOW_SEND_PAGE:
       return extend(appState, {
         currentView: {
-- 
cgit v1.2.3


From 29060acb722c855344b02416754ab7513be44493 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Tue, 10 Jan 2017 12:18:39 -0800
Subject: update coinbase info and view

---
 ui/app/reducers/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 5c5c0acce..31b9e109f 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -418,7 +418,7 @@ function reduceApp (state, action) {
         },
         buyView: {
           subview: 'buyForm',
-          amount: '5.00',
+          amount: '15.00',
           buyAddress: action.value,
           formView: {
             coinbase: true,
-- 
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/reducers/app.js | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index dc7344b3e..cfa98442a 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -99,6 +99,14 @@ function reduceApp (state, action) {
         transForward: action.value,
       })
 
+    case actions.SHOW_IMPORT_PAGE:
+      return extend(appState, {
+        currentView: {
+          name: 'import-menu',
+        },
+        transForward: true,
+      })
+
     case actions.SHOW_INFO_PAGE:
       return extend(appState, {
         currentView: {
-- 
cgit v1.2.3


From 5d8a3dd99b0cebad48e2fdcc4c407d7d89d4717c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 18 Jan 2017 16:45:39 -0800
Subject: Add ability to import v3 JSON wallets

There is now a menu item labeled "JSON File" for importing, and it can digest either:
- v1 MyEtherWallet JSON files
- v3 Account files (used by Geth, Mist, and MyEtherWallet).

Fixes #715
---
 ui/app/reducers/app.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index ae91272cc..6a2c93f78 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -386,6 +386,7 @@ function reduceApp (state, action) {
     case actions.SHOW_LOADING:
       return extend(appState, {
         isLoading: true,
+        loadingMessage: action.value,
       })
 
     case actions.HIDE_LOADING:
-- 
cgit v1.2.3