@redneckz/wildless-cms-uni-blocks 0.14.1035 → 0.14.1037

package/mobile/src/retail/validator/getRetailFormValidator.ts

@@ -1,5 +1,5 @@
-import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
+import { type ProductType } from '../model/ApplicationLeadFormTypes';
 import { type LeadFormState } from '../model/LeadFormState';
 import { type FieldRetailDef } from '../model/RetailFormContent';
 import { calculateInputs } from '../utils/calculateInputs';

package/mobile/src/ui-kit/DialogManager/Dialog.tsx

@@ -16,7 +16,7 @@ export interface DialogProps extends OnCloseProps, OnClickPreventableProps {
 }
 
 const DIALOG_STYLE: Record<DialogType, string> = {
-  sm: 'max-w-sm top-1/3',
+  sm: 'max-w-sm',
   lg: 'max-w-lg',
   xl: 'max-w-xl',
   '4xl': 'max-w-4xl',
@@ -24,7 +24,7 @@ const DIALOG_STYLE: Record<DialogType, string> = {
 };
 
 const DIALOG_POSITION: Record<DialogPosition, string> = {
-  center: 'relative mx-auto',
+  center: 'relative mx-auto top-1/2 -translate-y-1/2',
   corner: 'absolute bottom-0 right-0',
 };
 

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

@@ -33,7 +33,11 @@ export const DefaultFoldButton = JSX<DefaultFoldButtonProps>(
         {...rest}
       >
         <ButtonTitle labelColor={labelColorStyle}>{label}</ButtonTitle>
-        <ToggleIcon isUnfolded={isUnfolded} iconVersion={embedded ? iconColor : ''} />
+        <ToggleIcon
+          isUnfolded={isUnfolded}
+          iconVersion={embedded ? iconColor : ''}
+          className="flex-grow-0 flex-shrink-0 basis-auto"
+        />
       </Button>
     );
   },

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

@@ -24,15 +24,13 @@ export const LinkButton = JSX<LinkButtonProps>(
     const handleFormSubmit = useFormSubmit({ method, href });
     const linksStore = useLocalStore<LinkStoreSlice>();
 
-    saveLinksToStore({ linksStore, href, id, additionalHrefs });
+    useEffect(() => {
+      additionalHrefs && saveLinksToStore({ linksStore, href, id, additionalHrefs });
 
-    const adjustedHref = additionalHrefs
-      ? (linksStore.links || []).find((store) => store.id === id)?.lastLink
-      : href;
+      const adjustedHref = (linksStore.links || []).find((store) => store.id === id)?.lastLink;
 
-    useEffect(() => {
-      setCurrentLink(adjustedHref);
-    }, [adjustedHref]);
+      setCurrentLink(adjustedHref ?? href);
+    }, [additionalHrefs, href]);
 
     const link = useLink();
     const adjustedProps = link({ onClick: handleFormSubmit, href: currentLink, ...rest });

package/package.json

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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -4,6 +4,7 @@ import { useEffect, useMemo, useRef, useState } from '@redneckz/uni-jsx/lib/hook
 import { useForm } from '../../hooks/useForm/useForm';
 import { NoConsentDialog } from '../../retail/components/NoConsentDialog/NoConsentDialog';
 import { useIFrameMode } from '../../retail/hooks/useIFrameMode';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
@@ -21,11 +22,7 @@ import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { isIFrame } from '../../utils/isIFrame';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
-import {
-  EsiaStatuses,
-  type ApplicationLeadFormContent,
-  type ProductType,
-} from './ApplicationLeadFormContent';
+import { EsiaStatuses, type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
 import { EsiaLoginBanner } from './EsiaLoginBanner';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';

package/src/components/ApplicationLeadForm/ApplicationLeadFormContent.ts

@@ -1,6 +1,7 @@
 import { type AspectsProps } from '../../model/AspectsProps';
 import { type TextProps, type TitleProps } from '../../model/HeadlineType';
 import { type LinkButtonVersion } from '../../model/LinkButtonVersion';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type InputRetailSectionsType } from '../../retail/model/InputSectionsType';
 import { type UniBlockContent } from '../../UniBlock/UniBlockProps';
 
@@ -14,8 +15,6 @@ export type SubmitButtonProps = TextProps & {
   version?: LinkButtonVersion;
 };
 
-export type ProductType = 'credit' | 'creditCard' | 'debitCard';
-
 /**
  * @title Форма заявки настраиваемая
  */
@@ -34,3 +33,4 @@ export type ApplicationLeadFormContent = UniBlockContent &
     /** @title включить отправку заявки на новый микросервис */
     isNewMicroservice?: boolean;
   };
+export { ProductType };

package/src/components/ApplicationLeadForm/EsiaLoginBanner.tsx

@@ -4,9 +4,10 @@ import { useSessionStore } from '@redneckz/uni-jsx/lib/Store/useSessionStore';
 import { locationNavigator } from '../../external/locationNavigator';
 import { getLink } from '../../retail/api/getLink';
 import { type IFrameStore } from '../../retail/hooks/useIFrameMode';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { Button } from '../../ui-kit/Button/Button';
 import { Img } from '../../ui-kit/Img/Img';
-import { EsiaStatuses, type ProductType } from './ApplicationLeadFormContent';
+import { EsiaStatuses } from './ApplicationLeadFormContent';
 
 export interface EsiaLoginBannerProps {
   onChangeEsiaStatus: (status: EsiaStatuses) => void;

package/src/components/ApplicationLeadForm/applicationFormData.tsx

@@ -1,6 +1,7 @@
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
-import { type ProductType } from './ApplicationLeadFormContent';
+
 import { productTypeToConsentsMap } from './consents';
 
 export const getApplicationFormData = (productType: ProductType): SectionsRetailProps[] => {

package/src/components/ApplicationLeadForm/getLeadFormTaskData.ts

@@ -28,7 +28,7 @@ type getDebitLeadFormTaskDataProps = {
 };
 
 type getParticipantProps = {
-  participantId: number | string;
+  participantId: string | number;
   profileId?: number;
   formData: LeadFormState;
   consents?: FormRetailConsents;

package/src/components/ApplicationLeadForm/renderInputs.tsx

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { InputsApplicationLeadMap } from '../../retail/inputs';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { getField } from '../../ui-kit/FormField/getField';
-import { type ProductType } from './ApplicationLeadFormContent';
+
 import { productTypeToConsentsMap } from './consents';
 import { GroupedConsents, type GroupedConsentsProps } from './GroupedConsents';
 

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -8,26 +8,34 @@ import { createDraftTask } from '../../retail/api/createDraftTask';
 import { createParticipant } from '../../retail/api/createParticipant';
 import { createUserProfile } from '../../retail/api/createUserProfile';
 import { createUserTaskDebit } from '../../retail/api/createUserTaskDebit';
+import { type Task } from '../../retail/api/draftTasksKZO';
 import { getClaimChannel } from '../../retail/api/getClaimChannel';
 import { getLastTaskStatus } from '../../retail/api/getLastTaskStatus';
 import { getTaskById } from '../../retail/api/getTaskById';
 import { saveReferalInfo } from '../../retail/api/saveReferalInfo';
 import { updateUserProfile } from '../../retail/api/updateUserProfile';
-import { updateUserTask, type MarketingInfo } from '../../retail/api/updateUserTask';
+import { updateUserTask } from '../../retail/api/updateUserTask';
 import { useConsentBkiDialog } from '../../retail/components/ConsentBkiDialog/useConsentBkiDialog';
 import { useDraftDialog } from '../../retail/components/DraftDialog/useDraftDialog';
 import { VerifyPhoneDialog } from '../../retail/components/VerifyPhoneDialog/VerifyPhoneDialog';
+import { useDraftSearch } from '../../retail/hooks/useDraftSearch';
+import {
+  type CommonLeadProps,
+  type ProductType,
+  type TaskDataProps,
+  type UpdateUserDataNewMicroserviceProps,
+  type UpdateUserDataProps,
+} from '../../retail/model/ApplicationLeadFormTypes';
+import { type DraftTaskType } from '../../retail/model/DraftTaskType';
 import { type FormRetailConsents, type LeadFormState } from '../../retail/model/LeadFormState';
-import { type ReferalData } from '../../retail/model/ReferalData';
 import { getUpdateUserProfileData } from '../../retail/utils/getUpdateUserProfile';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
 import { formatPhone } from '../../utils/formatPhone';
-import { type ProductType } from './ApplicationLeadFormContent';
 import { productTypeToConsentsMap } from './consents';
 import { getCreditLeadFormTaskData, getDebitLeadFormTaskData } from './getLeadFormTaskData';
 import { type ApplicationLeadStore } from './useInitApplicationLead';
 import { useLeadFormStore } from './useLeadFormStore';
-import { useSaveUserData, type UserData } from './useSaveUserData';
+import { useSaveUserData } from './useSaveUserData';
 import { useSendLeadFormAspects } from './useSendLeadFormAspects';
 
 interface ApplicationLeadApiProps extends AspectsProps {
@@ -62,6 +70,7 @@ export const useApplicationLeadApi = ({
   const consentBkiDialog = useConsentBkiDialog(goToNextStep);
   const verifyPhoneDialog = useDialog(VerifyPhoneDialog);
   const draftDialog = useDraftDialog();
+  const { searchDrafts } = useDraftSearch();
 
   const handleFailSendForm = () => {
     verifyPhoneDialog.close();
@@ -115,7 +124,7 @@ export const useApplicationLeadApi = ({
             draftDialog.open({
               task,
               isFromLead: true,
-              isDebit: productType === 'debitCard',
+              taskType: productType === 'debitCard' ? 'debit' : 'credit',
               sendAspects,
               onClose: sendCurrentTask,
             });
@@ -163,31 +172,34 @@ export const useApplicationLeadApi = ({
       if (!participantId) {
         throw new Error();
       }
-
-      const sendCurrentTask = createSendCurrentTaskNew({
+      const common: CommonLeadProps = {
         programId,
-        participantId,
         userId,
+        productType,
+        sendAspects,
+        verifyPhoneDialog,
+        handleFailSendForm,
+      };
+
+      const taskData: TaskDataProps = {
+        participantId,
         formData: transformedFormData,
         referalData,
-        productType,
         marketingInfo,
         saveUserData,
-        sendAspects,
-        verifyPhoneDialog,
+      };
+
+      const sendCurrentTask = createSendCurrentTaskNew({
+        common,
+        taskData,
         consentBkiDialog,
-        handleFailSendForm,
       });
 
       const handleSuccessVerify = createHandleSuccessVerifyNew({
-        userId,
-        programId,
-        productType,
-        verifyPhoneDialog,
+        common,
         draftDialog,
-        sendAspects,
         sendCurrentTask,
-        handleFailSendForm,
+        searchDrafts,
       });
 
       const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
@@ -213,33 +225,18 @@ export const useApplicationLeadApi = ({
 
 const createSendCurrentTaskNew =
   ({
-    programId,
-    participantId,
-    userId,
-    formData,
-    referalData,
-    productType,
-    marketingInfo,
-    saveUserData,
-    sendAspects,
-    verifyPhoneDialog,
+    common,
+    taskData,
     consentBkiDialog,
-    handleFailSendForm,
   }: {
-    programId: string;
-    participantId: string | number;
-    userId?: string | number;
-    formData: LeadFormState;
-    referalData: ReferalData | null;
-    productType: ProductType;
-    marketingInfo: MarketingInfo | null;
-    saveUserData: (userData: UserData) => void;
-    sendAspects: (userId: string | number, taskId: number) => void;
-    verifyPhoneDialog: any;
-    consentBkiDialog: any;
-    handleFailSendForm: () => void;
+    common: CommonLeadProps;
+    taskData: TaskDataProps;
+    consentBkiDialog: ReturnType<typeof useConsentBkiDialog>;
   }) =>
   async () => {
+    const { programId, userId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } =
+      common;
+    const { participantId, formData, referalData, marketingInfo, saveUserData } = taskData;
     const taskId = await updateUserDataNewMicroservice({
       programId,
       participantId,
@@ -254,9 +251,8 @@ const createSendCurrentTaskNew =
     verifyPhoneDialog.close();
 
     consentBkiDialog.open({
-      phone: formData.phone,
+      phone: formData.phone as string,
       taskId,
-      userId,
       participantId,
       onFail: handleFailSendForm,
     });
@@ -264,49 +260,38 @@ const createSendCurrentTaskNew =
 
 const createHandleSuccessVerifyNew =
   ({
-    userId,
-    programId,
-    productType,
-    verifyPhoneDialog,
+    common,
     draftDialog,
-    sendAspects,
     sendCurrentTask,
-    handleFailSendForm,
+    searchDrafts,
   }: {
-    userId?: string | number;
-    programId: string;
-    productType: ProductType;
-    verifyPhoneDialog: any;
+    common: CommonLeadProps;
     draftDialog: any;
-    sendAspects: (userId: string | number, taskId: number) => void;
     sendCurrentTask: () => Promise<void>;
-    handleFailSendForm: () => void;
+    searchDrafts: () => Promise<{ draft: Task | null; taskType: DraftTaskType | undefined }>;
   }) =>
   async () => {
+    const { verifyPhoneDialog, sendAspects, handleFailSendForm } = common;
     try {
-      const lastTaskId = await getLastTaskStatus({
-        userId,
-        programId,
-      });
+      const { draft, taskType } = await searchDrafts();
 
-      if (lastTaskId) {
-        const task = await getTaskById({ taskId: lastTaskId });
-
-        if (task) {
-          verifyPhoneDialog.close();
-          draftDialog.open({
-            task,
-            isFromLead: true,
-            isDebit: productType === 'debitCard',
-            sendAspects,
-            onClose: sendCurrentTask,
-          });
+      verifyPhoneDialog.close();
 
-          return;
-        }
-      }
+      if (!draft) {
+        draftDialog.open({
+          task: undefined,
+          taskType: null,
+        });
 
-      await sendCurrentTask();
+        return;
+      }
+      draftDialog.open({
+        task: draft,
+        taskType,
+        isFromLead: true,
+        sendAspects,
+        onClose: sendCurrentTask,
+      });
     } catch {
       handleFailSendForm();
     }
@@ -329,16 +314,7 @@ const updateUserData = async ({
   marketingInfo,
   saveUserData,
   sendAspects,
-}: {
-  programId: string;
-  profileId: number;
-  formData: LeadFormState;
-  productType: ProductType;
-  referalData: ReferalData | null;
-  marketingInfo: MarketingInfo | null;
-  saveUserData: (userData: UserData) => void;
-  sendAspects: (profileId: number, taskId: number) => void;
-}) => {
+}: UpdateUserDataProps) => {
   let taskId: number;
   let participantId: number;
   const transformedConsents = transformConsentsFields(formData, productType);
@@ -401,17 +377,7 @@ const updateUserDataNewMicroservice = async ({
   marketingInfo,
   saveUserData,
   sendAspects,
-}: {
-  programId: string;
-  participantId: string | number;
-  userId?: string | number;
-  formData: LeadFormState;
-  referalData: ReferalData | null;
-  productType: ProductType;
-  marketingInfo: MarketingInfo | null;
-  saveUserData: (userData: UserData) => void;
-  sendAspects: (userId: string | number, taskId: number) => void;
-}): Promise<number> => {
+}: UpdateUserDataNewMicroserviceProps): Promise<number> => {
   let taskId: number;
   const transformedConsents = transformConsentsFields(formData, productType);
 

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -5,10 +5,11 @@ import { useSetter } from '../../hooks/useSetter';
 import { esiaRequestProfile } from '../../retail/api/esiaRequestProfile';
 import { type MarketingInfo } from '../../retail/api/updateUserTask';
 import { useReferalProgramm } from '../../retail/hooks/useReferalProgramm';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { QUERY_STORAGE_KEY } from '../../utils/getSessionQuery';
-import { EsiaStatuses, type ProductType } from './ApplicationLeadFormContent';
+import { EsiaStatuses } from './ApplicationLeadFormContent';
 import { getInitialFormState } from './getInitialFormState';
 import { parseEsiaProfile } from './parseEsiaProfile';
 import { useLeadFormStore } from './useLeadFormStore';

package/src/components/ApplicationLeadForm/useLeadFormStore.ts

@@ -1,8 +1,8 @@
 import { useLocalStore } from '@redneckz/uni-jsx/lib/Store/useLocalStore';
+import { type ProductType } from '../../retail/model/ApplicationLeadFormTypes';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { type ReferalData } from '../../retail/model/ReferalData';
 import { type Nullable } from '../../utils/Nullable';
-import { type ProductType } from './ApplicationLeadFormContent';
 
 export interface LeadFormStoreSlice {
   leadForm: LeadFormState;

package/src/components/ApplicationLeadForm/useSaveUserData.ts

@@ -1,16 +1,7 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { type LeadFormState } from '../../retail/model/LeadFormState';
-import { type Nullable } from '../../utils/Nullable';
+import { type UserData } from '../../retail/model/ApplicationLeadFormTypes';
 import { useLeadFormStore } from './useLeadFormStore';
 
-export interface UserData {
-  participantId: string | number;
-  taskId: number;
-  profileId?: Nullable<number>;
-  userId?: Nullable<string | number>;
-  programId: string;
-  formData: LeadFormState;
-}
 export const useSaveUserData = () => {
   const leadFormStore = useLeadFormStore();
 

package/src/retail/api/draftTaskCard.ts

@@ -0,0 +1,6 @@
+import { type Task } from './draftTasksKZO';
+
+export const draftTaskCard = async (): Promise<Task[]> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return [];
+};

package/src/retail/api/draftTaskCredit.ts

@@ -0,0 +1,8 @@
+import { fetchRetailJSON } from './doRequest';
+import { type Task } from './draftTasksKZO';
+
+export const draftTaskCredit = async (): Promise<Task[]> => {
+  const res = await fetchRetailJSON<Task>('/public-data/draftTaskCredit', 'GET');
+
+  return res ? [res] : [];
+};

package/src/retail/api/draftTaskDebit.ts

@@ -0,0 +1,6 @@
+import { type Task } from './draftTasksKZO';
+
+export const draftTaskDebit = async (): Promise<Task[]> => {
+  // TODO: Заглушка - бэкенд в разработке
+  return [];
+};

package/src/retail/api/sendMessage.ts

@@ -1,10 +1,13 @@
 import { doRequest } from './doRequest';
 
-export type MessageName = 'CREATE_APPLICATION_SHORT_MESSAGE' | 'CREATE_APPLICATION_LOAN_MESSAGE';
+export type MessageName =
+  | 'CREATE_APPLICATION_SHORT_MESSAGE'
+  | 'CREATE_APPLICATION_LOAN_MESSAGE'
+  | 'KILL_DRAFT_PROCESS_MESSAGE';
 
 interface SendMessage {
   messageName: MessageName;
-  taskId: number | null;
+  taskId: string | number | null;
 }
 
 export const sendMessage = async (body: SendMessage) => {

package/src/retail/components/DraftDialog/DraftDialog.tsx

@@ -7,34 +7,43 @@ import { Heading } from '../../../ui-kit/Heading/Heading';
 import { formatDate } from '../../../utils/formatDate';
 import { noop } from '../../../utils/noop';
 import { type Task } from '../../api/draftTasksKZO';
+import { sendMessage } from '../../api/sendMessage';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
-import { creditCodesToProgrammIdMap, creditProgramCodeToProductIdMap } from './creditProgramCodes';
+import { type DraftTaskType } from '../../model/DraftTaskType';
+import { checkNewMicroservice } from '../../utils/checkNewMicroservice';
+import { creditProgramCodeToProductIdMap } from './creditProgramCodes';
 import { DraftActionButton } from './DraftActionButton';
 import { parseDraftTask } from './parseDraftTask';
 import { getProductData } from './utils';
 
 export interface DraftDialogProps extends OnCloseProps {
   task: Task;
-  isFromLead?: boolean;
+  taskType?: DraftTaskType;
   isDebit?: boolean;
+  isFromLead?: boolean;
   sendAspects?: (userId: number, taskId: number) => void;
 }
 
+const getTaskTypeOrDebit = (taskType?: DraftTaskType, isDebit?: boolean) => {
+  return taskType || (isDebit ? 'debit' : undefined);
+};
+
 export const DraftDialog = JSX<DraftDialogProps>(function ({
   task,
+  taskType,
+  isDebit,
   isFromLead = false,
-  isDebit = false,
   sendAspects = noop,
   onClose = noop,
 }) {
   const retailFormStore = useRetailFormStore();
   const navigator = locationNavigator();
+  const isNewMicroservice = checkNewMicroservice();
 
   const { participants, participant, creditProgram, createdDate = '', id: taskId } = task;
 
   const programmId: string = creditProgramCodeToProductIdMap[creditProgram.code];
-  const isCredit = Boolean(creditCodesToProgrammIdMap[creditProgram.code]);
-  const productData = getProductData(isDebit, isCredit);
+  const productData = getProductData(getTaskTypeOrDebit(taskType, isDebit));
 
   const currentParticipant = participant || participants?.[0];
   const { id: participantId, profile } = currentParticipant || {};
@@ -54,9 +63,19 @@ export const DraftDialog = JSX<DraftDialogProps>(function ({
     navigator.assign(productData.nextStepLink);
   }, []);
 
-  const handleGoToNewTask = useCallback(() => {
+  const handleGoToNewTask = useCallback(async () => {
+    if (isNewMicroservice) {
+      try {
+        await sendMessage({
+          messageName: 'KILL_DRAFT_PROCESS_MESSAGE',
+          taskId: task.id,
+        });
+      } catch (ex) {
+        console.error(ex);
+      }
+    }
     navigator.assign(productData.newTaskLink);
-  }, []);
+  }, [task.id, productData.newTaskLink, isNewMicroservice]);
 
   return (
     <Dialog onClose={onClose}>

package/src/retail/components/DraftDialog/EmptyDraftDialog.tsx

@@ -7,15 +7,21 @@ import { Dialog } from '../../../ui-kit/DialogManager/Dialog';
 import { Heading } from '../../../ui-kit/Heading/Heading';
 import { Paragraph } from '../../../ui-kit/Paragraph/Paragraph';
 import { noop } from '../../../utils/noop';
+import { type DraftTaskType } from '../../model/DraftTaskType';
 import { getProductData } from './utils';
 
 export interface EmptyDraftDialogProps extends OnCloseProps {
+  taskType?: DraftTaskType;
   isDebit?: boolean;
 }
 
-export const EmptyDraftDialog = JSX<EmptyDraftDialogProps>(function ({ isDebit, onClose = noop }) {
+export const EmptyDraftDialog = JSX<EmptyDraftDialogProps>(function ({
+  taskType,
+  isDebit,
+  onClose = noop,
+}) {
   const navigator = locationNavigator();
-  const productData = getProductData(isDebit);
+  const productData = getProductData(taskType || (isDebit ? 'debit' : undefined));
 
   const handleGoNewTask = useCallback(() => {
     navigator.assign(productData.newTaskLink);

package/src/retail/components/DraftDialog/useDraftDialog.tsx

@@ -7,10 +7,17 @@ export const useDraftDialog = () => {
   const { open: openEmptyDraftDialog } = useDialog(EmptyDraftDialog);
 
   return {
-    open: ({ task, isFromLead, isDebit, onClose, sendAspects }: Partial<DraftDialogProps>) => {
+    open: ({
+      task,
+      isFromLead,
+      taskType,
+      isDebit,
+      onClose,
+      sendAspects,
+    }: Partial<DraftDialogProps>) => {
       task
-        ? openDraftDialog({ task, isFromLead, isDebit, onClose, sendAspects })
-        : openEmptyDraftDialog({ isDebit });
+        ? openDraftDialog({ task, isFromLead, taskType, isDebit, onClose, sendAspects })
+        : openEmptyDraftDialog({ taskType, isDebit });
     },
   };
 };

package/src/retail/components/DraftDialog/utils.ts

@@ -1,6 +1,7 @@
 import { type Option } from '../../../ui-kit/Select/Option';
 import { countIncomeAverage } from '../../adaptors/getFamilyStatusAndIncomeData';
 import { type Participant } from '../../api/updateUserTask';
+import { type DraftTaskType } from '../../model/DraftTaskType';
 import { type DictionaryItem } from '../../model/LeadFormData';
 
 export const enum EContactType {
@@ -128,14 +129,14 @@ export const getSelectValue = (
     : undefined;
 };
 
-export const getProductData = (isDebit = false, isCredit = false) => {
-  if (isDebit) {
+export const getProductData = (taskType?: DraftTaskType) => {
+  if (taskType === 'debit') {
     return {
       nextStepLink: '/debit-card-lead',
       newTaskLink: '/natural/debetcards',
       description: 'На дебетовую карту',
     };
-  } else if (isCredit) {
+  } else if (taskType === 'credit') {
     return {
       nextStepLink: '/credit-lead',
       newTaskLink: '/natural/loans/all-goals',