#493, #492

app/components/review-wizard/ReviewFooter.jsx

@@ -91,13 +91,21 @@ class ReviewFooter extends React.Component {
                         </Close>
                         <H2>Errors fixed? Send for:</H2>
                         <Buttons>
-                          <Button onClick={() => setStatus('xml-qa')} primary>
+                          <Button
+                            onClick={async () => {
+                              await setStatus('xml-qa')
+                              this.setState({ approve: false })
+                            }}
+                            primary
+                          >
                             XML QA
                           </Button>
                           <Button
                             onClick={async () => {
                               await setStatus('xml-review')
-                              history.push('/')
+                              history.push(
+                                `/submission/${manuscript.id}/activity`,
+                              )
                             }}
                             primary
                           >
@@ -113,7 +121,12 @@ class ReviewFooter extends React.Component {
                         <Notification className="hidden" type="warning">
                           Are you sure you want to skip author review?{' '}
                           <SmallAction
-                            onClick={() => setStatus('xml-complete')}
+                            onClick={async () => {
+                              await setStatus('xml-complete')
+                              history.push(
+                                `/submission/${manuscript.id}/activity`,
+                              )
+                            }}
                           >
                             I&apos;m sure!
                           </SmallAction>
@@ -168,7 +181,7 @@ class ReviewFooter extends React.Component {
                             ? `Approve the final web versions of the manuscript for release to Europe PMC now?`
                             : `Confirm QA has been completed, and approve the web versons of the manuscript?`}
                         </p>
-                        {annotations && (
+                        {annotations && annotations.length > 0 && (
                           <Notification type="warning">
                             {`Errors have been highlighted! Are you sure you want to approve the submission, rather than submitting your error report?`}
                           </Notification>
@@ -197,7 +210,7 @@ class ReviewFooter extends React.Component {
                     )}
                     {report && (
                       <React.Fragment>
-                        {annotations ? (
+                        {annotations && annotations.length > 0 ? (
                           <Portal transparent>
                             <Close>
                               <CloseButton