Merge branch 'refs/heads/main' into staging

# Conflicts: # src/services/notificationService.ts
Giveth · May 13, 2024 · c0b2959 · c0b2959
2 parents 7720de4 + 3fdd74d
commit c0b2959
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
@@ -66,6 +66,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:projectlink": payload.projectLink,
         "bol:cm:verified": payload.verified,
         "str:cm:transactionlink": payload.transactionLink,
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.DRAFTED_PROJECT_ACTIVATED:
@@ -75,34 +76,39 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:projectlink": payload.projectLink,
         "str:cm:firstname": payload.firstName,
         "str:cm:lastname": payload.lastName,
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_LISTED:
       attributes = {
         "str:cm:projecttitle": payload.title,
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_UNLISTED:
       attributes = {
         "str:cm:projecttitle": payload.title,
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_CANCELLED:
       attributes = {
         "str:cm:projecttitle": payload.title,
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_UPDATE_ADDED_OWNER:
       attributes = {
         "str:cm:projecttitle": payload.title,
         "str:cm:email": payload.email,
         "str:cm:projectupdatelink": payload.projectLink + '?tab=updates',
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_VERIFIED:
@@ -111,6 +117,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
         "str:cm:verified-status": 'verified',
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.VERIFICATION_FORM_REJECTED:
@@ -119,6 +126,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
         "str:cm:verified-status": 'rejected',
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_UNVERIFIED:
@@ -127,6 +135,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
         "str:cm:email": payload.email,
         "str:cm:projectlink": payload.projectLink,
         "str:cm:verified-status": 'rejected',
+        "str:cm:userid": payload.userId?.toString(),
       };
       break
     case NOTIFICATIONS_EVENT_NAMES.PROJECT_BADGE_REVOKED:
@@ -164,7 +173,7 @@ const activityCreator = (payload: any, orttoEventName: NOTIFICATIONS_EVENT_NAMES
   }
   const merge_by = [];
   if (process.env.ENVIRONMENT === 'production') {
-    merge_by.push("str:cm:userid")
+    merge_by.push("str:cm:user-id")
   } else {
     merge_by.push("str::email")
   }