From 01881d0db460a511c145dc05ab51d4574fc5c298 Mon Sep 17 00:00:00 2001
From: Adam Gough <adamgough@Adams-MacBook-Pro.local>
Date: Thu, 29 May 2025 18:37:37 -0700
Subject: [PATCH] removed more redundant logic

---
 .../components/deployed-workflow-modal.tsx           |  9 ---------
 .../components/workflow-block/workflow-block.tsx     | 12 +++++++++---
 .../components/workflow-preview/workflow-preview.tsx |  4 ----
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/apps/sim/app/w/[id]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx b/apps/sim/app/w/[id]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx
index 27c41c40ae..d3063042ca 100644
--- a/apps/sim/app/w/[id]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx
+++ b/apps/sim/app/w/[id]/components/control-bar/components/deployment-controls/components/deployed-workflow-modal.tsx
@@ -40,15 +40,6 @@ export function DeployedWorkflowModal({
   const { revertToDeployedState } = useWorkflowStore()
   const activeWorkflowId = useWorkflowRegistry((state) => state.activeWorkflowId)
 
-  // Add instance ID to track component lifecycle
-  const modalOpenCount = useRef(0)
-
-  useEffect(() => {
-    if (isOpen) {
-      modalOpenCount.current += 1
-    }
-  }, [isOpen])
-
   // Get current workflow state to compare with deployed state
   const currentWorkflowState = useWorkflowStore((state) => ({
     blocks: activeWorkflowId ? mergeSubblockState(state.blocks, activeWorkflowId) : state.blocks,
diff --git a/apps/sim/app/w/[id]/components/workflow-block/workflow-block.tsx b/apps/sim/app/w/[id]/components/workflow-block/workflow-block.tsx
index b50f375d75..0247857d3f 100644
--- a/apps/sim/app/w/[id]/components/workflow-block/workflow-block.tsx
+++ b/apps/sim/app/w/[id]/components/workflow-block/workflow-block.tsx
@@ -271,12 +271,18 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
       stateToUse = mergedState?.subBlocks || {}
     }
 
-    const isAdvancedMode = useWorkflowStore((state) => state.blocks[id]?.advancedMode ?? false)
+    const isAdvancedMode = useWorkflowStore.getState().blocks[blockId]?.advancedMode ?? false
 
     // Filter visible blocks and those that meet their conditions
     const visibleSubBlocks = subBlocks.filter((block) => {
       if (block.hidden) return false
 
+      // Filter by mode if specified
+      if (block.mode) {
+        if (block.mode === 'basic' && isAdvancedMode) return false
+        if (block.mode === 'advanced' && !isAdvancedMode) return false
+      }
+
       // If there's no condition, the block should be shown
       if (!block.condition) return true
 
@@ -526,7 +532,7 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
                         )}
                       />
                     </div>
-                    Scheduled
+                    {scheduleInfo?.isDisabled ? 'Disabled' : 'Scheduled'}
                   </Badge>
                 </TooltipTrigger>
                 <TooltipContent side='top' className='max-w-[300px] p-4'>
@@ -591,7 +597,7 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
                 </TooltipContent>
               </Tooltip>
             )}
-            {config.longDescription && (
+            {config.subBlocks.some((block) => block.mode) && (
               <Tooltip>
                 <TooltipTrigger asChild>
                   <Button
diff --git a/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx b/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx
index 9af0e7267b..db26014e2d 100644
--- a/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx
+++ b/apps/sim/app/w/components/workflow-preview/workflow-preview.tsx
@@ -25,13 +25,9 @@ import type { WorkflowState } from '@/stores/workflows/workflow/types'
 const logger = createLogger('WorkflowPreview')
 
 interface WorkflowPreviewProps {
-  // The workflow state to render
   workflowState: WorkflowState
-  // Whether to show subblocks
   showSubBlocks?: boolean
-  // Optional className for container styling
   className?: string
-  // Optional height/width overrides
   height?: string | number
   width?: string | number
   isPannable?: boolean