@hhgtech/hhg-components 1.29.314-beta-14 → 1.29.315

package/build/{store-b92e2b20.js → store-f2722742.js}

@@ -1,12 +1,11 @@
 'use strict';
 
-var tslib_es6 = require('./tslib.es6-c3c8c8ca.js');
+var tslib_es6 = require('./tslib.es6-2b428e0e.js');
 var zustand = require('zustand');
 var constantsIsProduction = require('./constantsIsProduction.js');
-var normalizeLink = require('./normalizeLink-74fc68f9.js');
-var index = require('./index-a4c0de8c.js');
+var normalizeLink = require('./normalizeLink-9b8b57c4.js');
+var index = require('./index-24703e8f.js');
 var miscCookieHelper = require('./miscCookieHelper.js');
-var Locale = require('./Locale-0b1d80be.js');
 var constantsDomainLocales = require('./constantsDomainLocales.js');
 
 const SSO_V2_PATHS = {
@@ -25,13 +24,6 @@ const SSO_V2_PATHS = {
         UPDATE_PHONE_SEND_OTP: 'login/sms-social/sent-otp',
         UPDATE_PHONE_VERIFY_OTP: 'login/sms-social/phone-verify-code',
     },
-    WHATSAPP: {
-        REGISTER_BY_SEND_OTP: 'login/login-with-whatsapp',
-        SEND_OTP: 'login/whatsapp/sent-otp',
-        UPDATE_PHONE_SEND_OTP: 'login/sms-social/whatsapp/sent-otp',
-        UPDATE_PHONE_VERIFY_OTP: 'login/sms-social/whatsapp-verify-code',
-        VERIFY_BY_OTP: 'login/whatsapp-verify-code',
-    },
     ZALO: {
         REGISTER_BY_SEND_OTP: 'login/login-with-zalo',
         SEND_OTP: 'login/zalo/sent-otp',
@@ -50,12 +42,8 @@ const SSO_V2_PATHS = {
     },
 };
 
-const locale = process.env.NEXT_PUBLIC_DEPLOY_LOCALE || 'vi-VN';
-const websiteId = {
-    [Locale.LOCALE.Vietnam]: '1',
-    [Locale.LOCALE.Indonesia]: '2',
-    [Locale.LOCALE.Malaysia]: '3',
-}[locale];
+const locale = process.env.UNIFY_LOCALE || 'vi-VN';
+const websiteId = index.LOCALE_SPECS[locale].SITE_ID;
 index.LOCALE_SPECS[locale].PHONE;
 const getSSOV2ApiUrl = (path) => {
     return normalizeLink.normalizeLinkSlash(`${normalizeLink.getCurrentSsoUrl(locale)}/api/v2/${path}`);
@@ -168,14 +156,14 @@ const handleAuthSuccess = (res) => {
         miscCookieHelper.setCookie(BEARER_TOKEN_COOKIE, res.token, {
             domain: window.location.hostname === 'localhost'
                 ? 'localhost'
-                : `.${constantsDomainLocales.domainLocales[locale]}`,
+                : `.${constantsDomainLocales.domainLocales[process.env.UNIFY_LOCALE || 'vi-VN']}`,
             expires: new Date(res.expire_in * 1000).toUTCString(),
         });
     (res === null || res === void 0 ? void 0 : res.refresh_token) &&
         miscCookieHelper.setCookie(index.BEARER_REFRESH_TOKEN_COOKIE, res.refresh_token, {
             domain: window.location.hostname === 'localhost'
                 ? 'localhost'
-                : `.${constantsDomainLocales.domainLocales[locale]}`,
+                : `.${constantsDomainLocales.domainLocales[process.env.UNIFY_LOCALE || 'vi-VN']}`,
         });
 };
 
@@ -453,7 +441,7 @@ const redirect = (returnUrl, source, forceReload) => {
         return;
     }
 };
-const SSOV2_LOCALES = ['vi-VN', 'id-ID', 'ms-MY'];
+const SSOV2_LOCALES = ['vi-VN'];
 const IS_SSOV2_ENABLED = (locale) => {
     return (!process.env.NEXT_PUBLIC_MARRY_BABY &&
         SSOV2_LOCALES.includes(locale ||
@@ -509,7 +497,6 @@ exports.isFlowFinishedSetup = isFlowFinishedSetup;
 exports.isLoginWithPhoneNotVerifedYet = isLoginWithPhoneNotVerifedYet;
 exports.isPhoneNotVerifedYet = isPhoneNotVerifedYet;
 exports.isUserFinishedSetup = isUserFinishedSetup;
-exports.locale = locale;
 exports.redirect = redirect;
 exports.resetPassword = resetPassword;
 exports.updateUserInfo = updateUserInfo;

package/build/subot/utils/index.d.ts

@@ -17,7 +17,7 @@ export declare const getUserInfoFromCookie: (reqCookie?: string) => {
     email: any;
     id: any;
 };
-export declare const getWindowId: () => string;
+export declare const getWindowId: () => any;
 export declare const getHelloSitesUrl: (locale: LOCALE | LocaleType, ignoreLocal?: boolean) => string;
 export declare const checkMobile: (userAgent: string) => boolean;
 export declare const clickAndOpenInNewTab: (url: string) => void;

package/build/subot.js

@@ -3,74 +3,74 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var index$2 = require('./index-41cfc156.js');
-var tslib_es6 = require('./tslib.es6-c3c8c8ca.js');
-var index$3 = require('./index-a4c0de8c.js');
+var index$2 = require('./index-1c545b22.js');
+var tslib_es6 = require('./tslib.es6-2b428e0e.js');
+var index$3 = require('./index-24703e8f.js');
 var Cookies = require('js-cookie');
 var fd = require('fastdom');
 var fastdomPromised = require('fastdom/extensions/fastdom-promised');
-var togetherComponentGlobalContext = require('./utils-7456fa06.js');
+var togetherComponentGlobalContext = require('./utils-ca8344ca.js');
 var formatString = require('string-format');
-var index$1 = require('./index-8e52a15d.js');
+var index$1 = require('./index-be8d8de4.js');
 var constantsDomainLocales = require('./constantsDomainLocales.js');
 var cn = require('classnames');
-var index$c = require('./index-61a0b233.js');
-var index$b = require('./index-667057a4.js');
+var index$c = require('./index-98746357.js');
+var index$b = require('./index-3578de33.js');
 var framerMotion = require('framer-motion');
 var styled = require('@emotion/styled');
-var utils = require('./utils-9a0cbb29.js');
-var index$4 = require('./index-a1cde0ec.js');
+var utils = require('./utils-e96269e2.js');
+var index$4 = require('./index-aa3468fd.js');
 var remarkable = require('remarkable');
 var other = require('@hhgtech/icons/other');
 var reactIntersectionObserver = require('react-intersection-observer');
 var core = require('@mantine/core');
-var index$5 = require('./index-072562aa.js');
+var index$5 = require('./index-65c24006.js');
 var dayjs = require('dayjs');
 var isSameOrBefore = require('dayjs/plugin/isSameOrBefore');
-var constants = require('./constants-e4dd5974.js');
+var constants = require('./constants-db39434e.js');
 var uuid = require('uuid');
-var index$6 = require('./index-839b3b8f.js');
+var index$6 = require('./index-c07785a9.js');
 var miscTheme = require('./miscTheme.js');
 var constantsIsProduction = require('./constantsIsProduction.js');
-var index$7 = require('./index-885f6871.js');
+var index$7 = require('./index-f9254156.js');
 require('@mantine/dates');
-require('./useMantineLocale-2f14fd9c.js');
-require('./index.styles-5be6c8af.js');
-require('./translationsContext-4384ed9c.js');
+require('./useMantineLocale-0e8caa51.js');
+require('./index.styles-4c55fb99.js');
+require('./translationsContext-70cdca66.js');
 require('@mantine/hooks');
-require('./other-81897f29.js');
-require('./index-44bf96a1.js');
+require('./other-fe759449.js');
+require('./index-4248215f.js');
 var isEmpty = require('lodash/isEmpty');
 var reactHookForm = require('react-hook-form');
 var PhoneInputBase = require('react-phone-number-input');
 var api = require('@react-google-maps/api');
-var usePlacesAutocomplete = require('./usePlacesAutocomplete-8666d83d.js');
+var usePlacesAutocomplete = require('./usePlacesAutocomplete-9f40b301.js');
 var miscDefaultClassWrapper = require('./miscDefaultClassWrapper.js');
-var Locale = require('./Locale-0b1d80be.js');
-var index$9 = require('./index-2dc0185a.js');
-var index$a = require('./index-dfc7a7d0.js');
-var index$8 = require('./index-895977d8.js');
-var store = require('./store-b92e2b20.js');
+var Locale = require('./Locale-242593ca.js');
+var index$9 = require('./index-9fed4f5a.js');
+var index$a = require('./index-7a02d5c4.js');
+var index$8 = require('./index-a99e0254.js');
+var store = require('./store-f2722742.js');
 require('date-fns/locale');
 require('./constantsSite.js');
 require('./constantsRiskScreener.js');
-require('./index-d677aeea.js');
+require('./index-40080fb4.js');
 require('./miscCookieHelper.js');
 require('slugify');
 require('./togetherApiPaths.js');
-require('./index-4c64613f.js');
-require('./WhatsApp-76ca0f91.js');
-require('./Spinner-19113ea7.js');
-require('./index-7087de20.js');
-require('./useScreenSize-a0254a25.js');
+require('./index-7cafd690.js');
+require('./WhatsApp-c4c30a46.js');
+require('./Spinner-831813bd.js');
+require('./index-07bfb8de.js');
+require('./useScreenSize-13312268.js');
 require('@mantine/carousel');
-require('./useUniqueId-c0f31b4e.js');
+require('./useUniqueId-e8768fb8.js');
 require('@hhgtech/icons/core');
 require('@mantine/notifications');
 require('date-fns');
 require('react-day-picker/DayPickerInput');
 require('zustand');
-require('./normalizeLink-74fc68f9.js');
+require('./normalizeLink-9b8b57c4.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { 'default': e }; }
 
@@ -1555,7 +1555,7 @@ const excludeNodeList = [
 //   return false
 // }
 const Container$u = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const { formatMessage: f, action: { pushNotifications }, } = React.useContext(togetherComponentGlobalContext.TogetherComponentGlobalContext);
     const currentUrl = useCurrentUrl();
     const { listNodes, activeId, isShowFooter, onNext, onPrev, params, onStartOver, loading, } = React.useContext(SubotInlineContext);
@@ -1566,16 +1566,15 @@ const Container$u = () => {
     const actionNextChoice = (_a = node === null || node === void 0 ? void 0 : node.actions) === null || _a === void 0 ? void 0 : _a.find((act) => act.type === index$2.NodeActionType.USER_CHOICE_NEXT);
     const actionPollSubmit = (_b = node === null || node === void 0 ? void 0 : node.actions) === null || _b === void 0 ? void 0 : _b.find(({ type }) => type == index$2.NodeActionType.POLL_BUTTON);
     const actionMultipleSubmit = (_c = node === null || node === void 0 ? void 0 : node.actions) === null || _c === void 0 ? void 0 : _c.find(({ type }) => type == index$2.NodeActionType.ACTION_MULTIPLE_BUTTON);
-    // const selectedWithOtherInput =
-    //   node?.actions?.find(({ id }) => id === value.action_id)?.type ===
-    //   NodeActionType.USER_CHOICE_TEXT_BY_INPUT
+    const selectedWithOtherInput = ((_e = (_d = node === null || node === void 0 ? void 0 : node.actions) === null || _d === void 0 ? void 0 : _d.find(({ id }) => id === value.action_id)) === null || _e === void 0 ? void 0 : _e.type) ===
+        index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT;
     const handleNextChoice = () => {
         const nextValue = {
             node_id: node.id,
             action_id: actionNextChoice === null || actionNextChoice === void 0 ? void 0 : actionNextChoice.id,
             action_value: actionNextChoice === null || actionNextChoice === void 0 ? void 0 : actionNextChoice.key,
         };
-        onNext(Object.assign(Object.assign(Object.assign({}, params), node === null || node === void 0 ? void 0 : node._message), nextValue));
+        onNext(Object.assign(Object.assign(Object.assign({}, params), nextValue), node === null || node === void 0 ? void 0 : node._message));
     };
     const handlePollSubmit = () => {
         var _a;
@@ -1620,15 +1619,15 @@ const Container$u = () => {
             });
         }
         else {
-            onNext(Object.assign(Object.assign(Object.assign({}, params), node === null || node === void 0 ? void 0 : node._message), value));
+            onNext(Object.assign(Object.assign(Object.assign({}, params), value), node === null || node === void 0 ? void 0 : node._message));
         }
     };
     if (!isShowFooter)
         return null;
     const found = listNodes.find((nodeItem) => nodeItem.id == activeId);
     const isDisabled = disabledNodeList.includes((found === null || found === void 0 ? void 0 : found.type) || '') ||
-        disabledPositionList.includes((found === null || found === void 0 ? void 0 : found.position) || '');
-    // selectedWithOtherInput
+        disabledPositionList.includes((found === null || found === void 0 ? void 0 : found.position) || '') ||
+        selectedWithOtherInput;
     const isDisplayAction = !excludeNodeList.includes((found === null || found === void 0 ? void 0 : found.type) || '');
     return (React__default["default"].createElement(StyledWrap$p, { "data-show-action": isDisplayAction },
         React__default["default"].createElement("button", { onClick: onStartOver, "data-event-category": "Service Connection", "data-event-action": "Risk Screening Start Over", "data-event-label": currentUrl, "data-bot-id": params.bot_id, className: "si-footer-start-over", disabled: Boolean((botItem === null || botItem === void 0 ? void 0 : botItem.subot_field_type) && activeId == (listNodes === null || listNodes === void 0 ? void 0 : listNodes[1].id)) },
@@ -5434,9 +5433,21 @@ const stylesTextarea = {
             boxShadow: '0px 0px 0px 2px var(--subot-inline-primary-color-300) !important',
         },
     },
+};
+const stylesButtonSubmitOther = {
+    root: {
+        ':not(:disabled)': {
+            backgroundColor: 'var(--subot-inline-primary-color) !important',
+            '&:hover': {
+                backgroundColor: 'var(--subot-inline-primary-color-hover) !important',
+            },
+        },
+    },
 };
 
 const Container$a = ({ action, onChange, active, htmlType, formSubmitMeta, }) => {
+    const timeoutId = React.useRef(null);
+    const { formatMessage: f } = React.useContext(togetherComponentGlobalContext.TogetherComponentGlobalContext);
     const currentUrl = useCurrentUrl();
     const inputRef = React.useRef(null);
     const [otherText, setOtherText] = React.useState('');
@@ -5444,6 +5455,14 @@ const Container$a = ({ action, onChange, active, htmlType, formSubmitMeta, }) =>
     const isActionPollWithOther = (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.POLL_CHOICE_TEXT_BY_INPUT;
     const isActionSelectWithOther = (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT ||
         isActionPollWithOther;
+    const actionSubmitted = isActionPollWithOther
+        ? {
+            key: action === null || action === void 0 ? void 0 : action.key,
+            control: index$2.ELEMENT_CONTROL_INPUT_TYPE[action === null || action === void 0 ? void 0 : action.type],
+            value: '',
+            action_id: action === null || action === void 0 ? void 0 : action.id,
+        }
+        : action;
     React.useEffect(() => {
         var _a, _b;
         if (active) {
@@ -5451,24 +5470,45 @@ const Container$a = ({ action, onChange, active, htmlType, formSubmitMeta, }) =>
             (_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.focus();
         }
     }, [active, formSubmitMeta]);
+    const handleClickWithFormMeta = () => {
+        if (otherText) {
+            onChange &&
+                onChange(actionSubmitted, [
+                    {
+                        key: KEY_OF_TEXT_CHOICE_WITH_OTHER_FIELD,
+                        control: 'text',
+                        value: otherText,
+                    },
+                ]);
+        }
+    };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const onChangeTextArea = (evt) => {
         setOtherText(evt.target.value);
-        onChange === null || onChange === void 0 ? void 0 : onChange(action, [
-            {
-                key: KEY_OF_TEXT_CHOICE_WITH_OTHER_FIELD,
-                control: 'text',
-                value: evt.target.value,
-                action_id: action === null || action === void 0 ? void 0 : action.id,
-            },
-        ]);
+        if (isActionPollWithOther) {
+            timeoutId.current && clearTimeout(timeoutId.current);
+            timeoutId.current = setTimeout(() => {
+                onChange &&
+                    onChange(actionSubmitted, [
+                        {
+                            key: KEY_OF_TEXT_CHOICE_WITH_OTHER_FIELD,
+                            control: 'text',
+                            value: evt.target.value,
+                        },
+                    ]);
+            }, 300);
+        }
     };
     return (React__default["default"].createElement(React__default["default"].Fragment, null,
-        React__default["default"].createElement(StyledWrap$5, { id: "si-action-text-choice", active: !!active, onClick: () => onChange === null || onChange === void 0 ? void 0 : onChange(action), "data-event-category": "Service Connection", "data-event-action": "Risk Screening Answer Click", "data-event-label": currentUrl, "data-bot-id": params.bot_id },
+        React__default["default"].createElement(StyledWrap$5, { id: "si-action-text-choice", active: !!active, onClick: () => onChange && onChange(actionSubmitted), "data-event-category": "Service Connection", "data-event-action": "Risk Screening Answer Click", "data-event-label": currentUrl, "data-bot-id": params.bot_id },
             React__default["default"].createElement(StyledRadioIcon, { active: !!active }, htmlType === 'checkbox' && (React__default["default"].createElement(Checkbox, { className: "icon-checkbox", viewBox: "0 0 22 22" }))),
             React__default["default"].createElement("div", { className: "label" }, action === null || action === void 0 ? void 0 : action.label)),
         isActionSelectWithOther && active && (React__default["default"].createElement(core.Box, { px: "2px", style: { textAlign: 'right' } },
-            React__default["default"].createElement(core.Textarea, { ref: inputRef, placeholder: action === null || action === void 0 ? void 0 : action.label, styles: stylesTextarea, value: otherText, onChange: onChangeTextArea, maxLength: 360 })))));
+            React__default["default"].createElement(core.Textarea, { ref: inputRef, placeholder: action === null || action === void 0 ? void 0 : action.label, styles: stylesTextarea, value: otherText, onChange: onChangeTextArea, maxLength: 360 }),
+            !isActionPollWithOther && (React__default["default"].createElement(index$4.Button, { size: "sm", mt: "5px", styles: stylesButtonSubmitOther, disabled: !otherText, onClick: handleClickWithFormMeta }, f({
+                id: 'feedback.submit',
+                defaultMessage: 'Submit',
+            })))))));
 };
 Container$a.displayName = 'SubotInlineActionTextChoice';
 
@@ -5628,49 +5668,34 @@ const Container$5 = ({ node, indexNumber }) => {
         }
         return [];
     }, [value, value === null || value === void 0 ? void 0 : value.selected_actions]);
-    const handleOnChange = (action, formSubmitMeta) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
-        var _b, _c;
-        if (action) {
-            const _value = JSON.parse(JSON.stringify(Object.assign(Object.assign({}, value), { action_id: submitButton === null || submitButton === void 0 ? void 0 : submitButton.id, action_value: submitButton === null || submitButton === void 0 ? void 0 : submitButton.key, selected_actions: Object.assign({}, value === null || value === void 0 ? void 0 : value.selected_actions) })));
-            if ((action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.POLL_CHOICE_TEXT_BY_INPUT ||
-                (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT) {
-                const isExistedPoll = (_value === null || _value === void 0 ? void 0 : _value.selected_actions) && action.id in _value.selected_actions;
-                if (isExistedPoll) {
-                    if (formSubmitMeta) {
-                        _value.form_submit_meta = formSubmitMeta;
-                    }
-                    else {
-                        delete _value.form_submit_meta;
-                        (_b = _value.selected_actions) === null || _b === void 0 ? true : delete _b[action.id];
-                    }
-                }
-                else {
-                    if (action === null || action === void 0 ? void 0 : action.id) {
-                        _value.selected_actions = Object.assign(Object.assign({}, _value.selected_actions), { [action.id]: action.key || '' });
-                    }
-                }
-                setValue(_value);
-                onChange === null || onChange === void 0 ? void 0 : onChange(_value);
-                return;
-            }
-            if (!((_c = _value.selected_actions) === null || _c === void 0 ? void 0 : _c[action.id])) {
-                _value.selected_actions = Object.assign(Object.assign({}, _value.selected_actions), { [action.id]: action.key || '' });
-                onChange && onChange(_value);
-                setValue(_value);
-                return;
-            }
-            if (_value.selected_actions[action.id]) {
-                delete _value.selected_actions[action.id];
-                onChange && onChange(_value);
-                setValue(_value);
-                return;
-            }
+    const handleOnChange = (action) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
+        if (!action) {
+            return;
+        }
+        const _value = Object.assign(Object.assign({}, value), { action_id: submitButton === null || submitButton === void 0 ? void 0 : submitButton.id, action_value: submitButton === null || submitButton === void 0 ? void 0 : submitButton.key });
+        if (!_value.selected_actions) {
+            const tmp = {};
+            tmp[action.id] = action === null || action === void 0 ? void 0 : action.key;
+            setValue(Object.assign(Object.assign({}, _value), { selected_actions: Object.assign({}, tmp) }));
+            return;
+        }
+        if (!_value.selected_actions[action.id]) {
+            _value.selected_actions[action.id] = action === null || action === void 0 ? void 0 : action.key;
+            onChange && onChange(_value);
+            setValue(_value);
+            return;
+        }
+        if (_value.selected_actions[action.id]) {
+            delete _value.selected_actions[action.id];
+            onChange && onChange(_value);
+            setValue(_value);
+            return;
         }
     });
     const actionsRemoveMultipleBtn = (_a = node === null || node === void 0 ? void 0 : node.actions) === null || _a === void 0 ? void 0 : _a.filter((a) => a.type !== index$2.NodeActionType.ACTION_MULTIPLE_BUTTON);
     return (React__default["default"].createElement(StyledWrap$3, { id: "si-node-text" },
         React__default["default"].createElement(Container$h, { intents: (node === null || node === void 0 ? void 0 : node.intents) || [], indexNumber: indexNumber }),
-        React__default["default"].createElement(Container$7, { value: activeActions, actions: actionsRemoveMultipleBtn, onChange: handleOnChange, formSubmitMeta: value === null || value === void 0 ? void 0 : value.form_submit_meta })));
+        React__default["default"].createElement(Container$7, { value: activeActions, actions: actionsRemoveMultipleBtn, onChange: handleOnChange })));
 };
 Container$5.displayName = 'SubotInlineNodeMultipleContainer';
 
@@ -5714,7 +5739,8 @@ const StyledWrap$2 = styled__default["default"].div `
 `;
 
 const Container$4 = ({ node, indexNumber }) => {
-    const { onChange, setIsShowFooter } = React.useContext(SubotInlineContext);
+    var _a;
+    const { params, setIsShowFooter } = React.useContext(SubotInlineContext);
     const { value, setValue } = React.useContext(NodeContext);
     const descriptionNode = useDescriptionPollNode({ node });
     React.useMemo(() => {
@@ -5731,41 +5757,48 @@ const Container$4 = ({ node, indexNumber }) => {
         return null;
     }, [node === null || node === void 0 ? void 0 : node.actions]);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const handleOnChange = (action, formSubmitMeta) => {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const newValue = JSON.parse(JSON.stringify(Object.assign(Object.assign({}, value), { node_id: node.id, action_id: submitButton === null || submitButton === void 0 ? void 0 : submitButton.id, action_value: submitButton === null || submitButton === void 0 ? void 0 : submitButton.key, form_submit_meta: [...((value === null || value === void 0 ? void 0 : value.form_submit_meta) || [])] })));
-        if ((action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.POLL_CHOICE_TEXT_BY_INPUT ||
-            (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT) {
-            const isExistedPoll = (_a = newValue.form_submit_meta) === null || _a === void 0 ? void 0 : _a.some(({ action_id }) => action_id === action.id);
-            if (isExistedPoll) {
-                newValue.form_submit_meta =
-                    typeof formSubmitMeta === 'undefined'
-                        ? (_b = newValue.form_submit_meta) === null || _b === void 0 ? void 0 : _b.filter(({ action_id }) => action_id !== action.id)
-                        : (_c = newValue.form_submit_meta) === null || _c === void 0 ? void 0 : _c.filter(({ action_id }) => action_id !== action.id).concat(formSubmitMeta);
+    const handleOnChange = (formValue, formSubmitMetaWithOther) => {
+        if (formValue) {
+            const { is_multi_select } = node;
+            const _message = Object.assign(Object.assign(Object.assign({}, params), value), { node_id: node.id, action_id: submitButton === null || submitButton === void 0 ? void 0 : submitButton.id, action_value: submitButton === null || submitButton === void 0 ? void 0 : submitButton.key, form_submit_meta: (value === null || value === void 0 ? void 0 : value.form_submit_meta)
+                    ? [...value === null || value === void 0 ? void 0 : value.form_submit_meta]
+                    : [] });
+            let tmpFormSubmitMeta = [];
+            const currentSubmitMeta = [
+                ..._message === null || _message === void 0 ? void 0 : _message.form_submit_meta,
+            ];
+            if (!formSubmitMetaWithOther) {
+                const formUpdateIndex = currentSubmitMeta.findIndex(({ action_id }) => action_id === formValue.action_id);
+                /**
+                 * The current logic when onChange is called will remove/add this poll action in the submit meta
+                 *  But IF the onChange is called due to the input text other, this action will be not removed from the previous list
+                 */
+                if (formUpdateIndex !== -1) {
+                    tmpFormSubmitMeta = [
+                        ...currentSubmitMeta.slice(0, formUpdateIndex),
+                        ...currentSubmitMeta.slice(formUpdateIndex + 1),
+                    ];
+                }
+                else {
+                    if (!is_multi_select) {
+                        tmpFormSubmitMeta = [Object.assign({}, formValue)];
+                    }
+                    else {
+                        tmpFormSubmitMeta = [...currentSubmitMeta];
+                        tmpFormSubmitMeta.push(formValue);
+                    }
+                }
             }
             else {
-                newValue.form_submit_meta = (_d = newValue.form_submit_meta) === null || _d === void 0 ? void 0 : _d.concat([
-                    {
-                        key: action === null || action === void 0 ? void 0 : action.key,
-                        control: index$2.ELEMENT_CONTROL_INPUT_TYPE[action === null || action === void 0 ? void 0 : action.type] || 'text',
-                        value: '',
-                        action_id: action === null || action === void 0 ? void 0 : action.id,
-                    },
-                ]);
+                tmpFormSubmitMeta = currentSubmitMeta;
             }
-            setValue(newValue);
-            onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
-            return;
-        }
-        const isPoll = (_e = newValue.form_submit_meta) === null || _e === void 0 ? void 0 : _e.some(({ action_id }) => action_id === (action === null || action === void 0 ? void 0 : action.action_id));
-        if (isPoll) {
-            newValue.form_submit_meta = (_f = newValue.form_submit_meta) === null || _f === void 0 ? void 0 : _f.filter(({ action_id }) => action_id !== (action === null || action === void 0 ? void 0 : action.action_id));
+            _message.form_submit_meta = [...tmpFormSubmitMeta]
+                .filter((item) => formSubmitMetaWithOther
+                ? item.key !== KEY_OF_TEXT_CHOICE_WITH_OTHER_FIELD
+                : true)
+                .concat(formSubmitMetaWithOther || []);
+            setValue(_message);
         }
-        else {
-            newValue.form_submit_meta = (_g = newValue.form_submit_meta) === null || _g === void 0 ? void 0 : _g.concat([action]);
-        }
-        setValue(newValue);
-        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
     };
     const activeActions = React.useMemo(() => {
         if (value === null || value === void 0 ? void 0 : value.form_submit_meta) {
@@ -5773,14 +5806,10 @@ const Container$4 = ({ node, indexNumber }) => {
         }
         return [];
     }, [value, value === null || value === void 0 ? void 0 : value.form_submit_meta]);
-    React.useEffect(() => {
-        console.log('adfsafsdf');
-        setValue(node === null || node === void 0 ? void 0 : node._message);
-    }, []);
     return (React__default["default"].createElement(StyledWrap$2, null,
         React__default["default"].createElement(Container$h, { intents: node.intents || [], indexNumber: indexNumber }),
         React__default["default"].createElement("p", { className: "si-poll-description" }, descriptionNode),
-        React__default["default"].createElement(Container$7, { node_type: node === null || node === void 0 ? void 0 : node.type, value: activeActions, actions: node === null || node === void 0 ? void 0 : node.actions, onChange: handleOnChange, formSubmitMeta: value === null || value === void 0 ? void 0 : value.form_submit_meta })));
+        React__default["default"].createElement(Container$7, { node_type: node === null || node === void 0 ? void 0 : node.type, value: activeActions, actions: node === null || node === void 0 ? void 0 : node.actions, onChange: handleOnChange, formSubmitMeta: (_a = node._message) === null || _a === void 0 ? void 0 : _a.form_submit_meta })));
 };
 Container$4.displayName = 'SubotinlineNodePoll';
 
@@ -5851,6 +5880,7 @@ const StyledWrap = styled__default["default"].div `
 `;
 
 const Container$2 = ({ node, indexNumber }) => {
+    var _a;
     const { params, onSubmit, setIsShowFooter, listNodes, activeId, setLoading, onChange, } = React.useContext(SubotInlineContext);
     const { value, setValue } = React.useContext(NodeContext);
     React.useMemo(() => {
@@ -5870,7 +5900,7 @@ const Container$2 = ({ node, indexNumber }) => {
         const res = yield subotInlineMessage(newParams);
         setLoading(false);
         if ((res === null || res === void 0 ? void 0 : res._status) === 1) {
-            const _a = res === null || res === void 0 ? void 0 : res._data, { node } = _a, restData = tslib_es6.__rest(_a, ["node"]);
+            const _b = res === null || res === void 0 ? void 0 : res._data, { node } = _b, restData = tslib_es6.__rest(_b, ["node"]);
             const nextNode = Object.assign(Object.assign({}, node), { _message: Object.assign(Object.assign({}, restData), { node_id: node.id }) });
             onSubmit(nextNode, newParams);
         }
@@ -5878,21 +5908,28 @@ const Container$2 = ({ node, indexNumber }) => {
     const handleOnChange = (action, formSubmitMeta) => tslib_es6.__awaiter(void 0, void 0, void 0, function* () {
         if (!action)
             return;
-        const actionWithOther = (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT ||
-            (action === null || action === void 0 ? void 0 : action.type) === index$2.NodeActionType.POLL_CHOICE_TEXT_BY_INPUT;
-        const newValue = Object.assign(Object.assign({}, value), { action_id: action === null || action === void 0 ? void 0 : action.id, action_value: action === null || action === void 0 ? void 0 : action.key, form_submit_meta: formSubmitMeta });
-        if (actionWithOther) {
-            setValue(newValue);
-            onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+        const isActionSelectWithOther = action.type === index$2.NodeActionType.USER_CHOICE_TEXT_BY_INPUT;
+        setValue(Object.assign(Object.assign({}, value), { action_id: action === null || action === void 0 ? void 0 : action.id, action_value: action === null || action === void 0 ? void 0 : action.key }));
+        if (!isActionSelectWithOther) {
+            handleOnChangeNormal(action);
             return;
         }
-        delete newValue.form_submit_meta;
-        setValue(newValue);
-        handleOnChangeNormal(action);
+        if (formSubmitMeta) {
+            const newParams = Object.assign(Object.assign(Object.assign(Object.assign({}, params), value), { node_id: node.id, action_id: action === null || action === void 0 ? void 0 : action.id, action_value: action === null || action === void 0 ? void 0 : action.key, form_submit_meta: formSubmitMeta }), getCurrentTotalDynamicScore(listNodes, activeId, action.id));
+            onChange(newParams);
+            setLoading(true);
+            const res = yield subotInlineMessage(newParams);
+            setLoading(false);
+            if ((res === null || res === void 0 ? void 0 : res._status) === 1) {
+                const _c = res === null || res === void 0 ? void 0 : res._data, { node } = _c, restData = tslib_es6.__rest(_c, ["node"]);
+                const nextNode = Object.assign(Object.assign({}, node), { _message: Object.assign(Object.assign({}, restData), { node_id: node.id }) });
+                onSubmit(nextNode, newParams);
+            }
+        }
     });
     return (React__default["default"].createElement(StyledWrap, { id: "si-node-text" },
         React__default["default"].createElement(Container$h, { intents: (node === null || node === void 0 ? void 0 : node.intents) || [], indexNumber: indexNumber }),
-        React__default["default"].createElement(Container$7, { value: (value === null || value === void 0 ? void 0 : value.action_id) ? [value === null || value === void 0 ? void 0 : value.action_id] : [], actions: node === null || node === void 0 ? void 0 : node.actions, onChange: handleOnChange, formSubmitMeta: value === null || value === void 0 ? void 0 : value.form_submit_meta })));
+        React__default["default"].createElement(Container$7, { value: (value === null || value === void 0 ? void 0 : value.action_id) ? [value === null || value === void 0 ? void 0 : value.action_id] : [], actions: node === null || node === void 0 ? void 0 : node.actions, onChange: handleOnChange, formSubmitMeta: (_a = node === null || node === void 0 ? void 0 : node._message) === null || _a === void 0 ? void 0 : _a.form_submit_meta })));
 };
 Container$2.displayName = 'SubotInlineNodeTextContainer';