Merge pull request #1769 from blockchain/philip/WEB-9-second-password-user-is-logged-out-after

fix(Second PW): preventDefault on form submission

Author: plondon

packages/blockchain-wallet-v4-frontend/src/modals/Settings/SecondPassword/index.js

@@ -1,16 +1,19 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import { bindActionCreators, compose } from 'redux'
+
 import { actions, selectors } from 'data'
+import { Types } from 'blockchain-wallet-v4'
+
 import modalEnhancer from 'providers/ModalEnhancer'
 import SecondPassword from './template.js'
-import { Types } from 'blockchain-wallet-v4'
 import * as C from 'services/AlertService'
 
 class SecondPasswordContainer extends React.PureComponent {
   state = { secondPassword: '' }
 
-  handleSubmit = () => {
+  handleSubmit = e => {
+    e.preventDefault()
     if (
       Types.Wallet.isValidSecondPwd(
         this.state.secondPassword,

packages/blockchain-wallet-v4-frontend/src/modals/Settings/SecondPassword/template.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import { reduxForm } from 'redux-form'
 import { FormattedMessage } from 'react-intl'
 
 import {
@@ -12,14 +13,15 @@ import {
   PasswordInput,
   Text
 } from 'blockchain-info-components'
+import { Form } from 'components/Form'
 
 const SecondPassword = props => {
   const { position, total, close, ...rest } = props
   const { handleSubmit, handleChange, value } = rest
 
   return (
     <Modal size='medium' position={position} total={total} closeButton={false}>
-      <form onSubmit={handleSubmit}>
+      <Form onSubmit={handleSubmit}>
         <ModalHeader icon='safe' onClose={close}>
           <FormattedMessage
             id='modals.secondpassword.title'
@@ -63,7 +65,7 @@ const SecondPassword = props => {
             />
           </Button>
         </ModalFooter>
-      </form>
+      </Form>
     </Modal>
   )
 }
@@ -73,4 +75,4 @@ SecondPassword.propTypes = {
   handleSubmit: PropTypes.func.isRequired
 }
 
-export default SecondPassword
+export default reduxForm({ form: 'secondPassword' })(SecondPassword)