Merge branch 'HIN-850' into 'develop'

Hin 850

See merge request !32

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

@@ -116,45 +116,27 @@ module.exports = {
           })
         }
 
-        if (
-          newRecommendation.recommendationType !== 'review' &&
-          newRecommendation.recommendation !== 'return-to-handling-editor'
-        ) {
-          if (isEditorInChief || collection.status === 'revisionRequested') {
-            sendAuthorsEmail({
-              email,
-              baseUrl,
-              titleText,
-              parsedFragment,
-              fragmentAuthors,
-              isEditorInChief,
-              subjectBaseText,
-              newRecommendation,
-            })
-          }
-
-          if (hasPeerReview(collection)) {
-            sendReviewersEmail({
-              email,
-              baseUrl,
-              UserModel,
-              titleText,
-              fragmentHelper,
-              isEditorInChief,
-              subjectBaseText,
-              recommendation: newRecommendation.recommendation,
-              handlingEditorName: get(collection, 'handlingEditor.name', 'N/A'),
-            })
-
-            sendEiCsEmail({
-              email,
-              baseUrl,
-              userHelper,
-              titleText,
-              subjectBaseText,
-              recommendation: newRecommendation,
-            })
-          }
+        if (hasPeerReview(collection)) {
+          sendReviewersEmail({
+            email,
+            baseUrl,
+            UserModel,
+            titleText,
+            fragmentHelper,
+            isEditorInChief,
+            subjectBaseText,
+            recommendation: newRecommendation.recommendation,
+            handlingEditorName: get(collection, 'handlingEditor.name', eicName),
+          })
+
+          sendEiCsEmail({
+            email,
+            baseUrl,
+            userHelper,
+            titleText,
+            subjectBaseText,
+            recommendation: newRecommendation,
+          })
         }
       }
     }

packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js

@@ -56,7 +56,7 @@ module.exports = {
     }
 
     const requestUser = await UserModel.find(reqUser)
-    if (requestUser.admin) {
+    if (requestUser.id !== user.id) {
       sendAddedToManuscriptEmail({
         email,
         baseUrl,