@redneckz/wildless-cms-uni-blocks 0.14.1070 → 0.14.1072

package/mobile/src/retail/model/ApplicationLeadFormTypes.ts

@@ -29,7 +29,7 @@ export interface CommonLeadProps {
 }
 
 export interface TaskDataProps {
-  participantId: string | number;
+  participantId?: string | number;
   formData: LeadFormState;
   referalData: ReferalData | null;
   marketingInfo: MarketingInfo | null;

package/package.json

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

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -152,26 +152,11 @@ export const useApplicationLeadApi = ({
     try {
       startSending();
       const transformedFormData = transformFormData(formData);
-      const participantData = await createParticipant({
-        phone: formatPhone(transformedFormData.phone as string),
-        email: transformedFormData.email as string,
-      });
-
       const referalData = leadFormStore.referalData;
       const marketingInfo = sessionStore.marketingInfo;
 
-      if (!participantData) {
-        throw new Error();
-      }
-
-      const { participantId, userId } = participantData;
-
-      if (!participantId) {
-        throw new Error();
-      }
       const common: CommonLeadProps = {
         programId,
-        userId,
         productType,
         sendAspects,
         verifyPhoneDialog,
@@ -179,23 +164,17 @@ export const useApplicationLeadApi = ({
       };
 
       const taskData: TaskDataProps = {
-        participantId,
         formData: transformedFormData,
         referalData,
         marketingInfo,
         saveUserData,
       };
 
-      const sendCurrentTask = createSendCurrentTaskNew({
-        common,
-        taskData,
-        consentBkiDialog,
-      });
-
       const handleSuccessVerify = createHandleSuccessVerifyNew({
         common,
+        taskData,
         draftDialog,
-        sendCurrentTask,
+        consentBkiDialog,
       });
 
       const acceptedConsents = getAcceptedConsents(transformedFormData, productType);
@@ -233,6 +212,11 @@ const createSendCurrentTaskNew =
     const { programId, userId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } =
       common;
     const { participantId, formData, referalData, marketingInfo, saveUserData } = taskData;
+
+    if (!participantId) {
+      throw new Error();
+    }
+
     const taskId = await updateUserDataNewMicroservice({
       programId,
       participantId,
@@ -257,17 +241,51 @@ const createSendCurrentTaskNew =
 const createHandleSuccessVerifyNew =
   ({
     common,
+    taskData,
     draftDialog,
-    sendCurrentTask,
+    consentBkiDialog,
   }: {
     common: CommonLeadProps;
+    taskData: TaskDataProps;
     draftDialog: any;
-    sendCurrentTask: () => Promise<void>;
+    consentBkiDialog: ReturnType<typeof useConsentBkiDialog>;
   }) =>
   async () => {
-    const { verifyPhoneDialog, sendAspects, handleFailSendForm, userId, programId, productType } =
-      common;
+    const { programId, productType, sendAspects, verifyPhoneDialog, handleFailSendForm } = common;
+    const { formData } = taskData;
+
     try {
+      const participantData = await createParticipant({
+        phone: formatPhone(formData.phone as string),
+        email: formData.email as string,
+      });
+
+      if (!participantData) {
+        throw new Error();
+      }
+
+      const { participantId, userId } = participantData;
+
+      if (!participantId) {
+        throw new Error();
+      }
+
+      const updatedCommon: CommonLeadProps = {
+        ...common,
+        userId,
+      };
+
+      const updatedTaskData: TaskDataProps = {
+        ...taskData,
+        participantId,
+      };
+
+      const sendCurrentTask = createSendCurrentTaskNew({
+        common: updatedCommon,
+        taskData: updatedTaskData,
+        consentBkiDialog,
+      });
+
       const lastTaskId = await getLastTaskStatus({ userId, programId });
 
       if (lastTaskId) {
@@ -283,7 +301,8 @@ const createHandleSuccessVerifyNew =
       } else {
         await sendCurrentTask();
       }
-    } catch {
+    } catch (error) {
+      console.error('Error in handleSuccessVerify:', error);
       handleFailSendForm();
     }
   };

package/src/components/Header/HeaderQuickActionsMenu.tsx

@@ -96,6 +96,13 @@ const renderQuickActionsDropdown = ({
       },
       text: 'Написать в чат',
     },
+    phone: {
+      handler: (ev: PreventableEventWithTarget) => {
+        handlers?.phone(ev);
+        closeDropdown();
+      },
+      text: 'Позвонить в Банк',
+    },
   };
 
   return (
@@ -127,8 +134,13 @@ export const useHandlers = () => {
     }
   }, []);
 
+  const handlePhoneClick = useCallback(() => {
+    globalThis.location.href = 'tel:88001007870';
+  }, []);
+
   return {
     call: handleCallClick,
     chat: handleChatClick,
+    phone: handlePhoneClick,
   };
 };

package/src/retail/api/createParticipant.ts

@@ -12,7 +12,7 @@ interface CreateParticipantResponseType {
 
 export const createParticipant = (body: CreateParticipantType) =>
   fetchRetailJSON<CreateParticipantResponseType>(
-    '/external/public-data/createParticipant',
+    '/internal/entities/createParticipant',
     'POST',
     body,
   ).then((res) => res || null);

package/src/retail/model/ApplicationLeadFormTypes.ts

@@ -29,7 +29,7 @@ export interface CommonLeadProps {
 }
 
 export interface TaskDataProps {
-  participantId: string | number;
+  participantId?: string | number;
   formData: LeadFormState;
   referalData: ReferalData | null;
   marketingInfo: MarketingInfo | null;