@redneckz/wildless-cms-uni-blocks 0.10.1 → 0.10.3

package/mobile/src/ui-kit/Button/ArrowButton.tsx

@@ -20,7 +20,6 @@ export const ArrowButton = JSX<ButtonProps>(({ className, disabled, ...rest }) =
       imageClassName="group-hover/btn:text-primary-main"
       width="16"
       height="16"
-      asSVG
     />
   </Button>
 ));

package/mobile/src/ui-kit/Button/ButtonInner.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import type { ButtonVersion } from '../../model/ButtonVersion';
+import { style } from '../../utils/style';
 import { iconStyleMap } from './buttonClassNameConstants';
 import type { ButtonWithIconProps } from './ButtonProps';
 
@@ -11,7 +12,7 @@ export const ButtonInner = JSX<ButtonInnerProps>((props) => {
   const { text, aboveText, appendLeft, appendRight, version = 'primary' } = props;
 
   return (
-    <div className={getButtonStyle(props)}>
+    <div className={style(getButtonStyle(props), 'flex gap-2')}>
       {appendLeft ? <div className={iconStyleMap[version]}>{appendLeft}</div> : null}
       {isWithText(props) ? (
         <div>
@@ -31,10 +32,10 @@ const getButtonStyle = (props: ButtonInnerProps) => {
     return '';
   }
 
-  const withTextStyle = `gap-2 ${aboveText ? 'py-2.5 px-7' : 'py-4 px-4'}`;
+  const withTextStyle = `${aboveText ? 'py-2.5 px-7' : 'py-4 px-4'}`;
 
   return [
-    'group/btn flex items-center justify-center',
+    'group/btn items-center justify-center',
     isWithText(props) ? withTextStyle : 'h-12 w-12',
     rounded ? 'rounded-full' : '',
   ].join(' ');

package/mobile/src/ui-kit/Button/ButtonProps.ts

@@ -58,6 +58,4 @@ export type BackwardButtonProps = ButtonProps &
     appendLeft?: VNode;
     /** @title Закругленные углы */
     rounded?: boolean;
-    /** @hidden */
-    asSVG?: boolean;
   };

package/mobile/src/ui-kit/Button/renderButtonsSection.tsx

@@ -24,7 +24,8 @@ const renderButton =
   (buttonClassName = '') =>
   (button?: ButtonWithIconProps, index?: number) => {
     const { text, icon, iconRight, version, ...rest } = button || {};
-    const iconVersion = version === 'secondary' ? 'color' : 'white';
+    const iconVersionDefault = version === 'secondary' ? 'color' : 'white';
+    const iconVersion = icon?.iconVersion ? icon?.iconVersion : iconVersionDefault;
 
     return text || icon?.icon ? (
       <Button
@@ -47,6 +48,5 @@ const renderButtonIcon = (icon: Picture) =>
       image={icon}
       width={String(icon?.size?.width || DEFAULT_ICON_W)}
       height={String(DEFAULT_ICON_W)}
-      asSVG
     />
   ) : null;

package/mobile/src/ui-kit/Foldable/DefaultFoldButton.tsx

@@ -39,7 +39,6 @@ export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
             className="flex-shrink-0 my-auto"
             width="20"
             height="20"
-            asSVG
           />
         ) : null}
       </button>

package/mobile/src/ui-kit/Icon/Icon.tsx

@@ -22,13 +22,12 @@ export const Icon = JSX<IconProps>(
     alt = `Иконка ${name}`,
     title = alt,
     iconVersion = 'color',
-    asSVG,
     ...imgProps
   }) => {
     const router = useRouter();
     const href = adjustHref(router)(joinPath(projectSettings.CDN, '/icons', `${name}.svg`));
 
-    if (asSVG && iconVersion !== 'normal') {
+    if (iconVersion !== 'normal') {
       return (
         <Background className={className}>
           <svg
@@ -48,6 +47,7 @@ export const Icon = JSX<IconProps>(
         </Background>
       );
     }
+
     if (!className.includes('h-')) {
       imgProps['style'] = { height: `${imgProps.height}px` };
     }

package/mobile/src/ui-kit/Icon/IconProps.ts

@@ -12,8 +12,6 @@ export interface IconCompatibilityFields {
   width?: string;
   /** @title Высота */
   height?: string;
-  /** @hidden */
-  asSVG?: boolean;
 }
 
 export type IconProps = IconCompatibilityFields & {

package/mobile/src/ui-kit/Img/ImgInner.tsx

@@ -13,7 +13,7 @@ export const ImgInner = JSX<ImageProps>(
       <Icon
         className={className}
         imageClassName={imageClassName}
-        iconVersion={image?.iconVersion || 'normal'}
+        iconVersion={image?.iconVersion}
         name={image.icon}
         {...iconProps}
       />

package/mobile/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -25,7 +25,6 @@ export const TableInnerButton = JSX<TableInnerButtonProps>(({ isOpen, onClick })
         iconVersion="white"
         width="20"
         height="20"
-        asSVG
       />
     </Button>
   );

package/mobile/src/ui-kit/InnerTable/InnerTableHeader.tsx

@@ -39,7 +39,6 @@ export const InnerTableHeader = JSX<InnerTableHeaderProps>(
               className="mr-0.5"
               width="20"
               height="20"
-              asSVG
             />
           }
           text="Скачать в PDF"

package/mobile/src/ui-kit/LinkButton/LinkButton.tsx

@@ -1,7 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../Img/Img';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
+import { Img } from '../Img/Img';
 
 const LINK_CLASS_NAME = `absolute border border-primary-main ml-3 px-6 py-5
   text-l-light bg-white text-primary-text flex w-[316px]
@@ -30,7 +30,6 @@ export const LinkButton = JSX<LinkButtonProps>(
               imageClassName="group-hover/link:text-primary-main"
               width="24"
               height="24"
-              asSVG
             />
           </div>
         </a>

package/mobile/src/ui-kit/Logo/renderImage.tsx

@@ -24,7 +24,6 @@ export const renderImage = (
       width={size?.width}
       height={size?.height}
       pathPrefix="/wcms-resources/"
-      asSVG
     />
   ) : (
     <Img
@@ -35,7 +34,6 @@ export const renderImage = (
       className={SVG_COLOR[bgColor]}
       width={size?.width}
       height={size?.height}
-      asSVG
     />
   );
 };

package/mobile/src/ui-kit/YandexMap/renderSearchField.tsx

@@ -1,6 +1,6 @@
+import ymaps from 'yandex-maps';
 import { Icon } from '../Icon/Icon';
 import type { MockPoints } from './mockPoints';
-import ymaps from 'yandex-maps';
 const styles = {
   border: 'border border-transparent rounded-md',
   position: 'relative flex items-center',
@@ -37,7 +37,6 @@ export const renderSearchField = (
         iconVersion="black"
         width="20"
         height="20"
-        asSVG
         className="absolute left-4"
       />
       <input

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/BenefitsBlock/BenefitsBlock.tsx

@@ -37,7 +37,6 @@ const renderStep = (benefit: BenefitBlockItemProps, i: number) => {
         <Img
           className="w-12 h-12 min-w-12 p-3 rounded-full bg-main-divider text-primary-main group-data-secondary:bg-white/30 group-data-secondary:text-black"
           image={benefit.icon}
-          asSVG
         />
       ) : null}
       {benefit?.icon?.src ? <Img image={benefit.icon} /> : null}

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.fixture.tsx

@@ -6,35 +6,35 @@ import { BonusBenefit } from './BonusBenefitsBlockContent';
 const bonusBenefits: BonusBenefit[] = [
   {
     description: 'Более 5000 товаров',
-    icon: { icon: 'WateringCanIcon' },
+    icon: { icon: 'WateringCanIcon', iconVersion: 'normal' },
   },
   {
     description: '750 авиакомпаний, 1,2 млн отелей, билеты РЖД',
-    icon: { icon: 'AirPlaneIcon' },
+    icon: { icon: 'AirPlaneIcon', iconVersion: 'normal' },
   },
   {
     description: 'Аренда автомобилей',
-    icon: { icon: 'CarIcon' },
+    icon: { icon: 'CarIcon', iconVersion: 'normal' },
   },
   {
     description: 'Болеее 1000 развлечений',
-    icon: { icon: 'CinemaIcon' },
+    icon: { icon: 'CinemaIcon', iconVersion: 'normal' },
   },
   {
     description: 'Платежные гаджеты Pay Ring',
-    icon: { icon: 'SoundIcon' },
+    icon: { icon: 'SoundIcon', iconVersion: 'normal' },
   },
   {
     description: 'Цифровые сервисы',
-    icon: { icon: 'DocsIcon' },
+    icon: { icon: 'DocsIcon', iconVersion: 'normal' },
   },
   {
     description: 'Фермерские продукты',
-    icon: { icon: 'PumpkinIcon' },
+    icon: { icon: 'PumpkinIcon', iconVersion: 'normal' },
   },
   {
     description: 'Страхование',
-    icon: { icon: 'PowerIcon' },
+    icon: { icon: 'PowerIcon', iconVersion: 'normal' },
   },
 ];
 

package/src/components/BusinessBlock/BusinessCard.tsx

@@ -12,7 +12,7 @@ export const BusinessCard = JSX<BusinessCardProps>((props) => {
       {image ? (
         <div className="flex justify-center">
           {image?.src ? <Img className="mb-5" image={image} /> : null}
-          {image?.icon ? <Img image={image} asSVG /> : null}
+          {image?.icon ? <Img image={image} /> : null}
         </div>
       ) : null}
       {title ? <Heading headingType="h4" title={title} className="mb-6" /> : null}
@@ -28,7 +28,7 @@ const renderItem = (item: BusinessCardItemProps, key: string) => {
   return (
     <li key={key} className="flex items-center gap-3.5 mb-3 last:mb-0">
       {icon?.icon ? (
-        <Img image={icon} className="w-12 h-12 min-w-12 p-3 rounded-full bg-main-divider" asSVG />
+        <Img image={icon} className="w-12 h-12 min-w-12 p-3 rounded-full bg-main-divider" />
       ) : null}
       {icon?.src ? <Img image={icon} /> : null}
       <span className="text-xl-light">{text}</span>

package/src/components/Calculator/Calculator.tsx

@@ -92,7 +92,6 @@ function renderNavButton({ tab, i, isActive, onClick }: NavButtonProps) {
         }}
         width="24"
         height="24"
-        asSVG
       />
       <div className="border-0">
         <div className={`${btnTitleClassName}`}>{tab?.title}</div>

package/src/components/Calculator/CreditCalculatorForm.tsx

@@ -1,7 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { renderButtonsSection } from '../../ui-kit/Button/renderButtonsSection';
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
+import { clamp } from '../../utils/clamp';
 import { style } from '../../utils/style';
 import type {
   CreditCalculatorParamsViewSettings,
@@ -50,6 +51,11 @@ export const CreditCalculatorForm = JSX<CreditCalculatorProp>(
       paramsViewSettings,
     );
 
+    useEffect(() => {
+      setMoneyValue(clamp(moneyValue, calculatorParams.minSum, calculatorParams.maxSum));
+      setMonthsValue(clamp(monthsValue, calculatorParams.minMonths, calculatorParams.maxMonths));
+    }, [calculatorParams]);
+
     return (
       <section className={style('flex justify-between', className)}>
         <div className="w-[468px]">

package/src/components/Calculator/UnknownRate.tsx

@@ -1,5 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { Img } from '../../ui-kit/Img/Img';
+import { Icon } from '../../ui-kit/Icon/Icon';
 import { Paragraph } from '../../ui-kit/Paragraph/Paragraph';
 import { Text } from '../../ui-kit/Text/Text';
 
@@ -13,7 +13,7 @@ export const UnknownRate = JSX<UnknownRateProps>(({ title = 'Ставка' }) =>
       {title}
     </Text>
     <div className="mt-1 pt-1 pl-5 pb-1.5">
-      <Img image={{ icon: 'PercentIcon' }} width="90" height="85" asSVG />
+      <Icon name="PercentIcon" width="90" height="85" />
     </div>
     <div className="w-[250px] mt-3.5">
       <Paragraph size="text-xl-light" color="text-primary-text">

package/src/components/Calculator/constants.ts

@@ -1,6 +1,6 @@
 import { BonusCalculatorSourceBookParams } from './useBonusCalculatorParams';
 import { BusinessDepositCalculatorSourceBookParams } from './useBusinessDepositCalculatorParams';
-import { CreditCalculatorSourceBookParams } from './useCreditCalculatorParams';
+import { CreditCalculatorSourceBookRateParams } from './useCreditCalculatorParams';
 import { DepositCalculatorSourceBookParams } from './useDepositCalculatorParams';
 
 export const DEFAULT_MIN_SUM = 10000;
@@ -21,7 +21,7 @@ export const MONTHS_IN_YEAR = 12;
 
 export const MONTHLY_INTEREST_RATE = MONTHS_IN_YEAR * 100;
 
-export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookParams = {
+export const DEFAULT_CREDIT_CALCULATOR_PARAMS: CreditCalculatorSourceBookRateParams = {
   minSum: DEFAULT_MIN_SUM,
   maxSum: DEFAULT_MAX_SUM,
   minMonths: DEFAULT_MIN_MONTHS,

package/src/components/Calculator/rangeHelpers.ts

@@ -2,6 +2,22 @@ import { maxBy } from '../../utils/maxBy';
 import { mergeIntervals } from '../../utils/mergeIntervals';
 import { minBy } from '../../utils/minBy';
 
+export const getLimitRangeByKeys = <
+  MinKey extends string,
+  MaxKey extends string,
+  T extends Record<MinKey | MaxKey, number>,
+>(
+  [minKey, maxKey]: [MinKey, MaxKey],
+  limitParams?: T,
+  rateRows: T[] = [],
+) =>
+  limitParams && limitParams[minKey] && limitParams[maxKey]
+    ? {
+        [minKey]: limitParams[minKey],
+        [maxKey]: limitParams[maxKey],
+      }
+    : getRangeByKeys([minKey, maxKey], rateRows);
+
 export const getRangeByKeys = <
   MinKey extends string,
   MaxKey extends string,
@@ -10,8 +26,8 @@ export const getRangeByKeys = <
   [minKey, maxKey]: [MinKey, MaxKey],
   rows: T[] = [],
 ) => ({
-  [minKey]: rows.length ? minBy()(rows.map((row) => row[minKey])) : 0,
-  [maxKey]: rows.length ? maxBy()(rows.map((row) => row[maxKey])) : 0,
+  [minKey]: rows.length ? minBy()(rows.filter((row) => row[minKey]).map((row) => row[minKey])) : 0,
+  [maxKey]: rows.length ? maxBy()(rows.filter((row) => row[maxKey]).map((row) => row[maxKey])) : 0,
 });
 
 export const getMergeRangesByKeys = <

package/src/components/Calculator/useBusinessDepositCalculatorParams.ts

@@ -38,7 +38,7 @@ export interface BusinessDepositCalculatorParams
 }
 
 export type BusinessDepositCalculatorData = {
-  rows: BusinessDepositCalculatorSourceBookParams[];
+  rateRows: BusinessDepositCalculatorSourceBookParams[];
 };
 
 export const useBusinessDepositCalculatorParams = (
@@ -70,7 +70,7 @@ export const useBusinessDepositCalculatorParams = (
     };
   }
   const businessDepositCalculatorSourceBookParams =
-    data?.rows?.find((_) => {
+    data?.rateRows?.find((_) => {
       return (
         isMonthlyInterestPayment === _.isMonthlyInterestPayment &&
         isSmallBusiness === _.isSmallBusiness &&
@@ -84,7 +84,7 @@ export const useBusinessDepositCalculatorParams = (
 
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
-  const sourceBookRows = data?.rows || [DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS];
+  const sourceBookRows = data?.rateRows || [DEFAULT_BUSINESS_DEPOSIT_CALCULATOR_PARAMS];
 
   return {
     ...businessDepositCalculatorSourceBookParams,

package/src/components/Calculator/useCreditCalculatorParams.ts

@@ -1,7 +1,8 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import type { CreditCalculatorParamsViewSettings } from './CalculatorContent';
 import { CREDIT_CALC_DEFAULT_DIR, DEFAULT_CREDIT_CALCULATOR_PARAMS } from './constants';
 import { getMonthlyPayment } from './getMonthlyPayment';
-import { checkRangeByKeys, getRangeByKeys } from './rangeHelpers';
+import { checkRangeByKeys, getLimitRangeByKeys } from './rangeHelpers';
 import { useCalculatorParams } from './useCalculatorParams';
 
 export interface CommonCreditParams {
@@ -10,7 +11,7 @@ export interface CommonCreditParams {
   isPensionClient: boolean;
   isStateEmployee: boolean;
 }
-export interface CreditCalculatorSourceBookParams extends CommonCreditParams {
+export interface CreditCalculatorSourceBookRateParams extends CommonCreditParams {
   minSum: number;
   maxSum: number;
   minMonths: number;
@@ -18,6 +19,13 @@ export interface CreditCalculatorSourceBookParams extends CommonCreditParams {
   rate: number;
 }
 
+export interface CreditCalculatorSourceBookLimitParams extends CommonCreditParams {
+  minSum: number;
+  maxSum: number;
+  minMonths: number;
+  maxMonths: number;
+}
+
 export interface CreditCalculatorUserInputParams extends CommonCreditParams {
   isAnnuity: boolean;
   moneyValue: number;
@@ -25,13 +33,14 @@ export interface CreditCalculatorUserInputParams extends CommonCreditParams {
 }
 
 export interface CreditCalculatorParams
-  extends CreditCalculatorSourceBookParams,
+  extends CreditCalculatorSourceBookRateParams,
     CreditCalculatorUserInputParams {
   monthlyPayment: number;
 }
 
 export type CreditCalculatorData = {
-  rows: CreditCalculatorSourceBookParams[];
+  rateRows?: CreditCalculatorSourceBookRateParams[];
+  limitRows?: CreditCalculatorSourceBookLimitParams[];
 };
 
 export const useCreditCalculatorParams = (
@@ -41,60 +50,88 @@ export const useCreditCalculatorParams = (
 ): CreditCalculatorParams => {
   const { moneyValue, monthsValue } = userInputParams;
   const data = useCalculatorParams<CreditCalculatorData>(sourceBookDir || CREDIT_CALC_DEFAULT_DIR);
-  const isExcludeSalaryClient = !paramsViewSettings?.isShowSalaryClient;
-  const isExcludeStateEmployee = !paramsViewSettings?.isShowStateEmployee;
-  const isExcludePensionClient = !paramsViewSettings?.isShowPensionClient;
-  const isExcludeInsurance = !paramsViewSettings?.isShowInsurance;
-  const creditCalculatorSourceBookParams =
-    data?.rows?.find(
+
+  const creditCalculatorSourceBookLimitParams = data?.limitRows?.find((row) =>
+    checkRowCommonParams({
+      row,
+      userInputParams,
+      paramsViewSettings,
+    }),
+  );
+
+  const creditCalculatorSourceBookRateParams =
+    data?.rateRows?.find(
       (row) =>
-        checkRowByParam({
-          row,
-          userInputParams,
-          paramKey: 'isSalaryClient',
-          isExclude: isExcludeSalaryClient,
-        }) &&
-        checkRowByParam({
+        checkRowCommonParams({
           row,
           userInputParams,
-          paramKey: 'isStateEmployee',
-          isExclude: isExcludeStateEmployee,
-        }) &&
-        checkRowByParam({
-          row,
-          userInputParams,
-          paramKey: 'isPensionClient',
-          isExclude: isExcludePensionClient,
-        }) &&
-        checkRowByParam({
-          row,
-          userInputParams,
-          paramKey: 'isInsurance',
-          isExclude: isExcludeInsurance,
+          paramsViewSettings,
         }) &&
         checkRangeByKeys(moneyValue, ['minSum', 'maxSum'], row) &&
         checkRangeByKeys(monthsValue, ['minMonths', 'maxMonths'], row),
     ) || DEFAULT_CREDIT_CALCULATOR_PARAMS;
 
-  const { rate } = creditCalculatorSourceBookParams;
+  const { rate } = creditCalculatorSourceBookRateParams;
   const monthlyPayment = getMonthlyPayment(rate, userInputParams);
-  const sourceBookRows = data?.rows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
+  const rateRows = data?.rateRows || [DEFAULT_CREDIT_CALCULATOR_PARAMS];
 
-  return {
-    ...creditCalculatorSourceBookParams,
-    ...getRangeByKeys(['minSum', 'maxSum'], sourceBookRows),
-    ...getRangeByKeys(['minMonths', 'maxMonths'], sourceBookRows),
-    ...userInputParams,
-    monthlyPayment,
-  };
+  return useMemo(
+    () => ({
+      ...creditCalculatorSourceBookRateParams,
+      ...getLimitRangeByKeys(['minSum', 'maxSum'], creditCalculatorSourceBookLimitParams, rateRows),
+      ...getLimitRangeByKeys(
+        ['minMonths', 'maxMonths'],
+        creditCalculatorSourceBookLimitParams,
+        rateRows,
+      ),
+      ...userInputParams,
+      monthlyPayment,
+    }),
+    [userInputParams],
+  );
 };
 
-interface CheckRowByParamProps {
-  row: CreditCalculatorSourceBookParams;
+interface CheckSourceBookRowProps {
+  row: CommonCreditParams;
   userInputParams: CreditCalculatorUserInputParams;
-  paramKey: string;
-  isExclude: boolean;
+  paramsViewSettings?: CreditCalculatorParamsViewSettings;
 }
 
-const checkRowByParam = ({ row, userInputParams, paramKey, isExclude }: CheckRowByParamProps) =>
-  isExclude || userInputParams[paramKey] === row[paramKey];
+interface CheckSourceBookRowFieldProps extends CheckSourceBookRowProps {
+  fieldKey: string;
+  viewSettingFieldKey: string;
+}
+
+const checkRowCommonParams = (props: CheckSourceBookRowProps) =>
+  checkRowParam({
+    ...props,
+    fieldKey: 'isSalaryClient',
+    viewSettingFieldKey: 'isShowSalaryClient',
+  }) &&
+  checkRowParam({
+    ...props,
+    fieldKey: 'isStateEmployee',
+    viewSettingFieldKey: 'isShowStateEmployee',
+  }) &&
+  checkRowParam({
+    ...props,
+    fieldKey: 'isPensionClient',
+    viewSettingFieldKey: 'isShowPensionClient',
+  }) &&
+  checkRowParam({
+    ...props,
+    fieldKey: 'isInsurance',
+    viewSettingFieldKey: 'isShowInsurance',
+  });
+
+const checkRowParam = ({
+  row,
+  userInputParams,
+  paramsViewSettings,
+  fieldKey,
+  viewSettingFieldKey,
+}: CheckSourceBookRowFieldProps) => {
+  const isExclude = paramsViewSettings ? !paramsViewSettings[viewSettingFieldKey] : false;
+
+  return isExclude || userInputParams[fieldKey] === row[fieldKey];
+};

package/src/components/Calculator/useDepositCalculatorParams.ts

@@ -33,7 +33,7 @@ export interface DepositCalculatorParams
 }
 
 export type DepositCalculatorData = {
-  rows: DepositCalculatorSourceBookParams[];
+  rateRows: DepositCalculatorSourceBookParams[];
 };
 
 export const useDepositCalculatorParams = (
@@ -45,13 +45,13 @@ export const useDepositCalculatorParams = (
   const data = useCalculatorParams<DepositCalculatorData>(
     sourceBookDir || DEPOSIT_CALC_DEFAULT_DIR,
   );
-  const defaultMonth = data?.rows[0]
-    ? getMiddleMonth(data.rows[0].minMonths, data.rows[0].maxMonths)
+  const defaultMonth = data?.rateRows[0]
+    ? getMiddleMonth(data.rateRows[0].minMonths, data.rateRows[0].maxMonths)
     : 1;
   const isExcludeMonthlyInterestPayment = !paramsViewSettings?.isShowMonthlyInterestPayment;
   const isExcludeRemoteRegistration = !paramsViewSettings?.isShowRemoteRegistration;
   const depositCalculatorSourceBookParams =
-    data?.rows?.find(
+    data?.rateRows?.find(
       (row) =>
         checkRowByParam({
           row,
@@ -72,7 +72,7 @@ export const useDepositCalculatorParams = (
   const { rate } = depositCalculatorSourceBookParams;
   const income = getDepositIncome(rate, userInputParams);
   const finalSum = moneyValue + income;
-  const sourceBookRows = data?.rows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
+  const sourceBookRows = data?.rateRows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
 
   return {
     ...depositCalculatorSourceBookParams,

package/src/components/CarouselEventCard/CarouselEventCard.tsx

@@ -5,7 +5,6 @@ import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
 import { Text } from '../../ui-kit/Text/Text';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { style } from '../../utils/style';
 import type { CarouselEventCardContent } from './CarouselEventCardContent';
 
@@ -16,7 +15,7 @@ export const CarouselEventCard = JSX<CarouselEventCardProps>(
     return (
       <BlockWrapper className={style('w-[365px]', className)} {...rest}>
         <LinkWrapper className="flex flex-col" href={href} target={target}>
-          {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
+          {icon?.icon ? <Img image={icon} /> : null}
           {icon?.src ? <Img image={icon} /> : null}
           {title ? (
             <Heading headingType="h6" as="h4" className="text-left pt-3 mb-2" title={title} />

package/src/components/CarouselProductCard/CarouselProductCard.tsx

@@ -64,7 +64,7 @@ const renderImage = (image?: Picture) => (
   <div className="flex justify-center">
     {image?.src ? <Img className="mb-5" image={image} /> : null}
     {image?.icon ? (
-      <Img className={`w-[32px] h-[32px] min-w-[32px] mb-5 rounded-full`} image={image} asSVG />
+      <Img className={`w-[32px] h-[32px] min-w-[32px] mb-5 rounded-full`} image={image} />
     ) : null}
   </div>
 );

package/src/components/CarouselProgramsCard/CarouselProgramsCard.tsx

@@ -5,7 +5,6 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Img } from '../../ui-kit/Img/Img';
 import { LinkWrapper } from '../../ui-kit/LinkWrapper/LinkWrapper';
-import { getIconWithVersion } from '../../utils/getIconWithVersion';
 import { style } from '../../utils/style';
 import type { CarouselProgramsCardContent } from './CarouselProgramsCardContent';
 
@@ -17,7 +16,7 @@ export const CarouselProgramsCard = JSX<CarouselTariffsCardProps>(
       <BlockWrapper className={style('border border-gray', className)} {...rest}>
         <LinkWrapper className="flex" href={href} target={target}>
           <div className="w-[200px] min-w-[200px] self-center">
-            {icon?.icon ? <Img image={getIconWithVersion(icon)} asSVG /> : null}
+            {icon?.icon ? <Img image={icon} /> : null}
             {icon?.src ? <Img image={icon} /> : null}
           </div>
           <div className="p-8 pl-3 w-full">