From 3d4d4481fa371cbf25b2764602b1f137f58702d0 Mon Sep 17 00:00:00 2001
From: EthanHealy01 <ethan.healy.21@gmail.com>
Date: Tue, 16 Dec 2025 14:30:59 +0000
Subject: [PATCH] undo silly AI stuff p2

---
 .../rightRail/ViewerAnnotationControls.tsx    | 42 +++++++------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
index 74a7d2feb..00c9787fd 100644
--- a/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
+++ b/frontend/src/core/components/shared/rightRail/ViewerAnnotationControls.tsx
@@ -58,6 +58,18 @@ export default function ViewerAnnotationControls({ currentView, disabled = false
     }
   }, [currentView, viewerContext]);
 
+  // Activate draw mode when annotation mode becomes active
+  useEffect(() => {
+    if (viewerContext?.isAnnotationMode && signatureApiRef?.current && currentView === 'viewer') {
+      try {
+        signatureApiRef.current.activateDrawMode();
+        signatureApiRef.current.updateDrawSettings(selectedColor, 2);
+      } catch (error) {
+        console.log('Signature API not ready:', error);
+      }
+    }
+  }, [viewerContext?.isAnnotationMode, currentView, selectedColor, signatureApiRef]);
+
   // Don't show any annotation controls in sign mode
   if (isSignMode) {
     return null;
@@ -247,36 +259,14 @@ export default function ViewerAnnotationControls({ currentView, disabled = false
             radius="md"
             className="right-rail-icon"
             onClick={() => {
-              const activateDrawMode = () => {
-                // Use setTimeout to ensure this runs after any state updates from applyChanges
-                setTimeout(() => {
-                  viewerContext?.setAnnotationMode(true);
-                  // Activate ink drawing tool when entering annotation mode
-                  if (signatureApiRef?.current && currentView === 'viewer') {
-                    try {
-                      signatureApiRef.current.activateDrawMode();
-                      signatureApiRef.current.updateDrawSettings(selectedColor, 2);
-                    } catch (error) {
-                      console.log('Signature API not ready:', error);
-                    }
-                  }
-                }, 150);
-              };
-              
               // If in redaction mode with pending redactions, show warning modal
               if (isRedactMode && redactionPendingCount > 0) {
-                requestNavigation(activateDrawMode);
+                requestNavigation(() => {
+                  viewerContext?.setAnnotationMode(true);
+                });
               } else {
-                // Direct activation - no need for delay
+                // Direct activation - useEffect will handle draw mode activation
                 viewerContext?.toggleAnnotationMode();
-                if (signatureApiRef?.current && currentView === 'viewer') {
-                  try {
-                    signatureApiRef.current.activateDrawMode();
-                    signatureApiRef.current.updateDrawSettings(selectedColor, 2);
-                  } catch (error) {
-                    console.log('Signature API not ready:', error);
-                  }
-                }
               }
             }}
             disabled={disabled}