🐛 Make sure variables are parsed in date and picture choice options

packages/bot-engine/blocks/inputs/date/parseDateInput.ts

@@ -5,27 +5,24 @@ import { parseVariables } from '@typebot.io/variables/parseVariables'
 
 export const parseDateInput =
   (state: SessionState) => (block: DateInputBlock) => {
-    if (!block.options) return block
+    const variables = state.typebotsQueue[0].typebot.variables
+    if (!block.options) return deepParseVariables(variables)(block)
     return {
-      ...block,
+      ...deepParseVariables(variables)(block),
       options: {
-        ...deepParseVariables(state.typebotsQueue[0].typebot.variables)(
-          block.options
-        ),
+        ...deepParseVariables(variables)(block.options),
         min: parseDateLimit(
           block.options.min,
           block.options.hasTime,
-          state.typebotsQueue[0].typebot.variables
+          variables
         ),
         max: parseDateLimit(
           block.options.max,
           block.options.hasTime,
-          state.typebotsQueue[0].typebot.variables
+          variables
         ),
       },
-      prefilledValue: getPrefilledInputValue(
-        state.typebotsQueue[0].typebot.variables
-      )(block),
+      prefilledValue: getPrefilledInputValue(variables)(block),
     }
   }
 

packages/bot-engine/blocks/inputs/pictureChoice/injectVariableValuesInPictureChoiceBlock.ts

@@ -19,7 +19,7 @@ export const injectVariableValuesInPictureChoiceBlock =
           variable.id === block.options?.dynamicItems?.pictureSrcsVariableId &&
           isDefined(variable.value)
       ) as VariableWithValue | undefined
-      if (!pictureSrcsVariable) return block
+      if (!pictureSrcsVariable) return deepParseVariables(variables)(block)
       const titlesVariable = block.options.dynamicItems.titlesVariableId
         ? (variables.find(
             (variable) =>
@@ -51,7 +51,7 @@ export const injectVariableValuesInPictureChoiceBlock =
           : pictureSrcsVariable.value
 
       return {
-        ...block,
+        ...deepParseVariables(variables)(block),
         items: variableValues.filter(isDefined).map((pictureSrc, idx) => ({
           id: idx.toString(),
           blockId: block.id,