0.57.5

package-lock.json

@@ -1,11 +1,11 @@
 {
   "name": "traxxx-web",
-  "version": "0.57.4",
+  "version": "0.57.5",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "version": "0.57.4",
+      "version": "0.57.5",
       "dependencies": {
         "@brillout/json-serializer": "^0.5.25",
         "@dicebear/collection": "7.0.5",

package.json

@@ -92,7 +92,7 @@
   "overrides": {
     "vite": "$vite"
   },
-  "version": "0.57.4",
+  "version": "0.57.5",
   "imports": {
     "#/*": "./*.js"
   },

src/actors.js

@@ -867,12 +867,9 @@ export async function mergeActors(targetActorId, sourceActorIds, comment, reqUse
 				.update('alias_for', targetActorId)
 				.whereIn('id', sourceActorIds)
 				.returning(['id', 'alias_for']),
-			// some avatars are not matched to a profile, need to investigate why this happens and the avatar table needs a dedicated actor field
 			trx('actors_avatars')
 				.update('actor_id', targetActorId)
-				.whereIn('actor_id', sourceActorIds)
-				.onConflict()
-				.ignore(),
+				.whereIn('actor_id', sourceActorIds),
 		]);
 
 		// multiple source actors may provide profiles for the same entity, but we can only assign one to the target actor; prefer the newest