Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into develop

packages/components-faraday/src/components/SignUp/ReviewerSignUp.js

 import React from 'react'
+import { get } from 'lodash'
 import { connect } from 'react-redux'
-import { reduxForm } from 'redux-form'
+import { reduxForm, SubmissionError } from 'redux-form'
 import { push } from 'react-router-redux'
 import { required, minChars } from 'xpub-validators'
 import { compose, withState, lifecycle } from 'recompose'
@@ -50,7 +51,7 @@ const ReviewerSignUp = ({
         {error && (
           <Row>
             <RowItem>
-              <Err>{error}</Err>
+              <Err>Token expired or Something went wrong.</Err>
             </RowItem>
           </Row>
         )}
@@ -107,15 +108,25 @@ export default compose(
       },
     ) => {
       const { collectionId, fragmentId, agree, invitationId } = searchParams
-      setReviewerPassword({
+      return setReviewerPassword({
         ...reviewer,
         password,
-      }).then(() => {
-        loginUser(
-          { username: reviewer.email, password },
-          `/projects/${collectionId}/versions/${fragmentId}/details?agree=${agree}&invitationId=${invitationId}`,
-        )
       })
+        .then(() => {
+          loginUser(
+            { username: reviewer.email, password },
+            `/projects/${collectionId}/versions/${fragmentId}/details?agree=${agree}&invitationId=${invitationId}`,
+          )
+        })
+        .catch(error => {
+          const err = get(error, 'response')
+          if (err) {
+            const errorMessage = get(JSON.parse(err), 'error')
+            throw new SubmissionError({
+              _error: errorMessage || 'Something went wrong',
+            })
+          }
+        })
     },
   }),
 )(ReviewerSignUp)