reconcile with other merge

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/deploy-modal/deploy-modal.tsx

@@ -100,7 +100,7 @@ export function DeployModal({
   const [previewing, setPreviewing] = useState(false)
   const [previewDeployedState, setPreviewDeployedState] = useState<WorkflowState | null>(null)
   const [currentPage, setCurrentPage] = useState(1)
-  const itemsPerPage = 10
+  const itemsPerPage = 5
 
   const getInputFormatExample = () => {
     let inputFormatExample = ''

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/training-controls/training-modal.tsx

@@ -350,7 +350,7 @@ export function TrainingModal() {
 
         {isTraining && (
           <>
-            <div className='rounded-lg border bg-orange-50 p-4 dark:bg-orange-950/30 mt-4'>
+            <div className='mt-4 rounded-lg border bg-orange-50 p-4 dark:bg-orange-950/30'>
               <p className='mb-2 font-medium text-orange-700 dark:text-orange-300'>
                 Recording: {currentTitle}
               </p>
@@ -376,7 +376,7 @@ export function TrainingModal() {
             </div>
 
             {startSnapshot && (
-              <div className='rounded-lg border p-3 mt-3'>
+              <div className='mt-3 rounded-lg border p-3'>
                 <p className='mb-2 font-medium text-sm'>Starting State</p>
                 <p className='text-muted-foreground text-xs'>
                   {Object.keys(startSnapshot.blocks).length} blocks, {startSnapshot.edges.length}{' '}
@@ -531,7 +531,7 @@ export function TrainingModal() {
                             </div>
                             <div className='flex items-center gap-3'>
                               {dataset.sentAt && (
-                                <span className='inline-flex items-center rounded-full bg-green-50 px-2 py-0.5 text-green-700 text-xs ring-1 ring-inset ring-green-600/20 dark:bg-green-900/20 dark:text-green-300'>
+                                <span className='inline-flex items-center rounded-full bg-green-50 px-2 py-0.5 text-green-700 text-xs ring-1 ring-green-600/20 ring-inset dark:bg-green-900/20 dark:text-green-300'>
                                   <CheckCircle2 className='mr-1 h-3 w-3' /> Sent
                                 </span>
                               )}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/input-mapping/input-mapping.tsx

@@ -291,8 +291,8 @@ function InputMappingField({
         <Input
           ref={inputRef}
           className={cn(
-            'allow-scroll h-9 w-full overflow-auto border-0 bg-muted/50 text-transparent caret-foreground placeholder:text-muted-foreground/50 focus:bg-background',
-            'transition-colors duration-200'
+            'allow-scroll h-9 w-full overflow-auto text-transparent caret-foreground placeholder:text-muted-foreground/50',
+            'transition-colors duration-200 border border-input bg-white dark:bg-background dark:border-input/60'
           )}
           type='text'
           value={value}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/components/sub-block/components/starter/input-format.tsx

@@ -312,7 +312,7 @@ export function FieldFormat({
                       onChange={(e) => updateField(field.id, 'name', e.target.value)}
                       placeholder={placeholder}
                       disabled={isPreview || disabled}
-                      className='h-9 placeholder:text-muted-foreground/50'
+                      className='h-9 border border-input bg-white placeholder:text-muted-foreground/50 dark:bg-background dark:border-input/60'
                     />
                   </div>
 
@@ -413,7 +413,7 @@ export function FieldFormat({
                             }
                             disabled={isPreview || disabled}
                             className={cn(
-                              'min-h-[120px] font-mono text-sm placeholder:text-muted-foreground/50',
+                              'min-h-[120px] font-mono text-sm placeholder:text-muted-foreground/50 border border-input bg-white dark:bg-background dark:border-input/60',
                               dragHighlight[field.id] && 'ring-2 ring-blue-500 ring-offset-2',
                               isConnecting &&
                                 config?.connectionDroppable !== false &&
@@ -451,7 +451,7 @@ export function FieldFormat({
                               placeholder={valuePlaceholder}
                               disabled={isPreview || disabled}
                               className={cn(
-                                'allow-scroll h-9 w-full overflow-auto text-transparent caret-foreground placeholder:text-muted-foreground/50',
+                                'allow-scroll h-9 w-full overflow-auto text-transparent caret-foreground placeholder:text-muted-foreground/50 border border-input bg-white dark:bg-background dark:border-input/60',
                                 dragHighlight[field.id] && 'ring-2 ring-blue-500 ring-offset-2',
                                 isConnecting &&
                                   config?.connectionDroppable !== false &&

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -632,7 +632,7 @@ export function WorkflowBlock({ id, data }: NodeProps<WorkflowBlockProps>) {
   const [workflowIdFromStore] = useSubBlockValue<string>(id, 'workflowId')
 
   // Determine if this is a workflow block (child workflow selector) and fetch child status
-  const isWorkflowSelector = type === 'workflow'
+  const isWorkflowSelector = type === 'workflow' || type === 'workflow_input'
   let childWorkflowId: string | undefined
   if (!data.isPreview) {
     // Use store value for real-time updates