Merge branch 'develop' into staging

packages/component-manuscript/src/components/ManuscriptPage.js

@@ -574,5 +574,27 @@ export default compose(
         this.props.toggleEditorialComments()
       }
     },
+    componentDidUpdate(prevProps) {
+      const {
+        editorialRecommendations: prevEditorialRecommendations,
+        editorInChief: prevEditorInChief,
+      } = prevProps
+
+      const {
+        currentUser: { isEIC, isHEToManuscript },
+        collection: { status },
+        editorialRecommendations: currentEditorialRecommendations,
+        editorInChief: currentEditorInChief,
+      } = this.props
+
+      if (
+        prevEditorInChief === currentEditorInChief &&
+        prevEditorialRecommendations !== currentEditorialRecommendations &&
+        (isEIC || isHEToManuscript) &&
+        status === 'rejected'
+      ) {
+        prevProps.toggleEditorialComments()
+      }
+    },
   }),
 )(ManuscriptLayout)