- Refactor conflict checker logic in upload and conflict utilities

- Introduced ``fetchConflictEntries`` to streamline fetching conflict entries based on the action type (upload or copy/move)
- Updated ``checkConflict`` to utilize the new fetching logic and improved conflict mapping
- Modified tests to reflect changes in conflict checking behavior, ensuring only direct children are checked for copy/move operations
- Updated dependencies and match ``v2.63.18``

Author: dormant-user

frontend/src/components/prompts/__tests__/copy-move-conflict.test.ts

@@ -71,7 +71,9 @@ const event = {
 describe("copy and move conflict prompts", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.mocked(checkConflict).mockResolvedValue(conflict);
+    vi.mocked(checkConflict).mockResolvedValue(
+      conflict as ConflictingResource[]
+    );
   });
 
   it("waits for copy conflict detection before calling the copy API", async () => {

frontend/src/css/epubReader.css

@@ -29,6 +29,13 @@
 
 .epub-reader .tocButton {
   color: var(--text);
+  /*
+   * vue-reader positions the TOC toggle at top: 10px, which lands under the
+   * fixed 4em header bar (see .header) — so clicks hit the header's Close
+   * button instead of opening the table of contents. Push it just below the
+   * header, tracking the header's height so it stays clear if that changes.
+   */
+  top: calc(4em + 10px);
 }
 
 .epub-reader .tocButton.tocButtonExpanded {

frontend/src/i18n/pt-pt.json

@@ -239,7 +239,7 @@
     "newPasswordConfirm": "Confirmar a sua palavra-passe",
     "newUser": "Novo Utilizador",
     "password": "Palavra-passe",
-    "passwordUpdated": "Palavras-passe não coincidem!",
+    "passwordUpdated": "Palavra-passe atualizada!",
     "path": "Caminho",
     "perm": {
       "create": "Criar ficheiros e pastas",