fix(AuthorEmail): Merge with origin

packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js

@@ -3,6 +3,7 @@ import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 import { required } from 'xpub-validators'
 import { Button, FilePicker, Menu, Spinner, ValidatedField } from '@pubsweet/ui'
+import { initial } from 'lodash'
 
 import {
   Row,
@@ -51,7 +52,9 @@ const ReviewerReportForm = ({
         >
           <Label required>Recommendation</Label>
           <ValidatedField
-            component={input => <Menu {...input} options={recommendations} />}
+            component={input => (
+              <Menu {...input} options={initial(recommendations)} />
+            )}
             name="recommendation"
             validate={[required]}
           />

packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js

@@ -37,7 +37,6 @@ const eicDecisions = [
     value: 'revision',
     label: 'Request Revision',
     modalTitle: 'Request Revision',
-    modalSubtitle: 'A request revision decision is final',
   },
   {
     value: 'reject',
@@ -69,7 +68,7 @@ const ManuscriptEicDecision = ({
     {...rest}
   >
     <Root>
-      <Row justify="flex-start">
+      <Row justify="flex-start" pl={1} pt={1}>
         <ItemOverrideAlert flex={0} vertical>
           <Label required>Decision</Label>
           <ValidatedField
@@ -81,7 +80,7 @@ const ManuscriptEicDecision = ({
       </Row>
 
       {decision !== 'publish' && (
-        <Row mt={2}>
+        <Row mt={2} pl={1} pr={1}>
           <Item vertical>
             <Label required={decision !== 'reject'}>
               {messagesLabel[get(formValues, 'decision', 'reject')]}
@@ -95,7 +94,7 @@ const ManuscriptEicDecision = ({
         </Row>
       )}
 
-      <Row justify="flex-end" mt={4}>
+      <Row justify="flex-end" mt={1} pr={1}>
         <Button onClick={handleSubmit} primary size="medium">
           SUBMIT DECISION
         </Button>