@redneckz/wildless-cms-uni-blocks 0.14.548 → 0.14.549

package/bundle/bundle.umd.js

@@ -1045,26 +1045,35 @@
 
     const identity = (_) => _;
 
-    const useForm = (initialState, { resetOnSubmit, onSubmit, } = {}) => {
-        const [formState, setFormState] = useState(initialState);
+    // eslint-disable-next-line max-lines-per-function
+    const useForm = (initialState, { resetOnSubmit, onSubmit, normalize, } = {}) => {
+        const [formState, setFormStateUnsafe] = useState(initialState);
+        const setFormState = useCallback(normalize
+            ? (_) => setFormStateUnsafe(_ instanceof Function
+                ? (prev) => {
+                    const _normalize = normalize(_(prev));
+                    return shellowCompare(prev, _normalize) ? prev : _normalize;
+                }
+                : normalize(_))
+            : setFormStateUnsafe, [normalize]);
+        useEffect(() => {
+            if (normalize) {
+                setFormStateUnsafe(normalize);
+            }
+        }, [normalize]);
         const [isDirtyForm, setDirtyForm] = useState(false);
         const [dirtyFieldsMap, setDirtyFieldsMap] = useState({});
-        const handlersMap = useRef({});
         const field = useCallback((fieldName, options) => {
             const { parse = identity, format = identity } = options || {};
-            if (!handlersMap.current) {
-                handlersMap.current = {};
-            }
-            handlersMap.current[fieldName] ||= (value) => {
-                setFormState((prev) => ({ ...prev, [fieldName]: parse(value) }));
-                setDirtyFieldsMap((prev) => ({ ...prev, [fieldName]: true }));
-            };
             return {
                 value: format(formState[fieldName]),
                 isDirty: isDirtyForm || dirtyFieldsMap[fieldName],
-                onChange: handlersMap.current[fieldName],
+                onChange: (value) => {
+                    setFormState((prev) => ({ ...prev, [fieldName]: parse(value) }));
+                    setDirtyFieldsMap((prev) => ({ ...prev, [fieldName]: true }));
+                },
             };
-        }, [formState, isDirtyForm, dirtyFieldsMap]);
+        }, [setFormState, isDirtyForm, dirtyFieldsMap]);
         const update = useCallback((_) => {
             setFormState(_);
             setDirtyFieldsMap(_);
@@ -1090,6 +1099,7 @@
             },
         ];
     };
+    const shellowCompare = (a, b) => Object.keys({ ...a, ...b }).every((key) => a[key] === b[key]);
 
     const ApplicationFormLayout = JSX((props) => {
         const { className, title, children, ...rest } = props;
@@ -1541,6 +1551,9 @@
         feedbackMethod: defaultSelectValidator,
         serviceType: defaultSelectValidator,
         serviceDirection: defaultSelectValidator,
+        meetingDay: defaultValidator,
+        product: defaultValidator,
+        localities: defaultValidator,
         consentDataProcessing: agreementValidator,
         annualRevenue: defaultValidator,
     };
@@ -1770,6 +1783,15 @@
         { key: 'phone', text: 'Телефонный звонок' },
         { key: 'email', text: 'Электронное сообщение' },
     ];
+    const PRODUCT_TYPE = [
+        { key: 'Карта дебетовая', text: 'Карта дебетовая' },
+        { key: 'Карта кредитная', text: 'Карта кредитная' },
+        { key: 'Потребительский кредит', text: 'Потребительский кредит' },
+        { key: 'Ипотечный кредит', text: 'Ипотечный кредит' },
+        { key: 'Вклад', text: 'Вклад' },
+        { key: 'Накопительный счет', text: 'Накопительный счет' },
+    ];
+    const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';
 
     const FeedbackMethodField = JSX(({ field }) => (jsx(SelectControl, { label: "\u0421\u043F\u043E\u0441\u043E\u0431 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u044F \u043E\u0442\u0432\u0435\u0442\u0430", options: FEEDBACK_METHOD, ...withValidator(field('feedbackMethod'), validatorObj.feedbackMethod) })));
 
@@ -1783,29 +1805,51 @@
         return (jsx(SelectControl, { label: "\u0422\u0435\u043C\u0430", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0435\u043C\u0443", options: FEEDBACK_TYPES, ...withValidator(feedbackType, validatorObj.feedbackType) }));
     });
 
+    const getRegionUrl = (typeForm) => typeForm === 'OUTSERVICE' ? OUT_SERVICE_URL : undefined;
+
     const IsClientField = JSX(({ field }) => (jsx(CheckboxWithError, { ...field('isClient'), text: '\u042F\u0432\u043B\u044F\u044E\u0441\u044C \u043A\u043B\u0438\u0435\u043D\u0442\u043E\u043C \u0431\u0430\u043D\u043A\u0430 \u0410\u041E "\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A"' })));
 
+    function isRenderField({ input, field, }) {
+        const { condition } = input;
+        const { value } = field(condition?.name || '');
+        return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
+    }
+
+    const REGIONS_URL = '/api/v1/regions';
+    function useRegions(url = REGIONS_URL) {
+        const { data } = useAsyncData(url, fetchJSONUnsafe);
+        return Array.isArray(data) ? data : [];
+    }
+
+    const LocalitiesField = JSX(({ field, input }) => {
+        const fieldRegion = field('region');
+        const regionKey = fieldRegion?.value?.key;
+        const localities = useRegions(OUT_SERVICE_URL)
+            ?.find((_) => _.code === regionKey)
+            ?.localities?.map((_) => ({ key: _, text: _ }));
+        useEffect(() => {
+            if (regionKey !== '') {
+                field?.('localities')?.onChange?.('');
+            }
+        }, [regionKey]);
+        return (jsx(SelectControl, { label: "\u041D\u0430\u0441\u0435\u043B\u0435\u043D\u043D\u044B\u0439 \u043F\u0443\u043D\u043A\u0442", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435", options: localities, ...getValidation(field('localities'), validatorObj.localities, input?.required), isSearch: true }));
+    });
+
     const SlideCheckbox = JSX(({ value = false, text, type = 'checkbox', onChange }) => (jsxs("div", { role: type, "aria-checked": value, className: "flex justify-start items-center w-full cursor-pointer mb-s", onClick: () => onChange && onChange(!value), children: [jsx("div", { className: style('relative flex-shrink-0 duration-300 w-9 h-5 mr-s rounded-2xl', value ? 'bg-primary-main' : 'bg-main-divider'), children: jsx("div", { className: style('absolute opacity-80 duration-500 top-0.5 w-4 h-4 bg-white rounded-full', value ? 'left-1/2' : 'left-[5%]') }) }), text ? (jsx(Text, { size: "text-l", font: "font-light", color: "text-primary-text", children: text })) : null] })));
 
     const OnlineCheckoutField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 \u043E\u043D\u043B\u0430\u0439\u043D-\u043A\u0430\u0441\u0441\u0443", ...field('onlineCheckout') })) : null);
 
-    const SecondaryPhoneField = JSX(({ field }) => {
-        const fieldPhone = field('secondaryPhone');
-        return (jsx(InputPhoneControl, { label: "\u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0442\u0435\u043B\u0435\u0444\u043E\u043D", ...(!fieldPhone.value || fieldPhone.value === '+7 ('
-                ? fieldPhone
-                : withValidator(fieldPhone, validatorObj.secondaryPhone)) }));
+    const PartnerCommentsField = JSX(({ field, input }) => {
+        const { required, ...rest } = input;
+        return (jsx(InputControl, { ...getValidation(field('partnerComments'), validatorObj.partnerComments, required), placeholder: "\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u0443\u044E\u0449\u0438\u0439 \u0432\u0430\u0441 \u0432\u043E\u043F\u0440\u043E\u0441", isTextarea: true, ...rest }));
     });
 
     const PosTerminalField = JSX(({ field }) => isAcquiringTrade(field('acquiringType')?.value?.key) ? (jsx(SlideCheckbox, { type: "radio", text: "\u0425\u043E\u0447\u0443 POS-\u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B", ...field('posTerminal') })) : null);
 
-    const REGIONS_URL = '/api/v1/regions';
-    function useRegions() {
-        const { data } = useAsyncData(REGIONS_URL, fetchJSONUnsafe);
-        return Array.isArray(data) ? data : [];
-    }
+    const ProductField = JSX(({ field }) => (jsx(SelectControl, { placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043F\u0440\u043E\u0434\u0443\u043A\u0442", label: "\u041F\u0440\u043E\u0434\u0443\u043A\u0442", options: PRODUCT_TYPE, ...withValidator(field('product'), validatorObj.product) })));
 
-    const RegionField = JSX(({ field, input }) => {
-        const regions = useRegions();
+    const RegionField = JSX(({ field, input, url }) => {
+        const regions = useRegions(url);
         return (jsx(SelectControl, { label: "\u0424\u0438\u043B\u0438\u0430\u043B", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0438\u043B\u0438\u0430\u043B", isSearch: true, options: useMemo(() => regions?.map(({ code = '', name = '' }) => ({ key: code, text: name })), [regions]), ...getValidation(field('region'), validatorObj.region, input?.required) }));
     });
 
@@ -1818,6 +1862,13 @@
         return (jsx(SelectControl, { label: "\u0420\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", options: regions, ...getValidation(field('region'), validatorObj.region, input?.required) }));
     });
 
+    const SecondaryPhoneField = JSX(({ field }) => {
+        const fieldPhone = field('secondaryPhone');
+        return (jsx(InputPhoneControl, { label: "\u0414\u043E\u043F\u043E\u043B\u043D\u0438\u0442\u0435\u043B\u044C\u043D\u044B\u0439 \u0442\u0435\u043B\u0435\u0444\u043E\u043D", ...(!fieldPhone.value || fieldPhone.value === '+7 ('
+                ? fieldPhone
+                : withValidator(fieldPhone, validatorObj.secondaryPhone)) }));
+    });
+
     const ServiceDirectionField = JSX(({ field }) => (jsx(SelectControl, { label: "\u041D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u0431\u0441\u043B\u0443\u0436\u0438\u0432\u0430\u043D\u0438\u044F", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u043D\u0430\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435", options: SERVICE_DIRECTIONS, ...withValidator(field('serviceDirection'), validatorObj.serviceDirection) })));
 
     const MIN_CREDIT_TERM = 1;
@@ -1860,12 +1911,15 @@
             fullName: (jsx(InputControl, { label: "\u0424\u0418\u041E", ...getValidation(field('fullName'), validatorObj.fullName, required), ...rest })),
             inn: (jsx(InputControl, { label: "\u0418\u041D\u041D", type: "number", ...getValidation(field('inn'), validatorObj.inn, required) })),
             comment: jsx(CommentField, { field: field, input: input }),
-            region: isPremium ? (jsx(RegionPremiumField, { field: field })) : (jsx(RegionField, { field: field, input: input })),
+            region: isPremium ? (jsx(RegionPremiumField, { field: field })) : (jsx(RegionField, { field: field, input: input, url: getRegionUrl(typeForm) })),
             addressBranch: jsx(AddressBranchField, { field: field, input: input, isPremium: isPremium }),
             birthday: (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthday'), validatorObj.birthday, required) })),
+            desiredMeetingDate: (jsx(DatePickerControl, { label: "\u0416\u0435\u043B\u0430\u0435\u043C\u0430\u044F \u0434\u0430\u0442\u0430 \u0432\u0441\u0442\u0440\u0435\u0447\u0438", ...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, required) })),
+            product: jsx(ProductField, { field: field }),
+            localities: jsx(LocalitiesField, { field: field, input: input }),
             isClient: jsx(IsClientField, { field: field }),
             consentToReceiveMaterials: (jsx(CheckboxWithError, { ...field('consentToReceiveMaterials'), text: "\u0421\u043E\u0433\u043B\u0430\u0441\u0435\u043D \u043D\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0438\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u043E\u043D\u043D\u044B\u0445 \u0438 \u0430\u043D\u0430\u043B\u0438\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0445 \u043C\u0430\u0442\u0435\u0440\u0438\u0430\u043B\u043E\u0432 \u043F\u043E \u044D\u043B\u0435\u043A\u0442\u0440\u043E\u043D\u043D\u043E\u0439 \u043F\u043E\u0447\u0442\u0435" })),
-            partnerComments: (jsx(InputControl, { ...getValidation(field('partnerComments'), validatorObj.partnerComments, required), placeholder: "\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u0443\u044E\u0449\u0438\u0439 \u0432\u0430\u0441 \u0432\u043E\u043F\u0440\u043E\u0441", isTextarea: true, ...rest })),
+            partnerComments: jsx(PartnerCommentsField, { field: field, input: input }),
             collectionCount: (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432 \u0438\u043D\u043A\u0430\u0441\u0441\u0430\u0446\u0438\u0438", type: "number", ...getValidation(field('collectionCount'), validatorObj.collectionCount, required) })),
             acquiringType: jsx(AcquiringField, { field: field, input: input }),
             onlineCheckout: jsx(OnlineCheckoutField, { field: field }),
@@ -1884,11 +1938,6 @@
         };
         return isRenderField({ input, field }) ? (jsx("div", { children: InputsMap[input?.name] }, String(i))) : null;
     };
-    function isRenderField({ input, field, }) {
-        const { condition } = input;
-        const { value } = field(condition?.name || '');
-        return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
-    }
 
     const getPartnerComments = (data) => {
         const { acquiringType, onlineCheckout = false, posTerminal = false, term, amount, annualRevenue, } = data;
@@ -2544,7 +2593,7 @@
     const CalculatorStyle = {
         wrapper: 'flex flex-col justify-between @4xl:flex-row gap-x-4xl gap-y-7 @xl:gap-y-4xl',
         input: 'flex flex-col lg:max-w-80 lg:w-1/2 gap-2xl',
-        result: 'flex flex-col gap-y-xl min-w-60',
+        result: 'flex flex-col gap-y-xl min-w-52',
     };
 
     const FormatValue = JSX(({ value, fractionDigits, fixed, prefix, postfix }) => (jsx(Text, { size: "text-h3", children: typeof value === 'number'
@@ -2822,7 +2871,7 @@
     const renderBusinessDepositParamsForm = (calculatorParams, field) => (jsxs("div", { className: "space-y-s", children: [jsx(Text, { color: "text-secondary-text", font: "font-light", children: "\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B" }), jsxs("div", { className: "flex flex-col gap-y-lg sm:gap-y-s", children: [jsx(Checkbox, { text: "\u041F\u043E\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435", disabled: calculatorParams.isDisabledOperatingDeposit, ...field('isReplenished'), value: calculatorParams.isReplenished }), jsx(Checkbox, { disabled: calculatorParams.isDisabledOperatingDeposit, text: "\u0427\u0430\u0441\u0442\u0438\u0447\u043D\u043E\u0435 \u0441\u043D\u044F\u0442\u0438\u0435", ...field('isPartialWithdrawal'), value: calculatorParams.isPartialWithdrawal })] })] }));
 
     const getDefaultParamsMin = (rateRows) => getDefaultParams([(i, acc) => i < acc, (i, prev) => i?.maxSum > prev?.maxSum], rateRows);
-    const getDefaultParamsMax = (rateRows) => getDefaultParams([(i, acc) => i > acc, (i, prev) => i?.minSum < prev?.minSum], rateRows);
+    const getDefaultParamsMax = (rateRows = [], isNewClient = false) => getDefaultParams([(i, acc) => i > acc, (i, prev) => i?.minSum < prev?.minSum], rateRows?.filter((_) => isNewClient === Boolean(_?.isNewClient)));
     const getDefaultParams = (comparators, rateRows) => {
         if (!rateRows?.length) {
             return undefined;
@@ -3036,8 +3085,6 @@
     });
     const renderCreditParamsForm$1 = (params, field) => (jsxs("div", { className: "flex flex-col gap-y-2xl", children: [params.isShowSalaryClient ? (jsx(Checkbox, { text: `Получаю зарплату на счёт\nв Россельхозбанке`, ...field('isSalaryClient'), value: params.isSalaryClient, className: "whitespace-pre-line sm:whitespace-normal" })) : null, params.isShowStateEmployee ? (jsx(Checkbox, { text: "\u0420\u0430\u0431\u043E\u0442\u0430\u044E \u0432 \u0431\u044E\u0434\u0436\u0435\u0442\u043D\u043E\u0439 \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438", ...field('isStateEmployee'), value: params.isStateEmployee })) : null, params.isShowPensionClient ? (jsx(Checkbox, { text: "\u041F\u043E\u043B\u0443\u0447\u0430\u044E \u043F\u0435\u043D\u0441\u0438\u044E \u043D\u0430 \u043A\u0430\u0440\u0442\u0443 \u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u0430", ...field('isPensionClient'), value: params.isPensionClient })) : null, params.isShowInsurance ? (jsx(Checkbox, { text: "\u041A\u043E\u043C\u043F\u043B\u0435\u043A\u0441\u043D\u0430\u044F \u0441\u0442\u0440\u0430\u0445\u043E\u0432\u0430\u044F \u0437\u0430\u0449\u0438\u0442\u0430", ...field('isInsurance'), value: params.isInsurance })) : null] }));
 
-    const isNotRubles = (currency = 'rub') => currency !== 'rub';
-
     const arrayByRange = (start, stop, step = 1) => Array.from({ length: Math.abs(stop - start) / step + 1 }, (value, index) => stop >= start ? start + index * step : start - index * step);
 
     const mergeIntervals = (intervals) => {
@@ -3076,32 +3123,36 @@
         const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
         const isExcludeReplenish = !paramsViewSettings?.isShowReplenish;
         const isExcludeWithdrawn = !paramsViewSettings?.isShowWithdrawn;
-        const depositCalculatorSourceBookParams = rows?.find((row) => checkRowByParam({
-            row,
-            userInputParams,
-            paramKey: 'isReplenish',
-            isExclude: isExcludeReplenish,
-        }) &&
+        const isExcludeNewClient = !paramsViewSettings?.isShowNewClient;
+        const depositCalculatorSourceBookParams = rows?.find((row) => [
+            checkRowByParam({
+                row,
+                userInputParams,
+                paramKey: 'isReplenish',
+                isExclude: isExcludeReplenish,
+            }),
             checkRowByParam({
                 row,
                 userInputParams,
                 paramKey: 'isWithdrawn',
                 isExclude: isExcludeWithdrawn,
-            }) &&
+            }),
             checkRowByParam({
                 row,
                 userInputParams,
                 paramKey: 'isMonthlyInterestPayment',
                 isExclude: isExcludeMonthlyInterestPayment,
-            }) &&
+            }),
             checkRowByParam({
                 row,
                 userInputParams,
                 paramKey: 'isRemoteRegistration',
                 isExclude: isExcludeRemoteRegistration,
-            }) &&
-            checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
-            checkRangeByKeys(monthsValue || defaultMonth, ['minMonths', 'maxMonths'], row)) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
+            }),
+            isExcludeNewClient || userInputParams?.['isNewClient'] === row?.['isNewClient'],
+            checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row),
+            checkRangeByKeys(monthsValue || defaultMonth, ['minMonths', 'maxMonths'], row),
+        ].every(Boolean)) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
         const { rate } = depositCalculatorSourceBookParams;
         const income = getDepositIncome(rate, userInputParams);
         const finalSum = moneyValue + income;
@@ -3132,6 +3183,8 @@
     const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }) => isExclude || userInputParams[paramKey] === row[paramKey];
     const getMiddleMonth = (minMonths, maxMonths) => minMonths + Math.round((maxMonths - minMonths) / 2);
 
+    const isRubles = (currency = 'rub') => currency === 'rub';
+
     const renderRegistrationType = (props) => renderBinaryRadioButtonGroup({
         ...props,
         items: [
@@ -3166,7 +3219,7 @@
                                 ],
                                 disabled: isCurrency,
                             })
-                            : null] }), separatorStyles(params.isShowReplenish || params.isShowWithdrawn), jsxs("div", { className: "flex gap-lg", children: [params.isShowMonthlyInterestPayment
+                            : null] }), renderSeparator(params.isShowReplenish || params.isShowWithdrawn), jsxs("div", { className: "flex gap-lg", children: [params.isShowMonthlyInterestPayment
                             ? renderPayout({
                                 title: 'Выплата процентов',
                                 ...field('isMonthlyInterestPayment'),
@@ -3180,9 +3233,31 @@
                                 value: params.isRemoteRegistration,
                                 orientation: 'vertical',
                             })
-                            : null] })] }));
+                            : null] }), renderSeparator(params.isShowNewClient), params.isShowNewClient ? jsx(Checkbox, { text: "\u041D\u043E\u0432\u044B\u0439 \u0432\u043A\u043B\u0430\u0434\u0447\u0438\u043A", ...field('isNewClient') }) : null] }));
+    };
+    const renderSeparator = (isShow = false) => isShow ? jsx("div", { className: "border-b border-main-divider w-full" }) : null;
+
+    const normalizeMonthValue = (_, rows) => {
+        const { minMonths, maxMonths } = getRangeByKeys(['minMonths', 'maxMonths'], getRows(rows, _?.currency));
+        const monthsValue = _.monthsValue || Math.round((minMonths + maxMonths) / 2);
+        return { monthsValue: clamp(monthsValue, minMonths, maxMonths) };
+    };
+    const normalizeMoneyValue = (_, rows) => {
+        const { minSum, maxSum } = getRangeByKeys(['minSum', 'maxSum'], getRows(rows, _?.currency));
+        const moneyValue = _.moneyValue || minSum;
+        return { moneyValue: clamp(moneyValue, minSum, maxSum) };
+    };
+    const normalizeCurrency = (_, rows) => ({
+        currency: _?.currency ?? rows?.map((row) => row.currency)?.[0],
+    });
+    const normalizeReplenishWithdrawn = (_) => {
+        const _isRubles = isRubles(_?.currency?.key);
+        return { isReplenish: _isRubles && _?.isReplenish, isWithdrawn: _isRubles && _?.isWithdrawn };
+    };
+    const getRows = (rows, currencyValue) => {
+        const { rates } = rows?.find((_) => _?.currency.key === currencyValue?.key) ?? {};
+        return rates ?? rows?.[0]?.rates;
     };
-    const separatorStyles = (isShow = false) => isShow ? jsx("div", { className: "border-b border-main-divider w-full" }) : null;
 
     const MAP = {
         isMonthlyInterestPayment: 'isMonthlyInterestPayment',
@@ -3196,67 +3271,49 @@
         key: 'rub',
     };
     const DEPOSIT_DEFAULT_SUM = 20000;
+    const DEPOSIT_DEFAULT_MONTHS = 1;
     const CalculatorDeposit = UniBlock(({ className, title, calcSource, buttons = [], footnote = '', paramsViewSettings, defaultParams, ...rest }) => {
         const { rows } = calcSource ?? {};
         const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
+        const normalize = useCallback((_) => !rows
+            ? _
+            : {
+                ..._,
+                ...normalizeReplenishWithdrawn(_),
+                ...normalizeMoneyValue(_, rows),
+                ...normalizeMonthValue(_, rows),
+                ...normalizeCurrency(_, rows),
+            }, [rows]);
         const [userInputParams, { field }] = useForm({
             moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
-            monthsValue: getMonthsDefaultValue(defaultParams),
+            monthsValue: getMonthsDefaultValue(defaultParams, DEPOSIT_DEFAULT_MONTHS),
             isMonthlyInterestPayment: Boolean(defaultParams?.isMonthlyInterestPayment),
             isRemoteRegistration: Boolean(defaultParams?.isRemoteRegistration),
             isReplenish: Boolean(defaultParams?.isReplenish),
             isWithdrawn: Boolean(defaultParams?.isWithdrawn),
+            isNewClient: Boolean(defaultParams?.isNewClient),
             currency: DEFAULT_CURRENCY,
-        });
-        const currencyValue = field?.('currency')?.value;
-        const { onChange: setMonthsValue } = field('monthsValue');
-        const { onChange: setMoneyValue } = field('moneyValue');
+        }, { normalize });
+        const currencyValue = field?.('currency')?.value ?? DEFAULT_CURRENCY;
+        const isNewClient = field?.('isNewClient')?.value;
         const row = getRows(rows, currencyValue);
-        const [defParams, setDefParams] = useState(getDefaultParamsMax(rows?.[0]?.rates));
-        const calcParams = getDepositCalculatorParams(userInputParams, getRows(rows, currencyValue), paramsViewSettings);
-        useEffect(() => {
-            if (currencyOptions?.[0]) {
-                field?.('currency')?.onChange?.(currencyOptions?.[0]);
-            }
-        }, [calcSource]);
+        const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
+        const { rate, income, finalSum, type = '' } = calcParams;
         const handleDefaultParamsCals = () => {
             setDefaultParamsCalc({
                 field,
-                defParams: defParams,
+                defParams: getDefaultParamsMax(row, isNewClient),
                 calcParams,
                 monthsValue: 'minMonths',
                 map: MAP,
             });
         };
-        const { defaultMonth, rate, income, finalSum, type = '' } = calcParams;
-        useEffect(() => {
-            setDefParams(getDefaultParamsMax(row));
-        }, [currencyValue, rows]);
-        useEffect(() => {
-            !userInputParams.monthsValue && setMonthsValue && setMonthsValue(defaultMonth);
-        }, [defaultMonth]);
-        useEffect(() => {
-            setMoneyValue &&
-                setMoneyValue(clamp(userInputParams.moneyValue, calcParams.minSum, calcParams.maxSum));
-        }, [calcParams.minSum, calcParams.maxSum, row]);
         useEffect(() => {
-            if (!isDefaultParams(defaultParams) && defParams) {
+            if (!isDefaultParams(defaultParams) && row) {
                 handleDefaultParamsCals();
             }
-        }, [defParams, defaultParams]);
-        useEffect(() => {
-            setMoneyValue?.(clamp(userInputParams.moneyValue, calcParams.minSum, calcParams.maxSum));
-            if (isNotRubles(currencyValue?.key)) {
-                field?.('isReplenish')?.onChange?.(false);
-                field?.('isWithdrawn')?.onChange?.(false);
-            }
-        }, [currencyValue]);
-        useEffect(() => {
-            if (!isDefaultParams(defaultParams) && defParams) {
-                handleDefaultParamsCals();
-            }
-        }, [defaultParams, row, defParams]);
-        const isMaxRate = rate === defParams?.rate;
+        }, [defaultParams, rows]);
+        const isMaxRate = rate === getDefaultParamsMax(row, isNewClient)?.rate;
         return (jsx(CalculatorLayout, { className: className, title: title, ...rest, children: jsxs("section", { className: style(CalculatorStyle.wrapper, className), children: [jsxs("div", { className: CalculatorStyle.input, children: [jsxs("div", { className: "flex gap-m", children: [renderWantedSumInput({
                                         className: 'w-full',
                                         title: `Сумма, ${currencyValue?.text}`,
@@ -3285,17 +3342,13 @@
                         isCapitalization: field('isMonthlyInterestPayment').value,
                     })] }) }));
     });
-    const getStep = (key = '') => (isNotRubles(key) ? 100 : 1000);
+    const getStep = (key = '') => (isRubles(key) ? 1000 : 100);
     const getTariffButton = (buttons = [], btnType = '') => {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { type, ...button } = buttons.find((_) => _.type === btnType) ?? {};
         return button;
     };
     const renderMaxRateButton = (handleDefaultParamsCals, isMaxRate = false) => isMaxRate ? null : (jsx(Button, { type: "button", version: "secondary", onClick: handleDefaultParamsCals, children: "\u041F\u043E\u043A\u0430\u0437\u0430\u0442\u044C \u043C\u0430\u043A\u0441\u0438\u043C\u0430\u043B\u044C\u043D\u0443\u044E \u0441\u0442\u0430\u0432\u043A\u0443" }));
-    const getRows = (rows, currencyValue) => {
-        const { rates } = rows?.find((_) => _?.currency.key === currencyValue?.key) ?? {};
-        return rates ?? rows?.[0]?.rates;
-    };
 
     const checkRefinancingSourceBookRowCommonParams = (props) => checkRowParam({
         ...props,
@@ -6500,7 +6553,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.547";
+    const packageVersion = "0.14.548";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;