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

Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1300-Changes-For-Trash-Icons

packages/component-faraday-ui/src/ManuscriptCard.js

@@ -75,7 +75,7 @@ const ManuscriptCard = ({
               </Text>
             )}
         </Row>
-        <Row alignItems="center" justify="flex-start">
+        <Row alignItems="center" height={5} justify="flex-start">
           <H4>Handling editor</H4>
           <Text ml={1} mr={3} whiteSpace="nowrap">
             {get(handlingEditor, 'name', 'Unassigned')}

packages/component-wizard/src/components/SubmissionWizard.js

@@ -51,6 +51,7 @@ import { onChange, onSubmit, setInitialValues, validate } from './utils'
 const Wizard = ({
   step,
   history,
+  canEdit,
   journal,
   prevStep,
   isEditMode,
@@ -58,13 +59,12 @@ const Wizard = ({
   isFirstStep,
   handleSubmit,
   getButtonText,
-  isLastFragment,
   isFilesFetching,
   isAuthorsFetching,
   journal: { manuscriptTypes = [] },
   ...rest
 }) =>
-  isLastFragment ? (
+  canEdit ? (
     <Root className="wizard-root">
       <Steps currentStep={step}>
         {wizardSteps.map(({ stepTitle }) => (
@@ -180,8 +180,13 @@ export default compose(
         reduxAuthorError,
       isLastFragment:
         get(fragment, 'id', '') === last(get(collection, 'fragments', [])),
+      status: get(collection, 'status', ''),
     }),
   ),
+  withProps(({ status, isLastFragment }) => ({
+    canEdit:
+      isLastFragment && !(status === 'accepted' || status === 'rejected'),
+  })),
   withHandlers({
     getButtonText: ({ isLastStep, isEditMode }) => () => {
       if (isEditMode && isLastStep) {