From 8642ced310890c7a3202a2826a2c74fad1fefca3 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Tue, 24 Jan 2017 12:06:59 -0800
Subject: Fix issue where generating a new account would put it in loose keys

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

(limited to 'ui/app')

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 7934a329a..9a68d231a 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -270,8 +270,8 @@ function navigateToNewAccountScreen() {
   }
 }
 
-function addNewAccount (ringNumber = 0) {
-  return callBackgroundThenUpdate(background.addNewAccount, ringNumber)
+function addNewAccount () {
+  return callBackgroundThenUpdate(background.addNewAccount)
 }
 
 function showInfoPage () {
-- 
cgit 


From 463a56ff54b0d850c86348e260e5f7c17b138ccb Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 24 Jan 2017 15:33:33 -0800
Subject: background controller - extract KeyringC.placeSeedWords to MetamaskC

---
 ui/app/actions.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'ui/app')

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 9a68d231a..5b2ad8a79 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -230,7 +230,21 @@ function createNewVaultAndRestore (password, seed) {
 }
 
 function createNewVaultAndKeychain (password) {
-  return callBackgroundThenUpdate(background.createNewVaultAndKeychain, password)
+  return (dispatch) => {
+    dispatch(actions.showLoadingIndication())
+    background.createNewVaultAndKeychain(password, (err, newState) => {
+      if (err) {
+        return dispatch(actions.displayWarning(err.message))
+      }
+      background.placeSeedWords((err, newState) => {
+        if (err) {
+          return dispatch(actions.displayWarning(err.message))
+        }
+        dispatch(actions.hideLoadingIndication())
+        dispatch(actions.updateMetamaskState(newState))
+      })
+    })
+  }
 }
 
 function revealSeedConfirmation () {
-- 
cgit