From da95cbd355a5fb0d0cd08fb67ade6d5377f025e5 Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Mon, 4 Apr 2022 10:23:34 +0200
Subject: [PATCH] =?UTF-8?q?fix(engine):=20=F0=9F=90=9B=20Current=20id=20bu?=
 =?UTF-8?q?g=20when=20linking=20to=20current=20bot?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bot-engine/src/services/logic.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/bot-engine/src/services/logic.ts b/packages/bot-engine/src/services/logic.ts
index e19c07ecf..e53d618c2 100644
--- a/packages/bot-engine/src/services/logic.ts
+++ b/packages/bot-engine/src/services/logic.ts
@@ -148,11 +148,12 @@ const executeTypebotLink = async (
 }> => {
   const { typebot, linkedTypebots, onNewLog, createEdge, setCurrentTypebotId } =
     context
-  const linkedTypebot =
+  const linkedTypebot = (
     step.options.typebotId === 'current'
       ? typebot
       : [typebot, ...linkedTypebots].find(byId(step.options.typebotId)) ??
         (await fetchAndInjectTypebot(step, context))
+  ) as PublicTypebot | LinkedTypebot | undefined
   if (!linkedTypebot) {
     onNewLog({
       status: 'error',
@@ -161,7 +162,9 @@ const executeTypebotLink = async (
     })
     return { nextEdgeId: step.outgoingEdgeId }
   }
-  setCurrentTypebotId(linkedTypebot.id)
+  setCurrentTypebotId(
+    'typebotId' in linkedTypebot ? linkedTypebot.typebotId : linkedTypebot.id
+  )
   const nextBlockId =
     step.options.blockId ??
     linkedTypebot.blocks.find((b) => b.steps.some((s) => s.type === 'start'))