diff --git a/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js b/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js index 6b6c3ae22a1f1c4f665e31ca919ea6c0f810bd02..ace1a76edeca379d7beb733515e56ae95d00e23a 100644 --- a/packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js +++ b/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) diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js index a158b73643dcabe91d17db7779a17f9f67ffae42..4cb4f094d06d1585a6a814e4cf1fda0af3b3d9bf 100644 --- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js +++ b/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> diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep1.js b/packages/components-faraday/src/components/SignUp/SignUpStep1.js index 2b704892b11d80f05b88ea4007b45d5ce8e9e0a5..21177e76eb9fa5006d88c02b432cf0057e3fa2a5 100644 --- a/packages/components-faraday/src/components/SignUp/SignUpStep1.js +++ b/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> )}