From 2b9fb1989994c480c793b47d294cfd9fb7e5ef7c Mon Sep 17 00:00:00 2001
From: Waleed <walif6@gmail.com>
Date: Fri, 10 Apr 2026 12:50:04 -0700
Subject: [PATCH] fix(trigger): resolve dependsOn for trigger-mode subblocks
 sharing canonical groups with block subblocks (#4095)

---
 apps/sim/lib/workflows/subblocks/visibility.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/sim/lib/workflows/subblocks/visibility.ts b/apps/sim/lib/workflows/subblocks/visibility.ts
index 55c4de1c69..867f60f750 100644
--- a/apps/sim/lib/workflows/subblocks/visibility.ts
+++ b/apps/sim/lib/workflows/subblocks/visibility.ts
@@ -284,8 +284,9 @@ export function resolveDependencyValue(
 
   const { basicValue, advancedValue } = getCanonicalValues(group, values)
   const mode = resolveCanonicalMode(group, values, overrides)
-  if (mode === 'advanced') return advancedValue ?? basicValue
-  return basicValue ?? advancedValue
+  const canonicalResult =
+    mode === 'advanced' ? (advancedValue ?? basicValue) : (basicValue ?? advancedValue)
+  return canonicalResult ?? values[dependencyKey]
 }
 
 /**