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

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

@@ -3,10 +3,10 @@ const config = require('config')
 const resetPath = config.get('invite-reset-password.url')
 const unsubscribeSlug = config.get('unsubscribe.url')
 const { name: journalName, staffEmail } = config.get('journal')
+const Email = require('@pubsweet/component-email-templating')
 
 const {
   User,
-  Email,
   services,
   Fragment,
 } = require('pubsweet-component-helper-service')

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

 const config = require('config')
-const { Email, services } = require('pubsweet-component-helper-service')
+const Email = require('@pubsweet/component-email-templating')
+
+const { services } = require('pubsweet-component-helper-service')
 
 const { getEmailCopy } = require('./emailCopy')