get identities from getState() instead of passing from caller, only set new account label if label set.

2 files changed, 9 insertions, 8 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index a6730db7f..0a2b4a636 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -349,9 +349,10 @@ function navigateToNewAccountScreen () {
   }
 }
 
-function addNewAccount (oldIdentities) {
+function addNewAccount () {
   log.debug(`background.addNewAccount`)
-  return (dispatch) => {
+  return (dispatch, getState) => {
+    const oldIdentities = getState().metamask.identities
     dispatch(actions.showLoadingIndication())
     return new Promise((resolve, reject) => {
       background.addNewAccount((err, { identities: newIdentities}) => {
diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js
index 1adc9e7c7..25beb6745 100644
--- a/ui/app/components/modals/new-account-modal.js
+++ b/ui/app/components/modals/new-account-modal.js
@@ -8,7 +8,6 @@ function mapStateToProps (state) {
   return {
     network: state.metamask.network,
     address: state.metamask.selectedAddress,
-    identities: state.metamask.identities,
   }
 }
 
@@ -20,10 +19,12 @@ function mapDispatchToProps (dispatch) {
     hideModal: () => {
       dispatch(actions.hideModal())
     },
-    createAccount: (identities, newAccountName) => {
-      dispatch(actions.addNewAccount(identities))
+    createAccount: (newAccountName) => {
+      dispatch(actions.addNewAccount())
         .then((newAccountAddress) => {
-          dispatch(actions.saveAccountLabel(newAccountAddress, newAccountName))
+          if (newAccountName) {
+            dispatch(actions.saveAccountLabel(newAccountAddress, newAccountName))
+          }
           dispatch(actions.hideModal())
         })
     },
@@ -42,7 +43,6 @@ function NewAccountModal () {
 module.exports = connect(mapStateToProps, mapDispatchToProps)(NewAccountModal)
 
 NewAccountModal.prototype.render = function () {
-  const { identities } = this.props
   const { newAccountName } = this.state
 
   return h('div', {}, [
@@ -77,7 +77,7 @@ NewAccountModal.prototype.render = function () {
 
       h('div.new-account-modal-content.button', {}, [
         h('button.btn-clear', {
-          onClick: () => this.props.createAccount(identities, newAccountName)
+          onClick: () => this.props.createAccount(newAccountName)
         }, [
           'SAVE',
         ]),