Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1066

packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js

@@ -90,6 +90,4 @@ const Root = styled.div`
   padding: calc(${th('gridUnit')} * 2);
 `
 
-export default reduxForm({ form: 'revision', destroyOnUnmount: false })(
-  SubmitRevision,
-)
+export default reduxForm({ form: 'revision' })(SubmitRevision)

packages/components-faraday/src/components/SignUp/SignUpStep0.js

@@ -4,7 +4,6 @@ import { reduxForm } from 'redux-form'
 import { get, isUndefined } from 'lodash'
 import { required as requiredValidator } from 'xpub-validators'
 import { Menu, Button, Checkbox, TextField, ValidatedField } from '@pubsweet/ui'
-import styled from 'styled-components'
 
 import {
   Row,
@@ -27,9 +26,6 @@ const AgreeCheckbox = ({ value, onChange }) => (
     </Text>
   </Row>
 )
-const ValidationRow = styled(Row)`
-  justify-content: left;
-`
 
 const Step0 = ({
   type,
@@ -102,13 +98,13 @@ const Step0 = ({
         </Item>
       </Row>
 
-      <ValidationRow data-test-id="sign-up-agree-TC" mb={2}>
+      <Row data-test-id="sign-up-agree-TC" justify="flex-start" mb={2}>
         <ValidatedField
           component={AgreeCheckbox}
           name="agreeTC"
           validate={[requiredValidator]}
         />
-      </ValidationRow>
+      </Row>
 
       <Row>
         <Text secondary small>
@@ -127,6 +123,7 @@ const Step0 = ({
         data-test-id="sign-up-proceed-to-set-email-and-password"
         mt={4}
         onClick={handleSubmit}
+        primary
       >
         PROCEED TO SET {type === 'signup' && 'EMAIL AND'} PASSWORD
       </Button>

packages/components-faraday/src/components/SignUp/SignUpStep1.js

@@ -99,7 +99,7 @@ const Step1 = ({
     {type === 'forgotPassword' && <ForgotEmailForm />}
     {type === 'invite' && <InviteForm />}
     {error && (
-      <Row justify="flex-start" mb={1}>
+      <Row justify="flex-start" mb={2}>
         <Text error>{error}</Text>
       </Row>
     )}