diff --git a/app/components/component-manuscript/src/components/ManuscriptPage.js b/app/components/component-manuscript/src/components/ManuscriptPage.js
index 8dc454b8d4cf4cf6f7212319c8f5c470329c0626..71be231abb2bfd26ef382a1a74fa47202b13fdb4 100644
--- a/app/components/component-manuscript/src/components/ManuscriptPage.js
+++ b/app/components/component-manuscript/src/components/ManuscriptPage.js
@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types'
 import React from 'react'
 import { useQuery, gql } from '@apollo/client'
 import Manuscript from './Manuscript'
@@ -37,15 +38,17 @@ const query = gql`
   }
 `
 
-// eslint-disable-next-line react/prop-types
 const ManuscriptPage = ({ match, ...props }) => {
   const { data, loading, error } = useQuery(query, {
     variables: {
-      // eslint-disable-next-line react/prop-types
       id: match.params.version,
     },
   })
 
+  ManuscriptPage.propTypes = {
+    match: PropTypes.node.isRequired,
+  }
+
   if (loading) return <Spinner />
   if (error) return JSON.stringify(error)
   const { manuscript } = data
diff --git a/app/components/component-review/src/components/metadata/ReviewMetadata.js b/app/components/component-review/src/components/metadata/ReviewMetadata.js
index 3b198faffb38b51a34b2b44621740c36235ee363..934032b9196b5788743324d6c2ebcc35ddf372f5 100644
--- a/app/components/component-review/src/components/metadata/ReviewMetadata.js
+++ b/app/components/component-review/src/components/metadata/ReviewMetadata.js
@@ -1,4 +1,4 @@
-/* eslint-disable react/prop-types */
+import PropTypes from 'prop-types'
 import React from 'react'
 import styled from 'styled-components'
 import { get } from 'lodash'
@@ -129,4 +129,8 @@ const ReviewMetadata = ({ manuscript: rawManuscript }) => {
   )
 }
 
+ReviewMetadata.propTypes = {
+  manuscript: PropTypes.node.isRequired,
+}
+
 export default ReviewMetadata
diff --git a/app/components/component-submit/src/upload.js b/app/components/component-submit/src/upload.js
index dc0c4f3485e569879ff3cc5ca2ded070230654be..7e6f76a3e484f1b1c6de6322dc3548643dc091aa 100644
--- a/app/components/component-submit/src/upload.js
+++ b/app/components/component-submit/src/upload.js
@@ -1,6 +1,5 @@
 import config from 'config'
 import request from 'pubsweet-client/src/helpers/api'
-// eslint-disable-next-line import/no-extraneous-dependencies
 import gql from 'graphql-tag'
 import currentRolesVar from '../../../shared/currentRolesVar'
 
@@ -204,7 +203,6 @@ export default ({
   journals,
   currentUser,
   setConversion,
-  // eslint-disable-next-line consistent-return
 }) => async files => {
   setConversion({ converting: true })
   let manuscriptData
@@ -251,4 +249,6 @@ export default ({
   } catch (error) {
     setConversion({ error })
   }
+
+  return false
 }
diff --git a/app/components/xpub-journal/src/index.js b/app/components/xpub-journal/src/index.js
index c4a699b76faf65c2a096c6efefa2a98a73591e0a..97f64d2f6fa2ef07571d0a7aab75eeb39839115f 100644
--- a/app/components/xpub-journal/src/index.js
+++ b/app/components/xpub-journal/src/index.js
@@ -1,13 +1,15 @@
-/* eslint-disable react/destructuring-assignment */
+import PropTypes from 'prop-types'
 import React from 'react'
 
 const JournalContext = React.createContext()
 
-const JournalProvider = props => (
-  // eslint-disable-next-line react/prop-types
-  <JournalContext.Provider value={props.journal}>
-    {props.children}
-  </JournalContext.Provider>
+const JournalProvider = ({ journal, children }) => (
+  <JournalContext.Provider value={journal}>{children}</JournalContext.Provider>
 )
 
+JournalProvider.propTypes = {
+  journal : PropTypes.node.isRequired,
+  children : PropTypes.node.isRequired,
+}
+
 export { JournalContext, JournalProvider }