#458

app/components/activity/ActivityPage.jsx

@@ -19,7 +19,11 @@ const ActivityPage = props => (
 const ActivityPageWithHeader = SubmissionHeader(ActivityPage)
 
 const ActivityPageContainer = ({ currentUser, history, match, ...props }) => (
-  <Query query={QUERY_ACTIVITY_INFO} variables={{ id: match.params.id }}>
+  <Query
+    fetchPolicy="cache-and-network"
+    query={QUERY_ACTIVITY_INFO}
+    variables={{ id: match.params.id }}
+  >
     {({ data, loading }) => {
       if (loading || !data || !data.activities) {
         return (

app/components/review-wizard/Review.jsx

@@ -79,16 +79,24 @@ class Review extends React.Component {
     showAll: false,
   }
   componentDidMount() {
-    if (!this.props.manuscript.files.find(f => f.type === 'PMC')) {
-      this.setState({ showAll: true })
-    }
-    if (
-      ['xml-triage', 'tagging'].includes(this.props.manuscript.status) &&
-      this.props.currentUser.admin
-    ) {
-      this.setState({ pane: 'files' })
+    if (this.page && this.props.manuscript) {
+      if (
+        this.props.manuscript.files &&
+        !this.props.manuscript.files.find(f => f.type === 'PMC')
+      ) {
+        this.setState({ showAll: true })
+      }
+      if (
+        ['xml-triage', 'tagging'].includes(this.props.manuscript.status) &&
+        this.props.currentUser.admin
+      ) {
+        this.setState({ pane: 'files' })
+      }
     }
   }
+  setRef = page => {
+    this.page = page
+  }
   render() {
     const { manuscript, currentUser, review } = this.props
     const { pane, showManuscript, showAll } = this.state
@@ -122,7 +130,7 @@ class Review extends React.Component {
       }
       return (
         <React.Fragment>
-          <PreviewPageDiv>
+          <PreviewPageDiv ref={this.setRef}>
             <PreviewPanel
               style={{
                 flex: showManuscript && '1 1 750px',
@@ -323,6 +331,7 @@ class Review extends React.Component {
         </React.Fragment>
       )
     }
+    return null
   }
 }