Merge pull request #178 from topcoder-platform/dev

Updated Email Templates

Author: RishiRajSahu

emails/src/partials/project-team.html

@@ -58,11 +58,7 @@
                             <strong>{{userFullName}}</strong> joined the project
                         {{/if}}
                         {{#if [connect.notification.project.member.invite.created]}}
-                          {{#if [isSSO]}}
-                            Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please use the link below to sign in and join the project.
-                          {{else}}
-                            Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please click on the button ("View project on Connect") below to join.
-                          {{/if}}
+                            Hi <strong>{{userFullName}}</strong>, you are invited to join the project {{projectName}}. Please click on the button ("Join Project") below to join.
                         {{/if}}
                         {{#if [connect.notification.project.member.invite.requested]}}
                             You are requested to add <strong>{{userFullName}}</strong> as a copilot

src/services/NotificationService.js

@@ -205,8 +205,8 @@ function* listNotifications(query, userId) {
   if (_.keys(notificationSettings).length > 0) {
     // only filter out notifications types which were explicitly set to 'no' - so we return notification by default
     const notifications = _.keys(notificationSettings).filter((notificationType) =>
-      !notificationSettings[notificationType] &&
-      !notificationSettings[notificationType].web &&
+      notificationSettings[notificationType] &&
+      notificationSettings[notificationType].web &&
       notificationSettings[notificationType].web.enabled === 'no'
     );
     filter.where.type = Object.assign(filter.where.type || {}, { $notIn: notifications });