@redneckz/wildless-cms-uni-blocks 0.8.23 → 0.8.24

package/mobile/lib/ui-kit/TopItem/TopItem.d.ts

@@ -1,4 +1,5 @@
 import type { LinkProps } from '../../model/LinkProps';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 export interface TopItemContent extends LinkProps {
     active?: boolean;
 }
@@ -6,6 +7,6 @@ export interface TopItemProps extends TopItemContent {
     className?: string;
     flat?: boolean;
     dataItemName?: string;
-    onClick?: () => void;
+    onClick?: (ev?: PreventableEvent) => void;
 }
 export declare const TopItem: import("@redneckz/uni-jsx").UNIComponent<TopItemProps, any, any>;

package/mobile/lib/ui-kit/TopItem/TopItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}
+{"version":3,"file":"TopItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TopItem/TopItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAa1C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,EAAE,SAAS,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC/F,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,CACL,YACE,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,CAAC,EACvD,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,GAAG,EAAC,qBAAqB,gBACb,IAAI,YAEhB,eAAM,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,YAAG,IAAI,IAAI,QAAQ,GAAQ,GACpE,CACL,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,0EAA0E,EAC1E,MAAM;IACJ,CAAC,CAAC,oEAAoE;IACtE,CAAC,CAAC,oBAAoB,EACxB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACxB,CAAC;AAEJ,MAAM,YAAY,GAAG,CAAC,MAAM,GAAG,KAAK,EAAE,IAAI,GAAG,KAAK,EAAE,EAAE,CACpD,KAAK,CACH,wBAAwB,EACxB,MAAM;IACJ,CAAC,CAAC,mBAAmB;IACrB,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,EACxF,mFAAmF,CACpF,CAAC"}

package/mobile/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -66,7 +66,7 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'acqr',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         PartnerComments,
         fullName,
         inn,

package/mobile/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -6,11 +6,11 @@ import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange } from './models';
 import { normalizeSelectedRegion } from './normalizeSelectedRegion';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useFormHandlers } from './useFormHandlers';
+import { WrapperSelect } from './WrapperSelect';
 
 export interface BusinessCardFormState {
   region: string;
@@ -47,7 +47,7 @@ export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) =>
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'bcrd',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         name,
         phone,
         inn,

package/mobile/src/components/ApplicationForm/ApplicationFormCredit.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useSafeBoxes } from '../../hooks/useSafeBoxes';
+import { useBranches } from '../../hooks/useBranches';
 import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
@@ -52,9 +52,9 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
     setFormState,
   });
 
-  const selectedRegion = normalizeSelectedRegion(formState.region, regions);
+  const selectedRegion = normalizeSelectedRegion(region, regions);
 
-  const branches = useSafeBoxes(region);
+  const branches = useBranches(selectedRegion).filter((branch) => branch.address);
 
   useEffect(() => {
     handleChange({
@@ -75,8 +75,8 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
         name,
         phone,
         mail,
-        region,
-        department,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
+        department: branches.find((_) => _.branchCode === department)?.address || '',
         PartnerComments,
       }));
   };

package/mobile/src/components/ApplicationForm/renderBankOffices.tsx

@@ -1,7 +1,7 @@
 import { Branch } from '../../hooks/useSafeBoxes';
 import type { CreditFormState } from './ApplicationFormCredit';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange, Select } from './models';
+import { WrapperSelect } from './WrapperSelect';
 
 interface RenderBankOfficesProps {
   regions: Select[];

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.example.json

@@ -6,7 +6,8 @@
     "cardTextAlign": "center",
     "bonusBenefits": [
       {
-        "label": "Более 5000 товаров",
+        "title": "",
+        "description": "Более 5000 товаров",
         "icon": {
           "format": "webp",
           "size": {
@@ -17,7 +18,8 @@
         }
       },
       {
-        "label": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
+        "title": "",
+        "description": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
         "icon": {
           "format": "webp",
           "size": {
@@ -28,7 +30,8 @@
         }
       },
       {
-        "label": "Аренда автомобилей",
+        "title": "",
+        "description": "Аренда автомобилей",
         "icon": {
           "format": "webp",
           "size": {
@@ -39,7 +42,8 @@
         }
       },
       {
-        "label": "Болеее 1000 развлечений",
+        "title": "",
+        "description": "Болеее 1000 развлечений",
         "icon": {
           "format": "webp",
           "size": {
@@ -50,7 +54,8 @@
         }
       },
       {
-        "label": "Платежные гаджеты Pay Ring",
+        "title": "",
+        "description": "Платежные гаджеты Pay Ring",
         "icon": {
           "format": "webp",
           "size": {
@@ -61,7 +66,8 @@
         }
       },
       {
-        "label": "Цифровые сервисы",
+        "title": "",
+        "description": "Цифровые сервисы",
         "icon": {
           "format": "webp",
           "size": {
@@ -72,7 +78,8 @@
         }
       },
       {
-        "label": "Фермерские продукты",
+        "title": "",
+        "description": "Фермерские продукты",
         "icon": {
           "format": "webp",
           "size": {
@@ -83,7 +90,8 @@
         }
       },
       {
-        "label": "Страхование",
+        "title": "",
+        "description": "Страхование",
         "icon": {
           "format": "webp",
           "size": {

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -38,12 +38,12 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
   ),
 );
 
-const renderBonusBenefit = ({ icon, label, description }: BonusBenefit, i: number) => {
+const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: number) => {
   return (
     <div key={String(i)} className="flex flex-col items-center text-h6">
-      {description ? <span>{description}</span> : null}
+      {title ? <span>{title}</span> : null}
       {icon ? <Img image={icon} height="180" width="auto" className="h-[180px] w-auto" /> : null}
-      <div>{label ? <span>{label}</span> : null}</div>
+      <div>{description ? <span>{description}</span> : null}</div>
     </div>
   );
 };

package/mobile/src/components/BonusBenefitsBlock/BonusBenefitsBlockContent.ts

@@ -1,5 +1,5 @@
 import type { AlignType } from '../../model/AlignType';
-import type { DescriptionProps, LabelProps, TitleProps } from '../../model/HeadlineType';
+import type { DescriptionProps, TitleProps } from '../../model/HeadlineType';
 import type { UniBlockContent } from '../../model/JSXBlock';
 import type { IconProps } from '../../model/Picture';
 
@@ -15,8 +15,12 @@ export type ColumnsCount = '3' | '4' | '5';
 
 /**
  * @title Бонус и преимущество
+ * @default {
+ *   "title": "Верхний заголовок",
+ *   "description": "Нижний заголовок",
+ * }
  */
-export type BonusBenefit = LabelProps & IconProps & DescriptionProps;
+export type BonusBenefit = TitleProps & IconProps & DescriptionProps;
 
 /**
  * @title Блок бонусов и преимуществ

package/mobile/src/components/Calculator/getMonthlyPayment.ts

@@ -9,7 +9,9 @@ import type { CreditCalculatorUserInputParams } from './useCreditCalculatorParam
 export const getMonthlyPayment = (rate: number, params: CreditCalculatorUserInputParams) => {
   const { isAnnuity, moneyValue, monthsValue } = params;
 
-  if (isAnnuity) {
+  if (rate === 0) {
+    return 0;
+  } else if (isAnnuity) {
     const i = rate / MONTHLY_INTEREST_RATE; // Используется значение ставки в процентах
 
     return moneyValue * (i + i / (Math.pow(1 + i, monthsValue) - 1));

package/mobile/src/components/Header/HeaderSecondaryMenu.tsx

@@ -1,14 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '../../hooks/useBool';
 import { useLocation } from '../../hooks/useLocation';
 import type { BlockVersion } from '../../model/BlockVersion';
 import type { IconVersion } from '../../model/IconVersion';
+import type { PreventableEvent } from '../../model/PreventableEvent';
+import { projectSettings } from '../../ProjectSettings';
 import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
 import { Location } from '../../ui-kit/Location/Location';
 import { TopItem } from '../../ui-kit/TopItem/TopItem';
 import { style } from '../../utils/style';
 import { HeaderChatBotButton } from './HeaderChatBotButton';
-import { projectSettings } from '../../ProjectSettings';
 
 interface HeaderSecondaryMenuContent {
   version?: BlockVersion;
@@ -30,6 +32,11 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
 
     const iconVersion: IconVersion = version === 'transparent' ? 'white' : 'black';
 
+    const handleShowLocationModal = useCallback((ev?: PreventableEvent) => {
+      ev?.preventDefault();
+      showLocationModal();
+    }, []);
+
     return (
       <div className={style('flex items-center', className)}>
         <TopItem
@@ -37,7 +44,7 @@ export const HeaderSecondaryMenu = JSX<HeaderSecondaryMenuProps>(
           flat={true}
           href="#"
           text={location.name}
-          onClick={showLocationModal}
+          onClick={handleShowLocationModal}
         />
         {officesLink ? (
           <TopItem className="mr-7" flat={true} href={officesLink} text="Офисы и банкоматы" />

package/mobile/src/components/Tabs/LinkTab.tsx

@@ -7,22 +7,28 @@ interface LinkTabProps {
   tab: LinkTabData;
   currentTab?: TabData;
   isScrollable?: boolean;
+  onClick: (tab: TabData) => void;
 }
 
 export const LinkTab = JSX<LinkTabProps>((props) => {
-  const { tab, currentTab, isScrollable = false } = props;
+  const { tab, currentTab, onClick, isScrollable = false } = props;
   const active = currentTab?.type === 'link' && currentTab.href === tab.href;
 
   const link = useLink();
   const adjustedProps = link(tab);
 
+  const handleClick = (ev?: { preventDefault: () => void }) => {
+    adjustedProps.onClick(ev);
+    onClick(tab);
+  };
+
   return (
     <a
       role="tab"
       className={getLinkTabClassName('link', active, isScrollable)}
       target={tab.target}
       href={adjustedProps.href}
-      onClick={adjustedProps.onClick}
+      onClick={handleClick}
     >
       <span className={getLinkTabClassName('text', active, isScrollable)}>{tab.text}</span>
     </a>

package/mobile/src/components/Tabs/Tabs.tsx

@@ -19,6 +19,14 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
 
   const [currentTab, setCurrentTab] = useState(tabs ? tabs[0] : undefined);
 
+  useEffect(() => {
+    if (!tabs || !tabs[0]) {
+      return;
+    }
+
+    fireTabEvent(tabs[0]);
+  }, []);
+
   useEffect(() => {
     if (currentTab?.type === 'group') {
       defaultEventBus.subject('tab', { type: currentTab.type, label: currentTab.ref });
@@ -26,9 +34,7 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
   }, [currentTab]);
 
   const handleClick = useCallback((selectedTab: TabData) => {
-    if (selectedTab?.type === 'group') {
-      defaultEventBus.fire('tab', { type: selectedTab.type, label: selectedTab.ref });
-    }
+    fireTabEvent(selectedTab);
     setCurrentTab(selectedTab);
   }, []);
 
@@ -61,3 +67,12 @@ export const Tabs = JSX<TabsBlockProps>((props) => {
     </BlockWrapper>
   );
 });
+
+const fireTabEvent = (tab: TabData) => {
+  if (tab.type === 'group') {
+    defaultEventBus.fire('tab', { type: tab.type, label: tab.ref });
+  }
+  if (tab.type === 'link') {
+    defaultEventBus.fire('tab', { type: tab.type, label: tab.href });
+  }
+};

package/mobile/src/components/Tabs/renderTab.tsx

@@ -26,7 +26,13 @@ export const renderTab =
         return renderGroupTab({ page, currentTab, showCounter, onClick, isScrollable })(tab, i);
       case 'link': {
         return (
-          <LinkTab key={String(i)} tab={tab} currentTab={currentTab} isScrollable={isScrollable} />
+          <LinkTab
+            key={String(i)}
+            tab={tab}
+            currentTab={currentTab}
+            isScrollable={isScrollable}
+            onClick={onClick}
+          />
         );
       }
       default:

package/mobile/src/hooks/useBranches.ts

@@ -0,0 +1,43 @@
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSON } from '../utils/fetchJSON';
+
+export interface Tariff {
+  tariffType?: string;
+  tariffValue?: number;
+}
+
+export interface SafeBoxCase {
+  safeBoxCasesSize?: string;
+  tariffs?: Tariff[];
+}
+
+export interface SafeBoxCaseVolume {
+  volume?: string;
+  safeBoxCases?: SafeBoxCase[];
+}
+
+export interface Branch {
+  branchCode?: string;
+  address?: string;
+  gpsLatitude?: number;
+  gpsLongitude?: number;
+  safeBoxCaseVolumes?: SafeBoxCaseVolume[];
+}
+
+const BRANCHES_URL = '/api/v1/branches';
+const EMPTY_VALUE = [];
+
+export function useBranches(regionCode?: string): Branch[] {
+  const { data } = useAsyncData<Branch[], any, string | null>(
+    regionCode ? `${BRANCHES_URL}?regionCode=${regionCode}` : null,
+    fetchSafeBoxes,
+  );
+
+  return data || EMPTY_VALUE;
+}
+
+const fetchSafeBoxes = async (url: string): Promise<Branch[]> => {
+  const result = await fetchJSON<Branch[]>(url, { method: 'GET' });
+
+  return result || EMPTY_VALUE;
+};

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

@@ -38,12 +38,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
       () =>
         defaultEventBus.subscribe('tab', (event) => {
           setHidden(
-            Boolean(
-              event.type === 'group' &&
-                event.label &&
-                block?.labels?.length &&
-                !block.labels.includes(event.label),
-            ),
+            Boolean(event.label && block?.labels?.length && !block.labels.includes(event.label)),
           );
         }),
       [block],

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { style } from '../../utils/style';
 
 export interface TopItemContent extends LinkProps {
@@ -11,7 +12,7 @@ export interface TopItemProps extends TopItemContent {
   className?: string;
   flat?: boolean;
   dataItemName?: string;
-  onClick?: () => void;
+  onClick?: (ev?: PreventableEvent) => void;
 }
 
 export const TopItem = JSX<TopItemProps>(({ className = '', active, flat, children, ...rest }) => {

package/package.json

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

package/src/components/ApplicationForm/ApplicationFormAcquiring.tsx

@@ -66,7 +66,7 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'acqr',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         PartnerComments,
         fullName,
         inn,

package/src/components/ApplicationForm/ApplicationFormBusinessCard.tsx

@@ -6,11 +6,11 @@ import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { Footnote } from './Footnote';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange } from './models';
 import { normalizeSelectedRegion } from './normalizeSelectedRegion';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useFormHandlers } from './useFormHandlers';
+import { WrapperSelect } from './WrapperSelect';
 
 export interface BusinessCardFormState {
   region: string;
@@ -47,7 +47,7 @@ export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) =>
     handleSubmit &&
       (await handleSubmit({
         typeForm: 'bcrd',
-        region,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
         name,
         phone,
         inn,

package/src/components/ApplicationForm/ApplicationFormCredit.tsx

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { useSafeBoxes } from '../../hooks/useSafeBoxes';
+import { useBranches } from '../../hooks/useBranches';
 import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
@@ -52,9 +52,9 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
     setFormState,
   });
 
-  const selectedRegion = normalizeSelectedRegion(formState.region, regions);
+  const selectedRegion = normalizeSelectedRegion(region, regions);
 
-  const branches = useSafeBoxes(region);
+  const branches = useBranches(selectedRegion).filter((branch) => branch.address);
 
   useEffect(() => {
     handleChange({
@@ -75,8 +75,8 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
         name,
         phone,
         mail,
-        region,
-        department,
+        region: regions.find((_) => _.code === selectedRegion)?.name || '',
+        department: branches.find((_) => _.branchCode === department)?.address || '',
         PartnerComments,
       }));
   };

package/src/components/ApplicationForm/renderBankOffices.tsx

@@ -1,7 +1,7 @@
 import { Branch } from '../../hooks/useSafeBoxes';
 import type { CreditFormState } from './ApplicationFormCredit';
-import { WrapperSelect } from './WrapperSelect';
 import type { HandleFormStateChange, Select } from './models';
+import { WrapperSelect } from './WrapperSelect';
 
 interface RenderBankOfficesProps {
   regions: Select[];

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.example.json

@@ -6,7 +6,8 @@
     "cardTextAlign": "center",
     "bonusBenefits": [
       {
-        "label": "Более 5000 товаров",
+        "title": "",
+        "description": "Более 5000 товаров",
         "icon": {
           "format": "webp",
           "size": {
@@ -17,7 +18,8 @@
         }
       },
       {
-        "label": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
+        "title": "",
+        "description": "750 авиакомпаний, 1,2 млн отелей, билеты РЖД",
         "icon": {
           "format": "webp",
           "size": {
@@ -28,7 +30,8 @@
         }
       },
       {
-        "label": "Аренда автомобилей",
+        "title": "",
+        "description": "Аренда автомобилей",
         "icon": {
           "format": "webp",
           "size": {
@@ -39,7 +42,8 @@
         }
       },
       {
-        "label": "Болеее 1000 развлечений",
+        "title": "",
+        "description": "Болеее 1000 развлечений",
         "icon": {
           "format": "webp",
           "size": {
@@ -50,7 +54,8 @@
         }
       },
       {
-        "label": "Платежные гаджеты Pay Ring",
+        "title": "",
+        "description": "Платежные гаджеты Pay Ring",
         "icon": {
           "format": "webp",
           "size": {
@@ -61,7 +66,8 @@
         }
       },
       {
-        "label": "Цифровые сервисы",
+        "title": "",
+        "description": "Цифровые сервисы",
         "icon": {
           "format": "webp",
           "size": {
@@ -72,7 +78,8 @@
         }
       },
       {
-        "label": "Фермерские продукты",
+        "title": "",
+        "description": "Фермерские продукты",
         "icon": {
           "format": "webp",
           "size": {
@@ -83,7 +90,8 @@
         }
       },
       {
-        "label": "Страхование",
+        "title": "",
+        "description": "Страхование",
         "icon": {
           "format": "webp",
           "size": {

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

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

package/src/components/BonusBenefitsBlock/BonusBenefitsBlock.tsx

@@ -38,12 +38,12 @@ export const BonusBenefitsBlock = JSX<BenefitsBlockProps>(
   ),
 );
 
-const renderBonusBenefit = ({ icon, label, description }: BonusBenefit, i: number) => {
+const renderBonusBenefit = ({ icon, title, description }: BonusBenefit, i: number) => {
   return (
     <div key={String(i)} className="flex flex-col items-center text-h6">
-      {description ? <span>{description}</span> : null}
+      {title ? <span>{title}</span> : null}
       {icon ? <Img image={icon} height="180" width="auto" className="h-[180px] w-auto" /> : null}
-      <div>{label ? <span>{label}</span> : null}</div>
+      <div>{description ? <span>{description}</span> : null}</div>
     </div>
   );
 };