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

packages/component-helper-service/src/services/Collection.js

@@ -23,7 +23,7 @@ class Collection {
       }
 
       if (recommendation === 'major') {
-        newStatus = 'reviewersInvited'
+        newStatus = 'underReview'
       }
     }
 

packages/component-helper-service/src/services/Email.js

@@ -32,6 +32,7 @@ class Email {
     FragmentModel,
   }) {
     const {
+      baseUrl,
       UserModel,
       collection,
       parsedFragment: { recommendations, title, type, id },
@@ -83,6 +84,7 @@ class Email {
 
     reviewers.forEach(user =>
       mailService.sendNotificationEmail({
+        baseUrl,
         emailType,
         toEmail: user.email,
         meta: {
@@ -178,15 +180,15 @@ class Email {
     if (returnWithComments) emailType = 'he-manuscript-return-with-comments'
     mailService.sendNotificationEmail({
       toEmail,
-      baseUrl,
       emailType,
       meta: {
+        baseUrl,
         collection,
         reviewerName,
         eicComments,
         eicName: `${eic.firstName} ${eic.lastName}`,
-        handlingEditorName: get(collection, 'handlingEditor.name') || '',
         emailSubject: `${collection.customId}: Manuscript Decision`,
+        handlingEditorName: get(collection, 'handlingEditor.name') || '',
         fragment: {
           id,
           title,