aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2017-09-15 23:09:34 +0800
committerChi Kei Chan <chikeichan@gmail.com>2017-09-16 07:19:48 +0800
commitb0f1fba2e5fbde573b46a284285985e63f1a3618 (patch)
tree3825356bd2d5ae05c2fe1ad66d3f2cfb8f5d99d7 /ui/app/components
parentfeb90f2fc478276150fb9e55eec700c46b63ab1c (diff)
downloadtangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar.gz
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar.bz2
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar.lz
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar.xz
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.tar.zst
tangerine-wallet-browser-b0f1fba2e5fbde573b46a284285985e63f1a3618.zip
Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account'
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/dropdowns/components/account-dropdowns.js5
-rw-r--r--ui/app/components/modals/new-account-modal.js8
2 files changed, 8 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',
]),
]),