@redneckz/wildless-cms-uni-blocks 0.14.1077 → 0.14.1079

package/mobile/bundle/bundle.umd.js

@@ -5937,6 +5937,7 @@
         moneyValue: 'maxSum',
     };
     const CalculatorCredit = UniBlock(({ className, title, calcSource, buttons, footnote, paramsViewSettings, defaultParams, onChange, ...rest }) => {
+        const isInitialized = useRef(false);
         const defaultParamsCals = getDefaultParamsMin(calcSource?.rateRows);
         const handleChange = useCallback((params) => {
             const _calcParams = getCreditCalculatorParams(params, calcSource, paramsViewSettings);
@@ -5945,7 +5946,7 @@
                 monthlyPayment: _calcParams.monthlyPayment,
                 rate: defaultParamsCals?.rate ?? 0,
             });
-        }, [paramsViewSettings, calcSource]);
+        }, [paramsViewSettings, calcSource, defaultParamsCals?.rate]);
         const [userInputParams, { field }] = useForm(getCalcParams(defaultParams), {
             onChange: handleChange,
         });
@@ -5955,6 +5956,18 @@
         });
         const { onChange: setMoneyValue } = field('moneyValue');
         const { onChange: setMonthsValue } = field('monthsValue');
+        useEffect(() => {
+            if (!isInitialized.current &&
+                defaultParamsCals?.rate !== undefined &&
+                calcParams.monthlyPayment !== undefined) {
+                onChange?.({
+                    ...userInputParams,
+                    monthlyPayment: calcParams.monthlyPayment,
+                    rate: defaultParamsCals.rate,
+                });
+                isInitialized.current = true;
+            }
+        }, [defaultParamsCals?.rate, calcParams.monthlyPayment]);
         useEffect(() => {
             setMoneyValue &&
                 setMoneyValue(clamp(userInputParams.moneyValue, calcParams.minSum, calcParams.maxSum));
@@ -6005,11 +6018,6 @@
                     : params?.calcData?.defaultParams);
             }
         }, [params?.calcData?.defaultParams]);
-        useEffect(() => {
-            if (defaultParams) {
-                handleChange(getCalcParams(defaultParams));
-            }
-        }, [defaultParams]);
         return defaultParams ? (jsx(CalculatorCredit, { ...params?.calcData, defaultParams: defaultParams, padding: "p-0", onChange: handleChange })) : (jsx(Loader, {}));
     });
     const PARAMS_MAP = {
@@ -6897,7 +6905,74 @@
         restInputs: inputs.filter(({ name }) => !Object.keys(productTypeToConsentsMap[productType]).includes(String(name))),
     });
 
-    const renderSubmitButton = (button, isSending = false) => (jsx(SubmitButton$1, { className: "w-full @xl:w-auto", isLoading: isSending, testId: "LeadSubmitButton", children: button?.text ? button.text : 'Отправить заявку' }));
+    const YANDEX_ID = projectSettings.YANDEX_METRIKA_ID || '92511315';
+
+    const ASPECTS_MAP = {
+        leadForm: {
+            debitCard: 'debit_lead_form',
+            creditCard: 'card_lead_form',
+            default: 'lead_form',
+        },
+        draft: {
+            debitCard: 'debit_draft_app',
+            creditCard: 'card_draft_app',
+            default: 'draft_app',
+        },
+        smsAuth: {
+            debitCard: 'debit_sms_auth',
+            creditCard: 'card_sms_auth',
+            default: 'sms_auth',
+        },
+        consentBki: {
+            creditCard: 'card_consent_bki',
+            default: 'consent_bki',
+        },
+        smsBki: {
+            creditCard: 'card_sms_bki',
+            default: 'sms_bki',
+        },
+        current: {
+            debitCard: 'debit_current_app',
+            creditCard: 'card_current_app',
+            default: 'current_app',
+        },
+        timer: {
+            creditCard: 'card_timer',
+            default: 'timer',
+        },
+        timerEnd: {
+            creditCard: 'card_timer_end',
+            default: 'timer_end',
+        },
+        preDecision: {
+            creditCard: 'card_pre_decision',
+            default: 'pre_decision',
+        },
+        revision: {
+            creditCard: 'card_revision',
+            default: 'revision',
+        },
+        refuse: {
+            creditCard: 'card_refuse',
+            default: 'refuse',
+        },
+    };
+    const getAspects = (aspectType, productType) => {
+        const aspectForType = ASPECTS_MAP[aspectType];
+        return [
+            {
+                aspectName: 'ymReachGoal',
+                params: { yandexId: YANDEX_ID, targetName: aspectForType[productType || 'default'] },
+            },
+        ];
+    };
+
+    const renderSubmitButton = (button, options) => {
+        const isSending = options?.isSending;
+        const productType = options?.productType;
+        const defaultAspects = getAspects('leadForm', productType);
+        return (jsx(SubmitButton$1, { className: "w-full @xl:w-auto", isLoading: isSending ?? false, testId: "LeadSubmitButton", data: defaultAspects, children: button?.text ? button.text : 'Отправить заявку' }));
+    };
 
     const createDraftTask = async (body) => {
         const isNewMicroservice = checkNewMicroservice();
@@ -7162,13 +7237,21 @@
         { id: 'REFUSE', text: 'Отказаться' },
     ];
     const CONSENT_BKI_ID = 2;
-    const ConsentBkiDialog = JSX(({ onSubmit = noop, onClose = noop }) => {
+    const ConsentBkiDialog = JSX(({ onSubmit = noop, onClose = noop, productType }) => {
         const [confirmStatus, setConfirmStatus] = useState('');
         const [showRefuseContent, setShowRefuseContent] = useState(false);
         const { openDocument } = useDocumentDialog(CONSENT_BKI_ID);
+        const aspects = useAspects();
         const handleSubmit = useCallback(() => {
+            if (confirmStatus === 'SIGNED') {
+                handleAspects({
+                    aspectsAttributes: getAspects('consentBki', productType),
+                    aspects,
+                    ev: {},
+                });
+            }
             onSubmit(confirmStatus);
-        }, [onSubmit, confirmStatus]);
+        }, [onSubmit, confirmStatus, aspects, productType]);
         const handleConfirmChange = useCallback((value) => {
             setConfirmStatus(value);
             setShowRefuseContent(value === 'REFUSE');
@@ -7177,63 +7260,77 @@
         return (jsx(Dialog, { onClose: onClose, children: jsxs("div", { className: "flex flex-col gap-xl items-center", children: [jsx("div", { role: "button", onClick: openDocument, children: jsx(Heading, { className: "text-center text-balance", headingType: "h2", title: consentText.title }) }), jsx(Paragraph, { align: "text-center", children: consentText.description }), jsx(RadioButtonGroup, { className: "whitespace-normal", orientation: "horizontal", items: ITEMS, value: confirmStatus, onChange: handleConfirmChange }), jsx(Button, { disabled: !confirmStatus, type: "button", onClick: handleSubmit, testId: "bki-button", children: "\u0414\u0430\u043B\u0435\u0435" })] }) }));
     });
 
-    const useConsentBkiDialog = (onClose) => {
-        const { open } = useDialog(ConsentBkiDialog);
-        const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
-        const handleSuccessVerify = (profileId, taskId, participantId) => async (smsCode) => {
-            try {
-                if (profileId) {
-                    await updateUserProfile({
-                        profile: {
-                            id: profileId,
+    const createHandleSuccessVerify = ({ profileId, taskId, participantId, aspects, onClose, productType, }) => async (smsCode) => {
+        try {
+            if (profileId) {
+                await updateUserProfile({
+                    profile: {
+                        id: profileId,
+                        consentBkiFlg: true,
+                        smsConsentBki: smsCode,
+                    },
+                });
+            }
+            else if (taskId && participantId) {
+                await updateUserTask({
+                    task: {
+                        id: taskId,
+                        participant: {
+                            id: participantId,
                             consentBkiFlg: true,
                             smsConsentBki: smsCode,
                         },
-                    });
-                }
-                else if (taskId && participantId) {
-                    await updateUserTask({
-                        task: {
-                            id: taskId,
-                            participant: {
-                                id: participantId,
-                                consentBkiFlg: true,
-                                smsConsentBki: smsCode,
-                            },
-                        },
-                        sendToBank: false,
-                        taskKind: 'SHORT',
-                    });
-                }
-                onClose();
-            }
-            catch (ex) {
-                console.log(ex);
-            }
-        };
-        const handleSubmitBkiConsent = ({ phone, profileId, onFail, taskId, participantId }) => async (confirmStatus) => {
-            if (confirmStatus === 'SIGNED' && phone) {
-                verifyPhoneDialog.open({
-                    phone,
-                    consents: ['согласие на запрос информации в БКИ'],
-                    onSuccess: handleSuccessVerify(profileId, taskId, participantId),
-                    onFail,
+                    },
+                    sendToBank: false,
+                    taskKind: 'SHORT',
                 });
             }
-            else {
-                onClose();
-            }
-        };
-        return {
-            open: ({ phone, profileId, onFail, taskId, participantId }) => open({
-                onSubmit: handleSubmitBkiConsent({
-                    phone,
+            handleAspects({
+                aspectsAttributes: getAspects('smsBki', productType),
+                aspects,
+                ev: {},
+            });
+            onClose();
+        }
+        catch (ex) {
+            console.log(ex);
+        }
+    };
+    const createHandleSubmitBkiConsent = ({ submitProps, verifyPhoneDialog, aspects, onClose }) => async (confirmStatus) => {
+        const { phone, profileId, onFail, taskId, participantId, productType } = submitProps;
+        if (confirmStatus === 'SIGNED' && phone) {
+            verifyPhoneDialog.open({
+                phone,
+                consents: ['согласие на запрос информации в БКИ'],
+                onSuccess: createHandleSuccessVerify({
                     profileId,
-                    onFail,
                     taskId,
                     participantId,
+                    aspects,
+                    onClose,
+                    productType,
+                }),
+                onFail,
+            });
+        }
+        else {
+            onClose();
+        }
+    };
+    const useConsentBkiDialog = (onClose, productType) => {
+        const { open } = useDialog(ConsentBkiDialog);
+        const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
+        const aspects = useAspects();
+        return {
+            open: ({ phone, profileId, onFail, taskId, participantId }) => open({
+                onSubmit: createHandleSubmitBkiConsent({
+                    submitProps: { phone, profileId, onFail, taskId, participantId, productType },
+                    verifyPhoneDialog,
+                    aspects,
+                    onClose,
                 }),
                 onClose,
+                productType,
             }),
         };
     };
@@ -7296,10 +7393,10 @@
         return undefined;
     };
 
-    const DraftActionButton = JSX(({ title, icon, description, name, onClick = noop }) => (jsxs("button", { className: "flex gap-lg items-center border border-gray/30 rounded-xl cursor-pointer p-4 hover:border-green", type: "button", onClick: onClick, "data-test-id": name, children: [jsx(Img, { image: { icon, iconVersion: 'normal' }, width: "78", height: "78" }), jsxs("div", { className: "flex flex-col items-start gap-xs md:w-72 md:mr-lg", children: [title ? (jsx(Text, { font: "font-medium", size: "text-s", children: title })) : null, description ? (jsx(Text, { color: "text-secondary-text", size: "text-xs", children: description })) : null] })] })));
+    const DraftActionButton = JSX(({ title, icon, description, name, onClick = noop, data }) => (jsxs("button", { className: "flex gap-lg items-center border border-gray/30 rounded-xl cursor-pointer p-4 hover:border-green", type: "button", onClick: onClick, "data-test-id": name, ...getAspectsAttributes(data), children: [jsx(Img, { image: { icon, iconVersion: 'normal' }, width: "78", height: "78" }), jsxs("div", { className: "flex flex-col items-start gap-xs md:w-72 md:mr-lg", children: [title ? (jsx(Text, { font: "font-medium", size: "text-s", children: title })) : null, description ? (jsx(Text, { color: "text-secondary-text", size: "text-xs", children: description })) : null] })] })));
 
-    const DraftDialogContent = JSX(function ({ createdDate, productData, isFromLead, handleGoToDraft, handleGoToNewTask, onClose, }) {
-        return (jsxs("div", { className: "flex flex-col gap-lg items-center mt-xs mx-6xl", children: [jsx(Heading, { className: "whitespace-pre-wrap text-center", title: "\u041D\u0430\u0448\u043B\u0438 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A \u0432\u0430\u0448\u0435\u0439 \u0437\u0430\u044F\u0432\u043A\u0438", headingType: "h5" }), jsxs("div", { className: "flex flex-col gap-m max-w-lg", children: [jsx(DraftActionButton, { title: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0437\u0430\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A\u0430", icon: "BankColorIcon", description: createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : '', onClick: handleGoToDraft, name: "go-to-draft-button" }), jsx(DraftActionButton, { title: isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку', icon: "NewLoanIcon", description: productData.description, onClick: isFromLead ? onClose : handleGoToNewTask, name: "go-to-current-task-button" })] })] }));
+    const DraftDialogContent = JSX(function ({ createdDate, productData, isFromLead, handleGoToDraft, handleGoToNewTask, onClose, draftAspects, currentAspects, }) {
+        return (jsxs("div", { className: "flex flex-col gap-lg items-center mt-xs mx-6xl", children: [jsx(Heading, { className: "whitespace-pre-wrap text-center", title: "\u041D\u0430\u0448\u043B\u0438 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A \u0432\u0430\u0448\u0435\u0439 \u0437\u0430\u044F\u0432\u043A\u0438", headingType: "h5" }), jsxs("div", { className: "flex flex-col gap-m max-w-lg", children: [jsx(DraftActionButton, { title: "\u041F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0437\u0430\u043F\u043E\u043B\u043D\u0435\u043D\u0438\u0435 \u0447\u0435\u0440\u043D\u043E\u0432\u0438\u043A\u0430", icon: "BankColorIcon", description: createdDate ? `Черновик от ${formatDate(new Date(createdDate))}` : '', onClick: handleGoToDraft, name: "go-to-draft-button", data: draftAspects }), jsx(DraftActionButton, { title: isFromLead ? 'Продолжить заполнение текущей заявки' : 'Создать новую заявку', icon: "NewLoanIcon", description: productData.description, onClick: isFromLead ? onClose : handleGoToNewTask, name: "go-to-current-task-button", data: isFromLead ? currentAspects : undefined })] })] }));
     });
 
     const fieldsNamesToContactKeysMap = {
@@ -7580,7 +7677,19 @@
             }
             navigator.assign(productData.newTaskLink);
         }, [task.id, productData.newTaskLink, isNewMicroservice]);
-        return (jsx(Dialog, { onClose: onClose, children: jsx(DraftDialogContent, { createdDate: createdDate, productData: productData, isFromLead: isFromLead, handleGoToDraft: handleGoToDraft, handleGoToNewTask: handleGoToNewTask, onClose: onClose }) }));
+        let productType;
+        if (isDebit) {
+            productType = 'debitCard';
+        }
+        else if (taskType === 'card') {
+            productType = 'creditCard';
+        }
+        else {
+            productType = 'credit';
+        }
+        const draftAspects = getAspects('draft', productType);
+        const currentAspects = getAspects('current', productType);
+        return (jsx(Dialog, { onClose: onClose, children: jsx(DraftDialogContent, { createdDate: createdDate, productData: productData, isFromLead: isFromLead, handleGoToDraft: handleGoToDraft, handleGoToNewTask: handleGoToNewTask, onClose: onClose, draftAspects: draftAspects, currentAspects: currentAspects }) }));
     });
 
     const EmptyDraftDialog = JSX(function ({ taskType, isDebit, onClose = noop, }) {
@@ -7758,11 +7867,12 @@
         const sessionStore = useSessionStore();
         const leadFormStore = useLeadFormStore();
         const sendAspects = useSendLeadFormAspects({ data });
+        const aspects = useAspects();
         const navigator = locationNavigator();
         const goToNextStep = useCallback(() => {
             navigator.assign(nextStepLink);
         }, []);
-        const consentBkiDialog = useConsentBkiDialog(goToNextStep);
+        const consentBkiDialog = useConsentBkiDialog(goToNextStep, productType);
         const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
         const draftDialog = useDraftDialog();
         const handleFailSendForm = () => {
@@ -7781,51 +7891,28 @@
                 if (!profileId) {
                     throw new Error();
                 }
-                const sendCurrentTask = async () => {
-                    await updateUserData({
+                const oldMicroserviceProps = {
+                    common: {
+                        aspects,
                         programId,
+                        productType,
+                        sendAspects,
+                        verifyPhoneDialog,
+                        handleFailSendForm,
                         profileId,
+                    },
+                    taskData: {
                         formData: transformedFormData,
-                        productType,
                         referalData,
                         marketingInfo,
                         saveUserData,
-                        sendAspects,
-                    });
-                    verifyPhoneDialog.close();
-                    if (productType === 'debitCard') {
-                        goToNextStep();
-                    }
-                    else {
-                        consentBkiDialog.open({
-                            phone: transformedFormData.phone,
-                            profileId,
-                            onFail: handleFailSendForm,
-                        });
-                    }
-                };
-                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,
-                                taskType: productTypeToTaskType(productType),
-                                sendAspects,
-                                onClose: sendCurrentTask,
-                            });
-                        }
-                        else {
-                            await sendCurrentTask();
-                        }
-                    }
-                    catch {
-                        handleFailSendForm();
-                    }
+                    },
+                    goToNextStep,
+                    consentBkiDialog,
+                    draftDialog,
                 };
+                const sendCurrentTask = createSendCurrentTaskOld(oldMicroserviceProps);
+                const handleSuccessVerify = createHandleSuccessVerifyOld(oldMicroserviceProps, sendCurrentTask);
                 const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
                 verifyPhoneDialog.open({
                     phone: transformedFormData.phone,
@@ -7853,6 +7940,7 @@
                     sendAspects,
                     verifyPhoneDialog,
                     handleFailSendForm,
+                    aspects,
                 };
                 const taskData = {
                     formData: transformedFormData,
@@ -7912,8 +8000,13 @@
         });
     };
     const createHandleSuccessVerifyNew = ({ common, taskData, draftDialog, consentBkiDialog, }) => async () => {
-        const { programId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } = common;
+        const { verifyPhoneDialog, sendAspects, handleFailSendForm, programId, productType, aspects } = common;
         const { formData } = taskData;
+        handleAspects({
+            aspectsAttributes: getAspects('leadForm', productType),
+            aspects,
+            ev: {},
+        });
         try {
             const participantData = await createParticipant({
                 phone: formatPhone(formData.phone),
@@ -7960,6 +8053,62 @@
             handleFailSendForm();
         }
     };
+    const createSendCurrentTaskOld = (props) => async () => {
+        const { common, taskData, goToNextStep, consentBkiDialog } = props;
+        const { programId, profileId, productType, verifyPhoneDialog, handleFailSendForm } = common;
+        const { formData } = taskData;
+        await updateUserData({
+            programId,
+            profileId,
+            formData,
+            productType,
+            referalData: taskData.referalData,
+            marketingInfo: taskData.marketingInfo,
+            saveUserData: taskData.saveUserData,
+            sendAspects: common.sendAspects,
+        });
+        verifyPhoneDialog.close();
+        if (productType === 'debitCard') {
+            goToNextStep();
+        }
+        else {
+            consentBkiDialog.open({
+                phone: formData.phone,
+                profileId,
+                onFail: handleFailSendForm,
+            });
+        }
+    };
+    const createHandleSuccessVerifyOld = (props, sendCurrentTask) => async () => {
+        const { common, draftDialog } = props;
+        const { aspects, programId, sendAspects, verifyPhoneDialog, handleFailSendForm, profileId } = common;
+        const productType = common.productType;
+        handleAspects({
+            aspectsAttributes: getAspects('leadForm', productType),
+            aspects,
+            ev: {},
+        });
+        try {
+            const lastTaskId = await getLastTaskStatus({ profileId, programId });
+            if (lastTaskId) {
+                const task = await getTaskById({ taskId: lastTaskId });
+                verifyPhoneDialog.close();
+                draftDialog.open({
+                    task,
+                    isFromLead: true,
+                    taskType: productTypeToTaskType(productType),
+                    sendAspects,
+                    onClose: sendCurrentTask,
+                });
+            }
+            else {
+                await sendCurrentTask();
+            }
+        }
+        catch {
+            handleFailSendForm();
+        }
+    };
     const getAcceptedConsents = (formData, productType) => {
         const consents = productTypeToConsentsMap[productType];
         return Object.keys(consents)
@@ -8517,7 +8666,7 @@
                 reset();
             }
         }, [leadForm?.current, esiaStatus]);
-        return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [!esiaStatus && !isFrame ? (jsx(EsiaLoginBanner, { onChangeEsiaStatus: setEsiaStatus, productType: productType })) : null, jsxs("form", { onSubmit: onSubmitWithPrecondition, className: "space-y-m relative", ref: leadForm, children: [esiaStatus === EsiaStatuses.Pending ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, isSending), esiaStatus === EsiaStatuses.Error ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] })] }));
+        return (jsxs(ApplicationFormLayout, { className: style('container space-y-m', className), title: title, ...rest, children: [!esiaStatus && !isFrame ? (jsx(EsiaLoginBanner, { onChangeEsiaStatus: setEsiaStatus, productType: productType })) : null, jsxs("form", { onSubmit: onSubmitWithPrecondition, className: "space-y-m relative", ref: leadForm, children: [esiaStatus === EsiaStatuses.Pending ? jsx(Loader, { blur: false }) : null, applicationFormData.map((_, i) => (jsxs("div", { className: style(inputColumnStyles(_.columns), 'grid gap-x-m'), children: [renderTitle(_.title), renderInputs$1({ field, inputs: _?.inputs }, productType)] }, `section-${i}`))), renderSubmitButton(button, { isSending, productType }), esiaStatus === EsiaStatuses.Error ? (jsx(Text, { size: "text-m", font: "font-medium", color: "text-error", children: "\u0418\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u044C \u0413\u043E\u0441\u0443\u0441\u043B\u0443\u0433\u0438 \u0434\u043B\u044F \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u044F \u0437\u0430\u044F\u0432\u043A\u0438 \u043D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E, \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0437\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u044C \u043F\u043E\u043B\u044F \u0432\u0440\u0443\u0447\u043D\u0443\u044E." })) : null] })] }));
     });
     const getInputs = (applicationFormData) => (applicationFormData?.flatMap((_) => _?.inputs) || []);
     const getExtendedValidatorObj = (productType) => ({
@@ -10454,10 +10603,36 @@
     };
     const renderItem$2 = ({ label, description }) => (jsxs("div", { className: "flex flex-col", children: [jsx(Text, { color: "text-secondary-text", size: "text-l", children: label }), jsx(Text, { color: "text-primary-text", size: "text-xl", children: description })] }));
 
-    const FailedStatusContent$2 = JSX(() => (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0412\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435", description: "\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439 \u043C\u043E\u043C\u0435\u043D\u0442 \u0411\u0430\u043D\u043A \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0434\u043E\u0431\u0440\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442\u043D\u0443\u044E \u043A\u0430\u0440\u0442\u0443. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0430\u0442\u044C \u0437\u0430\u044F\u0432\u043A\u0443 \u043F\u043E\u0437\u0436\u0435. \u0421\u043F\u0430\u0441\u0438\u0431\u043E \u0437\u0430 \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0432 \u0410\u041E \u00AB\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u00BB.", buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" })));
+    const FailedStatusContent$2 = JSX(() => {
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('refuse', 'creditCard'),
+                aspects,
+                ev: {},
+            });
+        }, []);
+        return (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0412\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435", description: "\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439 \u043C\u043E\u043C\u0435\u043D\u0442 \u0411\u0430\u043D\u043A \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0434\u043E\u0431\u0440\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0430\u0442\u044C \u0437\u0430\u044F\u0432\u043A\u0443 \u043F\u043E\u0437\u0436\u0435. \u0421\u043F\u0430\u0441\u0438\u0431\u043E \u0437\u0430 \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0432 \u0410\u041E \u00AB\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u00BB.", buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" }));
+    });
 
     const PendingStatusContent$2 = JSX(({ onExpire }) => {
         const { statusInfo } = useRetailFormStore();
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('timer', 'creditCard'),
+                aspects,
+                ev: {},
+            });
+        }, []);
+        const handleExpireWithEvent = () => {
+            handleAspects({
+                aspectsAttributes: getAspects('timerEnd', 'creditCard'),
+                aspects,
+                ev: {},
+            });
+            onExpire();
+        };
         return (jsx(FormStatus, { interval: 300, title: "\u0417\u0430\u044F\u0432\u043A\u0430 \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430", description: "\u041D\u0435 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0439\u0442\u0435 \u043E\u043A\u043D\u043E, \u0441\u043A\u043E\u0440\u043E \u0441\u043E\u043E\u0431\u0449\u0438\u043C \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442", sectionInfoTitle: "\u0417\u0430\u044F\u0432\u043B\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F \u043F\u043E \u043A\u0440\u0435\u0434\u0438\u0442\u043D\u043E\u0439 \u043A\u0430\u0440\u0442\u0435", sectionInfo: [
                 {
                     label: 'Название продукта',
@@ -10467,11 +10642,19 @@
                     label: 'Категория',
                     description: statusInfo?.cardCategory,
                 },
-            ], onExpire: onExpire }));
+            ], onExpire: handleExpireWithEvent }));
     });
 
     const ReworkStatusContent$1 = JSX(() => {
         const { statusInfo } = useRetailFormStore();
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('revision', 'creditCard'),
+                aspects,
+                ev: {},
+            });
+        }, []);
         const isCourierDelivery = statusInfo?.methodObtain === 'courier';
         const infoAdditional = isCourierDelivery
             ? [
@@ -10501,6 +10684,14 @@
 
     const SuccessStatusCardContent = JSX(() => {
         const { statusInfo } = useRetailFormStore();
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('preDecision', 'creditCard'),
+                aspects,
+                ev: {},
+            });
+        }, []);
         return (jsx(FormStatus, { title: "\u0411\u0430\u043D\u043A \u043E\u0434\u043E\u0431\u0440\u0438\u043B \u0412\u0430\u043C \u043A\u0440\u0435\u0434\u0438\u0442\u043D\u0443\u044E \u043A\u0430\u0440\u0442\u0443", description: "\u041E\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044C \u0432 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u0431\u0430\u043D\u043A\u0430, \u0447\u0442\u043E\u0431\u044B \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438 \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u043A\u0440\u0435\u0434\u0438\u0442\u043D\u0443\u044E \u043A\u0430\u0440\u0442\u0443", sectionInfo: getSectionInfo(statusInfo), buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" }));
     });
     const getSectionInfo = (statusInfo) => {
@@ -10630,10 +10821,88 @@
         inn: organizationInnValidator(formState.isDadataOrganization),
     })(formState);
 
-    const StepsNavigationButtons$2 = JSX(({ step, isSending, onPrevStep }) => {
+    const getCreditInfo = (programmId) => {
+        switch (programmId) {
+            case '11': {
+                return {
+                    name: 'Потребительский кредит на рефинансирование',
+                    description: 'Погашение основного долга по кредиту, иные цели и оплату страхования',
+                };
+            }
+            case '10':
+            default: {
+                return {
+                    name: 'Кредит на любые цели',
+                    description: 'На любые цели',
+                };
+            }
+        }
+    };
+
+    const getVisitParams = (programId, productType, paymentSystem) => {
+        const creditInfo = getCreditInfo(programId ?? null);
+        const productName = creditInfo?.name || '';
+        const productTypeValue = productType ?? '';
+        if (paymentSystem && productType !== 'credit') {
+            return {
+                [productTypeValue]: {
+                    [productName]: paymentSystem,
+                },
+            };
+        }
+        else {
+            return {
+                [productTypeValue]: productName,
+            };
+        }
+    };
+    const getStepAspects = ({ step, programId, productType, paymentSystem, stepsConfig, }) => {
+        const config = stepsConfig[step];
+        if (!config) {
+            return [];
+        }
+        const visitParams = getVisitParams(programId, productType, paymentSystem);
+        const aspects = [];
+        aspects.push({
+            aspectName: 'ymReachGoal',
+            params: {
+                yandexId: YANDEX_ID,
+                targetName: config.ymTargetName,
+                ...visitParams,
+            },
+        });
+        if (config.snowplowEventAction) {
+            aspects.push({
+                aspectName: 'snowplowEvent',
+                params: {
+                    eventAction: config.snowplowEventAction,
+                    eventCategory: config.snowplowEventCategory || 'naturalCredits',
+                    eventValueText: config.snowplowEventValueText || '',
+                },
+            });
+        }
+        return aspects;
+    };
+
+    const CREDIT_CARD_FORM_STEPS_ASPECTS = [
+        { ymTargetName: 'card_credit_calculator' },
+        { ymTargetName: 'card_app_personal_data' },
+        { ymTargetName: 'card_app_work' },
+        { ymTargetName: 'card_app_income' },
+        { ymTargetName: 'card_app_bank_office' },
+    ];
+
+    const StepsNavigationButtons$2 = JSX(({ step, isSending, onPrevStep, programId, productType, paymentSystem }) => {
         const isFirstStep = step === 0;
         const isFinalStep = step === 5;
-        return (jsxs("div", { className: "flex justify-between gap-m", children: [jsx(Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(SubmitButton$1, { isLoading: isSending, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
+        const aspects = getStepAspects({
+            step,
+            programId,
+            productType,
+            paymentSystem,
+            stepsConfig: CREDIT_CARD_FORM_STEPS_ASPECTS,
+        });
+        return (jsxs("div", { className: "flex justify-between gap-m", children: [jsx(Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(SubmitButton$1, { isLoading: isSending, data: aspects, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
 
     const getInitialFormState = (step, formState, formStateMap) => ({
@@ -10968,6 +11237,7 @@
 
     const PRODUCT_TYPE$2 = 'creditCard';
     const CreditCardFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+        const { programId } = useRetailFormStore();
         useIFrameMode();
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs || []), [sections]);
         const formValidator = useCallback((formState) => getRetailFormValidator({
@@ -10980,11 +11250,12 @@
             onNextStep,
             onFinish,
         });
-        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+        const [formState, { field, onSubmit: handleSubmit }] = useForm(initialState, {
             formValidator,
             onSubmit,
         });
-        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons$2, { isSending: isSending, step: step, onPrevStep: onPrevStep })] }));
+        const PAYMENT_SYSTEM = formState.paymentSystem?.text;
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons$2, { isSending: isSending, step: step, onPrevStep: onPrevStep, programId: programId, productType: PRODUCT_TYPE$2, paymentSystem: PAYMENT_SYSTEM })] }));
     });
 
     const PERSONAL_DATA = [
@@ -11492,29 +11763,37 @@
         return (jsx("div", { className: "py-lg px-5xl bg-white col-span-12", children: jsxs("div", { children: [jsxs("span", { className: "font-bold mr-s", children: ["\u0428\u0430\u0433 ", step, " \u0438\u0437 ", totalSteps, "."] }), stepsTitles[step] || null, jsx(ProgressBar, { step: progress, showPercentage: false })] }) }));
     });
 
-    const FailedStatusContent$1 = JSX(() => (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0412\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435", description: "\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439 \u043C\u043E\u043C\u0435\u043D\u0442 \u0411\u0430\u043D\u043A \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0434\u043E\u0431\u0440\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0430\u0442\u044C \u0437\u0430\u044F\u0432\u043A\u0443 \u043F\u043E\u0437\u0436\u0435. \u0421\u043F\u0430\u0441\u0438\u0431\u043E \u0437\u0430 \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0432 \u0410\u041E \u00AB\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u00BB.", buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" })));
-
-    const getCreditInfo = (programmId) => {
-        switch (programmId) {
-            case '11': {
-                return {
-                    name: 'Потребительский кредит на рефинансирование',
-                    description: 'Погашение основного долга по кредиту, иные цели и оплату страхования',
-                };
-            }
-            case '10':
-            default: {
-                return {
-                    name: 'Кредит на любые цели',
-                    description: 'На любые цели',
-                };
-            }
-        }
-    };
+    const FailedStatusContent$1 = JSX(() => {
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('refuse', 'credit'),
+                aspects,
+                ev: {},
+            });
+        }, []);
+        return (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0412\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435", description: "\u0412 \u043D\u0430\u0441\u0442\u043E\u044F\u0449\u0438\u0439 \u043C\u043E\u043C\u0435\u043D\u0442 \u0411\u0430\u043D\u043A \u043D\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0434\u043E\u0431\u0440\u0438\u0442\u044C \u0412\u0430\u0448\u0443 \u0437\u0430\u044F\u0432\u043A\u0443 \u043D\u0430 \u043A\u0440\u0435\u0434\u0438\u0442. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u043F\u043E\u0434\u0430\u0442\u044C \u0437\u0430\u044F\u0432\u043A\u0443 \u043F\u043E\u0437\u0436\u0435. \u0421\u043F\u0430\u0441\u0438\u0431\u043E \u0437\u0430 \u043E\u0431\u0440\u0430\u0449\u0435\u043D\u0438\u0435 \u0432 \u0410\u041E \u00AB\u0420\u043E\u0441\u0441\u0435\u043B\u044C\u0445\u043E\u0437\u0431\u0430\u043D\u043A\u00BB.", buttonText: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u0433\u043B\u0430\u0432\u043D\u0443\u044E" }));
+    });
 
     const PendingStatusContent$1 = JSX(({ onExpire }) => {
         const { statusInfo, programId } = useRetailFormStore();
         const creditInfo = getCreditInfo(programId);
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('timer', 'credit'),
+                aspects,
+                ev: {},
+            });
+        }, []);
+        const handleExpireWithEvent = useCallback(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('timerEnd', 'credit'),
+                aspects,
+                ev: {},
+            });
+            onExpire();
+        }, [aspects, onExpire]);
         return (jsx(FormStatus, { interval: 300, title: "\u0417\u0430\u044F\u0432\u043A\u0430 \u0443\u0441\u043F\u0435\u0448\u043D\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430", description: "\u041D\u0435 \u0437\u0430\u043A\u0440\u044B\u0432\u0430\u0439\u0442\u0435 \u043E\u043A\u043D\u043E, \u0441\u043A\u043E\u0440\u043E \u0441\u043E\u043E\u0431\u0449\u0438\u043C \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442", sectionInfoTitle: "\u0417\u0430\u044F\u0432\u043B\u0435\u043D\u043D\u044B\u0435 \u0443\u0441\u043B\u043E\u0432\u0438\u044F \u043F\u043E \u043A\u0440\u0435\u0434\u0438\u0442\u0443", sectionInfo: [
                 {
                     label: 'Название продукта',
@@ -11536,11 +11815,19 @@
                     label: 'Тип платежа',
                     description: statusInfo?.calculator?.isAnnuity ? 'Аннуитетный' : 'Дифференцированный',
                 },
-            ], onExpire: onExpire }));
+            ], onExpire: handleExpireWithEvent }));
     });
 
     const ReworkStatusContent = JSX(() => {
         const { statusInfo } = useRetailFormStore();
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('revision', 'credit'),
+                aspects,
+                ev: {},
+            });
+        }, []);
         return (jsx(FormStatus, { title: "\u0411\u043B\u0430\u0433\u043E\u0434\u0430\u0440\u0438\u043C \u0432\u0430\u0441 \u0437\u0430 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435, \u043D\u043E \u043D\u0430\u043C \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044F \u0431\u043E\u043B\u044C\u0448\u0435 \u0432\u0440\u0435\u043C\u0435\u043D\u0438 \u0434\u043B\u044F \u043F\u0440\u0438\u043D\u044F\u0442\u0438\u044F \u0440\u0435\u0448\u0435\u043D\u0438\u044F", description: "\u041F\u043E\u0441\u0435\u0442\u0438\u0442\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u043E\u0435 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u0431\u0430\u043D\u043A\u0430 \u0441 \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u044B\u043C\u0438 \u0434\u043E\u043A\u0443\u043C\u0435\u043D\u0442\u0430\u043C\u0438 \u0438 \u0442\u0430\u043A \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u0435 \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u043A\u0440\u0435\u0434\u0438\u0442\u0430.", sectionAdditionalTitle: "\u0412 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0438 \u0411\u0430\u043D\u043A\u0430", sectionInfoAdditional: [
                 {
                     label: 'Регион',
@@ -11561,6 +11848,14 @@
     const SuccessStatusContent$1 = JSX(() => {
         const { statusInfo, programId } = useRetailFormStore();
         const creditInfo = getCreditInfo(programId);
+        const aspects = useAspects();
+        useEffect(() => {
+            handleAspects({
+                aspectsAttributes: getAspects('preDecision', 'credit'),
+                aspects,
+                ev: {},
+            });
+        }, []);
         return (jsx(FormStatus, { title: "\u0411\u0430\u043D\u043A \u043E\u0434\u043E\u0431\u0440\u0438\u043B \u0432\u0430\u043C \u043A\u0440\u0435\u0434\u0438\u0442", description: "\u041E\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044C \u0432 \u043E\u0442\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u0431\u0430\u043D\u043A\u0430, \u0447\u0442\u043E\u0431\u044B \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C \u043E\u0444\u043E\u0440\u043C\u043B\u0435\u043D\u0438\u0435 \u0438 \u043F\u043E\u043B\u0443\u0447\u0438\u0442\u044C \u0432\u0430\u0448 \u043A\u0440\u0435\u0434\u0438\u0442", sectionInfo: [
                 {
                     label: 'Название продукта',
@@ -11635,136 +11930,47 @@
         return statusesMap[status] || jsx(ReworkStatusContent, {});
     };
 
-    const getVisitParams = (programId, productType, paymentSystem) => {
-        const creditInfo = getCreditInfo(programId ?? null);
-        const productName = creditInfo?.name || '';
-        const productTypeValue = productType ?? '';
-        if (paymentSystem && productType !== 'credit') {
-            return {
-                [productTypeValue]: {
-                    [productName]: paymentSystem,
-                },
-            };
-        }
-        else {
-            return {
-                [productTypeValue]: productName,
-            };
-        }
-    };
-    const getYandexAspects = ({ step, programId, productType, paymentSystem, aspectsData, }) => {
-        const aspects = aspectsData[step] || [];
-        const visitParams = getVisitParams(programId, productType, paymentSystem);
-        return aspects.map((aspect) => {
-            if (aspect.aspectName === 'ymReachGoal') {
-                return {
-                    ...aspect,
-                    params: {
-                        ...aspect.params,
-                        ...visitParams,
-                    },
-                };
-            }
-            return aspect;
-        });
-    };
-
-    const YANDEX_ID = projectSettings.YANDEX_METRIKA_ID || '92511315';
-    const data = [
-        [
-            {
-                aspectName: 'ymReachGoal',
-                params: {
-                    yandexId: YANDEX_ID,
-                    targetName: 'credit_calculator',
-                },
-            },
-            {
-                aspectName: 'snowplowEvent',
-                params: {
-                    eventAction: 'naturalCreditsReducedPaymentCreditSummPeriodNext',
-                    eventCategory: 'naturalCredits',
-                    eventValueText: 'Кредит со сниженным платежом Сумма и сроки кредита Кнопка Далее',
-                },
-            },
-        ],
-        [
-            {
-                aspectName: 'ymReachGoal',
-                params: {
-                    yandexId: YANDEX_ID,
-                    targetName: 'app_personal_data',
-                },
-            },
-            {
-                aspectName: 'snowplowEvent',
-                params: {
-                    eventAction: 'naturalCreditsReducedPaymentCreditFormPassportNext',
-                    eventCategory: 'naturalCredits',
-                    eventValueText: 'Кредит со сниженным платежом Паспортные данные Кнопка Далее',
-                },
-            },
-        ],
-        [
-            {
-                aspectName: 'ymReachGoal',
-                params: {
-                    yandexId: YANDEX_ID,
-                    targetName: 'app_work',
-                },
-            },
-            {
-                aspectName: 'snowplowEvent',
-                params: {
-                    eventAction: 'naturalCreditsReducedPaymentCreditFormEmployerDetailsNext',
-                    eventCategory: 'naturalCredits',
-                    eventValueText: 'Кредит со сниженным платежом Данные о работодателе Кнопка Далее',
-                },
-            },
-        ],
-        [
-            {
-                aspectName: 'ymReachGoal',
-                params: {
-                    yandexId: YANDEX_ID,
-                    targetName: 'app_income',
-                },
-            },
-            {
-                aspectName: 'snowplowEvent',
-                params: {
-                    eventAction: 'naturalCreditsReducedPaymentCreditFormFamilyStatusNext',
-                    eventCategory: 'naturalCredits',
-                    eventValueText: 'Кредит со сниженным платежом Семейное положение и доход Кнопка Далее',
-                },
-            },
-        ],
-        [
-            {
-                aspectName: 'ymReachGoal',
-                params: {
-                    yandexId: YANDEX_ID,
-                    targetName: 'app_bank_office',
-                },
-            },
-            {
-                aspectName: 'snowplowEvent',
-                params: {
-                    eventAction: 'naturalCreditsReducedPaymentCreditFormBankDepartmentChoosingNext',
-                    eventCategory: 'naturalCredits',
-                    eventValueText: 'Кредит со сниженным платежом Выбор отделения Кнопка Далее',
-                },
-            },
-        ],
+    const CREDIT_FORM_STEPS_ASPECTS = [
+        {
+            ymTargetName: 'credit_calculator',
+            snowplowEventAction: 'naturalCreditsReducedPaymentCreditSummPeriodNext',
+            snowplowEventCategory: 'naturalCredits',
+            snowplowEventValueText: 'Кредит со сниженным платежом Сумма и сроки кредита Кнопка Далее',
+        },
+        {
+            ymTargetName: 'app_personal_data',
+            snowplowEventAction: 'naturalCreditsReducedPaymentCreditFormPassportNext',
+            snowplowEventCategory: 'naturalCredits',
+            snowplowEventValueText: 'Кредит со сниженным платежом Паспортные данные Кнопка Далее',
+        },
+        {
+            ymTargetName: 'app_work',
+            snowplowEventAction: 'naturalCreditsReducedPaymentCreditFormEmployerDetailsNext',
+            snowplowEventCategory: 'naturalCredits',
+            snowplowEventValueText: 'Кредит со сниженным платежом Данные о работодателе Кнопка Далее',
+        },
+        {
+            ymTargetName: 'app_income',
+            snowplowEventAction: 'naturalCreditsReducedPaymentCreditFormFamilyStatusNext',
+            snowplowEventCategory: 'naturalCredits',
+            snowplowEventValueText: 'Кредит со сниженным платежом Семейное положение и доход Кнопка Далее',
+        },
+        {
+            ymTargetName: 'app_bank_office',
+            snowplowEventAction: 'naturalCreditsReducedPaymentCreditFormBankDepartmentChoosingNext',
+            snowplowEventCategory: 'naturalCredits',
+            snowplowEventValueText: 'Кредит со сниженным платежом Выбор отделения Кнопка Далее',
+        },
     ];
+
     const StepsNavigationButtons$1 = JSX(({ step, onPrevStep, isSending, programId, productType = 'credit' }) => {
         const isFirstStep = step === 0;
         const isFinalStep = step === 5;
-        const aspects = getYandexAspects({
+        const aspects = getStepAspects({
             step,
             programId,
             productType,
-            aspectsData: data,
+            stepsConfig: CREDIT_FORM_STEPS_ASPECTS,
         });
         return (jsxs("div", { className: 'flex justify-between gap-m', children: [jsx(Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, testId: "back-button", children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(SubmitButton$1, { isLoading: isSending, testId: "next-button", data: aspects, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
@@ -12292,10 +12498,23 @@
         return statusesMap[status] || jsx(SuccessStatusContent, { isOffice: isOffice });
     };
 
-    const StepsNavigationButtons = JSX(({ step, onPrevStep, isSending }) => {
+    const DEBIT_FORM_STEPS_ASPECTS = [
+        { ymTargetName: 'debit_region' },
+        { ymTargetName: 'debit_app_personal_data' },
+        { ymTargetName: 'debit_app_card_data' },
+    ];
+
+    const StepsNavigationButtons = JSX(({ step, onPrevStep, isSending, programId, productType = 'debitCard', paymentSystem }) => {
         const isFirstStep = step === 0;
         const isFinalStep = step === 5;
-        return (jsxs("div", { className: 'flex justify-between gap-m', children: [jsx(Button, { onClick: onPrevStep, type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(SubmitButton$1, { isLoading: isSending, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
+        const aspects = getStepAspects({
+            step,
+            programId,
+            productType,
+            paymentSystem,
+            stepsConfig: DEBIT_FORM_STEPS_ASPECTS,
+        });
+        return (jsxs("div", { className: 'flex justify-between gap-m', children: [jsx(Button, { onClick: onPrevStep, type: "button", version: "secondary", disabled: isFirstStep, children: "\u041D\u0430\u0437\u0430\u0434" }), jsx(SubmitButton$1, { isLoading: isSending, data: aspects, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
     });
 
     const updateUserTaskDebit = (body) => doRequest('/user-data/updateUserTaskDebit', 'PUT', body);
@@ -12466,6 +12685,7 @@
 
     const PRODUCT_TYPE = 'debitCard';
     const DebitFormStep = JSX(({ step, sections, onPrevStep, onNextStep, onFinish }) => {
+        const { programId } = useRetailFormStore();
         useIFrameMode();
         const inputs = useMemo(() => sections?.flatMap((_) => _?.inputs ?? []), [sections]);
         const formValidator = useCallback((formState) => getRetailFormValidator({
@@ -12478,11 +12698,12 @@
             onNextStep,
             onFinish,
         });
-        const [, { field, onSubmit: handleSubmit }] = useForm(initialState, {
+        const [formState, { field, onSubmit: handleSubmit }] = useForm(initialState, {
             formValidator,
             onSubmit,
         });
-        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
+        const PAYMENT_SYSTEM = formState.paymentSystem?.text;
+        return (jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field }), jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep, programId: programId, productType: PRODUCT_TYPE, paymentSystem: PAYMENT_SYSTEM })] }));
     });
 
     /* eslint-disable max-lines */
@@ -14682,7 +14903,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1076";
+    const packageVersion = "0.14.1078";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;