From 299822d2e433bb3ce49e925cfde3aa2fd5da6b3d Mon Sep 17 00:00:00 2001
From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com>
Date: Sun, 25 Jan 2026 13:10:35 +0200
Subject: [PATCH 1/2] fix(853): Fixed Service name in button payloads

---
 GUI/src/services/service-builder.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/GUI/src/services/service-builder.ts b/GUI/src/services/service-builder.ts
index 38ce2786..e8215370 100644
--- a/GUI/src/services/service-builder.ts
+++ b/GUI/src/services/service-builder.ts
@@ -426,7 +426,7 @@ export function getYamlContent(
       }
 
       if (parentNode.data.stepType === StepType.MultiChoiceQuestion) {
-        return handleMultiChoiceQuestion(finishedFlow, parentStepName, parentNode, childNode);
+        return handleMultiChoiceQuestion(finishedFlow, parentStepName, parentNode, childNode, name);
       }
 
       if (parentNode.data.stepType === StepType.DynamicChoices) {
@@ -711,7 +711,13 @@ function handleMultiChoiceQuestion(
   parentStepName: string,
   parentNode: Node<NodeDataProps>,
   childNode: Node<NodeDataProps> | undefined,
+  serviceName: string,
 ) {
+
+  parentNode.data.multiChoiceQuestion?.buttons.forEach(
+    (b) => (b.payload = b.payload.replaceAll('/_mcq_', `/${serviceName}_mcq_`)),
+  );
+
   return finishedFlow.set(parentStepName, {
     assign: {
       buttons: parentNode?.data?.multiChoiceQuestion?.buttons ?? [],

From 382d94e377270425112cb5710e72a3faba2147e3 Mon Sep 17 00:00:00 2001
From: 1AhmedYasser <26207361+1AhmedYasser@users.noreply.github.com>
Date: Sun, 25 Jan 2026 13:12:45 +0200
Subject: [PATCH 2/2] chore(853): Fixed format

---
 GUI/src/services/service-builder.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/GUI/src/services/service-builder.ts b/GUI/src/services/service-builder.ts
index e8215370..355c5b54 100644
--- a/GUI/src/services/service-builder.ts
+++ b/GUI/src/services/service-builder.ts
@@ -713,7 +713,6 @@ function handleMultiChoiceQuestion(
   childNode: Node<NodeDataProps> | undefined,
   serviceName: string,
 ) {
-
   parentNode.data.multiChoiceQuestion?.buttons.forEach(
     (b) => (b.payload = b.payload.replaceAll('/_mcq_', `/${serviceName}_mcq_`)),
   );