Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account'

3 files changed, 9 insertions, 5 deletions

diff --git a/ui/app/components/dropdowns/components/account-dropdowns.js b/ui/app/components/dropdowns/components/account-dropdowns.js
index 48354ff94..bb112dcca 100644
--- a/ui/app/components/dropdowns/components/account-dropdowns.js
+++ b/ui/app/components/dropdowns/components/account-dropdowns.js
@@ -162,11 +162,11 @@ class AccountDropdowns extends Component {
           DropdownMenuItem,
           {
             closeMenu: () => {},
-            onClick: () => actions.addNewAccount(),
             style: Object.assign(
               {},
               menuItemStyles,
             ),
+            onClick: () => actions.showNewAccountModal(),
           },
           [
             h(
@@ -185,9 +185,6 @@ class AccountDropdowns extends Component {
                 fontSize: '16px',
                 lineHeight: '23px',
               },
-              onClick: () => {
-                actions.showNewAccountModal()
-              },
             }, 'Create Account'),
           ],
         ),
diff --git a/ui/app/components/modals/new-account-modal.js b/ui/app/components/modals/new-account-modal.js
index 8d67762ac..910f3c0ca 100644
--- a/ui/app/components/modals/new-account-modal.js
+++ b/ui/app/components/modals/new-account-modal.js
@@ -19,6 +19,10 @@ function mapDispatchToProps (dispatch) {
     hideModal: () => {
       dispatch(actions.hideModal())
     },
+    createAccount: () => {
+      dispatch(actions.addNewAccount())
+      dispatch(actions.hideModal())
+    },
   }
 }
 
@@ -60,7 +64,9 @@ NewAccountModal.prototype.render = function () {
       ]),
 
       h('div.new-account-modal-content.button', {}, [
-        h('button.btn-clear', {}, [
+        h('button.btn-clear', {
+          onClick: this.props.createAccount
+        }, [
           'SAVE',
         ]),
       ]),
diff --git a/ui/app/css/itcss/components/modal.scss b/ui/app/css/itcss/components/modal.scss
index 6d2205164..e9698ce5b 100644
--- a/ui/app/css/itcss/components/modal.scss
+++ b/ui/app/css/itcss/components/modal.scss
@@ -284,6 +284,7 @@
   top: 25px;
   right: 17.5px;
   font-family: sans-serif;
+  cursor: pointer;
 }
 
 .new-account-modal-content {