Fix post merge issues

.claude/settings.local.json

@@ -12,6 +12,7 @@
       "Bash(ls:*)",
       "Bash(npx tsc:*)"
     ],
-    "deny": []
+    "deny": [],
+    "defaultMode": "acceptEdits"
   }
 }

frontend/src/components/layout/Workbench.tsx

@@ -146,11 +146,7 @@ export default function Workbench() {
       {/* Top Controls */}
       <TopControls
         currentView={currentView}
-<<<<<<< HEAD
+        setCurrentView={setCurrentView}
-        setCurrentView={actions.setMode}
-=======
-        setCurrentView={setCurrentView as any /* FIX ME */}
->>>>>>> origin/V2
         selectedToolKey={selectedToolKey}
       />
 

frontend/src/components/pageEditor/PageEditor.tsx

@@ -45,7 +45,6 @@ export interface PageEditorProps {
     exportLoading: boolean;
     selectionMode: boolean;
     selectedPages: number[];
-    selectedPages: number[];
     closePdf: () => void;
   }) => void;
 }
@@ -205,7 +204,6 @@ const PageEditor = ({
   // Drag and drop state
   const [draggedPage, setDraggedPage] = useState<number | null>(null);
   const [dropTarget, setDropTarget] = useState<number | 'end' | null>(null);
-  const [dropTarget, setDropTarget] = useState<number | 'end' | null>(null);
   const [multiPageDrag, setMultiPageDrag] = useState<{pageNumbers: number[], count: number} | null>(null);
   const [dragPosition, setDragPosition] = useState<{x: number, y: number} | null>(null);
 
@@ -869,7 +867,6 @@ const PageEditor = ({
     if (!mergedPdfDocument) return;
 
     // Convert page numbers to page IDs for export service
-    const exportPageIds = selectedOnly
     const exportPageIds = selectedOnly
       ? selectedPageNumbers.map(pageNum => {
           const page = mergedPdfDocument.pages.find(p => p.pageNumber === pageNum);
@@ -889,7 +886,6 @@ const PageEditor = ({
     setExportLoading(true);
     try {
       // Convert page numbers to page IDs for export service
-      const exportPageIds = selectedOnly
       const exportPageIds = selectedOnly
         ? selectedPageNumbers.map(pageNum => {
             const page = mergedPdfDocument.pages.find(p => p.pageNumber === pageNum);
@@ -900,7 +896,6 @@ const PageEditor = ({
 
       const errors = pdfExportService.validateExport(mergedPdfDocument, exportPageIds, selectedOnly);
       if (errors.length > 0) {
-        setStatus(errors.join(', '));
         setStatus(errors.join(', '));
         return;
       }
@@ -1156,10 +1151,6 @@ const PageEditor = ({
                 {Math.round(processingProgress || 0)}%
               </Text>
             </Group>
-            <div style={{
-              width: '100%',
-              height: '4px',
-              backgroundColor: 'var(--mantine-color-gray-2)',
             <div style={{
               width: '100%',
               height: '4px',
@@ -1190,10 +1181,6 @@ const PageEditor = ({
                 <Text size="sm" fw={500}>Processing thumbnails...</Text>
                 <Text size="sm" c="dimmed">{Math.round(processingProgress || 0)}%</Text>
               </Group>
-              <div style={{
-                width: '100%',
-                height: '4px',
-                backgroundColor: 'var(--mantine-color-gray-2)',
               <div style={{
                 width: '100%',
                 height: '4px',
@@ -1291,7 +1278,6 @@ const PageEditor = ({
               selectionMode={selectionMode}
               draggedPage={draggedPage}
               dropTarget={dropTarget === 'end' ? null : dropTarget}
-              dropTarget={dropTarget === 'end' ? null : dropTarget}
               movingPage={movingPage}
               isAnimating={isAnimating}
               pageRefs={refs}

frontend/src/contexts/FileContext.tsx

@@ -242,8 +242,6 @@ const FileActionsContext = createContext<FileContextActionsValue | undefined>(un
 const FileContext = createContext<any | undefined>(undefined);
 
 // Provider component
-export function FileContextProvider({
-  children,
 export function FileContextProvider({
   children,
   enableUrlSync = true,

frontend/src/tools/AddPassword.tsx

@@ -3,8 +3,7 @@ import { Box, Button, Stack, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
-import { useFileContext } from "../contexts/FileContext";
+import { useFileContext, useToolFileSelection } from "../contexts/FileContext";
-import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
 import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";

frontend/src/tools/ChangePermissions.tsx

@@ -3,8 +3,7 @@ import { Button, Stack, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
-import { useFileContext } from "../contexts/FileContext";
+import { useFileContext, useToolFileSelection } from "../contexts/FileContext";
-import { useToolFileSelection } from "../contexts/FileSelectionContext";
 
 import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";

frontend/src/tools/Sanitize.tsx

@@ -3,7 +3,7 @@ import { Button, Stack, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import DownloadIcon from "@mui/icons-material/Download";
 import { useEndpointEnabled } from "../hooks/useEndpointConfig";
-import { useToolFileSelection } from "../contexts/FileSelectionContext";
+import { useToolFileSelection } from "../contexts/FileContext";
 
 import ToolStep, { ToolStepContainer } from "../components/tools/shared/ToolStep";
 import OperationButton from "../components/tools/shared/OperationButton";