From e7b98ee047a1f146a5c1d03149f6cea6d3e1adfe Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Tue, 22 May 2018 16:28:59 +0300
Subject: [PATCH] fix(styling): fix styling issues found by raluca
---
.../src/components/Dashboard/DashboardCard.js | 4 ++--
.../src/components/MakeRecommendation/StepTwo.js | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index cd03a3fc0..720c6ea6f 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -199,9 +199,9 @@ export default compose(
const handlingEditor = get(project, 'handlingEditor')
const isAdmin = get(currentUser, 'admin')
const isEic = get(currentUser, 'editorInChief')
- const isHe = get(currentUser, 'handlingEditor')
const isAccepted = get(handlingEditor, 'isAccepted')
- return (isAdmin || isEic || isHe) && isAccepted
+ const heId = get(handlingEditor, 'id')
+ return isAccepted && (currentUser.id === heId || isAdmin || isEic)
},
showConfirmationModal: ({
deleteProject,
diff --git a/packages/components-faraday/src/components/MakeRecommendation/StepTwo.js b/packages/components-faraday/src/components/MakeRecommendation/StepTwo.js
index 26a2320e4..2e554d6cc 100644
--- a/packages/components-faraday/src/components/MakeRecommendation/StepTwo.js
+++ b/packages/components-faraday/src/components/MakeRecommendation/StepTwo.js
@@ -52,7 +52,7 @@ const StepTwo = ({
<RowItem vertical>
<Label>Message for Editor in Chief (optional)</Label>
<ValidatedField
- component={input => <Textarea {...input} />}
+ component={input => <Textarea {...input} height={70} />}
name="message.eic"
/>
</RowItem>
@@ -61,7 +61,7 @@ const StepTwo = ({
<RowItem vertical>
<Label>Message for Author (optional)</Label>
<ValidatedField
- component={input => <Textarea {...input} />}
+ component={input => <Textarea {...input} height={70} />}
name="message.author"
/>
</RowItem>
@@ -88,6 +88,7 @@ const StepTwo = ({
/>
)}
name="revision.revisionType"
+ validate={[required]}
/>
</RowItem>
</CustomRow>
--
GitLab