Merge branch 'master' into rating-widget

Author: widatama

CHANGELOG.md

@@ -1,9 +1,9 @@
-## Version 25.03.X
+## Version 25.03.XX
 Fixes:
+- [compliance-hub] Correctly merge user history on user merge
 - [star-rating] Fix active status checkbox in drawer
 - [star-rating] Fix consent fields in drawer
 
-
 ## Version 25.03.32
 Fixes:
 - [core] Filtering out internal events while calculating top events

plugins/compliance-hub/api/api.js

@@ -346,7 +346,7 @@ const FEATURE_NAME = 'compliance_hub';
         var newUid = ob.newUser.uid;
         if (oldUid !== newUid) {
             return new Promise(function(resolve, reject) {
-                common.db.collection('consent_history').update({uid: oldUid}, {'$set': {app_id: ob.app_id, uid: newUid}}, {multi: true}, function(err) {
+                common.db.collection('consent_history').update({app_id: ob.app_id, uid: oldUid}, {'$set': { uid: newUid}}, {multi: true}, function(err) {
                     if (err) {
                         reject(err);
                         return;