Skip to content
Snippets Groups Projects
Commit 906b366b authored by Iosif Boanca's avatar Iosif Boanca
Browse files

fix(merge conflicts solved)

parents 00fb3416 df203100
No related branches found
No related tags found
3 merge requests!160Update staging with master features,!150Develop,!137fix(HIN-1100) ready to be merged; statuses checked, contextual box added
...@@ -133,9 +133,9 @@ const ManuscriptLayout = ({ ...@@ -133,9 +133,9 @@ const ManuscriptLayout = ({
/> />
)} )}
{authorResponseToRevisonRequest.content && ( {get(authorResponseToRevisonRequest, 'content', false) && (
<ResponseToRevisionRequest <ResponseToRevisionRequest
authorReply={authorResponseToRevisonRequest.content} authorReply={get(authorResponseToRevisonRequest, 'content', '')}
expanded={responseToRevisionRequest} expanded={responseToRevisionRequest}
fragment={fragment} fragment={fragment}
toggle={toggleResponseToRevisionRequest} toggle={toggleResponseToRevisionRequest}
......
...@@ -363,7 +363,7 @@ export default compose( ...@@ -363,7 +363,7 @@ export default compose(
isHEToManuscript && isHEToManuscript &&
!!reviewerReports.length && !!reviewerReports.length &&
editorialRecommendations.length === 0 && editorialRecommendations.length === 0 &&
!get(fragment, 'responseToReviewers.content', false) get(fragment, 'responseToReviewers.content', false)
) { ) {
this.props.toggleReviewerDetails() this.props.toggleReviewerDetails()
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment