fix(call-service): Fix merge context merge order

zachowj · Jan 9, 2024 · e2f2ac8 · e2f2ac8
1 parent 05e519f
commit e2f2ac8
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/nodes/call-service/CallServiceController.ts b/src/nodes/call-service/CallServiceController.ts
@@ -176,12 +176,12 @@ export default class CallServiceController extends InputOutputController<
             const flowVal = ctx.flow.get(this.node.config.mergeContext);
             const globalVal = ctx.global.get(this.node.config.mergeContext);
 
-            if (this.#isValidContextData(flowVal)) {
-                contextData = flowVal;
+            if (this.#isValidContextData(globalVal)) {
+                contextData = globalVal;
             }
 
-            if (this.#isValidContextData(globalVal)) {
-                contextData = { ...contextData, ...globalVal };
+            if (this.#isValidContextData(flowVal)) {
+                contextData = { ...contextData, ...flowVal };
             }
         }