resolved conflicts

e2e/helpers/selectors.js

@@ -1000,9 +1000,9 @@ export default {
         saveButton: 'vn-worker-basic-data button[type=submit]'
     },
     workerNotes: {
-        addNoteFloatButton: 'vn-worker-note vn-float-button',
-        note: 'vn-textarea[ng-model="$ctrl.note.text"]',
-        saveButton: 'button[type=submit]',
+        addNoteFloatButton: 'vn-worker-note vn-icon[icon="add"]',
+        note: 'vn-note-worker-create vn-textarea[ng-model="$ctrl.note.text"]',
+        saveButton: 'vn-note-worker-create button[type=submit]',
         firstNoteText: 'vn-worker-note .text'
     },
     workerPbx: {

loopback/locale/en.json

@@ -155,5 +155,7 @@
 	"Warehouse inventory not set": "Almacén inventario no está establecido",
 	"Component cost not set": "Componente coste no está estabecido",
 	"Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2": "Tickets with associated refunds can't be deleted. This ticket is associated with refund Nº 2",
-	"Description cannot be blank": "Description cannot be blank"
+	"Description cannot be blank": "Description cannot be blank",
+	"Added observation": "Added observation",
+	"Comment added to client": "Comment added to client"
 }

package.json

@@ -39,7 +39,6 @@
         "mailparser": "^2.8.0",
         "md5": "^2.2.1",
         "node-ssh": "^11.0.0",
-        "npm": "^8.19.4",
         "object-diff": "0.0.4",
         "object.pick": "^1.3.0",
         "puppeteer": "^18.0.5",