From 323332ce4bf5827ab9d7ce39b5676f57e9043213 Mon Sep 17 00:00:00 2001
From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com>
Date: Mon, 9 Feb 2026 10:28:17 +0200
Subject: [PATCH] fix(893): Fixed value check in condition

---
 GUI/src/services/service-builder.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GUI/src/services/service-builder.ts b/GUI/src/services/service-builder.ts
index 3bc2aef3..cddbda80 100644
--- a/GUI/src/services/service-builder.ts
+++ b/GUI/src/services/service-builder.ts
@@ -146,7 +146,7 @@ const buildConditionString = (group: any, assignedVariableNames: Set<string>): s
         const rule = child;
         const rawField = rule.field.replaceAll('${', '').replaceAll('}', '');
         const absoluteValue = removeWrapperQuotes(rule.value.replaceAll('${', '').replaceAll('}', ''));
-        const value = isNumericString(absoluteValue) ? absoluteValue : `"${absoluteValue}"`;
+        const value = formatField(absoluteValue);
         const field = formatField(rawField);
         return `${field} ${rule.operator} ${value}`;
       }
@@ -161,7 +161,7 @@ const buildConditionString = (group: any, assignedVariableNames: Set<string>): s
     const rule = group as Rule;
     const rawField = rule.field.replaceAll('${', '').replaceAll('}', '');
     const absoluteValue = removeWrapperQuotes(rule.value.replaceAll('${', '').replaceAll('}', ''));
-    const value = isNumericString(absoluteValue) ? absoluteValue : `"${absoluteValue}"`;
+    const value = formatField(absoluteValue);
     const field = formatField(rawField);
     return `${field} ${rule.operator} ${value}`;
   }