last ...

X121SMCEA/Signals/x-121.smc.xpvob.signal.lib.mq5

@@ -419,13 +419,29 @@ bool DetectX121SMCXPVOBSiganlSetup(
     //
     // Setup Conditions ...
 
+    //
+    // Detect Market Trend ...
+    ENUM_X_DIRECTION trend;
+    bool hasTrend = consolidationCycleHelper
+                        .DetectTrend(trend);
+    bool hasBullishTrend = hasTrend &&
+                           IsBullish(trend);
+    bool hasBearishTrend = hasTrend &&
+                           IsBearish(trend);
+    result = hasBullishTrend ||
+             hasBearishTrend;
+    if (!result)
+    {
+        return result;
+    }
+
     //
     // Select Source State ...
     XPOIState state = decisionState;
 
     //
     // Detect Imbalance ...
-    
+
     //
     bool hasBullishOB = conditions.HasBullishOB();
     if (!hasBullishOB)
@@ -638,8 +654,20 @@ bool DetectX121SMCXPVOBSiganlSetup(
 
     //
     // Detect Setup Conditions based on Peaks or Vales Occurance ...
-    bool lookupForLong = isNewVale && hasBullishOB && hasBullishFVG;
-    bool lookupForShort = isNewPeak && hasBearishOB && hasBearishFVG;
+
+    //
+    bool lookupForLong = isNewVale &&
+                         hasBullishOB &&
+                         hasBullishFVG &&
+                         hasBullishTrend;
+
+    //
+    bool lookupForShort = isNewPeak &&
+                          hasBearishOB &&
+                          hasBearishFVG &&
+                          hasBearishTrend;
+
+    //
     result = lookupForLong ||
              lookupForShort;
     if (!result)