From 69e40621467028e1f8d9dbe6da415ff8fbbb9990 Mon Sep 17 00:00:00 2001
From: Rodrigo Rodriguez <me@rodrigorodriguez.com>
Date: Sat, 9 Sep 2023 14:07:05 -0300
Subject: [PATCH] fix(all): Fix user switching on a single chip.

---
 packages/core.gbapp/services/GBMinService.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts
index 028dc3d5..57195cf8 100644
--- a/packages/core.gbapp/services/GBMinService.ts
+++ b/packages/core.gbapp/services/GBMinService.ts
@@ -771,6 +771,8 @@ export class GBMinService {
     const group = min.core.getParam<string>(min.instance, 'WhatsApp Group ID', null);
     
     WhatsappDirectLine.botGroups[min.botId] = group;
+  
+    const minBoot = GBServer.globals.minBoot as any;
     
     // If there is WhatsApp configuration specified, initialize
     // infrastructure objects.
@@ -788,7 +790,6 @@ export class GBMinService {
 
       await min.whatsAppDirectLine.setup(true);
     } else {
-      const minBoot = GBServer.globals.minBoot as any;
       if (min !== minBoot && minBoot.instance.whatsappServiceKey) {
         min.whatsAppDirectLine = new WhatsappDirectLine(
           min,
@@ -803,11 +804,15 @@ export class GBMinService {
         }
       }
       
-      const botNumber = min.core.getParam<string>(min.instance, 'Bot Number', null);
-      if (botNumber){
-        WhatsappDirectLine.botsByNumber[botNumber] = min.whatsAppDirectLine;
+      // Builds bot numbers map in WhatsAppDirectLine globals.
+
+      let botNumber = min.core.getParam<string>(min.instance, 'Bot Number', null);
+      if (!botNumber){
+        botNumber = minBoot.core.getParam(minBoot.instance, 'Bot Number', null);
       }
-      
+
+      WhatsappDirectLine.botsByNumber[botNumber] = min.whatsAppDirectLine;
+
       // Setups default BOT Framework dialogs.
     
     min.userProfile = conversationState.createProperty('userProfile');