fix(Security): form submission

blockchain · May 31, 2018 · 1f8aeba · 1f8aeba
1 parent aa15de9
commit 1f8aeba
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/Settings/template.js b/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/IPWhitelist/Settings/template.js
@@ -36,7 +36,7 @@ const Settings = (props) => {
             <Button nature='empty' capitalize onClick={handleCancel}>
               <FormattedMessage id='scenes.securitysettings.advancedsettings.ipwhitelist.settings.cancel' defaultMessage='Cancel' />
             </Button>
-            <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleSubmit}>
+            <Button type='submit' nature='primary' capitalize disabled={submitting || invalid}>
               <FormattedMessage id='scenes.securitysettings.advancedsettings.ipwhitelist.settings.save' defaultMessage='Save' />
             </Button>
           </ButtonWrapper>

diff --git a/...n-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordHint/Settings/template.js b/...n-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordHint/Settings/template.js
@@ -33,7 +33,7 @@ const Settings = (props) => {
             <Button nature='empty' capitalize onClick={handleCancel}>
               <FormattedMessage id='scenes.securitysettings.basicsecurity.passwordhint.settings.cancel' defaultMessage='Cancel' />
             </Button>
-            <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleSubmit}>
+            <Button type='submit' nature='primary' capitalize disabled={submitting || invalid}>
               <FormattedMessage id='scenes.securitysettings.basicsecurity.passwordhint.settings.save' defaultMessage='Change' />
             </Button>
           </ButtonWrapper>

diff --git a/...et-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordStretching/Settings/template.js b/...et-v4-frontend/src/scenes/SecurityCenter/Advanced/PasswordStretching/Settings/template.js
@@ -35,7 +35,7 @@ const Settings = (props) => {
             <Button nature='empty' capitalize onClick={handleToggle}>
               <FormattedMessage id='scenes.securitysettings.advancedsettings.passwordstretching.settings.cancel' defaultMessage='Cancel' />
             </Button>
-            <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleSubmit}>
+            <Button type='submit' nature='primary' capitalize disabled={submitting || invalid}>
               <FormattedMessage id='scenes.securitysettings.advancedsettings.passwordstretching.settings.save' defaultMessage='Change' />
             </Button>
           </ButtonWrapper>

diff --git a/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/index.js b/...in-wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/index.js
@@ -11,11 +11,11 @@ import Settings from './template.js'
 class SettingsContainer extends React.PureComponent {
   constructor (props) {
     super(props)
-    this.handleClick = this.handleClick.bind(this)
+    this.onSubmit = this.onSubmit.bind(this)
     this.handleToggle = this.handleToggle.bind(this)
   }
 
-  handleClick () {
+  onSubmit () {
     this.props.walletActions.setMainPassword(this.props.newWalletPasswordValue)
     this.props.formActions.reset('settingWalletPassword')
     this.handleToggle()
@@ -32,7 +32,7 @@ class SettingsContainer extends React.PureComponent {
       {...rest}
       updateToggled={ui.updateToggled}
       handleToggle={this.handleToggle}
-      handleClick={this.handleClick}
+      onSubmit={this.onSubmit}
       handleCancel={() => { this.props.formActions.reset('settingWalletPassword'); this.handleToggle() }}
     />
   }

diff --git a/...wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/template.js b/...wallet-v4-frontend/src/scenes/SecurityCenter/Advanced/WalletPassword/Settings/template.js
@@ -17,7 +17,7 @@ const ButtonWrapper = styled(ButtonGroup)`
 `
 
 const Settings = (props) => {
-  const { updateToggled, handleToggle, handleClick, submitting, invalid, currentWalletPassword, handleCancel } = props
+  const { updateToggled, handleToggle, handleSubmit, submitting, invalid, currentWalletPassword, handleCancel } = props
   return (
     <SettingWrapper>
       { !updateToggled &&
@@ -26,7 +26,7 @@ const Settings = (props) => {
         </Button>
       }
       { updateToggled &&
-        <Form>
+        <Form onSubmit={handleSubmit}>
           <FormGroup>
             <FormItem>
               <FormLabel for='currentPassword'>
@@ -51,7 +51,7 @@ const Settings = (props) => {
             <Button nature='empty' capitalize onClick={handleCancel}>
               <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.cancel' defaultMessage='Cancel' />
             </Button>
-            <Button nature='primary' capitalize disabled={submitting || invalid} onClick={handleClick}>
+            <Button type='submit' nature='primary' capitalize disabled={submitting || invalid}>
               <FormattedMessage id='scenes.securitysettings.basicsecurity.walletpassword.settings.save' defaultMessage='Save' />
             </Button>
           </ButtonWrapper>
@@ -64,7 +64,7 @@ const Settings = (props) => {
 Settings.propTypes = {
   updateToggled: PropTypes.bool.isRequired,
   handleToggle: PropTypes.func.isRequired,
-  handleClick: PropTypes.func.isRequired
+  handleSubmit: PropTypes.func.isRequired
 }
 
 export default reduxForm({ form: 'settingWalletPassword' })(Settings)