🐛 (engine) Fix button validation when item content includes a comma

baptisteArno · Jan 25, 2023 · 07f2626 · 07f2626 · vercel · Jan 25, 2023
1 parent 79622c6
commit 07f2626
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx b/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx
@@ -41,7 +41,13 @@ export const CreateNewTypebotButtons = () => {
               ...typebot.theme,
               chat: {
                 ...typebot.theme.chat,
-                hostAvatar: { isEnabled: true, url: user.image ?? undefined },
+                hostAvatar: {
+                  isEnabled: true,
+                  url:
+                    typebot.theme.chat.hostAvatar?.url ??
+                    user.image ??
+                    undefined,
+                },
               },
             },
           },

diff --git a/apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts b/apps/viewer/src/features/blocks/inputs/buttons/api/utils/validateButtonInput.ts
@@ -3,9 +3,4 @@ import { ChoiceInputBlock } from 'models'
 export const validateButtonInput = (
   buttonBlock: ChoiceInputBlock,
   input: string
-) =>
-  input
-    .split(',')
-    .every((value) =>
-      buttonBlock.items.some((item) => item.content === value.trim())
-    )
+) => buttonBlock.items.some((item) => item.content === input)
diff --git a/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts b/apps/viewer/src/features/chat/api/utils/continueBotFlow.ts
@@ -223,6 +223,7 @@ export const isReplyValid = (inputValue: string, block: Block): boolean => {
     case InputBlockType.URL:
       return validateUrl(inputValue)
     case InputBlockType.CHOICE:
+      if (block.options.isMultipleChoice) return true
       return validateButtonInput(block, inputValue)
   }
   return true