@redneckz/wildless-cms-uni-blocks 0.14.825 → 0.14.827

package/lib/components/ApplicationLeadForm/parseEsiaProfile.js

@@ -1,22 +1,12 @@
 import { uploadFile } from '../../retail/api/uploadFile.js';
 import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone.js';
-export const parseEsiaProfile = async (esiaProfile, taskId, isDebit) => {
-    isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
+export const parseEsiaProfile = async (esiaProfile, isDebit) => {
+    checkEsiaData(esiaProfile);
+    const isFullEsiaData = !isDebit && checkEsiaAdditionalDocument(esiaProfile);
     const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } = esiaProfile;
-    const files = [];
-    if (!isDebit) {
-        await saveDocument({
-            document: esiaAdditionalDocument.pdfFileWorkbook,
-            taskId,
-            category: 'CONFIRMING_INCOME_DOC',
-            files,
-        });
-        await saveDocument({
-            document: esiaAdditionalDocument.pdfFilePayout,
-            taskId,
-            category: 'CONFIRMING_EMPLOYMENT_DOC',
-            files,
-        });
+    let files = [];
+    if (isFullEsiaData) {
+        files = await saveDocuments(esiaAdditionalDocument);
     }
     const mainData = {
         name: profile.name,
@@ -33,11 +23,11 @@ export const parseEsiaProfile = async (esiaProfile, taskId, isDebit) => {
         birthPlace: addInfo.birthPlace,
         addressRegistration: buildAddress(addressRegistration),
         addressFact: buildAddress(addressFact),
-        esiaAccountTypeCd: profile.esiaAccountType,
+        esiaAccountTypeCd: isDebit ? profile.esiaAccountType : { key: '' },
     };
     return {
         ...mainData,
-        ...(!isDebit && {
+        ...(isFullEsiaData && {
             snils: addInfo.snils,
             inn: esiaAdditionalDocument.inn,
             wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
@@ -46,6 +36,9 @@ export const parseEsiaProfile = async (esiaProfile, taskId, isDebit) => {
             generalSeniority: getYearFromMonth(esiaAdditionalDocument.workLength).toString(),
             lastJobExperience: getYearFromMonth(esiaAdditionalDocument.workLengthLastJob).toString(),
             jobsNumber: esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
+            esiaAccountTypeCd: profile.esiaAccountType,
+            confirmationIncome: { key: 'SFR_CERTIFICATE', text: 'Запрос Банком доходов из СФР' },
+            employment: { key: 'WORK', text: 'Работаю' },
             files,
         }),
     };
@@ -78,43 +71,60 @@ const buildAddress = (fields) => {
     };
 };
 const getYearFromMonth = (month) => Math.floor(month / 12);
-const saveDocument = async ({ document, taskId, category, files, }) => {
-    await fetch(`data:application/pdf;base64,${document}`)
-        .then((res) => res.blob())
-        .then((value) => uploadFile(value, taskId, category))
-        .then((file) => files.push(file));
-};
-const checkEsiaDataForCredit = (esiaProfile) => {
-    const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
-    const data = [
-        profile.name,
-        profile.surname,
-        profile.midname,
-        profile.birthDate,
-        profile.phone,
-        profile.email,
-        document.dulIssueDate,
-        document.dulIssuedBy,
-        document.dulNumber,
-        document.dulSerie,
-        document.dulSubdivisionCode,
-        addressRegistration,
-        profile.esiaAccountType,
-        esiaAdditionalDocument.inn,
-        esiaAdditionalDocument.averageMonthlyIncome.toString(),
-        esiaAdditionalDocument.startWorkDate,
-        esiaAdditionalDocument.workLengthInFiveYears.toString(),
-        esiaAdditionalDocument.workLength.toString(),
-        esiaAdditionalDocument.workLengthLastJob.toString(),
-        esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
-        esiaAdditionalDocument.pdfFilePayout,
-        esiaAdditionalDocument.pdfFileWorkbook,
+const saveDocuments = async (esiaAdditionalDocument) => {
+    const files = [];
+    const documents = [
+        {
+            file: esiaAdditionalDocument.pdfFileWorkbook,
+            category: 'CONFIRMING_INCOME_DOC',
+            isPDF: true,
+        },
+        {
+            file: esiaAdditionalDocument.pdfFilePayout,
+            category: 'CONFIRMING_EMPLOYMENT_DOC',
+            isPDF: true,
+        },
+        {
+            file: esiaAdditionalDocument.pdfFileSigPayout,
+            category: 'CONFIRMING_EMPLOYMENT_DOC',
+            isPDF: true,
+        },
+        {
+            file: esiaAdditionalDocument.xmlFilePayout,
+            category: 'CONFIRMING_EMPLOYMENT_DOC',
+            isPDF: false,
+        },
+        {
+            file: esiaAdditionalDocument.xmlFileSigPayout,
+            category: 'CONFIRMING_EMPLOYMENT_DOC',
+            isPDF: false,
+        },
+        {
+            file: esiaAdditionalDocument.xmlFileWorkbook,
+            category: 'CONFIRMING_INCOME_DOC',
+            isPDF: false,
+        },
+        {
+            file: esiaAdditionalDocument.pdfFileSigWorkbook,
+            category: 'CONFIRMING_INCOME_DOC',
+            isPDF: true,
+        },
+        {
+            file: esiaAdditionalDocument.xmlFileSigWorkbook,
+            category: 'CONFIRMING_INCOME_DOC',
+            isPDF: false,
+        },
     ];
-    if (!data.every((_) => Boolean(_))) {
-        throw new Error();
+    for (const doc of documents) {
+        const contentType = doc.isPDF ? 'data:application/pdf;base64' : 'data:application/xml;base64';
+        await fetch(`${contentType},${doc.file}`)
+            .then((res) => res.blob())
+            .then((value) => uploadFile(value, doc.category, doc.isPDF))
+            .then((file) => files.push(file));
     }
+    return files;
 };
-const checkEsiaDataForDebit = (esiaProfile) => {
+const checkEsiaData = (esiaProfile) => {
     const { profile, document, addressRegistration } = esiaProfile;
     const data = [
         profile.name,
@@ -122,7 +132,6 @@ const checkEsiaDataForDebit = (esiaProfile) => {
         profile.midname,
         profile.birthDate,
         profile.phone,
-        profile.email,
         document.dulIssueDate,
         document.dulIssuedBy,
         document.dulNumber,
@@ -131,8 +140,29 @@ const checkEsiaDataForDebit = (esiaProfile) => {
         addressRegistration,
         profile.esiaAccountType,
     ];
-    if (!data.every((_) => Boolean(_))) {
+    if (!data.every(Boolean)) {
         throw new Error();
     }
 };
+const checkEsiaAdditionalDocument = (esiaProfile) => {
+    const { esiaAdditionalDocument } = esiaProfile;
+    const data = [
+        esiaAdditionalDocument?.inn,
+        esiaAdditionalDocument?.averageMonthlyIncome?.toString(),
+        esiaAdditionalDocument?.startWorkDate,
+        esiaAdditionalDocument?.workLengthInFiveYears?.toString(),
+        esiaAdditionalDocument?.workLength?.toString(),
+        esiaAdditionalDocument?.workLengthLastJob?.toString(),
+        esiaAdditionalDocument?.jobsNumberInFiveYears?.toString(),
+        esiaAdditionalDocument?.pdfFilePayout,
+        esiaAdditionalDocument?.pdfFileWorkbook,
+        esiaAdditionalDocument?.pdfFileSigPayout,
+        esiaAdditionalDocument?.xmlFilePayout,
+        esiaAdditionalDocument?.xmlFileSigPayout,
+        esiaAdditionalDocument?.xmlFileWorkbook,
+        esiaAdditionalDocument?.pdfFileSigWorkbook,
+        esiaAdditionalDocument?.xmlFileSigWorkbook,
+    ];
+    return data.every(Boolean);
+};
 //# sourceMappingURL=parseEsiaProfile.js.map

package/lib/components/ApplicationLeadForm/parseEsiaProfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseEsiaProfile.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/parseEsiaProfile.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAyB,MAAM,6BAA6B,CAAC;AAEhF,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAExE,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,WAAsC,EACtC,MAAc,EACd,OAAgB,EACQ,EAAE;IAC1B,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAC;IAEnF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,WAAW,EAAE,sBAAsB,EAAE,GAC5F,WAAW,CAAC;IACd,MAAM,KAAK,GAAW,EAAE,CAAC;IAEzB,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,YAAY,CAAC;YACjB,QAAQ,EAAE,sBAAsB,CAAC,eAAe;YAChD,MAAM;YACN,QAAQ,EAAE,uBAAuB;YACjC,KAAK;SACN,CAAC,CAAC;QACH,MAAM,YAAY,CAAC;YACjB,QAAQ,EAAE,sBAAsB,CAAC,aAAa;YAC9C,MAAM;YACN,QAAQ,EAAE,2BAA2B;YACrC,KAAK;SACN,CAAC,CAAC;KACJ;IAED,MAAM,QAAQ,GAAG;QACf,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,OAAO,CAAC,OAAO;QAC3B,eAAe,EAAE,OAAO,CAAC,SAAS;QAClC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC;QACpC,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,WAAW,EAAE,QAAQ,CAAC,WAAW;QACjC,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;QAC/C,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,mBAAmB,EAAE,YAAY,CAAC,mBAAmB,CAAC;QACtD,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC;QACtC,iBAAiB,EAAE,OAAO,CAAC,eAAe;KAC3C,CAAC;IAEF,OAAO;QACL,GAAG,QAAQ;QACX,GAAG,CAAC,CAAC,OAAO,IAAI;YACd,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,GAAG,EAAE,sBAAsB,CAAC,GAAG;YAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,EAAE,QAAQ,EAAE;YAC1E,SAAS,EAAE,sBAAsB,CAAC,aAAa;YAC/C,gBAAgB,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAC,QAAQ,EAAE;YAC3F,gBAAgB,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE;YAChF,iBAAiB,EAAE,gBAAgB,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,CAAC,QAAQ,EAAE;YACxF,UAAU,EAAE,sBAAsB,CAAC,qBAAqB,CAAC,QAAQ,EAAE;YACnE,KAAK;SACN,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAkC,EAAU,EAAE;IACvE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAK,EAAE,EAAE;QAC3C,IAAI,KAAK,EAAE;YACT,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;SACzC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,MAAwD,EAAW,EAAE;IACzF,MAAM,EACJ,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,GACV,GAAG,MAAM,CAAC;IAEX,MAAM,KAAK,GAAG,QAAQ,IAAI,IAAI,CAAC;IAE/B,MAAM,WAAW,GAAG,iBAAiB,CAAC;QACpC,QAAQ;QACR,MAAM;QACN,KAAK;QACL,MAAM,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS;QACnC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS;QAChC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS;QAChC,QAAQ,CAAC,CAAC,CAAC,OAAO,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS;QACxC,SAAS,CAAC,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS;KAC1C,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,MAAM;QACT,UAAU,EAAE,UAAU,EAAE,GAAG;QAC3B,WAAW;KACZ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;AAEnE,MAAM,YAAY,GAAG,KAAK,EAAE,EAC1B,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,KAAK,GAMN,EAAE,EAAE;IACH,MAAM,KAAK,CAAC,+BAA+B,QAAQ,EAAE,CAAC;SACnD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACzB,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;SACpD,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAAC,WAAsC,EAAE,EAAE;IACxE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,sBAAsB,EAAE,GAAG,WAAW,CAAC;IAEvF,MAAM,IAAI,GAAG;QACX,OAAO,CAAC,IAAI;QACZ,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,SAAS;QACjB,OAAO,CAAC,KAAK;QACb,OAAO,CAAC,KAAK;QACb,QAAQ,CAAC,YAAY;QACrB,QAAQ,CAAC,WAAW;QACpB,QAAQ,CAAC,SAAS;QAClB,QAAQ,CAAC,QAAQ;QACjB,QAAQ,CAAC,kBAAkB;QAC3B,mBAAmB;QACnB,OAAO,CAAC,eAAe;QACvB,sBAAsB,CAAC,GAAG;QAC1B,sBAAsB,CAAC,oBAAoB,CAAC,QAAQ,EAAE;QACtD,sBAAsB,CAAC,aAAa;QACpC,sBAAsB,CAAC,qBAAqB,CAAC,QAAQ,EAAE;QACvD,sBAAsB,CAAC,UAAU,CAAC,QAAQ,EAAE;QAC5C,sBAAsB,CAAC,iBAAiB,CAAC,QAAQ,EAAE;QACnD,sBAAsB,CAAC,qBAAqB,CAAC,QAAQ,EAAE;QACvD,sBAAsB,CAAC,aAAa;QACpC,sBAAsB,CAAC,eAAe;KACvC,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;AACH,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,WAAsC,EAAE,EAAE;IACvE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,WAAW,CAAC;IAE/D,MAAM,IAAI,GAAG;QACX,OAAO,CAAC,IAAI;QACZ,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,OAAO;QACf,OAAO,CAAC,SAAS;QACjB,OAAO,CAAC,KAAK;QACb,OAAO,CAAC,KAAK;QACb,QAAQ,CAAC,YAAY;QACrB,QAAQ,CAAC,WAAW;QACpB,QAAQ,CAAC,SAAS;QAClB,QAAQ,CAAC,QAAQ;QACjB,QAAQ,CAAC,kBAAkB;QAC3B,mBAAmB;QACnB,OAAO,CAAC,eAAe;KACxB,CAAC;IAEF,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE;QAClC,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;AACH,CAAC,CAAC"}
+{"version":3,"file":"parseEsiaProfile.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/parseEsiaProfile.ts"],"names":[],"mappings":"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"}

package/lib/components/ApplicationLeadForm/useApplicationLeadApi.d.ts

@@ -5,9 +5,8 @@ interface ApplicationLeadApiProps extends AspectsProps {
     programId: string;
     nextStepLink: string;
     productType: ProductType;
-    esiaError: boolean;
 }
-export declare const useApplicationLeadApi: ({ programId, nextStepLink, productType, esiaError, data, }: ApplicationLeadApiProps) => {
+export declare const useApplicationLeadApi: ({ programId, nextStepLink, productType, data, }: ApplicationLeadApiProps) => {
     isSending: boolean;
     ok: boolean | undefined;
     handleSubmit: (formData: LeadFormState) => Promise<void>;

package/lib/components/ApplicationLeadForm/useApplicationLeadApi.js

@@ -11,7 +11,6 @@ import { updateUserProfile } from '../../retail/api/updateUserProfile.js';
 import { updateUserTask } from '../../retail/api/updateUserTask.js';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog.js';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog.js';
-import { useEsiaLoginDialog } from '../../retail/components/EsiaLoginDialog/useEsiaLoginDialog.js';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog.js';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile.js';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog.js';
@@ -21,79 +20,80 @@ import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFo
 import { useSaveUserData } from './useSaveUserData.js';
 import { useSendLeadFormAspects } from './useSendLeadFormAspects.js';
 // eslint-disable-next-line max-lines-per-function
-export const useApplicationLeadApi = ({ programId, nextStepLink, productType, esiaError, data, }) => {
+export const useApplicationLeadApi = ({ programId, nextStepLink, productType, data, }) => {
     const [isSending, { setTrue: startSending, setFalse: endSending }] = useBool(false);
     const [ok, setOK] = useState();
     const saveUserData = useSaveUserData();
     const sendAspects = useSendLeadFormAspects({ data });
     const navigator = locationNavigator();
-    const openEsiaLoginDialog = useEsiaLoginDialog(nextStepLink);
-    const consentBkiDialog = useConsentBkiDialog(openEsiaLoginDialog);
+    const goToNextStep = useCallback(() => {
+        navigator.assign(nextStepLink);
+    }, []);
+    const consentBkiDialog = useConsentBkiDialog(goToNextStep);
     const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
     const draftDialog = useDraftDialog();
     const handleSubmit = useCallback(async (formData) => {
-        if (esiaError) {
-            navigator.assign(nextStepLink);
-            return;
-        }
         try {
             startSending();
             const transformedFormData = transformFormData(formData);
             const profileId = await createUserProfile({
                 profile: { phone: formatPhone(transformedFormData.phone) },
             });
-            if (profileId && transformedFormData?.phone) {
-                const sendCurrentTask = async () => {
-                    await updateUserData({
-                        programId,
-                        profileId,
-                        formData: transformedFormData,
-                        productType,
-                        saveUserData,
-                        sendAspects,
-                    });
-                    verifyPhoneDialog.close();
-                    if (productType === 'debitCard') {
-                        openEsiaLoginDialog();
+            if (!profileId) {
+                throw new Error();
+            }
+            const sendCurrentTask = async () => {
+                await updateUserData({
+                    programId,
+                    profileId,
+                    formData: transformedFormData,
+                    productType,
+                    saveUserData,
+                    sendAspects,
+                });
+                verifyPhoneDialog.close();
+                if (productType === 'debitCard') {
+                    goToNextStep();
+                }
+                else {
+                    consentBkiDialog.open(transformedFormData.phone, profileId);
+                }
+            };
+            const handleSuccessVerify = async () => {
+                try {
+                    const lastTaskId = await getLastTaskStatus({ profileId, programId });
+                    if (lastTaskId) {
+                        const task = await getTaskById({ taskId: lastTaskId });
+                        verifyPhoneDialog.close();
+                        draftDialog.open({
+                            task,
+                            isFromLead: true,
+                            sendAspects,
+                            onClose: sendCurrentTask,
+                        });
                     }
                     else {
-                        consentBkiDialog.open(transformedFormData.phone, profileId);
-                    }
-                };
-                const handleSuccessVerify = async () => {
-                    try {
-                        const lastTaskId = await getLastTaskStatus({ profileId, programId });
-                        if (lastTaskId) {
-                            const task = await getTaskById({ taskId: lastTaskId });
-                            verifyPhoneDialog.close();
-                            draftDialog.open({
-                                task,
-                                isFromLead: true,
-                                sendAspects,
-                                onClose: sendCurrentTask,
-                            });
-                        }
-                        else {
-                            await sendCurrentTask();
-                        }
-                    }
-                    catch {
-                        setOK(false);
+                        await sendCurrentTask();
                     }
-                };
-                const acceptedConsents = getAcceptedConsents(formData, productType);
-                verifyPhoneDialog.open({
-                    phone: transformedFormData?.phone,
-                    consents: acceptedConsents,
-                    onSuccess: handleSuccessVerify,
-                });
-                endSending();
-            }
+                }
+                catch {
+                    setOK(false);
+                }
+            };
+            const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
+            verifyPhoneDialog.open({
+                phone: transformedFormData.phone,
+                consents: acceptedConsents,
+                onSuccess: handleSuccessVerify,
+            });
         }
         catch {
             setOK(false);
         }
-    }, [esiaError]);
+        finally {
+            endSending();
+        }
+    }, []);
     return { isSending, ok, handleSubmit };
 };
 const getAcceptedConsents = (formData, productType) => {

package/lib/components/ApplicationLeadForm/useApplicationLeadApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"useApplicationLeadApi.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useApplicationLeadApi.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useApplicationLeadApi.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useApplicationLeadApi.tsx"],"names":[],"mappings":"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"}

package/lib/components/ApplicationLeadForm/useInitApplicationLead.d.ts

@@ -1,13 +1,13 @@
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { EsiaStatuses } from './ApplicationLeadForm';
 import { type ProductType } from './ApplicationLeadFormContent';
 declare type InitApplicationLeadProps = {
     inputs: FieldRetailDef[];
     nextStepLink: string;
     productType: ProductType;
-    setEsiaError: () => void;
+    setEsiaStatus: (status: EsiaStatuses) => void;
+    esiaAuthSuccess: boolean;
 };
-export declare const useInitApplicationLead: ({ inputs, nextStepLink, productType, setEsiaError, }: InitApplicationLeadProps) => [LeadFormState, {
-    isLoading: boolean;
-}];
+export declare const useInitApplicationLead: ({ inputs, productType, setEsiaStatus, esiaAuthSuccess, }: InitApplicationLeadProps) => LeadFormState;
 export {};

package/lib/components/ApplicationLeadForm/useInitApplicationLead.js

@@ -1,57 +1,49 @@
 import { useCallback, useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
-import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
-import { locationNavigator } from '../../external/locationNavigator.js';
 import { useSetter } from '../../hooks/useSetter.js';
-import { updateProfileEsia } from '../../retail/api/updateProfileEsia.js';
-import { safeJsonParse } from '../../utils/safeJsonParse.js';
+import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile.js';
+import { EsiaStatuses } from './ApplicationLeadForm.js';
 import { getInitialFormState } from './getInitialFormState.js';
 import { parseEsiaProfile } from './parseEsiaProfile.js';
 import { useLeadFormStore } from './useLeadFormStore.js';
-export const useInitApplicationLead = ({ inputs, nextStepLink, productType, setEsiaError, }) => {
-    const navigator = locationNavigator();
-    const [isLoading, { setTrue: startLoading, setFalse: endLoading }] = useBool(false);
+export const useInitApplicationLead = ({ inputs, productType, setEsiaStatus, esiaAuthSuccess, }) => {
     const leadFormStore = useLeadFormStore();
     const saveForm = useSetter(leadFormStore, 'leadForm');
-    const initialFormState = useMemo(() => getInitialFormState(inputs, leadFormStore.leadForm), [inputs, leadFormStore.leadForm]);
-    const updateEsiaProfile = useCallback(async (profileId, code, state) => {
-        startLoading();
+    const initialFormState = useMemo(() => getInitialFormState(inputs, leadFormStore.leadForm, esiaAuthSuccess), [inputs, leadFormStore.leadForm]);
+    const requestEsiaProfile = useCallback(async (code, state) => {
+        setEsiaStatus(EsiaStatuses.Pending);
         try {
-            const data = await updateProfileEsia({
-                profileId,
+            const data = await esiaRequestProfile({
                 code,
                 state,
                 redirectUri: globalThis.location?.href,
+                authorize: true,
             });
-            if (data && leadFormStore?.taskId) {
-                const parsedData = await parseEsiaProfile(data, leadFormStore.taskId.toString(), productType === 'debitCard');
+            if (data) {
+                const parsedData = await parseEsiaProfile(data, productType === 'debitCard');
                 saveForm((_) => ({
                     ..._,
                     ...parsedData,
                 }));
+                setEsiaStatus(EsiaStatuses.Success);
             }
-            navigator.assign(nextStepLink);
         }
         catch {
-            setEsiaError();
+            setEsiaStatus(EsiaStatuses.Error);
         }
-        finally {
-            endLoading();
-        }
-    }, [nextStepLink]);
+    }, []);
     useEffect(() => {
         leadFormStore.productType = productType;
-        const profileId = (safeJsonParse(globalThis.localStorage?.getItem('profileId') ?? ''));
         const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
         const code = params.get('code');
         const state = params.get('state');
-        if (profileId && code && state) {
-            updateEsiaProfile(profileId, code, state);
+        if (code && state) {
+            requestEsiaProfile(code, state);
         }
         else {
             sessionStorage.removeItem('accessToken');
             sessionStorage.removeItem('refreshToken');
         }
     }, []);
-    return [initialFormState, { isLoading }];
+    return initialFormState;
 };
 //# sourceMappingURL=useInitApplicationLead.js.map

package/lib/components/ApplicationLeadForm/useInitApplicationLead.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAGzE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAUtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,EACrC,MAAM,EACN,WAAW,EACX,aAAa,EACb,eAAe,GACU,EAAiB,EAAE;IAC5C,MAAM,aAAa,GAAG,gBAAgB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,SAAS,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;IAEtD,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,EAAE,eAAe,CAAC,EAC1E,CAAC,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CACjC,CAAC;IAEF,MAAM,kBAAkB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAY,EAAE,KAAa,EAAE,EAAE;QAC3E,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACpC,IAAI;YACF,MAAM,IAAI,GAAG,MAAM,kBAAkB,CAAC;gBACpC,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;gBACtC,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YAEH,IAAI,IAAI,EAAE;gBACR,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,WAAW,KAAK,WAAW,CAAC,CAAC;gBAE7E,QAAQ,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACf,GAAG,CAAC;oBACJ,GAAG,UAAU;iBACd,CAAC,CAAC,CAAC;gBACJ,aAAa,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;aACrC;SACF;QAAC,MAAM;YACN,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;SACnC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,aAAa,CAAC,WAAW,GAAG,WAAW,CAAC;QAExC,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACpF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,IAAI,IAAI,KAAK,EAAE;YACjB,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;SACjC;aAAM;YACL,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACzC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC3C;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC"}

package/lib/components/CreditCardForm/CreditCardFormStep.js

@@ -2,23 +2,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm.js';
-import { calculateInputs } from '../../retail/utils/calculateInputs.js';
 import { renderStep } from '../../retail/utils/renderStep.js';
-import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation.js';
-import { validatorObj } from '../../retail/validator/validatorObj.js';
-import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator.js';
+import { getRetailFormValidator } from '../../retail/validator/getRetailFormValidator.js';
 import { StepsNavigationButtons } from './StepsNavigationButtons.js';
 import { useCreditCardFormAPI } from './useCreditCardFormAPI.js';
 const PRODUCT_TYPE = 'creditCard';
-const extendedValidatorObj = {
-    ...validatorObj,
-    limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
 export const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
-    const formValidator = useCallback((formState) => 
-    // TODO Слишком сложно
-    getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
+    const formValidator = useCallback((formState) => getRetailFormValidator({
+        formState,
+        inputs,
+        step,
+        productType: PRODUCT_TYPE,
+    }), [inputs]);
     const [initialState, onSubmit, isSending] = useCreditCardFormAPI({
         step,
         onNextStep,

package/lib/components/CreditCardForm/CreditCardFormStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreditCardFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/CreditCardFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAU9D,MAAM,YAAY,GAAG,YAAY,CAAC;AAElC,MAAM,oBAAoB,GAAG;IAC3B,GAAG,YAAY;IACf,eAAe,EAAE,4BAA4B,CAAC,YAAY,CAAC;CAC5D,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE;IAC3B,sBAAsB;IACtB,gBAAgB,CACd,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,EAClD,oBAAoB,CACrB,CAAC,SAAS,CAAC,EACd,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,oBAAoB,CAAC;QAC/D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,KAAC,sBAAsB,IAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"CreditCardFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/CreditCardFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAU9D,MAAM,YAAY,GAAG,YAAY,CAAC;AAElC,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,CACnC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvD,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,sBAAsB,CAAC;QACrB,SAAS;QACT,MAAM;QACN,IAAI;QACJ,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,oBAAoB,CAAC;QAC/D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EACtC,KAAC,sBAAsB,IAAC,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/components/CreditForm/CreditFormStep.js

@@ -3,25 +3,21 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm.js';
 import { useRetailFormStore } from '../../retail/hooks/useRetailFormStore.js';
-import { calculateInputs } from '../../retail/utils/calculateInputs.js';
 import { renderStep } from '../../retail/utils/renderStep.js';
-import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation.js';
-import { validatorObj } from '../../retail/validator/validatorObj.js';
-import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator.js';
+import { getRetailFormValidator } from '../../retail/validator/getRetailFormValidator.js';
 import { StepsNavigationButtons } from './StepsNavigationButtons.js';
 import { useCreditFormAPI } from './useCreditFormAPI.js';
 const PRODUCT_TYPE = 'credit';
-const extendedValidatorObj = {
-    ...validatorObj,
-    limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
 export const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
     const calcData = programsSource?.[programId ?? '']; // Need normalizator useForm, to be save defaultParams
     const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
-    const formValidator = useCallback((formState) => 
-    // TODO Слишком сложно
-    getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
+    const formValidator = useCallback((formState) => getRetailFormValidator({
+        formState,
+        inputs,
+        step,
+        productType: PRODUCT_TYPE,
+    }), [inputs]);
     const [initialState, onSubmit, isSending] = useCreditFormAPI({
         step,
         onNextStep,

package/lib/components/CreditForm/CreditFormStep.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,4BAA4B,EAAE,MAAM,qDAAqD,CAAC;AACnG,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B,MAAM,oBAAoB,GAAG;IAC3B,GAAG,YAAY;IACf,eAAe,EAAE,4BAA4B,CAAC,YAAY,CAAC;CAC5D,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE;IAC3B,sBAAsB;IACtB,gBAAgB,CACd,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,EAClD,oBAAoB,CACrB,CAAC,SAAS,CAAC,EACd,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EAC5D,KAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
+{"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3C,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,sBAAsB,CAAC;QACrB,SAAS;QACT,MAAM;QACN,IAAI;QACJ,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EAC5D,KAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/components/DebitForm/DebitFormStep.js

@@ -2,23 +2,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "@redneckz/uni-jsx/jsx-runtime";
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm/useForm.js';
-import { calculateInputs } from '../../retail/utils/calculateInputs.js';
 import { renderStep } from '../../retail/utils/renderStep.js';
-import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation.js';
-import { validatorObj } from '../../retail/validator/validatorObj.js';
-import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator.js';
+import { getRetailFormValidator } from '../../retail/validator/getRetailFormValidator.js';
 import { StepsNavigationButtons } from './StepsNavigationButtons.js';
 import { useDebitFormAPI } from './useDebitFormAPI.js';
 const PRODUCT_TYPE = 'debitCard';
-const extendedValidatorObj = {
-    ...validatorObj,
-    limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
-};
 export const DebitFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
-    const formValidator = useCallback((formState) => 
-    // TODO Слишком сложно
-    getFormValidator(calculateInputs((_) => formState[_])(inputs, step), extendedValidatorObj)(formState), [inputs]);
+    const formValidator = useCallback((formState) => getRetailFormValidator({
+        formState,
+        inputs,
+        step,
+        productType: PRODUCT_TYPE,
+    }), [inputs]);
     const [initialState, onSubmit, isSending] = useDebitFormAPI({
         step,
         onNextStep,