From e2f2ac80112d1d38c65d74b7cc0e8d6554e46d65 Mon Sep 17 00:00:00 2001 From: Jason <37859597+zachowj@users.noreply.github.com> Date: Mon, 8 Jan 2024 18:52:30 -0800 Subject: [PATCH] fix(call-service): Fix merge context merge order --- src/nodes/call-service/CallServiceController.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nodes/call-service/CallServiceController.ts b/src/nodes/call-service/CallServiceController.ts index f17e160e8d..dcd4bbba04 100644 --- 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 }; } }