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

package/src/components/ApplicationForm/FeedbackMethodField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { FEEDBACK_METHOD } from './contants';
+import { FEEDBACK_METHOD } from './constants';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 

package/src/components/ApplicationForm/FeedbackTypeField.tsx

@@ -2,7 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from './contants';
+import { FEEDBACK_TYPES, SERVICE_DIRECTIONS } from './constants';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 

package/src/components/ApplicationForm/LocalitiesField.tsx

@@ -0,0 +1,34 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { useRegions } from '../../hooks/useRegions';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
+import { OUT_SERVICE_URL } from './constants';
+import { type CustomFieldProps } from './CustomFieldProps';
+import { validatorObj } from './getObjectValidator';
+import { getValidation } from './getValidation';
+
+type RegionFieldProps = CustomFieldProps;
+
+export const LocalitiesField = JSX<RegionFieldProps>(({ 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 (
+    <SelectControl
+      label="Населенный пункт"
+      placeholder="Выберите отделение"
+      options={localities}
+      {...getValidation(field('localities'), validatorObj.localities, input?.required)}
+      isSearch={true}
+    />
+  );
+});

package/src/components/ApplicationForm/PartnerCommentsField.tsx

@@ -1,18 +1,19 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { InputPhoneControl } from '../../ui-kit/Input/InputPhoneControl';
-import { withValidator } from '../../validation/withValidator';
+import { InputControl } from '../../ui-kit/Input/InputControl';
+import { type FieldDef } from './ApplicationFormContent';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
+import { getValidation } from './getValidation';
 
-export const SecondaryPhoneField = JSX<CustomFieldProps>(({ field }) => {
-  const fieldPhone = field('secondaryPhone');
+export const PartnerCommentsField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { required, ...rest } = input as FieldDef;
 
   return (
-    <InputPhoneControl
-      label="Дополнительный телефон"
-      {...(!fieldPhone.value || fieldPhone.value === '+7 ('
-        ? fieldPhone
-        : withValidator(fieldPhone, validatorObj.secondaryPhone))}
+    <InputControl
+      {...getValidation(field('partnerComments'), validatorObj.partnerComments, required)}
+      placeholder="Укажите интересующий вас вопрос"
+      isTextarea={true}
+      {...rest}
     />
   );
 });

package/src/components/ApplicationForm/ProductField.tsx

@@ -0,0 +1,15 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
+import { withValidator } from '../../validation/withValidator';
+import { PRODUCT_TYPE } from './constants';
+import { type CustomFieldProps } from './CustomFieldProps';
+import { validatorObj } from './getObjectValidator';
+
+export const ProductField = JSX<CustomFieldProps>(({ field }) => (
+  <SelectControl
+    placeholder="Выберите продукт"
+    label="Продукт"
+    options={PRODUCT_TYPE}
+    {...withValidator(field('product'), validatorObj.product)}
+  />
+));

package/src/components/ApplicationForm/RegionField.tsx

@@ -6,8 +6,8 @@ import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 import { getValidation } from './getValidation';
 
-export const RegionField = JSX<CustomFieldProps>(({ field, input }) => {
-  const regions = useRegions();
+export const RegionField = JSX<CustomFieldProps>(({ field, input, url }) => {
+  const regions = useRegions(url);
 
   return (
     <SelectControl

package/src/components/ApplicationForm/SecondaryPhoneField.tsx

@@ -0,0 +1,18 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputPhoneControl } from '../../ui-kit/Input/InputPhoneControl';
+import { withValidator } from '../../validation/withValidator';
+import { type CustomFieldProps } from './CustomFieldProps';
+import { validatorObj } from './getObjectValidator';
+
+export const SecondaryPhoneField = JSX<CustomFieldProps>(({ field }) => {
+  const fieldPhone = field('secondaryPhone');
+
+  return (
+    <InputPhoneControl
+      label="Дополнительный телефон"
+      {...(!fieldPhone.value || fieldPhone.value === '+7 ('
+        ? fieldPhone
+        : withValidator(fieldPhone, validatorObj.secondaryPhone))}
+    />
+  );
+});

package/src/components/ApplicationForm/ServiceDirectionField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { SERVICE_DIRECTIONS } from './contants';
+import { SERVICE_DIRECTIONS } from './constants';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 

package/src/components/ApplicationForm/UltraPremiumField.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { withValidator } from '../../validation/withValidator';
-import { SERVICE_TYPES } from './contants';
+import { SERVICE_TYPES } from './constants';
 import { type CustomFieldProps } from './CustomFieldProps';
 import { validatorObj } from './getObjectValidator';
 export const UltraPremiumField = JSX<CustomFieldProps>(({ field }) => (

package/src/components/ApplicationForm/{contants.tsx → constants.tsx}

@@ -25,3 +25,14 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'phone', text: 'Телефонный звонок' },
   { key: 'email', text: 'Электронное сообщение' },
 ];
+
+export const PRODUCT_TYPE: Option[] = [
+  { key: 'Карта дебетовая', text: 'Карта дебетовая' },
+  { key: 'Карта кредитная', text: 'Карта кредитная' },
+  { key: 'Потребительский кредит', text: 'Потребительский кредит' },
+  { key: 'Ипотечный кредит', text: 'Ипотечный кредит' },
+  { key: 'Вклад', text: 'Вклад' },
+  { key: 'Накопительный счет', text: 'Накопительный счет' },
+];
+
+export const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';

package/src/components/ApplicationForm/getField.tsx

@@ -11,13 +11,18 @@ import { CommentField } from './CommentField';
 import { FeedbackMethodField } from './FeedbackMethodField';
 import { FeedbackTypeField } from './FeedbackTypeField';
 import { validatorObj } from './getObjectValidator';
+import { getRegionUrl } from './getRegionUrl';
 import { getValidation } from './getValidation';
 import { IsClientField } from './IsClientField';
+import { isRenderField } from './isRenderField';
+import { LocalitiesField } from './LocalitiesField';
 import { OnlineCheckoutField } from './OnlineCheckoutField';
-import { SecondaryPhoneField } from './PartnerCommentsField';
+import { PartnerCommentsField } from './PartnerCommentsField';
 import { PosTerminalField } from './PosTerminalField';
+import { ProductField } from './ProductField';
 import { RegionField } from './RegionField';
 import { RegionPremiumField } from './RegionPremiumField';
+import { SecondaryPhoneField } from './SecondaryPhoneField';
 import { ServiceDirectionField } from './ServiceDirectionField';
 import { TermField } from './TermField';
 import { UltraPremiumField } from './UltraPremiumField';
@@ -77,7 +82,7 @@ export const getField =
       region: isPremium ? (
         <RegionPremiumField field={field} />
       ) : (
-        <RegionField field={field} input={input} />
+        <RegionField field={field} input={input} url={getRegionUrl(typeForm)} />
       ),
       addressBranch: <AddressBranchField field={field} input={input} isPremium={isPremium} />,
       birthday: (
@@ -86,6 +91,14 @@ export const getField =
           {...getValidation(field('birthday'), validatorObj.birthday, required)}
         />
       ),
+      desiredMeetingDate: (
+        <DatePickerControl
+          label="Желаемая дата встречи"
+          {...getValidation(field('desiredMeetingDate'), validatorObj.meetingDay, required)}
+        />
+      ),
+      product: <ProductField field={field} />,
+      localities: <LocalitiesField field={field} input={input} />,
       isClient: <IsClientField field={field} />,
       consentToReceiveMaterials: (
         <CheckboxWithError
@@ -93,14 +106,7 @@ export const getField =
           text="Согласен на получение информационных и аналитических материалов по электронной почте"
         />
       ),
-      partnerComments: (
-        <InputControl
-          {...getValidation(field('partnerComments'), validatorObj.partnerComments, required)}
-          placeholder="Укажите интересующий вас вопрос"
-          isTextarea={true}
-          {...rest}
-        />
-      ),
+      partnerComments: <PartnerCommentsField field={field} input={input} />,
       collectionCount: (
         <InputControl
           label="Количество объектов инкассации"
@@ -140,16 +146,3 @@ export const getField =
       <div key={String(i)}>{InputsMap[input?.name]}</div>
     ) : null;
   };
-
-export function isRenderField({
-  input,
-  field,
-}: {
-  input: FieldDef;
-  field: FormFieldRegisterer<any>;
-}) {
-  const { condition } = input;
-  const { value } = field(condition?.name || '');
-
-  return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
-}

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -1,7 +1,7 @@
 import { type Option } from '../../ui-kit/Select/Option';
 import { ACQUIRING_TYPES } from './AcquiringField';
 import { type FieldDef } from './ApplicationFormContent';
-import { FEEDBACK_METHOD, FEEDBACK_TYPES, SERVICE_DIRECTIONS, SERVICE_TYPES } from './contants';
+import { FEEDBACK_METHOD, FEEDBACK_TYPES, SERVICE_DIRECTIONS, SERVICE_TYPES } from './constants';
 import { VED_TYPES } from './VedField';
 
 export interface FormState {

package/src/components/ApplicationForm/getObjectValidator.tsx

@@ -30,6 +30,9 @@ export const validatorObj: Record<string, Validator> = {
   feedbackMethod: defaultSelectValidator,
   serviceType: defaultSelectValidator,
   serviceDirection: defaultSelectValidator,
+  meetingDay: defaultValidator,
+  product: defaultValidator,
+  localities: defaultValidator,
   consentDataProcessing: agreementValidator,
   annualRevenue: defaultValidator,
 };

package/src/components/ApplicationForm/getRegionUrl.tsx

@@ -0,0 +1,4 @@
+import { OUT_SERVICE_URL } from './constants';
+
+export const getRegionUrl = (typeForm?: string) =>
+  typeForm === 'OUTSERVICE' ? OUT_SERVICE_URL : undefined;

package/src/components/ApplicationForm/isRenderField.tsx

@@ -0,0 +1,15 @@
+import type { FormFieldRegisterer } from '../../hooks/useForm';
+import type { FieldDef } from './ApplicationFormContent';
+
+export function isRenderField({
+  input,
+  field,
+}: {
+  input: FieldDef;
+  field: FormFieldRegisterer<any>;
+}) {
+  const { condition } = input;
+  const { value } = field(condition?.name || '');
+
+  return !condition || condition?.values?.find((_) => _ === (value?.key ?? value));
+}

package/src/components/CalculatorDeposit/CalculatorDeposit.fixture.tsx

@@ -68,6 +68,7 @@ export default {
           isShowWithdrawn: true,
           isShowRemoteRegistration: true,
           isShowMonthlyInterestPayment: true,
+          isShowNewClient: true,
         }}
         calcSource={{
           $ref: '/wcms-resources/vklad-calculator-main-data.json',
@@ -86,6 +87,7 @@ export default {
           isShowWithdrawn: true,
           isShowRemoteRegistration: true,
           isShowMonthlyInterestPayment: true,
+          isShowNewClient: true,
         }}
         defaultParams={{ sum: 65000, isRemoteRegistration: true }}
         calcSource={{

package/src/components/CalculatorDeposit/CalculatorDeposit.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable max-lines, max-lines-per-function */
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { useForm } from '../../hooks/useForm';
 import { Button } from '../../ui-kit/Button/Button';
@@ -18,20 +18,25 @@ import { type Option } from '../../ui-kit/Select/Option';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
-import { clamp } from '../../utils/clamp';
 import { style } from '../../utils/style';
 import { isDefaultParams } from '../CalculatorCredit/isDefaultParams';
-import { isNotRubles } from '././isNotRubles';
-import { type CalculatorDepositContent } from './CalculatorDepositContent';
+import { type CalculatorDepositContent, type DepositParams } from './CalculatorDepositContent';
 import {
   getDepositCalculatorParams,
   type DepositCalculatorData,
-  type DepositCalculatorRowsData,
   type DepositCalculatorSourceBookParams,
   type TariffsButtonContent,
 } from './getDepositCalculatorParams';
+import { isRubles } from './isRubles';
 import { renderDepositParamsForm } from './renderDepositParamsForm';
 import { renderDepositResult } from './renderDepositResult';
+import {
+  getRows,
+  normalizeCurrency,
+  normalizeMoneyValue,
+  normalizeMonthValue,
+  normalizeReplenishWithdrawn,
+} from './utils';
 
 const MAP = {
   isMonthlyInterestPayment: 'isMonthlyInterestPayment',
@@ -47,6 +52,7 @@ const DEFAULT_CURRENCY: Option = {
 };
 
 const DEPOSIT_DEFAULT_SUM = 20000;
+const DEPOSIT_DEFAULT_MONTHS = 1;
 
 export interface CalculatorDepositProps extends CalculatorDepositContent, UniBlockProps {
   className?: string;
@@ -65,81 +71,57 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
   }) => {
     const { rows } = calcSource ?? {};
     const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
-
-    const [userInputParams, { field }] = useForm({
-      moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
-      monthsValue: getMonthsDefaultValue(defaultParams),
-      isMonthlyInterestPayment: Boolean(defaultParams?.isMonthlyInterestPayment),
-      isRemoteRegistration: Boolean(defaultParams?.isRemoteRegistration),
-      isReplenish: Boolean(defaultParams?.isReplenish),
-      isWithdrawn: Boolean(defaultParams?.isWithdrawn),
-      currency: DEFAULT_CURRENCY,
-    });
-    const currencyValue = field?.('currency')?.value;
-    const { onChange: setMonthsValue } = field('monthsValue');
-    const { onChange: setMoneyValue } = field('moneyValue');
-
-    const row = getRows(rows, currencyValue);
-    const [defParams, setDefParams] = useState(getDefaultParamsMax(rows?.[0]?.rates));
-
-    const calcParams = getDepositCalculatorParams(
-      userInputParams,
-      getRows(rows, currencyValue),
-      paramsViewSettings,
+    const normalize = useCallback(
+      (_: DepositParams) =>
+        !rows
+          ? _
+          : {
+              ..._,
+              ...normalizeReplenishWithdrawn(_),
+              ...normalizeMoneyValue(_, rows),
+              ...normalizeMonthValue(_, rows),
+              ...normalizeCurrency(_, rows),
+            },
+
+      [rows],
+    );
+    const [userInputParams, { field }] = useForm(
+      {
+        moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
+        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,
+      },
+      { normalize },
     );
 
-    useEffect(() => {
-      if (currencyOptions?.[0]) {
-        field?.('currency')?.onChange?.(currencyOptions?.[0]);
-      }
-    }, [calcSource]);
+    const currencyValue = field?.('currency')?.value ?? DEFAULT_CURRENCY;
+    const isNewClient = field?.('isNewClient')?.value;
+    const row = getRows(rows, currencyValue);
+    const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
+    const { rate, income, finalSum, type = '' } = calcParams;
 
     const handleDefaultParamsCals = () => {
       setDefaultParamsCalc({
         field,
-        defParams: defParams as DepositCalculatorSourceBookParams,
+        defParams: getDefaultParamsMax(row, isNewClient) as DepositCalculatorSourceBookParams,
         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]);
+    }, [defaultParams, rows]);
 
-    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;
+    const isMaxRate = rate === getDefaultParamsMax(row, isNewClient)?.rate;
 
     return (
       <CalculatorLayout className={className} title={title} {...rest}>
@@ -188,7 +170,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
   },
 );
 
-const getStep = (key = '') => (isNotRubles(key) ? 100 : 1000);
+const getStep = (key = '') => (isRubles(key) ? 1000 : 100);
 
 const getTariffButton = (buttons: TariffsButtonContent[] = [], btnType = '') => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -203,9 +185,3 @@ const renderMaxRateButton = (handleDefaultParamsCals: () => void, isMaxRate = fa
       Показать максимальную ставку
     </Button>
   );
-
-const getRows = (rows?: DepositCalculatorRowsData[], currencyValue?: Option) => {
-  const { rates } = rows?.find((_) => _?.currency.key === currencyValue?.key) ?? {};
-
-  return rates ?? rows?.[0]?.rates;
-};

package/src/components/CalculatorDeposit/CalculatorDepositContent.ts

@@ -1,7 +1,9 @@
 import {
+  type CalcValueProps,
   type CommonCalculatorProps,
   type CommonDefaultParams,
 } from '../../ui-kit/Calculator/CalculatorProps';
+import { type Option } from '../../ui-kit/Select/Option';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
 export interface CalculatorDepositParamsViewSettings {
@@ -19,10 +21,12 @@ export interface CalculatorDepositParamsViewSettings {
   isShowReplenish?: boolean;
   /** @title Снятие */
   isShowWithdrawn?: boolean;
+  /** @title Новый клиент */
+  isShowNewClient?: boolean;
 }
 
 export interface CommonDepositParams {
-  /** @title Возможность помолнять */
+  /** @title Возможность пополнять */
   isReplenish?: boolean;
   /** @title Возможно снимать */
   isWithdrawn?: boolean;
@@ -30,11 +34,16 @@ export interface CommonDepositParams {
   isMonthlyInterestPayment?: boolean;
   /** @title Дистанционное оформление */
   isRemoteRegistration?: boolean;
+  /** @title Новый клиент */
+  isNewClient?: boolean;
+  /** @title Валюта */
+  currency?: Option;
   /** @hidden */
   type?: string;
 }
 
 export interface DepositDefaultParams extends CommonDefaultParams, CommonDepositParams {}
+export interface DepositParams extends DepositDefaultParams, CalcValueProps {}
 
 /**
  * @title Калькулятор вкладов

package/src/components/CalculatorDeposit/getDepositCalculatorParams.ts

@@ -27,7 +27,9 @@ const DEFAULT_DEPOSIT_CALCULATOR_PARAMS: DepositCalculatorSourceBookParams = {
 
 export interface DepositCalculatorSourceBookParams
   extends CommonDepositParams,
-    CalcDefaultParamsProps {}
+    CalcDefaultParamsProps {
+  currency?: Option;
+}
 
 export interface DepositCalculatorUserInputParams extends CommonDepositParams, CalcValueProps {}
 
@@ -47,7 +49,7 @@ export type TariffsButtonContent = LinkButtonContent & {
 
 export type DepositCalculatorRowsData = {
   currency: Option;
-  rates?: DepositCalculatorSourceBookParams[];
+  rates: DepositCalculatorSourceBookParams[];
 };
 
 export type DepositCalculatorData = {
@@ -66,35 +68,38 @@ export const getDepositCalculatorParams = (
   const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
   const isExcludeReplenish = !paramsViewSettings?.isShowReplenish;
   const isExcludeWithdrawn = !paramsViewSettings?.isShowWithdrawn;
+  const isExcludeNewClient = !paramsViewSettings?.isShowNewClient;
   const depositCalculatorSourceBookParams =
-    rows?.find(
-      (row) =>
+    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) &&
+        }),
+        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;

package/src/components/CalculatorDeposit/isRubles.tsx

@@ -0,0 +1 @@
+export const isRubles = (currency = 'rub') => currency === 'rub';

package/src/components/CalculatorDeposit/renderDepositParamsForm.tsx

@@ -1,6 +1,7 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { renderBinaryRadioButtonGroup } from '../../ui-kit/Calculator/renderBinaryRadioButtonGroup';
 import { renderPayout } from '../../ui-kit/Calculator/renderPayout';
+import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
 import { type CalculatorDepositParamsViewSettings } from './CalculatorDepositContent';
 import { type DepositCalculatorParams } from './getDepositCalculatorParams';
 import { renderRegistrationType } from './renderRegistrationType';
@@ -41,7 +42,7 @@ export const renderDepositParamsForm = (
             })
           : null}
       </div>
-      {separatorStyles(params.isShowReplenish || params.isShowWithdrawn)}
+      {renderSeparator(params.isShowReplenish || params.isShowWithdrawn)}
       <div className="flex gap-lg">
         {params.isShowMonthlyInterestPayment
           ? renderPayout({
@@ -60,9 +61,11 @@ export const renderDepositParamsForm = (
             })
           : null}
       </div>
+      {renderSeparator(params.isShowNewClient)}
+      {params.isShowNewClient ? <Checkbox text="Новый вкладчик" {...field('isNewClient')} /> : null}
     </div>
   );
 };
 
-const separatorStyles = (isShow = false) =>
+const renderSeparator = (isShow = false) =>
   isShow ? <div className="border-b border-main-divider w-full"></div> : null;