impact-chatbot 2.3.78 → 2.3.81

package/dist/components/message-template/components/message-content/ButtonContent.d.ts

@@ -8,10 +8,12 @@ export declare const stepFormStreamControl: {
     initValue: boolean;
     uniqueChatId: string;
 };
-declare const ButtonContent: ({ bodyText, isFormDisabled, isStepFormSubmit, isFormValid }: {
+declare const ButtonContent: ({ bodyText, isFormDisabled, isStepFormSubmit, isFormValid, formParamNames, messageIndex }: {
     bodyText: any;
     isFormDisabled?: boolean;
     isStepFormSubmit?: boolean;
     isFormValid?: boolean;
+    formParamNames?: any[];
+    messageIndex?: number;
 }) => import("react/jsx-runtime").JSX.Element;
 export default ButtonContent;

package/dist/hooks/useChatFlow.d.ts

@@ -1,4 +1,4 @@
-export declare const useChatFlow: (chatDataRef: any, setLoader: any, setFlowType: any, setScreenName: any, setUserInput: any, setQuestionIndex: any, setCurrentAppLink: any, flowType: any, screenName: any, questionIndex: any, userInput: any, dateFormat: any, currentMode: any, activeConversationId: any, setIsModuleChanged: any, chatBodyRef: any, filterReducerState: any, dispatch: any, navigate: any, setShowChatPlaceholder: any, baseUrl: any, setChatDataState: any, setCurrentSessionId: any, customChatConfig: any, chatDataInfoRef: any, chatbotContext: any, setInitValue: any, setSessionId: any, thinkingContent: any, setThinkingContent: any, isThinking: any, setIsThinking: any, chatId: any, setChatId: any, isStop: any, setIsStop: any, functionsRef: any, functionsState: any, setFunctionsState: any, thinkingHeaderMessage: any, setThinkingHeaderMessage: any, uniqueChatId: any, initValue: any, sessionId: any, fieldNumber: any, setFieldNumber: any, additionalArgs: any, setActiveConversationId: any, navSessionId: any, setNavSessionId: any) => {
+export declare const useChatFlow: (chatDataRef: any, setLoader: any, setFlowType: any, setScreenName: any, setUserInput: any, setQuestionIndex: any, setCurrentAppLink: any, flowType: any, screenName: any, questionIndex: any, userInput: any, dateFormat: any, currentMode: any, activeConversationId: any, setIsModuleChanged: any, chatBodyRef: any, filterReducerState: any, dispatch: any, navigate: any, setShowChatPlaceholder: any, baseUrl: any, setChatDataState: any, setCurrentSessionId: any, customChatConfig: any, chatDataInfoRef: any, chatbotContext: any, setInitValue: any, setSessionId: any, thinkingContent: any, setThinkingContent: any, isThinking: any, setIsThinking: any, chatId: any, setChatId: any, isStop: any, setIsStop: any, functionsRef: any, functionsState: any, setFunctionsState: any, thinkingHeaderMessage: any, setThinkingHeaderMessage: any, uniqueChatId: any, initValue: any, sessionId: any, fieldNumber: any, setFieldNumber: any, additionalArgs: any, setActiveConversationId: any, navSessionId: any, setNavSessionId: any, setUniqueChatId: any, setAdditionalArgs: any) => {
     setUserFlow: (data: any) => Promise<void>;
     setUserScreenAndFlow: (data: any) => void;
     fetchUserResultsFromQuery: (refObject: any, fetchQuestions?: boolean, inputValue?: any, conversationId?: any) => Promise<void>;

package/dist/index.cjs.js

@@ -2201,11 +2201,17 @@ const useAgentFlow = (dateFormat, chatDataRef, currentMode, setShowChatPlacehold
     };
 };
 
-const useChatFlow = (chatDataRef, setLoader, setFlowType, setScreenName, setUserInput, setQuestionIndex, setCurrentAppLink, flowType, screenName, questionIndex, userInput, dateFormat, currentMode, activeConversationId, setIsModuleChanged, chatBodyRef, filterReducerState, dispatch, navigate, setShowChatPlaceholder, baseUrl, setChatDataState, setCurrentSessionId, customChatConfig, chatDataInfoRef, chatbotContext, setInitValue, setSessionId, thinkingContent, setThinkingContent, isThinking, setIsThinking, chatId, setChatId, isStop, setIsStop, functionsRef, functionsState, setFunctionsState, thinkingHeaderMessage, setThinkingHeaderMessage, uniqueChatId, initValue, sessionId, fieldNumber, setFieldNumber, additionalArgs, setActiveConversationId, navSessionId, setNavSessionId) => {
+const useChatFlow = (chatDataRef, setLoader, setFlowType, setScreenName, setUserInput, setQuestionIndex, setCurrentAppLink, flowType, screenName, questionIndex, userInput, dateFormat, currentMode, activeConversationId, setIsModuleChanged, chatBodyRef, filterReducerState, dispatch, navigate, setShowChatPlaceholder, baseUrl, setChatDataState, setCurrentSessionId, customChatConfig, chatDataInfoRef, chatbotContext, setInitValue, setSessionId, thinkingContent, setThinkingContent, isThinking, setIsThinking, chatId, setChatId, isStop, setIsStop, functionsRef, functionsState, setFunctionsState, thinkingHeaderMessage, setThinkingHeaderMessage, uniqueChatId, initValue, sessionId, fieldNumber, setFieldNumber, additionalArgs, setActiveConversationId, navSessionId, setNavSessionId, setUniqueChatId, setAdditionalArgs) => {
     const navSessionIdRef = React.useRef(navSessionId);
     React.useEffect(() => {
         navSessionIdRef.current = navSessionId;
     }, [navSessionId]);
+    // Keep a fresh reference to uniqueChatId so callbacks memoized with narrow
+    // deps (e.g. handleUserAction) don't send a stale/empty chat_id on follow-ups.
+    const uniqueChatIdRef = React.useRef(uniqueChatId);
+    React.useEffect(() => {
+        uniqueChatIdRef.current = uniqueChatId;
+    }, [uniqueChatId]);
     const { prepareDataAndSendToAgent, setAgentFlow, processResponse, } = useAgentFlow(dateFormat, chatDataRef, currentMode, setShowChatPlaceholder, setLoader, baseUrl, setCurrentSessionId, customChatConfig, chatDataInfoRef, {
         setChatDataState,
         activeConversationId,
@@ -2228,9 +2234,10 @@ const useChatFlow = (chatDataRef, setLoader, setFlowType, setScreenName, setUser
         thinkingHeaderMessage,
         setThinkingHeaderMessage,
         uniqueChatId,
+        setUniqueChatId,
         fieldNumber,
         setFieldNumber,
-        setAdditionalArgs: () => { },
+        setAdditionalArgs: setAdditionalArgs || (() => { }),
     });
     const getCurrentDateTimeString = () => {
         return moment().format(dateFormat);
@@ -2393,7 +2400,7 @@ const useChatFlow = (chatDataRef, setLoader, setFlowType, setScreenName, setUser
                 sessionId: sessionId,
                 setSessionId: setSessionId,
                 setInitValue: setInitValue,
-                uniqueChatId: uniqueChatId,
+                uniqueChatId: uniqueChatIdRef.current,
                 additionalArgs: additionalArgs,
             });
         }
@@ -3613,6 +3620,9 @@ const useStyles$a = styles.makeStyles((theme) => ({
     boldText: {
         fontWeight: 600,
     },
+    combinedBlockHeaderTitle: {
+        marginBottom: "0.5rem",
+    },
     botViewHeader: {
         color: theme.palette.textColours.botDateChipText,
     },
@@ -5509,7 +5519,7 @@ const useStyles$8 = styles.makeStyles((theme) => ({
 }));
 const MAX_RETRY_COUNT_BUTTON = 1;
 const RETRY_COUNTDOWN_SECONDS_BUTTON = 15;
-const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = false, isFormValid = true }) => {
+const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = false, isFormValid = true, formParamNames = [], messageIndex = 0 }) => {
     const classes = useStyles$8();
     const dispatch = reactRedux.useDispatch();
     const sourceRef = React.useRef(null);
@@ -5535,19 +5545,56 @@ const ButtonContent = ({ bodyText, isFormDisabled = false, isStepFormSubmit = fa
         status: "",
     });
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
+    const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
+    const persistedFormValuesRef = React.useRef(persistedFormValues);
+    persistedFormValuesRef.current = persistedFormValues;
     const thinkingContext = reactRedux.useSelector((state) => state.smartBotReducer.thinkingContext);
     const handleButtonClick = (button) => {
         if (isStepFormSubmit) {
-            // Build the user_input from chatbotContext
+            // Read the latest chatbotContext from ref to avoid stale closures
+            const currentContext = chatbotContextRef.current;
+            const currentPersisted = persistedFormValuesRef.current;
+            // Build the user_input ONLY from formParamNames (current form's fields)
             const userInput = {};
-            for (const key in chatbotContext) {
-                if (key.startsWith('__'))
-                    continue;
-                if (chatbotContext[key]?.updated) {
-                    let value = chatbotContext[key][key];
-                    userInput[key] = isArray$1(value)
-                        ? value
-                        : typeof value === 'number' ? value : String(value);
+            if (formParamNames.length > 0) {
+                formParamNames.forEach((paramName) => {
+                    // Primary source: chatbotContext (set by handleChange in form components)
+                    if (currentContext[paramName]?.updated) {
+                        let value = currentContext[paramName][paramName];
+                        userInput[paramName] = isArray$1(value)
+                            ? value
+                            : typeof value === 'number' ? value : String(value);
+                    }
+                    else {
+                        // Fallback: persistedFormValues (covers edge case where chatbotContext
+                        // was cleared but the form still has a valid selection displayed)
+                        const persistedKey = `${messageIndex}_${paramName}`;
+                        const persistedValue = currentPersisted[persistedKey];
+                        if (persistedValue !== undefined && persistedValue !== null) {
+                            // For select components, persistedFormValues stores option objects
+                            if (isArray$1(persistedValue)) {
+                                userInput[paramName] = persistedValue.map((opt) => opt.value !== undefined ? opt.value : opt);
+                            }
+                            else {
+                                userInput[paramName] = typeof persistedValue === 'number' ? persistedValue : String(persistedValue);
+                            }
+                        }
+                    }
+                });
+            }
+            else {
+                // Legacy fallback: no formParamNames provided, iterate chatbotContext
+                for (const key in currentContext) {
+                    if (key.startsWith('__'))
+                        continue;
+                    if (currentContext[key]?.updated) {
+                        let value = currentContext[key][key];
+                        userInput[key] = isArray$1(value)
+                            ? value
+                            : typeof value === 'number' ? value : String(value);
+                    }
                 }
             }
             dispatch(smartBotActions.setChatbotContext({}));
@@ -5885,6 +5932,8 @@ const TableContent = ({ bodyText }) => {
     const [isModalOpen, setIsModalOpen] = React.useState(false);
     const [downloadUrl, setDownloadUrl] = React.useState("");
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const dispatch = reactRedux.useDispatch();
     React.useEffect(() => {
         let formattedColumns = getFormattedTableConfig(table_config);
@@ -5930,9 +5979,10 @@ const TableContent = ({ bodyText }) => {
     const onSelectionChanged = (event) => {
         try {
             const selectedList = event.api.getSelectedRows();
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
-                tables: { ...chatbotContext?.tables, [table_name]: selectedList },
+                ...latestContext,
+                tables: { ...latestContext?.tables, [table_name]: selectedList },
             }));
         }
         catch (error) {
@@ -6803,6 +6853,8 @@ const SliderContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
     const formKey = `${messageIndex}_${bodyText?.paramName}`;
     const { header, headerOrentiation, inputPosition, label, max, min, required, disabled, } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [sliderValue, setSliderValue] = React.useState(persistedFormValues[formKey] !== undefined ? persistedFormValues[formKey] : 0);
@@ -6810,16 +6862,18 @@ const SliderContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
         return null;
     const handleChange = (value) => {
         try {
-            setSliderValue(value?.target?.value);
+            const newValue = value?.target?.value;
+            setSliderValue(newValue);
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
-                    [bodyText?.paramName]: value?.target?.value,
+                    ...latestContext?.[bodyText?.paramName],
+                    [bodyText?.paramName]: newValue,
                     updated: true,
                 },
             }));
-            dispatch(smartBotActions.setPersistedFormValues({ [formKey]: value?.target?.value }));
+            dispatch(smartBotActions.setPersistedFormValues({ [formKey]: newValue }));
         }
         catch (error) {
             console.error("Error in slider handleChange", error);
@@ -6855,6 +6909,8 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
     const searchTermRef = React.useRef("");
     const selectAllCountRef = React.useRef(persistedFormValues?.[selectAllKey] || 0);
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const heirarchyKeyValuePairs = reactRedux.useSelector((state) => state.smartBotReducer.heirarchyKeyValuePairs);
     const dispatch = reactRedux.useDispatch();
     // Cross-filter cascading context (optional — graceful fallback when not wrapped)
@@ -6872,10 +6928,11 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
             else {
                 value = selectedOptions.value;
             }
+            const latestContext = chatbotContextRef.current;
             const updatedContext = {
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: value,
                     updated: true,
                 },
@@ -6925,10 +6982,11 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
                 setCurrentSelectedOptions([]);
                 setIsAllSelected(false);
                 // Also clear from chatbotContext and persistedFormValues
+                const ctx = chatbotContextRef.current;
                 dispatch(smartBotActions.setChatbotContext({
-                    ...chatbotContext,
+                    ...ctx,
                     [bodyText?.paramName]: {
-                        ...chatbotContext?.[bodyText?.paramName],
+                        ...ctx?.[bodyText?.paramName],
                         [bodyText?.paramName]: [],
                         updated: true,
                     },
@@ -6986,10 +7044,11 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
             isRequired: isRequired, isDisabled: isDisabled || isFormDisabled, isClearable: !(isDisabled || isFormDisabled), onClearAll: () => {
                 setCurrentSelectedOptions([]);
                 setIsAllSelected(false);
+                const ctx1 = chatbotContextRef.current;
                 dispatch(smartBotActions.setChatbotContext({
-                    ...chatbotContext,
+                    ...ctx1,
                     [bodyText?.paramName]: {
-                        ...chatbotContext?.[bodyText?.paramName],
+                        ...ctx1?.[bodyText?.paramName],
                         [bodyText?.paramName]: [],
                         updated: true,
                     },
@@ -7068,10 +7127,11 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
                         selectAllCountRef.current = allOptionsRef.current.length;
                     }
                     setIsAllSelected(true);
+                    const ctx2 = chatbotContextRef.current;
                     dispatch(smartBotActions.setChatbotContext({
-                        ...chatbotContext,
+                        ...ctx2,
                         [bodyText?.paramName]: {
-                            ...chatbotContext?.[bodyText?.paramName],
+                            ...ctx2?.[bodyText?.paramName],
                             [bodyText?.paramName]: valuesToDispatch,
                             updated: true,
                         },
@@ -7089,10 +7149,11 @@ const SelectContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
                 else {
                     setCurrentSelectedOptions([]);
                     setIsAllSelected(false);
+                    const ctx3 = chatbotContextRef.current;
                     dispatch(smartBotActions.setChatbotContext({
-                        ...chatbotContext,
+                        ...ctx3,
                         [bodyText?.paramName]: {
-                            ...chatbotContext?.[bodyText?.paramName],
+                            ...ctx3?.[bodyText?.paramName],
                             [bodyText?.paramName]: [],
                             updated: true,
                         },
@@ -7114,6 +7175,8 @@ const DatePickerContent = ({ bodyText, isFormDisabled = false, messageIndex }) =
     const formKey = `${messageIndex}_${bodyText?.paramName}`;
     const { displayFormat, label, isRequired, labelOrientation, placeholder, minDate, maxDate, isDisabled, minStartDate, } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [selectedDate, setSelectedDate] = React.useState(persistedFormValues[formKey] || null);
@@ -7122,10 +7185,11 @@ const DatePickerContent = ({ bodyText, isFormDisabled = false, messageIndex }) =
     const handleDateChange = (date) => {
         try {
             setSelectedDate(date);
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: moment(date).format(displayFormat),
                     updated: true,
                 },
@@ -7153,6 +7217,8 @@ const DateRangePickerContent = ({ bodyText, isFormDisabled = false, messageIndex
     const formKey = `${messageIndex}_${bodyText?.paramName}`;
     const { displayFormat, label, isRequired, labelOrientation, minDate, maxDate, isDisabled, showMonthYearSelect, minStartDate, } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [startDate, setStartDate] = React.useState(persistedFormValues[formKey]?.startDate || null);
@@ -7163,10 +7229,11 @@ const DateRangePickerContent = ({ bodyText, isFormDisabled = false, messageIndex
         try {
             setStartDate(start);
             setEndDate(end);
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: {
                         startDate: start ? moment(start).format(displayFormat) : null,
                         endDate: end ? moment(end).format(displayFormat) : null,
@@ -7201,6 +7268,8 @@ const CheckboxContent = ({ bodyText, isFormDisabled = false, messageIndex }) =>
     const formKey = `${messageIndex}_${bodyText?.paramName}`;
     const { label, checked: checkedValue, required, disabled, } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [checked, setChecked] = React.useState(persistedFormValues[formKey] !== undefined ? persistedFormValues[formKey] : checkedValue);
@@ -7209,15 +7278,11 @@ const CheckboxContent = ({ bodyText, isFormDisabled = false, messageIndex }) =>
     const handleChange = (isChecked) => {
         try {
             setChecked(isChecked?.currentTarget?.checked);
-            // chatbotContext.checkbox = {
-            //   ...chatbotContext?.checkbox,
-            //   [bodyText?.paramName]: isChecked?.currentTarget?.checked,
-            //   updated: true
-            // };
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: isChecked?.currentTarget?.checked,
                     updated: true,
                 },
@@ -7236,6 +7301,8 @@ const RadioContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
     const classes = useStyles$a();
     const { label, isDisabled, orientation, options } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [selectedOption, setSelectedOption] = React.useState(persistedFormValues[formKey] ?? null);
@@ -7250,10 +7317,11 @@ const RadioContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
             //   [bodyText?.paramName]: value,
             //   updated: true,
             // };
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: value,
                     updated: true,
                 },
@@ -7271,6 +7339,8 @@ const InputContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
     const formKey = `${messageIndex}_${bodyText?.paramName}`;
     const { label, placeholder, isRequired, isDisabled, inputType, labelOrientation, defaultValue, maxLength, minLength, } = bodyText;
     const chatbotContext = reactRedux.useSelector((state) => state.smartBotReducer.chatbotContext);
+    const chatbotContextRef = React.useRef(chatbotContext);
+    chatbotContextRef.current = chatbotContext;
     const persistedFormValues = reactRedux.useSelector((state) => state.smartBotReducer.persistedFormValues);
     const dispatch = reactRedux.useDispatch();
     const [value, setValue] = React.useState(persistedFormValues[formKey] !== undefined ? persistedFormValues[formKey] : (defaultValue || ""));
@@ -7280,10 +7350,11 @@ const InputContent = ({ bodyText, isFormDisabled = false, messageIndex }) => {
         try {
             const newValue = event?.target?.value || event?.currentTarget?.value || "";
             setValue(newValue);
+            const latestContext = chatbotContextRef.current;
             dispatch(smartBotActions.setChatbotContext({
-                ...chatbotContext,
+                ...latestContext,
                 [bodyText?.paramName]: {
-                    ...chatbotContext?.[bodyText?.paramName],
+                    ...latestContext?.[bodyText?.paramName],
                     [bodyText?.paramName]: replaceSpecialCharToCharCode(newValue),
                     updated: true,
                     type: inputType,
@@ -7579,6 +7650,15 @@ const StepFormContent = ({ formData, messageIndex = 0, isFormDisabled = false, s
         });
         return selections;
     }, [crossFilterConfigs, chatbotContext, persistedFormValues, messageIndex]);
+    // Extract the param names of the current form's fields so ButtonContent
+    // can restrict user_input to only these keys (avoids leaking stale context).
+    const formParamNames = React.useMemo(() => {
+        if (!formData || !Array.isArray(formData))
+            return [];
+        return formData
+            .filter((item) => item?.type !== "button" && item?.data?.param_name)
+            .map((item) => item.data.param_name);
+    }, [formData]);
     if (!formData || !Array.isArray(formData) || formData.length === 0) {
         return null;
     }
@@ -7606,7 +7686,7 @@ const StepFormContent = ({ formData, messageIndex = 0, isFormDisabled = false, s
             case "radio":
                 return jsxRuntime.jsx(RadioContent, { bodyText: parsedData.bodyText, isFormDisabled: formFieldsDisabled, messageIndex: messageIndex }, key);
             case "button":
-                return jsxRuntime.jsx(ButtonContent, { bodyText: parsedData.bodyText, isFormDisabled: isFormDisabled || isFormSubmitted || isTimedOut, isStepFormSubmit: true, isFormValid: requiredFieldsFilled }, key);
+                return jsxRuntime.jsx(ButtonContent, { bodyText: parsedData.bodyText, isFormDisabled: isFormDisabled || isFormSubmitted || isTimedOut, isStepFormSubmit: true, isFormValid: requiredFieldsFilled, formParamNames: formParamNames, messageIndex: messageIndex }, key);
             case "input":
                 return jsxRuntime.jsx(InputContent, { bodyText: parsedData.bodyText, isFormDisabled: formFieldsDisabled, messageIndex: messageIndex }, key);
             case "image":
@@ -10575,10 +10655,18 @@ const resetActiveTabularInstance = () => {
 };
 
 const CombinedContent = ({ botData, props }) => {
+    const classes = useStyles$a();
     const isFormDisabled = botData?.isFormDisabled || false;
     const isTabEnabled = botData?.utilityData?.isTabEnabled;
     // Get the array of content items from bodyText
     const contentItems = Array.isArray(botData.bodyText) ? botData.bodyText : [];
+    // Renders the optional block-level header title above a content item
+    const renderHeaderTitle = (parsedData) => {
+        const showHeaderTitle = !parsedData?.noShowHeaderTitle && Boolean(parsedData?.headerTitle?.length);
+        if (!showHeaderTitle)
+            return null;
+        return (jsxRuntime.jsx("div", { className: `${classes.chatbotText} ${classes.boldText} ${classes.combinedBlockHeaderTitle}`, children: parsedData.headerTitle }));
+    };
     // Function to render individual content based on its type
     const renderIndividualContent = (parsedData, index) => {
         const key = `combined-content-${index}`;
@@ -10631,8 +10719,8 @@ const CombinedContent = ({ botData, props }) => {
             if (!parsedData) {
                 return null;
             }
-            // Render the parsed content
-            return renderIndividualContent(parsedData, index);
+            // Render the parsed content, preceded by the block's header title when present
+            return (jsxRuntime.jsxs(React.Fragment, { children: [renderHeaderTitle(parsedData), renderIndividualContent(parsedData, index)] }, `combined-block-${index}`));
         }
         catch (error) {
             console.error(`Error parsing combined content item at index ${index}:`, error);
@@ -14843,7 +14931,7 @@ const SmartBot = (props) => {
     const [chatBotWidth, setChatBotWidth] = React.useState(null);
     const [tabList, setTabList] = React.useState([]);
     React.useRef(0);
-    const { setUserFlow, setUserScreenAndFlow, fetchUserResultsFromQuery, getCurrentDateTimeString, setLink, } = useChatFlow(chatDataRef, setLoader, setFlowType, setScreenName, setUserInput, setQuestionIndex, setCurrentAppLink, flowType, screenName, questionIndex, userInput, dateFormat, currentMode, activeConversationId, setIsModuleChanged, chatBodyRef, filterReducerState, dispatch, navigate, setShowChatPlaceholder, baseUrl, setChatDataState, setCurrentSessionId, customChatConfig, chatDataInfoRef, chatbotContext, setInitValue, setSessionId, thinkingContent, setThinkingContent, isThinking, setIsThinking, chatId, setChatId, isStop, setIsStop, functionsRef, functionsState, setFunctionsState, thinkingHeaderMessage, setThinkingHeaderMessage, uniqueChatId, initValue, sessionId, fieldNumber, setFieldNumber, additionalArgs, setActiveConversationId, navSessionId, setNavSessionId);
+    const { setUserFlow, setUserScreenAndFlow, fetchUserResultsFromQuery, getCurrentDateTimeString, setLink, } = useChatFlow(chatDataRef, setLoader, setFlowType, setScreenName, setUserInput, setQuestionIndex, setCurrentAppLink, flowType, screenName, questionIndex, userInput, dateFormat, currentMode, activeConversationId, setIsModuleChanged, chatBodyRef, filterReducerState, dispatch, navigate, setShowChatPlaceholder, baseUrl, setChatDataState, setCurrentSessionId, customChatConfig, chatDataInfoRef, chatbotContext, setInitValue, setSessionId, thinkingContent, setThinkingContent, isThinking, setIsThinking, chatId, setChatId, isStop, setIsStop, functionsRef, functionsState, setFunctionsState, thinkingHeaderMessage, setThinkingHeaderMessage, uniqueChatId, initValue, sessionId, fieldNumber, setFieldNumber, additionalArgs, setActiveConversationId, navSessionId, setNavSessionId, setUniqueChatId, setAdditionalArgs);
     const { parseSavedFlow, saveCurrentChanges, endCurrentSession, clearChatSession, initiateNewChat, hasUnsavedChanges, } = useChatSession(chatDataRef, setFlowType, setScreenName, setUserInput, setTemplateData, chatDataScreenLinkRef, setShowModal, setMinimizedMode, setSelectedModule, setChatDataState, currentMode, setUserFlow, getCurrentDateTimeString, setCurrentAppLink, selectedModule, fetchUserResultsFromQuery, props.closeBot, activeConversationId, setActiveConversationId, setShowChatPlaceholder);
     const { refreshAndUpdateUserManual, configureBotActions, displaySnackMessages, } = useBotConfiguration(setRefreshLoader, setEnableRefreshAction, dispatch);
     const { prepareDataAndSendToAgent, processResponse } = useAgentFlow(dateFormat, chatDataRef, currentMode, setShowChatPlaceholder, setLoader, baseUrl, setCurrentSessionId, customChatConfig, chatDataInfoRef, {