@redneckz/wildless-cms-uni-blocks 0.8.17 → 0.8.18

package/mobile/lib/components/ApplicationForm/useFormHandlers.d.ts

@@ -1,13 +1,9 @@
 import { Dispatch, SetStateAction } from 'react';
 import type { HandleFormStateChange } from './models';
 interface UseFormHandlersProps<T> {
-    formState: Partial<T>;
-    handleSubmit: (data: Partial<T>) => void;
     setFormState: Dispatch<SetStateAction<T>>;
-    typeForm: string;
 }
-export declare const useFormHandlers: <T>({ formState, handleSubmit, setFormState, typeForm, }: UseFormHandlersProps<T>) => {
+export declare const useFormHandlers: <T>({ setFormState }: UseFormHandlersProps<T>) => {
     handleChange: HandleFormStateChange<T>;
-    onSubmit: (e: React.FormEvent<HTMLFormElement>) => Promise<void>;
 };
 export {};

package/mobile/lib/components/ApplicationForm/useFormHandlers.js

@@ -1,13 +1,8 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-export const useFormHandlers = ({ formState, handleSubmit, setFormState, typeForm, }) => {
+export const useFormHandlers = ({ setFormState }) => {
     const handleChange = useCallback((state) => setFormState((oldState) => ({ ...oldState, ...state })), []);
-    const onSubmit = useCallback(async (e) => {
-        e.preventDefault();
-        handleSubmit && (await handleSubmit({ ...formState, typeForm }));
-    }, []);
     return {
         handleChange,
-        onSubmit,
     };
 };
 //# sourceMappingURL=useFormHandlers.js.map

package/mobile/lib/components/ApplicationForm/useFormHandlers.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFormHandlers.js","sourceRoot":"","sources":["../../../src/components/ApplicationForm/useFormHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAW1D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAI,EACjC,SAAS,EACT,YAAY,EACZ,YAAY,EACZ,QAAQ,GACgB,EAAE,EAAE;IAC5B,MAAM,YAAY,GAA6B,WAAW,CACxD,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,EAClE,EAAE,CACH,CAAC;IAEF,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,CAAmC,EAAE,EAAE;QACzE,CAAC,CAAC,cAAc,EAAE,CAAC;QACnB,YAAY,IAAI,CAAC,MAAM,YAAY,CAAC,EAAE,GAAG,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,YAAY;QACZ,QAAQ;KACT,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useFormHandlers.js","sourceRoot":"","sources":["../../../src/components/ApplicationForm/useFormHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAQ1D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAI,EAAE,YAAY,EAA2B,EAAE,EAAE;IAC9E,MAAM,YAAY,GAA6B,WAAW,CACxD,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC,EAClE,EAAE,CACH,CAAC;IAEF,OAAO;QACL,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}

package/mobile/lib/components/Video/Video.js

@@ -6,8 +6,8 @@ import { adjustHref } from '../../utils/adjustHref.js';
 import { style } from '../../utils/style.js';
 import { Headline } from '../Headline/Headline.js';
 import { getPaddings } from './getPaddings.js';
-export const Video = JSX(({ className, title, src, previewImg, ...rest }) => {
+export const Video = JSX(({ className, title, url, previewImg, ...rest }) => {
     const router = useRouter();
-    return (_jsxs(BlockWrapper, { className: style(getPaddings(className), className), ...rest, children: [_jsx(Headline, { title: title, headlineVersion: "M" }), src ? (_jsx("video", { className: "m-auto w-full object-fill", preload: "metadata", poster: adjustHref(router)(previewImg?.src), style: { maxHeight: 524 }, controls: true, children: _jsx("source", { src: adjustHref(router)(src) }) })) : null] }));
+    return (_jsxs(BlockWrapper, { className: style(getPaddings(className), className), ...rest, children: [_jsx(Headline, { title: title, headlineVersion: "M" }), url ? (_jsx("video", { className: "m-auto w-full object-fill", preload: "metadata", poster: adjustHref(router)(previewImg?.src), style: { maxHeight: 524 }, controls: true, children: _jsx("source", { src: adjustHref(router)(url) }) })) : null] }));
 });
 //# sourceMappingURL=Video.js.map

package/mobile/lib/components/Video/Video.js.map

@@ -1 +1 @@
-{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../../src/components/Video/Video.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAK5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACtF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CACL,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,aACzE,KAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,GAAG,GAAG,EAC7C,GAAG,CAAC,CAAC,CAAC,CACL,gBACE,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAC,UAAU,EAClB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAC3C,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EACzB,QAAQ,kBAER,iBAAQ,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAI,GAClC,CACT,CAAC,CAAC,CAAC,IAAI,IACK,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Video.js","sourceRoot":"","sources":["../../../src/components/Video/Video.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAM5C,MAAM,CAAC,MAAM,KAAK,GAAG,GAAG,CAAa,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IACtF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CACL,MAAC,YAAY,IAAC,SAAS,EAAE,KAAK,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,KAAM,IAAI,aACzE,KAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,EAAE,eAAe,EAAC,GAAG,GAAG,EAC7C,GAAG,CAAC,CAAC,CAAC,CACL,gBACE,SAAS,EAAC,2BAA2B,EACrC,OAAO,EAAC,UAAU,EAClB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,EAC3C,KAAK,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,EACzB,QAAQ,kBAER,iBAAQ,GAAG,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAI,GAClC,CACT,CAAC,CAAC,CAAC,IAAI,IACK,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/mobile/lib/components/Video/VideoContent.d.ts

@@ -1,9 +1,24 @@
 import type { TitleProps } from '../../model/HeadlineType';
 import type { Picture } from '../../model/Picture';
-/** @title Блок Видео */
+/**
+ * @title Блок Видео
+ * @default {
+ *   "title": "Заголовок блока"
+ * }
+ */
 export interface VideoContent extends TitleProps {
-    /** @title URL */
-    src?: string;
-    /** @title Заставка */
+    /**
+     * @title Ссылка на видео
+     */
+    url?: string;
+    /**
+     * @title Заставка в блоке
+     * @default {
+     *   "format": "webp",
+     *   "size": {
+     *       "width": 1004
+     *   },
+     * }
+     */
     previewImg?: Picture;
 }

package/mobile/lib/hooks/useLink.d.ts

@@ -1,7 +1,5 @@
 import type { LinkProps } from '../model/LinkProps';
-interface PreventableEvent {
-    preventDefault: () => void;
-}
+import type { PreventableEvent } from '../model/PreventableEvent';
 interface Clickable {
     onClick(ev?: PreventableEvent): void;
 }

package/mobile/lib/hooks/useLink.js.map

@@ -1 +1 @@
-{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAUxC,MAAM,UAAU,OAAO,CAAC,QAAQ,GAAG,KAAK;IACtC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}
+{"version":3,"file":"useLink.js","sourceRoot":"","sources":["../../src/hooks/useLink.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,MAAM,UAAU,OAAO,CAAC,QAAQ,GAAG,KAAK;IACtC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,OAAO,CAA2C,KAAQ,EAAiB,EAAE,CAAC,CAAC;QAC7E,GAAG,KAAK;QACR,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5D,YAAY,EAAE,KAAK,CAAC,IAAI;QACxB,OAAO,EAAE,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;KACpD,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAkC;QAC3E,OAAO,CAAC,EAAqB,EAAE,EAAE;YAC/B,OAAO,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;YAEvB,IAAI,CAAC,IAAI,IAAI,QAAQ,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;gBAClD,kBAAkB;gBAClB,OAAO;aACR;YAED,iBAAiB;YACjB,EAAE,EAAE,cAAc,EAAE,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC,CAAC;IACJ,CAAC;AACH,CAAC"}

package/mobile/lib/model/PreventableEvent.d.ts

@@ -0,0 +1,3 @@
+export interface PreventableEvent {
+    preventDefault: () => void;
+}

package/mobile/lib/model/PreventableEvent.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=PreventableEvent.js.map

package/mobile/lib/model/PreventableEvent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PreventableEvent.js","sourceRoot":"","sources":["../../src/model/PreventableEvent.ts"],"names":[],"mappings":""}

package/mobile/src/api/CorporateLeadAPI.ts

@@ -13,7 +13,7 @@ export interface DaDataResult {
 }
 
 export function CorporateLeadAPI() {
-  async function send(body: any) {
+  async function send(body: Record<string, string>) {
     try {
       const response = await fetch('/api/v1/sendCorporateLead', {
         method: 'POST',
@@ -22,7 +22,7 @@ export function CorporateLeadAPI() {
         body: JSON.stringify(body),
       });
 
-      const data = (await response.json()) as any;
+      const data = await response.json();
 
       return data;
     } catch (e) {

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { CorporateLeadAPI } from '../../api/CorporateLeadAPI';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { Heading } from '../../ui-kit/Heading/Heading';
@@ -8,7 +9,7 @@ import { ApplicationFormBusinessCard } from './ApplicationFormBusinessCard';
 import type { ApplicationFormContent } from './ApplicationFormContent';
 import { ApplicationFormCredit } from './ApplicationFormCredit';
 import { ApplicationFormDeposit } from './ApplicationFormDeposit';
-import { ApplicationFormsProps } from './ApplicationFormsProps';
+import type { ApplicationFormsProps } from './ApplicationFormsProps';
 import { ApplicationFormWed } from './ApplicationFormWed';
 import { ResponseNotification } from './ResponseNotification';
 
@@ -22,13 +23,16 @@ const COMPONENTS_MAP = {
   wed: (props: ApplicationFormsProps) => <ApplicationFormWed {...props} />,
 };
 
+const API = CorporateLeadAPI();
+
 export const ApplicationForm = JSX<ApplicationFormProps>((props) => {
   const { className = '', title, typeForm = 'credit', button, link, ...rest } = props;
 
-  const [responceType, setResponceType] = useState<'OK' | 'Fail' | ''>('');
+  const [responceType, setResponseType] = useState<'OK' | 'Fail' | ''>('');
 
-  const handleSubmit = useCallback(() => {
-    setResponceType('OK');
+  const handleSubmit = useCallback(async (data: Record<string, string>) => {
+    const status = await API.send(data);
+    setResponseType(status ? 'OK' : 'Fail');
 
     return 'OK';
   }, []);

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
@@ -43,11 +44,8 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<AcquiringFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<AcquiringFormState>({
     setFormState,
-    typeForm: 'acqr',
   });
 
   const selectedRegion = normalizeSelectedRegion(region, regions);
@@ -56,10 +54,27 @@ export const ApplicationFormAcquiring = JSX<ApplicationFormsProps>((props) => {
     setFormState((oldState) => ({
       ...oldState,
       acquiringType:
-        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.code ? ACQUIRING_TYPES[0].code : '',
+        ACQUIRING_TYPES?.length && ACQUIRING_TYPES[0]?.name ? ACQUIRING_TYPES[0].name : '',
     }));
   }, []);
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    const PartnerComments = `Вид эквайринга=${acquiringType}/Онлайн касса=${onlineСheckout}/POS-терминал=${posTerminal}`;
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'acqr',
+        region,
+        PartnerComments,
+        fullName,
+        inn,
+        name,
+        phone,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Вид эквайринга и регион" className="text-center mb-4" />

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

@@ -1,6 +1,7 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { Region } from '../../hooks/useRegions';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Input } from '../../ui-kit/Input/Input';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
@@ -21,6 +22,7 @@ export interface BusinessCardFormState {
 
 export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
+
   const [formState, setFormState] = useState<BusinessCardFormState>({
     region: '',
     name: '',
@@ -29,18 +31,29 @@ export const ApplicationFormBusinessCard = JSX<ApplicationFormsProps>((props) =>
     mail: '',
   });
 
-  const { name, phone, inn, mail } = formState;
+  const { region, name, phone, inn, mail } = formState;
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<BusinessCardFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<BusinessCardFormState>({
     setFormState,
-    typeForm: 'bcrd',
   });
 
-  const selectedRegion = normalizeSelectedRegion(formState.region, regions);
+  const selectedRegion = normalizeSelectedRegion(region, regions);
+
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'bcrd',
+        region,
+        name,
+        phone,
+        inn,
+        mail,
+      }));
+  };
 
   return (
     <form onSubmit={onSubmit} className="container">
@@ -122,7 +135,7 @@ const renderRegion = ({ regions, region, handleChange }: RenderRegionProps) => (
     <div className="w-full">
       <WrapperSelect
         data={regions}
-        fieldValue="code"
+        fieldValue="name"
         fieldLabel="name"
         selected={region}
         setSelected={(value) => handleChange({ region: value })}

package/mobile/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -1,18 +1,30 @@
-import type { HeadlineCommonProps } from '../../model/HeadlineType';
+import type { ButtonVersion } from '../../model/ButtonVersion';
+import type { TitleProps } from '../../model/HeadlineType';
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonAdditionalProps } from '../../ui-kit/Button/ButtonProps';
+
+/**
+ * @title Кнопка
+ */
+export interface ButtonProps extends ButtonAdditionalProps {
+  /**
+   * @title Текст
+   * @default "Отправить заявку"
+   */
+  text?: string;
+  version?: ButtonVersion;
+}
 
 /**
  * @title Форма заявки
  */
-export type ApplicationFormContent = HeadlineCommonProps & {
+export type ApplicationFormContent = TitleProps & {
   /**
    * @title Вид заявки
    * @default credit
    * @enumNames ["Бизнес-карта", "ВЭД", "Депозит", "Кредит", "Эквайринг"]
    */
   typeForm?: 'business-card' | 'wed' | 'deposit' | 'credit' | 'acquiring';
-  /** @title Кнопка */
   button?: ButtonProps;
   /** @title Условия передачи данных */
   link?: LinkProps;

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

@@ -1,9 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useSafeBoxes } from '../../hooks/useSafeBoxes';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { useGetRegions } from '../SafeDepositRental/useGetRegions';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
+import { MIN_CREDIT_AMOUNT, MIN_CREDIT_TERM } from './CreditParameters';
 import { Footnote } from './Footnote';
 import { normalizeSelectedRegion } from './normalizeSelectedRegion';
 import { renderBankOffices } from './renderBankOffices';
@@ -25,16 +27,9 @@ export interface CreditFormState {
   annualRevenue: string;
 }
 
-export const MIN_CREDIT_AMOUNT = 50000;
-export const MAX_CREDIT_AMOUNT = 3000000;
-export const ITEMS_CREDIT_AMOUNT = ['От 50 000 ₽', 'До 3 000 000 ₽'];
-
-export const MIN_CREDIT_TERM = 1;
-export const MAX_CREDIT_TERM = 60;
-export const ITEMS_CREDIT_TERM = ['От 1 года', 'До 5 лет'];
-
 export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
   const { button, link, handleSubmit } = props;
+
   const [formState, setFormState] = useState<CreditFormState>({
     amount: MIN_CREDIT_AMOUNT,
     term: MIN_CREDIT_TERM,
@@ -53,11 +48,8 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
 
   const regions = useGetRegions();
 
-  const { handleChange, onSubmit } = useFormHandlers<CreditFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<CreditFormState>({
     setFormState,
-    typeForm: 'cred',
   });
 
   const selectedRegion = normalizeSelectedRegion(formState.region, regions);
@@ -70,6 +62,25 @@ export const ApplicationFormCredit = JSX<ApplicationFormsProps>((props) => {
     });
   }, [formState.region, handleChange]);
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    const PartnerComments = `Сумма=${amount}/Срок=${term}/Выручка=${annualRevenue}`;
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'cred',
+        fullName,
+        inn,
+        name,
+        phone,
+        mail,
+        region,
+        department,
+        PartnerComments,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Параметры кредита" className="text-center mb-4" />

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Input } from '../../ui-kit/Input/Input';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
@@ -21,13 +22,23 @@ export const ApplicationFormDeposit = JSX<ApplicationFormsProps>((props) => {
     phone: '',
   });
 
-  const { handleChange, onSubmit } = useFormHandlers<DepositFormState>({
-    formState,
-    handleSubmit,
+  const { name, phone } = formState;
+
+  const { handleChange } = useFormHandlers<DepositFormState>({
     setFormState,
-    typeForm: 'dpst',
   });
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'dpst',
+        name,
+        phone,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading

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

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
+import type { PreventableEvent } from '../../model/PreventableEvent';
 import { Heading } from '../../ui-kit/Heading/Heading';
 import { Input } from '../../ui-kit/Input/Input';
 import type { ApplicationFormsProps } from './ApplicationFormsProps';
@@ -46,13 +47,26 @@ export const ApplicationFormWed = JSX<ApplicationFormsProps>((props) => {
     text,
   } = formState;
 
-  const { handleChange, onSubmit } = useFormHandlers<WedFormState>({
-    formState,
-    handleSubmit,
+  const { handleChange } = useFormHandlers<WedFormState>({
     setFormState,
-    typeForm: 'kved',
   });
 
+  const onSubmit = async (e: PreventableEvent) => {
+    e.preventDefault();
+
+    const PartnerComments = `Валютный контроль=${currencyControl}/Документарные операции=${documentaryOperations}/Конверсионные операции=${conversionOperations}/Доп инф=${text}`;
+
+    handleSubmit &&
+      (await handleSubmit({
+        typeForm: 'kved',
+        fullName,
+        name,
+        phone,
+        mail,
+        PartnerComments,
+      }));
+  };
+
   return (
     <form onSubmit={onSubmit} className="container">
       <Heading headingType="h6" title="Данные организации" className="text-center mb-4" />

package/mobile/src/components/ApplicationForm/ApplicationFormsProps.ts

@@ -1,8 +1,8 @@
 import type { LinkProps } from '../../model/LinkProps';
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
+import type { ButtonProps } from './ApplicationFormContent';
 
 export interface ApplicationFormsProps {
   button?: ButtonProps;
   link?: LinkProps;
-  handleSubmit: (data: any) => void;
+  handleSubmit: (data: Record<string, string>) => Promise<string>;
 }

package/mobile/src/components/ApplicationForm/CreditParameters.ts

@@ -0,0 +1,7 @@
+export const MIN_CREDIT_AMOUNT = 50000;
+export const MAX_CREDIT_AMOUNT = 3000000;
+export const ITEMS_CREDIT_AMOUNT = ['От 50 000 ₽', 'До 3 000 000 ₽'];
+
+export const MIN_CREDIT_TERM = 1;
+export const MAX_CREDIT_TERM = 60;
+export const ITEMS_CREDIT_TERM = ['От 1 года', 'До 5 лет'];

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

@@ -1,6 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { OptionProps, Select } from '../../ui-kit/Select/Select';
-import { Currency } from '../ExchangeRateTile/CurrencyProps';
+import type { Currency } from '../ExchangeRateTile/CurrencyProps';
 
 interface WrapperSelectProps {
   data: Record<string, any>[];

package/mobile/src/components/ApplicationForm/acquiringTypes.ts

@@ -2,23 +2,18 @@ import { Select } from './models';
 
 export const ACQUIRING_TYPES: Select[] = [
   {
-    code: '1',
     name: 'Торговый эквайринг',
   },
   {
-    code: '2',
     name: 'Мобильный эквайринг',
   },
   {
-    code: '3',
     name: 'Интернет-эквайринг',
   },
   {
-    code: '4',
     name: 'QR-эквайринг (СБП)',
   },
   {
-    code: '5',
     name: 'Все виды эквайринга',
   },
 ];

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

@@ -22,7 +22,7 @@ export const renderBankOffices = ({
     <div className="w-1/2">
       <WrapperSelect
         data={regions}
-        fieldValue="code"
+        fieldValue="name"
         fieldLabel="name"
         selected={region}
         setSelected={(value) => handleChange({ region: value })}

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

@@ -1,15 +1,14 @@
-import { InputRange } from '../../ui-kit/InputRange/InputRange';
-import { Text } from '../../ui-kit/Text/Text';
+import type { CreditFormState } from './ApplicationFormCredit';
 import {
-  CreditFormState,
   ITEMS_CREDIT_AMOUNT,
   ITEMS_CREDIT_TERM,
   MAX_CREDIT_AMOUNT,
   MAX_CREDIT_TERM,
   MIN_CREDIT_AMOUNT,
   MIN_CREDIT_TERM,
-} from './ApplicationFormCredit';
+} from './CreditParameters';
 import type { HandleFormStateChange } from './models';
+import { renderInputRange } from './renderInputRange';
 
 interface RenderCreditParametersProps {
   amount: number;
@@ -41,21 +40,3 @@ export const renderCreditParameters = ({
     })}
   </div>
 );
-
-interface RenderInputRangeProps {
-  label: string;
-  value: number;
-  onChange: (value: number) => void;
-  min: number;
-  max: number;
-  items: string[];
-}
-
-const renderInputRange = (props: RenderInputRangeProps) => (
-  <div className="w-1/2">
-    <label>
-      <Text size="text-m-light">{props.label}</Text>
-    </label>
-    <InputRange {...props} />
-  </div>
-);

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

@@ -0,0 +1,20 @@
+import { InputRange } from '../../ui-kit/InputRange/InputRange';
+import { Text } from '../../ui-kit/Text/Text';
+
+interface RenderInputRangeProps {
+  label: string;
+  value: number;
+  onChange: (value: number) => void;
+  min: number;
+  max: number;
+  items: string[];
+}
+
+export const renderInputRange = (props: RenderInputRangeProps) => (
+  <div className="w-1/2">
+    <label>
+      <Text size="text-m-light">{props.label}</Text>
+    </label>
+    <InputRange {...props} />
+  </div>
+);

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

@@ -1,6 +1,6 @@
 import { Checkbox } from '../../ui-kit/Checkbox/Checkbox';
-import { WedFormState } from './ApplicationFormWed';
-import { HandleFormStateChange } from './models';
+import type { WedFormState } from './ApplicationFormWed';
+import type { HandleFormStateChange } from './models';
 
 interface RenderQuestionsInterestedProps {
   currencyControl: boolean;
@@ -37,7 +37,7 @@ export const renderQuestionsInterested = ({
     </div>
     <textarea
       placeholder="Укажите интересующий Вас вопрос, место ведения бизнеса и удобное время для телефонного звонка"
-      className="block w-full resize-y min-h-24 p-4 outline-none border rounded-md border-main-stroke hover:border-primary-hover active:border-primary-text focus:border-primary-text"
+      className="block w-full resize-y min-h-24 p-4 outline-none border rounded-md border-main-stroke hover:border-primary-hover active:focus:border-primary-text"
       value={text}
       onChange={(e) => handleChange({ text: e.target.value })}
     />

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

@@ -15,7 +15,7 @@ export const renderSelects = ({ acquiringType, regions, region, handleChange }:
     <div className="w-1/2">
       <WrapperSelect
         data={ACQUIRING_TYPES}
-        fieldValue="code"
+        fieldValue="name"
         fieldLabel="name"
         selected={acquiringType}
         setSelected={(value) => handleChange({ acquiringType: value })}
@@ -26,7 +26,7 @@ export const renderSelects = ({ acquiringType, regions, region, handleChange }:
     <div className="w-1/2">
       <WrapperSelect
         data={regions}
-        fieldValue="code"
+        fieldValue="name"
         fieldLabel="name"
         selected={region}
         setSelected={(value) => handleChange({ region: value })}

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

@@ -1,5 +1,5 @@
-import type { ButtonProps } from '../../ui-kit/Button/ButtonProps';
 import { getRegularButtonClasses } from '../../ui-kit/Button/getRegularButtonClasses';
+import type { ButtonProps } from './ApplicationFormContent';
 
 export const renderSubmitButton = (button?: ButtonProps, className?: string) => {
   const buttonStyle = getRegularButtonClasses({