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

packages/component-mail-service/src/Mail.js

@@ -454,7 +454,7 @@ module.exports = {
         replacements.paragraph = `I am sorry to inform you that manuscript titled "${
           meta.fragment.title
         }" by ${
-          meta.fragment.authorName
+          meta.fragment.submittingAuthorName
         } has been rejected for publication. <br/><br/>
         ${meta.authorNoteText}<br/><br/>`
         replacements.hasLink = false

packages/component-manuscript-manager/src/helpers/User.js

@@ -205,6 +205,9 @@ const setupAuthorsEmailData = async ({
           id,
           title,
           authorName: toAuthor.name,
+          submittingAuthorName: `${submittingAuthor.firstName} ${
+            submittingAuthor.lastName
+          }`,
         },
         handlingEditorName: collection.handlingEditor.name,
         baseUrl,

packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js

@@ -68,15 +68,16 @@ module.exports = models => async (req, res) => {
       collection,
       recommendation,
     )
-    await userHelper.setupAuthorsEmailData({
-      baseUrl,
-      UserModel: models.User,
-      collection,
-      mailService,
-      fragment: { title, submittingAuthor },
-      comments: get(heRecommendation, 'comments'),
-      requestToRevision: false,
-    })
+    if (recommendation !== 'publish')
+      await userHelper.setupAuthorsEmailData({
+        baseUrl,
+        UserModel: models.User,
+        collection,
+        mailService,
+        fragment: { title, submittingAuthor },
+        comments: get(heRecommendation, 'comments'),
+        requestToRevision: false,
+      })
   } else if (recommendationType === 'editorRecommendation') {
     await collectionHelper.updateStatusByRecommendation(
       collection,