From aeda98c9a06bea359b76630803d033e832f0dd00 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Tue, 11 Sep 2018 15:57:21 +0300
Subject: [PATCH] fix: fix add account issues
---
.../src/routes/fragments/notifications/notifications.js | 1 +
.../src/components/SignUp/SignUpInvitationForm.js | 1 +
.../src/components/SignUp/SignUpInvitationPage.js | 2 +-
.../src/components/SignUp/SignUpStep0.js | 8 ++++----
packages/hindawi-theme/src/elements/Menu.js | 1 +
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
index dc3c37671..94e16bb57 100644
--- a/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
+++ b/packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js
@@ -227,6 +227,7 @@ const sendAuthorsEmail = async ({
return {
...author,
isConfirmed: user.isConfirmed,
+ passwordResetToken: user.passwordResetToken,
...getEmailCopy({
customId,
emailType: author.isSubmitting
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
index a673b61e2..73b856696 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
@@ -27,6 +27,7 @@ const SignUpInvitation = ({
initialValues={initialValues}
journal={journal}
onSubmit={nextStep}
+ type={type}
/>
)}
{step === 1 && (
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index d268de21d..1c9551903 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -76,7 +76,7 @@ export default compose(
return {
onSubmitText: 'CONFIRM',
onSubmit: confirmInvitation,
- onBack: () => history.push('/'),
+ onBack: prevStep,
}
}
},
diff --git a/packages/components-faraday/src/components/SignUp/SignUpStep0.js b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
index aaccd8322..375615fa4 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpStep0.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpStep0.js
@@ -32,7 +32,7 @@ const AgreeCheckbox = ({ value, onChange }) => (
</Row>
)
-const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
+const Step0 = ({ journal, handleSubmit, initialValues, error, type }) =>
!isUndefined(initialValues) ? (
<Fragment>
<Row mb={2} mt={3}>
@@ -55,7 +55,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
</Row>
<Row mb={2}>
- <Item mr={1} vertical>
+ <ItemOverrideAlert mr={1} vertical>
<Label required>Title</Label>
<ValidatedField
component={input => (
@@ -68,7 +68,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
name="title"
validate={[requiredValidator]}
/>
- </Item>
+ </ItemOverrideAlert>
<ItemOverrideAlert ml={1} vertical>
<Label required>Country</Label>
<ValidatedField
@@ -116,7 +116,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
</Row>
<Button mt={4} onClick={handleSubmit}>
- PROCEED TO SET EMAIL AND PASSWORD
+ PROCEED TO SET {type === 'signup' && 'EMAIL AND'} PASSWORD
</Button>
<Row mt={3}>
diff --git a/packages/hindawi-theme/src/elements/Menu.js b/packages/hindawi-theme/src/elements/Menu.js
index 460cdacb4..a35f18829 100644
--- a/packages/hindawi-theme/src/elements/Menu.js
+++ b/packages/hindawi-theme/src/elements/Menu.js
@@ -20,6 +20,7 @@ export default {
color: ${th('colorText')};
line-height: ${th('gridUnit')};
padding: 0 ${th('gridUnit')};
+ font-family: ${th('fontWriting')};
`,
Opener: css`
border-color: ${props =>
--
GitLab