@redneckz/wildless-cms-uni-blocks 0.14.779 → 0.14.787

package/src/components/CalculatorDeposit/CalculatorDeposit.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable max-lines, max-lines-per-function */
 import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { type JSONRefObject } from '../../data/JSONRefObject';
-import { useForm } from '../../hooks/useForm/useForm';
+import { useForm, type FormFieldRegisterer } from '../../hooks/useForm/useForm';
 import { Button } from '../../ui-kit/Button/Button';
 import { CalculatorLayout } from '../../ui-kit/Calculator/CalculatorLayout';
 import { CalculatorStyle } from '../../ui-kit/Calculator/CalculatorStyle';
@@ -20,13 +20,14 @@ import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { isDefaultParams } from '../CalculatorCredit/isDefaultParams';
-import { type CalculatorDepositContent } from './CalculatorDepositContent';
 import {
-  getDepositCalculatorParams,
+  type CalculatorDepositContent,
   type DepositCalculatorData,
   type DepositCalculatorSourceBookParams,
-  type TariffsButtonContent,
-} from './getDepositCalculatorParams';
+  type DepositParams,
+  type LinkButtonWithTypeContent,
+} from './CalculatorDepositContent';
+import { getDepositCalculatorParams } from './getDepositCalculatorParams';
 import { isRubles } from './isRubles';
 import { getRows, normalizeDepositParams } from './normalize';
 import { renderDepositParamsForm } from './renderDepositParamsForm';
@@ -38,6 +39,7 @@ const MAP = {
   isReplenish: 'isReplenish',
   isWithdrawn: 'isWithdrawn',
   moneyValue: 'minSum',
+  extraPercent: 'extraPercent',
 };
 
 const DEFAULT_CURRENCY: Option = {
@@ -47,11 +49,13 @@ const DEFAULT_CURRENCY: Option = {
 
 const DEPOSIT_DEFAULT_SUM = 20000;
 const DEPOSIT_DEFAULT_MONTHS = 1;
+const DEPOSIT_DEFAULT_EXTRA_PERCENT = { text: 'Без учета надбавки', key: '0' };
 
 export interface CalculatorDepositProps extends CalculatorDepositContent, UniBlockProps {
   className?: string;
   calcSource?: DepositCalculatorData & JSONRefObject;
 }
+
 export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
   ({
     className,
@@ -67,7 +71,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
     const currencyOptions = rows?.map((_) => _.currency) ?? [DEFAULT_CURRENCY];
     const normalize = useCallback(normalizeDepositParams(rows), [rows]);
 
-    const [userInputParams, { field }] = useForm(
+    const [userInputParams, { field }] = useForm<DepositParams>(
       {
         moneyValue: getMoneyDefaultValue(defaultParams, DEPOSIT_DEFAULT_SUM),
         monthsValue: getMonthsDefaultValue(defaultParams, DEPOSIT_DEFAULT_MONTHS),
@@ -77,25 +81,30 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
         isWithdrawn: Boolean(defaultParams?.isWithdrawn),
         isNewClient: Boolean(defaultParams?.isNewClient),
         currency: DEFAULT_CURRENCY,
+        extraPercent: defaultParams?.extraPercent ?? DEPOSIT_DEFAULT_EXTRA_PERCENT,
       },
       { normalizer: normalize },
     );
 
-    const currencyValue = field?.('currency')?.value ?? DEFAULT_CURRENCY;
-    const isNewClient = field?.('isNewClient')?.value;
+    const currencyValue = getCurrencyValue(field);
+    const isNewClient = Boolean(field?.('isNewClient')?.value);
+    const extraPercents = rows?.find((_) => _?.extraPercents)?.extraPercents;
     const row = getRows(rows, currencyValue);
     const calcParams = getDepositCalculatorParams(userInputParams, row, paramsViewSettings);
     const { rate, income, finalSum, type = '' } = calcParams;
-
     const handleDefaultParamsCals = useCallback(() => {
       setDefaultParamsCalc({
         field,
-        defParams: getDefaultParamsMax(row, isNewClient) as DepositCalculatorSourceBookParams,
+        defParams: getDefaultParamsMax(
+          row,
+          isNewClient,
+          extraPercents,
+        ) as DepositCalculatorSourceBookParams,
         calcParams,
         monthsValue: 'minMonths',
         map: MAP,
       });
-    }, [field, rows]);
+    }, [field, rows, extraPercents]);
 
     useEffect(() => {
       if (!isDefaultParams(defaultParams) && row) {
@@ -103,7 +112,11 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
       }
     }, [defaultParams, rows]);
 
-    const isMaxRate = rate === getDefaultParamsMax(row, isNewClient)?.rate;
+    const extraRate = field?.('extraPercent')?.value?.key;
+    const totalRate = getTotalRate(rate, extraRate);
+    const isMaxRate =
+      rate === getDefaultParamsMax(row, isNewClient)?.rate &&
+      extraRate === extraPercents?.at(-1)?.key;
 
     return (
       <CalculatorLayout className={className} title={title} {...rest}>
@@ -132,10 +145,14 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
               ...field('monthsValue'),
               value: calcParams.monthsValue,
             })}
-            {renderDepositParamsForm({ ...calcParams, ...paramsViewSettings }, field)}
+            {renderDepositParamsForm(
+              { ...calcParams, ...paramsViewSettings },
+              field,
+              extraPercents,
+            )}
           </div>
           {renderRate({
-            rate,
+            rate: totalRate,
             children: renderMaxRateButton(handleDefaultParamsCals, isMaxRate),
           })}
           {renderDepositResult({
@@ -154,7 +171,7 @@ export const CalculatorDeposit = UniBlock<CalculatorDepositProps>(
 
 const getStep = (key = '') => (isRubles(key) ? 1000 : 100);
 
-const getTariffButton = (buttons: TariffsButtonContent[] = [], btnType = '') => {
+const getTariffButton = (buttons: LinkButtonWithTypeContent[] = [], btnType = '') => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { type, ...button } = buttons.find((_) => _.type === btnType) ?? {};
 
@@ -167,3 +184,9 @@ const renderMaxRateButton = (handleDefaultParamsCals: () => void, isMaxRate = fa
       Показать максимальную ставку
     </Button>
   );
+
+const getTotalRate = (rate: number, extraRate?: string): number =>
+  Number(rate) + Number(extraRate ?? 0);
+
+const getCurrencyValue = (field: FormFieldRegisterer<DepositParams>) =>
+  field?.('currency')?.value ?? DEFAULT_CURRENCY;

package/src/components/CalculatorDeposit/CalculatorDepositContent.ts

@@ -1,11 +1,47 @@
 import {
+  type CalcDefaultParamsProps,
   type CalcValueProps,
   type CommonCalculatorProps,
   type CommonDefaultParams,
 } from '../../ui-kit/Calculator/CalculatorProps';
+import type { LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
 import { type Option } from '../../ui-kit/Select/Option';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
+export interface DepositCalculatorUserInputParams extends CommonDepositParams, CalcValueProps {}
+
+export interface DepositCalculatorParams
+  extends DepositCalculatorSourceBookParams,
+    DepositCalculatorUserInputParams {
+  availableMonths: number[];
+  defaultMonth: number;
+  income: number;
+  finalSum: number;
+  currency?: Option;
+}
+
+export type LinkButtonWithTypeContent = LinkButtonContent & {
+  type?: string;
+};
+
+export type DepositCalculatorRowsData = {
+  currency: Option;
+  rates?: DepositCalculatorSourceBookParams[];
+  extraPercents?: Option[];
+};
+
+export type DepositCalculatorData = {
+  rows?: DepositCalculatorRowsData[];
+  buttons?: LinkButtonWithTypeContent[];
+};
+
+export interface DepositCalculatorSourceBookParams
+  extends CommonDepositParams,
+    CalcDefaultParamsProps {
+  currency?: Option;
+  extraPercent?: Option;
+}
+
 export interface CalculatorDepositParamsViewSettings {
   /**
    * @title Выплата процентов
@@ -23,6 +59,8 @@ export interface CalculatorDepositParamsViewSettings {
   isShowWithdrawn?: boolean;
   /** @title Новый клиент */
   isShowNewClient?: boolean;
+  /** @title Новый клиент */
+  isShowExtraPercent?: boolean;
 }
 
 export interface CommonDepositParams {
@@ -36,6 +74,8 @@ export interface CommonDepositParams {
   isRemoteRegistration?: boolean;
   /** @title Новый клиент */
   isNewClient?: boolean;
+  /** @title Дополнительный процент */
+  extraPercent?: Option;
   /** @title Валюта */
   currency?: Option;
   /** @hidden */
@@ -43,6 +83,7 @@ export interface CommonDepositParams {
 }
 
 export interface DepositDefaultParams extends CommonDefaultParams, CommonDepositParams {}
+
 export interface DepositParams extends DepositDefaultParams, CalcValueProps {}
 
 /**

package/src/components/CalculatorDeposit/getDepositCalculatorParams.ts

@@ -1,15 +1,11 @@
-import {
-  type CalcDefaultParamsProps,
-  type CalcValueProps,
-} from '../../ui-kit/Calculator/CalculatorProps';
 import { checkRangeByKeys, getRangeByKeys } from '../../ui-kit/Calculator/rangeHelpers';
-import { type LinkButtonContent } from '../../ui-kit/LinkButton/LinkButtonContent';
-import { type Option } from '../../ui-kit/Select/Option';
 import { arrayByRange } from '../../utils/arrayByRange';
 import { mergeIntervals } from '../../utils/mergeIntervals';
 import {
   type CalculatorDepositParamsViewSettings,
-  type CommonDepositParams,
+  type DepositCalculatorParams,
+  type DepositCalculatorSourceBookParams,
+  type DepositCalculatorUserInputParams,
 } from './CalculatorDepositContent';
 
 const DEFAULT_DEPOSIT_CALCULATOR_PARAMS: DepositCalculatorSourceBookParams = {
@@ -25,38 +21,6 @@ const DEFAULT_DEPOSIT_CALCULATOR_PARAMS: DepositCalculatorSourceBookParams = {
   type: '',
 };
 
-export interface DepositCalculatorSourceBookParams
-  extends CommonDepositParams,
-    CalcDefaultParamsProps {
-  currency?: Option;
-}
-
-export interface DepositCalculatorUserInputParams extends CommonDepositParams, CalcValueProps {}
-
-export interface DepositCalculatorParams
-  extends DepositCalculatorSourceBookParams,
-    DepositCalculatorUserInputParams {
-  availableMonths: number[];
-  defaultMonth: number;
-  income: number;
-  finalSum: number;
-  currency?: Option;
-}
-
-export type TariffsButtonContent = LinkButtonContent & {
-  type?: string;
-};
-
-export type DepositCalculatorRowsData = {
-  currency: Option;
-  rates: DepositCalculatorSourceBookParams[];
-};
-
-export type DepositCalculatorData = {
-  rows?: DepositCalculatorRowsData[];
-  buttons?: TariffsButtonContent[];
-};
-
 export const getDepositCalculatorParams = (
   userInputParams: DepositCalculatorUserInputParams,
   rows?: DepositCalculatorSourceBookParams[],

package/src/components/CalculatorDeposit/normalize.tsx

@@ -1,8 +1,7 @@
 import { getRangeByKeys } from '../../ui-kit/Calculator/rangeHelpers';
 import { type Option } from '../../ui-kit/Select/Option';
 import { clamp } from '../../utils/clamp';
-import { type DepositParams } from './CalculatorDepositContent';
-import { type DepositCalculatorRowsData } from './getDepositCalculatorParams';
+import { type DepositCalculatorRowsData, type DepositParams } from './CalculatorDepositContent';
 import { isRubles } from './isRubles';
 
 export const normalizeDepositParams = (rows?: DepositCalculatorRowsData[]) => (_: DepositParams) =>

package/src/components/CalculatorDeposit/renderDepositParamsForm.tsx

@@ -1,71 +1,84 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm/useForm';
-import { renderBinaryRadioButtonGroup } from '../../ui-kit/Calculator/renderBinaryRadioButtonGroup';
+import {
+  renderBinaryRadioButtonGroup,
+  type BinaryRadioButtonGroupProps,
+} 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 { type Option } from '../../ui-kit/Select/Option';
+import { Select, type SelectProps } from '../../ui-kit/Select/Select';
+import { Text } from '../../ui-kit/Text/Text';
+import {
+  type CalculatorDepositParamsViewSettings,
+  type DepositCalculatorParams,
+} from './CalculatorDepositContent';
 import { renderRegistrationType } from './renderRegistrationType';
 
 export const renderDepositParamsForm = (
   params: DepositCalculatorParams & CalculatorDepositParamsViewSettings,
   field: FormFieldRegisterer<any>,
+  extraPercents?: Option[],
 ) => {
   const isCurrency = params?.currency?.key !== 'rub';
 
   return (
-    <div className="grid gap-lg">
-      <div className="flex gap-lg">
-        {params.isShowReplenish
-          ? renderBinaryRadioButtonGroup({
-              title: 'Пополнение',
-              ...field('isReplenish'),
-              value: params.isReplenish,
-              orientation: 'vertical',
-              items: [
-                { id: 'withReplenish', text: 'С пополнением' },
-                { id: 'withoutReplenish', text: 'Без пополнения' },
-              ],
-              disabled: isCurrency,
-            })
-          : null}
-        {params.isShowWithdrawn
-          ? renderBinaryRadioButtonGroup({
-              title: 'Снятие',
-              ...field('isWithdrawn'),
-              value: params.isWithdrawn,
-              orientation: 'vertical',
-              items: [
-                { id: 'wthDrawn', text: 'Со снятием' },
-                { id: 'noWithdrawn', text: 'Без снятия' },
-              ],
-              disabled: isCurrency,
-            })
-          : null}
-      </div>
+    <div className="grid grid-cols-2 gap-lg">
+      {renderReplenish(field('isReplenish'), params, isCurrency)}
+      {renderWithdrawn(field('isWithdrawn'), params, isCurrency)}
       {renderSeparator(params.isShowReplenish || params.isShowWithdrawn)}
-      <div className="flex gap-lg">
-        {params.isShowMonthlyInterestPayment
-          ? renderPayout({
-              title: 'Выплата процентов',
-              ...field('isMonthlyInterestPayment'),
-              value: params.isMonthlyInterestPayment,
-              orientation: 'vertical',
-            })
-          : null}
-        {params.isShowRemoteRegistration
-          ? renderRegistrationType({
-              title: 'Оформление',
-              ...field('isRemoteRegistration'),
-              value: params.isRemoteRegistration,
-              orientation: 'vertical',
-            })
-          : null}
-      </div>
-      {renderSeparator(params.isShowNewClient)}
+      {params.isShowMonthlyInterestPayment ? renderPayout(field('isMonthlyInterestPayment')) : null}
+      {renderRegistrationType(field('isRemoteRegistration'), params.isShowRemoteRegistration)}
+      {renderExtraPercents(field('extraPercent'), extraPercents)}
       {params.isShowNewClient ? <Checkbox text="Новый вкладчик" {...field('isNewClient')} /> : null}
     </div>
   );
 };
 
+const renderReplenish = (
+  props: Partial<BinaryRadioButtonGroupProps>,
+  params: DepositCalculatorParams & CalculatorDepositParamsViewSettings,
+  isCurrency = false,
+) =>
+  params.isShowReplenish
+    ? renderBinaryRadioButtonGroup({
+        ...props,
+        title: 'Пополнение',
+        orientation: 'vertical',
+        items: [
+          { id: 'withReplenish', text: 'С пополнением' },
+          { id: 'withoutReplenish', text: 'Без пополнения' },
+        ],
+        disabled: isCurrency,
+      })
+    : null;
+
+const renderWithdrawn = (
+  props: Partial<BinaryRadioButtonGroupProps>,
+  params: DepositCalculatorParams & CalculatorDepositParamsViewSettings,
+  isCurrency = false,
+) =>
+  params.isShowWithdrawn
+    ? renderBinaryRadioButtonGroup({
+        ...props,
+        title: 'Снятие',
+        orientation: 'vertical',
+        items: [
+          { id: 'wthDrawn', text: 'Со снятием' },
+          { id: 'noWithdrawn', text: 'Без снятия' },
+        ],
+        disabled: isCurrency,
+      })
+    : null;
+
 const renderSeparator = (isShow = false) =>
-  isShow ? <div className="border-b border-main-divider w-full"></div> : null;
+  isShow ? <div className="border-b border-main-divider col-span-2 w-full"></div> : null;
+
+const renderExtraPercents = (props: Partial<SelectProps>, extraPercents?: Option[]) =>
+  extraPercents?.length ? (
+    <div className="w-full space-y-s col-span-2">
+      <Text color="text-secondary-text" font="font-light">
+        Надбавка за операции по карте
+      </Text>
+      <Select options={extraPercents} {...props} />
+    </div>
+  ) : null;

package/src/components/CalculatorDeposit/renderRegistrationType.tsx

@@ -3,11 +3,18 @@ import {
   type BinaryRadioButtonGroupProps,
 } from '../../ui-kit/Calculator/renderBinaryRadioButtonGroup';
 
-export const renderRegistrationType = (props: Partial<BinaryRadioButtonGroupProps>) =>
-  renderBinaryRadioButtonGroup({
-    ...props,
-    items: [
-      { id: 'remote', text: 'Дистанционно' },
-      { id: 'office', text: 'Офис Банка' },
-    ],
-  });
+export const renderRegistrationType = (
+  props: Partial<BinaryRadioButtonGroupProps>,
+  isShow = false,
+) =>
+  isShow
+    ? renderBinaryRadioButtonGroup({
+        ...props,
+        title: 'Оформление',
+        orientation: 'vertical',
+        items: [
+          { id: 'remote', text: 'Дистанционно' },
+          { id: 'office', text: 'Офис Банка' },
+        ],
+      })
+    : null;

package/src/components/CalculatorRefinancing/CalculatorRefinancing.tsx

@@ -57,9 +57,6 @@ export const CalculatorRefinancing = UniBlock<RefinancingCalculatorProp>(
     );
 
     const paymentTypeElement = renderPaymentType({
-      title: '',
-      mobileTitle: 'Тип платежа',
-      orientation: 'vertical',
       ...field('isAnnuity'),
     });
 
@@ -114,7 +111,7 @@ export const CalculatorRefinancing = UniBlock<RefinancingCalculatorProp>(
               postfix="₽"
             />
             {calcParams.benefit > 0 ? (
-              <CalculatorValue title={'Выгода в месяц'} value={calcParams.benefit} postfix="₽" />
+              <CalculatorValue title="Выгода в месяц" value={calcParams.benefit} postfix="₽" />
             ) : null}
             <div className="hidden sm:block mb-lg">{paymentTypeElement}</div>
             {renderButtonsSection(buttons, { isVertical: true })}

package/src/retail/adaptors/getFamilyStatusAndIncomeData.ts

@@ -44,4 +44,4 @@ export const getFamilyStatusAndIncomeData = (formData: LeadFormState): Partial<P
 };
 
 export const countIncomeAverage = (wages?: number, retirementIncome?: number) =>
-  Number(wages) + Number(retirementIncome);
+  Number(wages ?? 0) + Number(retirementIncome ?? 0);

package/src/retail/components/DocumentDialog/DocumentDialog.tsx

@@ -13,7 +13,7 @@ export const DocumentDialog = JSX<DocumentDialogProps>(({ src, onClose, onDocume
   const isMobileMode = useMobileMode();
 
   return (
-    <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0" onClose={onClose}>
+    <Dialog className="my-6xl max-w-4xl mx-auto px-0 min-h-0 pb-0 z-[101]" onClose={onClose}>
       {isMobileMode ? (
         <img src={src} />
       ) : (

package/src/retail/components/EsiaLoginDialog/EsiaLoginDialog.tsx

@@ -45,11 +45,16 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
           </ul>
           <Img image={{ icon: 'GosUslugiIcon', iconVersion: 'normal' }} height="70" />
         </div>
-        <div className="flex flex-wrap gap-lg w-full">
-          <Button type="button" onClick={handleAuth}>
+        <div className="@container flex flex-wrap gap-lg w-full">
+          <Button type="button" onClick={handleAuth} className="w-full md:w-auto">
             Заполнить через Госуслуги
           </Button>
-          <Button type="button" version="secondary" onClick={handleClose}>
+          <Button
+            type="button"
+            version="secondary"
+            onClick={handleClose}
+            className="w-full md:w-auto"
+          >
             Пропустить
           </Button>
         </div>

package/src/retail/components/Fields/AddressCourierField.tsx

@@ -0,0 +1,74 @@
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { type JSONRefObject } from '../../../data/JSONRefObject';
+import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { UniBlock } from '../../../UniBlock/UniBlock';
+import { type UniBlockProps } from '../../../UniBlock/UniBlockProps';
+import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
+import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
+import { getAddressFromDaDataItem } from './AddressField';
+
+export interface AddressCourierFieldProps extends CustomFieldProps, UniBlockProps {
+  source?: JSONRefObject & {
+    deliveryCities?: string[];
+  };
+}
+
+export const AddressCourierField = UniBlock<AddressCourierFieldProps>(
+  ({ field, input, source }) => {
+    const [errorCity, setErrorCity] = useState('');
+    const fieldValue = field('addressCourier')?.value;
+    const currentLocality = fieldValue?.locality;
+    const currentCity = fieldValue?.city;
+
+    useEffect(() => {
+      if (
+        (currentCity || currentLocality) &&
+        !source?.deliveryCities?.includes(currentCity as string)
+      ) {
+        field?.('addressCourier')?.onChange?.({
+          ...fieldValue,
+          house: '',
+        });
+        setErrorCity('Город недоступен для доставки');
+      } else {
+        setErrorCity('');
+      }
+    }, [currentCity, currentLocality, source]);
+
+    const onDaDataChange = useCallback((item: DaDataSuggestion) => {
+      field?.('addressCourier')?.onChange?.(getAddressFromDaDataItem(item));
+    }, []);
+
+    const onChange = useCallback((value: string) => {
+      field?.('addressCourier')?.onChange?.({
+        apartment: '',
+        city: '',
+        district: '',
+        fullAddress: value,
+        fiasCode: '',
+        house: '',
+        locality: '',
+        okatoRegionCode: '',
+        postcode: '',
+        region: '',
+        regionCode: '',
+        street: '',
+        qc: '',
+        qcComplete: '',
+        qcHouse: '',
+      });
+    }, []);
+
+    return (
+      <DaDataInputControl
+        label="Адрес"
+        {...field('addressCourier')}
+        value={fieldValue?.fullAddress}
+        onChange={onChange}
+        {...input}
+        error={errorCity || field('addressCourier')?.error}
+        onDaDataChange={onDaDataChange}
+      />
+    );
+  },
+);

package/src/retail/inputs.tsx

@@ -1,4 +1,7 @@
+/* eslint-disable max-lines */
+import { type CustomFieldProps } from '../ui-kit/FormField/CustomFieldProps';
 import { PhoneField } from '../ui-kit/FormField/Fields/PhoneField';
+import { AddressCourierField } from './components/Fields/AddressCourierField';
 import { AddressFactField } from './components/Fields/AddressFactField';
 import { AddressField } from './components/Fields/AddressField';
 import { AddressMatchField } from './components/Fields/AddressMatchField';
@@ -65,6 +68,10 @@ import { SurnameField } from './components/Fields/SurnameField';
 import { TotalIncomeField } from './components/Fields/TotalIncomeField';
 import { WagesField } from './components/Fields/WagesField';
 
+const DELIVERY_CITIES_REF = {
+  $ref: '/wcms-resources/delivery-cities-data.json',
+};
+
 export const InputsApplicationLeadMap = {
   limitedBirthday: LimitedBirthdayField,
   name: NameField,
@@ -142,7 +149,9 @@ export const InputsRetailMap = {
 };
 
 export const InputRetailCardMap = {
-  addressCourier: AddressField,
+  addressCourier: (props: CustomFieldProps) => (
+    <AddressCourierField {...props} source={DELIVERY_CITIES_REF} />
+  ),
   paymentSystem: PaymentSystemField,
   currency: CurrencyField,
   cardCategory: CardCategoryField,

package/src/retail/model/LeadFormState.ts

@@ -57,7 +57,7 @@ export interface Address {
   qcHouse?: string;
 }
 
-export interface Calculator {
+export interface CalculatorProps {
   moneyValue?: number;
   monthsValue?: number;
   isAnnuity?: boolean;
@@ -164,7 +164,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   cardCategory?: Option;
   codeWord?: string;
   esiaAccountTypeCd?: Option;
-  calculator?: Calculator;
+  calculator?: CalculatorProps;
   addressRetail?: Option;
   loanAmount?: number;
   creditPeriod?: number;

package/src/ui-kit/Calculator/getDefaultParams.tsx

@@ -1,4 +1,5 @@
-import { type DepositCalculatorSourceBookParams } from '../../components/CalculatorDeposit/getDepositCalculatorParams';
+import { type DepositCalculatorSourceBookParams } from '../../components/CalculatorDeposit/CalculatorDepositContent';
+import { type Option } from '../Select/Option';
 import { type CalcDefaultParamsProps } from './CalculatorProps';
 
 export const getDefaultParamsMin = (rateRows?: CalcDefaultParamsProps[]) =>
@@ -9,11 +10,17 @@ export const getDefaultParamsMin = (rateRows?: CalcDefaultParamsProps[]) =>
 export const getDefaultParamsMax = (
   rateRows: DepositCalculatorSourceBookParams[] = [],
   isNewClient = false,
-) =>
-  getDefaultParams(
-    [(i: number, acc: number) => i > acc, (i, prev) => i?.minSum < prev?.minSum],
-    rateRows?.filter((_) => isNewClient === Boolean(_?.isNewClient)),
-  );
+  extraPercents: Option[] = [],
+) => {
+  return {
+    ...getDefaultParams(
+      [(i: number, acc: number) => i > acc, (i, prev) => i?.minSum < prev?.minSum],
+      rateRows?.filter((_) => isNewClient === Boolean(_?.isNewClient)),
+    ),
+    extraPercent: extraPercents.at(-1),
+    extraPercents,
+  };
+};
 
 const getDefaultParams = (
   comparators: [