@redneckz/wildless-cms-uni-blocks 0.14.636 → 0.14.637

package/mobile/bundle/components/ApplicationLeadForm/pasreEsiaProfile.d.ts

@@ -0,0 +1,3 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { type FormState } from './getInitialFormState';
+export declare const parseEsiaProfile: (esiaProfile: UpdateProfileEsiaResponse) => FormState;

package/mobile/dist/api/RetailAPI/updateProfileEsia.d.ts

@@ -11,7 +11,7 @@ export declare type UpdateProfileEsiaResponse = {
         surname: string;
         name: string;
         midname: string;
-        birthDate: string;
+        birthDate: Date;
         phone: string;
         email: string;
         esiaAccountType: {
@@ -39,11 +39,11 @@ export declare type UpdateProfileEsiaResponse = {
             value: string;
         };
         city: string;
-        locality: null;
+        locality: string;
         street: string;
         house: string;
-        building: null;
-        block: null;
+        building: string;
+        block: string;
         apartment: string;
     };
     addressFact: {
@@ -55,11 +55,11 @@ export declare type UpdateProfileEsiaResponse = {
             value: string;
         };
         city: string;
-        locality: null;
+        locality: string;
         street: string;
         house: string;
-        building: null;
-        block: null;
+        building: string;
+        block: string;
         apartment: string;
     };
 };

package/mobile/dist/components/ApplicationLeadForm/pasreEsiaProfile.d.ts

@@ -0,0 +1,3 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { type FormState } from './getInitialFormState';
+export declare const parseEsiaProfile: (esiaProfile: UpdateProfileEsiaResponse) => FormState;

package/mobile/dist/components/ApplicationLeadForm/pasreEsiaProfile.js

@@ -0,0 +1,52 @@
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseEsiaProfile = void 0;
+const normalizePhone_1 = require("../../ui-kit/PhoneInput/normalizePhone");
+const parseEsiaProfile = (esiaProfile) => {
+    const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+    return {
+        name: profile?.name,
+        surname: profile?.surname,
+        middleName: profile?.midname,
+        birthday: profile?.birthDate,
+        phone: (0, normalizePhone_1.normalizePhone)(profile?.phone),
+        email: profile?.email,
+        dulIssueDateField: document?.dulIssueDate,
+        dulIssuedBy: document?.dulIssuedBy,
+        dulNumber: document?.dulNumber,
+        dulSerie: document?.dulSerie,
+        dulSubdivisionCode: document?.dulSubdivisionCode,
+        snils: addInfo?.snils,
+        birthPlace: addInfo?.birthPlace,
+        addressRegistration: buildAddress(addressRegistration),
+        addressFact: buildAddress(addressFact),
+    };
+};
+exports.parseEsiaProfile = parseEsiaProfile;
+const concatFullAddress = (address) => {
+    return address.reduce((acc, value) => {
+        if (value) {
+            return acc ? `${acc}, ${value}` : value;
+        }
+        return acc;
+    }, '');
+};
+const buildAddress = (fields) => {
+    const { postcode, region, regionCode, locality, city, street, house, building, block, apartment, } = fields;
+    const place = locality || city;
+    const fullAddress = concatFullAddress([
+        postcode,
+        region,
+        place,
+        street ? `ул ${street}` : undefined,
+        house ? `д ${house}` : undefined,
+        block ? `к ${block}` : undefined,
+        building ? `стр ${building}` : undefined,
+        apartment ? `кв ${apartment}` : undefined,
+    ]);
+    return {
+        ...fields,
+        regionCode: regionCode?.key,
+        fullAddress,
+    };
+};
+//# sourceMappingURL=pasreEsiaProfile.js.map

package/mobile/dist/components/ApplicationLeadForm/pasreEsiaProfile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pasreEsiaProfile.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/pasreEsiaProfile.ts"],"names":[],"mappings":";;AACA,2EAAwE;AAGjE,MAAM,gBAAgB,GAAG,CAAC,WAAsC,EAAa,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;IAErF,OAAO;QACL,IAAI,EAAE,OAAO,EAAE,IAAI;QACnB,OAAO,EAAE,OAAO,EAAE,OAAO;QACzB,UAAU,EAAE,OAAO,EAAE,OAAO;QAC5B,QAAQ,EAAE,OAAO,EAAE,SAAS;QAC5B,KAAK,EAAE,IAAA,+BAAc,EAAC,OAAO,EAAE,KAAK,CAAC;QACrC,KAAK,EAAE,OAAO,EAAE,KAAK;QACrB,iBAAiB,EAAE,QAAQ,EAAE,YAAY;QACzC,WAAW,EAAE,QAAQ,EAAE,WAAW;QAClC,SAAS,EAAE,QAAQ,EAAE,SAAS;QAC9B,QAAQ,EAAE,QAAQ,EAAE,QAAQ;QAC5B,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB;QAChD,KAAK,EAAE,OAAO,EAAE,KAAK;QACrB,UAAU,EAAE,OAAO,EAAE,UAAU;QAC/B,mBAAmB,EAAE,YAAY,CAAC,mBAAmB,CAAC;QACtD,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC;KACvC,CAAC;AACJ,CAAC,CAAC;AApBW,QAAA,gBAAgB,oBAoB3B;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"}

package/mobile/dist/components/ApplicationLeadForm/useInitApplicationLead.js

@@ -3,10 +3,11 @@ exports.useInitApplicationLead = void 0;
 const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
 const updateProfileEsia_1 = require("../../api/RetailAPI/updateProfileEsia");
 const useLocalStorage_1 = require("../../hooks/useLocalStorage");
+const pasreEsiaProfile_1 = require("./pasreEsiaProfile");
 const useInitApplicationLead = (nextStepLink) => {
     const [isLoading, setIsLoading] = (0, hooks_1.useState)(false);
     const [profileId] = (0, useLocalStorage_1.useLocalStorage)('profileId');
-    const [, setEsiaData] = (0, useLocalStorage_1.useLocalStorage)('esiaData');
+    const [leadForm, setLeadForm] = (0, useLocalStorage_1.useLocalStorage)('leadForm');
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
@@ -18,7 +19,10 @@ const useInitApplicationLead = (nextStepLink) => {
                 state,
                 redirectUri: globalThis.location?.href,
             });
-            setEsiaData(JSON.stringify(data));
+            setLeadForm({
+                ...leadForm,
+                ...(0, pasreEsiaProfile_1.parseEsiaProfile)(data),
+            });
             globalThis.location.href = nextStepLink;
         }
     }, []);
@@ -28,7 +32,6 @@ const useInitApplicationLead = (nextStepLink) => {
             updateEsiaProfile();
         }
         else {
-            setEsiaData('');
             sessionStorage.removeItem('accessToken');
             sessionStorage.removeItem('refreshToken');
         }

package/mobile/dist/components/ApplicationLeadForm/useInitApplicationLead.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAE/E,6EAA0E;AAC1E,iEAA8D;AAEvD,MAAM,sBAAsB,GAAG,CAAC,YAAoB,EAAE,EAAE;IAC7D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,iCAAe,EAAS,WAAW,CAAC,CAAC;IACzD,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,IAAA,iCAAe,EAAC,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAiB,EAAC;gBACnC,SAAS,EAAE,SAAS;gBACpB,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;aACvC,CAAC,CAAC;YAEH,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAClC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;SACzC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,iBAAiB,EAAE,CAAC;SACrB;aAAM;YACL,WAAW,CAAC,EAAE,CAAC,CAAC;YAChB,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACzC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC3C;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,SAAS;KACV,CAAC;AACJ,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
+{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAE/E,6EAA0E;AAC1E,iEAA8D;AAE9D,yDAAsD;AAE/C,MAAM,sBAAsB,GAAG,CAAC,YAAoB,EAAE,EAAE;IAC7D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,SAAS,CAAC,GAAG,IAAA,iCAAe,EAAS,WAAW,CAAC,CAAC;IACzD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,IAAA,iCAAe,EAAY,UAAU,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,IAAA,qCAAiB,EAAC;gBACnC,SAAS,EAAE,SAAS;gBACpB,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;aACvC,CAAC,CAAC;YAEH,WAAW,CAAC;gBACV,GAAG,QAAQ;gBACX,GAAG,IAAA,mCAAgB,EAAC,IAAI,CAAC;aAC1B,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;SACzC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,iBAAiB,EAAE,CAAC;SACrB;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;QACL,SAAS;KACV,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,sBAAsB,0BAuCjC"}

package/mobile/lib/api/RetailAPI/updateProfileEsia.d.ts

@@ -11,7 +11,7 @@ export declare type UpdateProfileEsiaResponse = {
         surname: string;
         name: string;
         midname: string;
-        birthDate: string;
+        birthDate: Date;
         phone: string;
         email: string;
         esiaAccountType: {
@@ -39,11 +39,11 @@ export declare type UpdateProfileEsiaResponse = {
             value: string;
         };
         city: string;
-        locality: null;
+        locality: string;
         street: string;
         house: string;
-        building: null;
-        block: null;
+        building: string;
+        block: string;
         apartment: string;
     };
     addressFact: {
@@ -55,11 +55,11 @@ export declare type UpdateProfileEsiaResponse = {
             value: string;
         };
         city: string;
-        locality: null;
+        locality: string;
         street: string;
         house: string;
-        building: null;
-        block: null;
+        building: string;
+        block: string;
         apartment: string;
     };
 };

package/mobile/lib/components/ApplicationLeadForm/pasreEsiaProfile.d.ts

@@ -0,0 +1,3 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { type FormState } from './getInitialFormState';
+export declare const parseEsiaProfile: (esiaProfile: UpdateProfileEsiaResponse) => FormState;

package/mobile/lib/components/ApplicationLeadForm/pasreEsiaProfile.js

@@ -0,0 +1,49 @@
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone.js';
+export const parseEsiaProfile = (esiaProfile) => {
+    const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+    return {
+        name: profile?.name,
+        surname: profile?.surname,
+        middleName: profile?.midname,
+        birthday: profile?.birthDate,
+        phone: normalizePhone(profile?.phone),
+        email: profile?.email,
+        dulIssueDateField: document?.dulIssueDate,
+        dulIssuedBy: document?.dulIssuedBy,
+        dulNumber: document?.dulNumber,
+        dulSerie: document?.dulSerie,
+        dulSubdivisionCode: document?.dulSubdivisionCode,
+        snils: addInfo?.snils,
+        birthPlace: addInfo?.birthPlace,
+        addressRegistration: buildAddress(addressRegistration),
+        addressFact: buildAddress(addressFact),
+    };
+};
+const concatFullAddress = (address) => {
+    return address.reduce((acc, value) => {
+        if (value) {
+            return acc ? `${acc}, ${value}` : value;
+        }
+        return acc;
+    }, '');
+};
+const buildAddress = (fields) => {
+    const { postcode, region, regionCode, locality, city, street, house, building, block, apartment, } = fields;
+    const place = locality || city;
+    const fullAddress = concatFullAddress([
+        postcode,
+        region,
+        place,
+        street ? `ул ${street}` : undefined,
+        house ? `д ${house}` : undefined,
+        block ? `к ${block}` : undefined,
+        building ? `стр ${building}` : undefined,
+        apartment ? `кв ${apartment}` : undefined,
+    ]);
+    return {
+        ...fields,
+        regionCode: regionCode?.key,
+        fullAddress,
+    };
+};
+//# sourceMappingURL=pasreEsiaProfile.js.map

package/mobile/lib/components/ApplicationLeadForm/pasreEsiaProfile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pasreEsiaProfile.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/pasreEsiaProfile.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AAGxE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,WAAsC,EAAa,EAAE;IACpF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,WAAW,EAAE,GAAG,WAAW,CAAC;IAErF,OAAO;QACL,IAAI,EAAE,OAAO,EAAE,IAAI;QACnB,OAAO,EAAE,OAAO,EAAE,OAAO;QACzB,UAAU,EAAE,OAAO,EAAE,OAAO;QAC5B,QAAQ,EAAE,OAAO,EAAE,SAAS;QAC5B,KAAK,EAAE,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC;QACrC,KAAK,EAAE,OAAO,EAAE,KAAK;QACrB,iBAAiB,EAAE,QAAQ,EAAE,YAAY;QACzC,WAAW,EAAE,QAAQ,EAAE,WAAW;QAClC,SAAS,EAAE,QAAQ,EAAE,SAAS;QAC9B,QAAQ,EAAE,QAAQ,EAAE,QAAQ;QAC5B,kBAAkB,EAAE,QAAQ,EAAE,kBAAkB;QAChD,KAAK,EAAE,OAAO,EAAE,KAAK;QACrB,UAAU,EAAE,OAAO,EAAE,UAAU;QAC/B,mBAAmB,EAAE,YAAY,CAAC,mBAAmB,CAAC;QACtD,WAAW,EAAE,YAAY,CAAC,WAAW,CAAC;KACvC,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"}

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

@@ -1,10 +1,11 @@
 import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia.js';
 import { useLocalStorage } from '../../hooks/useLocalStorage.js';
+import { parseEsiaProfile } from './pasreEsiaProfile.js';
 export const useInitApplicationLead = (nextStepLink) => {
     const [isLoading, setIsLoading] = useState(false);
     const [profileId] = useLocalStorage('profileId');
-    const [, setEsiaData] = useLocalStorage('esiaData');
+    const [leadForm, setLeadForm] = useLocalStorage('leadForm');
     const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
     const code = params.get('code');
     const state = params.get('state');
@@ -16,7 +17,10 @@ export const useInitApplicationLead = (nextStepLink) => {
                 state,
                 redirectUri: globalThis.location?.href,
             });
-            setEsiaData(JSON.stringify(data));
+            setLeadForm({
+                ...leadForm,
+                ...parseEsiaProfile(data),
+            });
             globalThis.location.href = nextStepLink;
         }
     }, []);
@@ -26,7 +30,6 @@ export const useInitApplicationLead = (nextStepLink) => {
             updateEsiaProfile();
         }
         else {
-            setEsiaData('');
             sessionStorage.removeItem('accessToken');
             sessionStorage.removeItem('refreshToken');
         }

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

@@ -1 +1 @@
-{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,YAAoB,EAAE,EAAE;IAC7D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,SAAS,CAAC,GAAG,eAAe,CAAS,WAAW,CAAC,CAAC;IACzD,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC;gBACnC,SAAS,EAAE,SAAS;gBACpB,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;aACvC,CAAC,CAAC;YAEH,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;YAClC,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;SACzC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,iBAAiB,EAAE,CAAC;SACrB;aAAM;YACL,WAAW,CAAC,EAAE,CAAC,CAAC;YAChB,cAAc,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;YACzC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;SAC3C;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,SAAS;KACV,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useInitApplicationLead.js","sourceRoot":"","sources":["../../../src/components/ApplicationLeadForm/useInitApplicationLead.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAE/E,OAAO,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,YAAoB,EAAE,EAAE;IAC7D,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,CAAC,SAAS,CAAC,GAAG,eAAe,CAAS,WAAW,CAAC,CAAC;IACzD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,eAAe,CAAY,UAAU,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,kBAAkB,CAAC,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;IACpF,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAElC,MAAM,iBAAiB,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC/C,IAAI,SAAS,IAAI,IAAI,IAAI,KAAK,EAAE;YAC9B,MAAM,IAAI,GAAG,MAAM,iBAAiB,CAAC;gBACnC,SAAS,EAAE,SAAS;gBACpB,IAAI;gBACJ,KAAK;gBACL,WAAW,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI;aACvC,CAAC,CAAC;YAEH,WAAW,CAAC;gBACV,GAAG,QAAQ;gBACX,GAAG,gBAAgB,CAAC,IAAI,CAAC;aAC1B,CAAC,CAAC;YAEH,UAAU,CAAC,QAAQ,CAAC,IAAI,GAAG,YAAY,CAAC;SACzC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,IAAI,EAAE;YACR,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,iBAAiB,EAAE,CAAC;SACrB;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;QACL,SAAS;KACV,CAAC;AACJ,CAAC,CAAC"}

package/mobile/src/api/RetailAPI/updateProfileEsia.ts

@@ -14,7 +14,7 @@ export type UpdateProfileEsiaResponse = {
     surname: string;
     name: string;
     midname: string;
-    birthDate: string;
+    birthDate: Date;
     phone: string;
     email: string;
     esiaAccountType: {
@@ -42,11 +42,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
   addressFact: {
@@ -58,11 +58,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
 };

package/mobile/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -0,0 +1,69 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
+import { type Address, type FormState } from './getInitialFormState';
+
+export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormState => {
+  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+
+  return {
+    name: profile?.name,
+    surname: profile?.surname,
+    middleName: profile?.midname,
+    birthday: profile?.birthDate,
+    phone: normalizePhone(profile?.phone),
+    email: profile?.email,
+    dulIssueDateField: document?.dulIssueDate,
+    dulIssuedBy: document?.dulIssuedBy,
+    dulNumber: document?.dulNumber,
+    dulSerie: document?.dulSerie,
+    dulSubdivisionCode: document?.dulSubdivisionCode,
+    snils: addInfo?.snils,
+    birthPlace: addInfo?.birthPlace,
+    addressRegistration: buildAddress(addressRegistration),
+    addressFact: buildAddress(addressFact),
+  };
+};
+
+const concatFullAddress = (address: Array<string | undefined>): string => {
+  return address.reduce((acc: string, value) => {
+    if (value) {
+      return acc ? `${acc}, ${value}` : value;
+    }
+
+    return acc;
+  }, '');
+};
+
+const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+  const {
+    postcode,
+    region,
+    regionCode,
+    locality,
+    city,
+    street,
+    house,
+    building,
+    block,
+    apartment,
+  } = fields;
+
+  const place = locality || city;
+
+  const fullAddress = concatFullAddress([
+    postcode,
+    region,
+    place,
+    street ? `ул ${street}` : undefined,
+    house ? `д ${house}` : undefined,
+    block ? `к ${block}` : undefined,
+    building ? `стр ${building}` : undefined,
+    apartment ? `кв ${apartment}` : undefined,
+  ]);
+
+  return {
+    ...fields,
+    regionCode: regionCode?.key,
+    fullAddress,
+  };
+};

package/mobile/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -2,11 +2,13 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { type FormState } from './getInitialFormState';
+import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
   const [isLoading, setIsLoading] = useState(false);
   const [profileId] = useLocalStorage<string>('profileId');
-  const [, setEsiaData] = useLocalStorage('esiaData');
+  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
   const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
   const code = params.get('code');
   const state = params.get('state');
@@ -20,7 +22,11 @@ export const useInitApplicationLead = (nextStepLink: string) => {
         redirectUri: globalThis.location?.href,
       });
 
-      setEsiaData(JSON.stringify(data));
+      setLeadForm({
+        ...leadForm,
+        ...parseEsiaProfile(data),
+      });
+
       globalThis.location.href = nextStepLink;
     }
   }, []);
@@ -30,7 +36,6 @@ export const useInitApplicationLead = (nextStepLink: string) => {
       setIsLoading(true);
       updateEsiaProfile();
     } else {
-      setEsiaData('');
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }

package/package.json

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

package/src/api/RetailAPI/updateProfileEsia.ts

@@ -14,7 +14,7 @@ export type UpdateProfileEsiaResponse = {
     surname: string;
     name: string;
     midname: string;
-    birthDate: string;
+    birthDate: Date;
     phone: string;
     email: string;
     esiaAccountType: {
@@ -42,11 +42,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
   addressFact: {
@@ -58,11 +58,11 @@ export type UpdateProfileEsiaResponse = {
       value: string;
     };
     city: string;
-    locality: null;
+    locality: string;
     street: string;
     house: string;
-    building: null;
-    block: null;
+    building: string;
+    block: string;
     apartment: string;
   };
 };

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -0,0 +1,69 @@
+import { type UpdateProfileEsiaResponse } from '../../api/RetailAPI/updateProfileEsia';
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
+import { type Address, type FormState } from './getInitialFormState';
+
+export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): FormState => {
+  const { profile, addInfo, document, addressRegistration, addressFact } = esiaProfile;
+
+  return {
+    name: profile?.name,
+    surname: profile?.surname,
+    middleName: profile?.midname,
+    birthday: profile?.birthDate,
+    phone: normalizePhone(profile?.phone),
+    email: profile?.email,
+    dulIssueDateField: document?.dulIssueDate,
+    dulIssuedBy: document?.dulIssuedBy,
+    dulNumber: document?.dulNumber,
+    dulSerie: document?.dulSerie,
+    dulSubdivisionCode: document?.dulSubdivisionCode,
+    snils: addInfo?.snils,
+    birthPlace: addInfo?.birthPlace,
+    addressRegistration: buildAddress(addressRegistration),
+    addressFact: buildAddress(addressFact),
+  };
+};
+
+const concatFullAddress = (address: Array<string | undefined>): string => {
+  return address.reduce((acc: string, value) => {
+    if (value) {
+      return acc ? `${acc}, ${value}` : value;
+    }
+
+    return acc;
+  }, '');
+};
+
+const buildAddress = (fields: UpdateProfileEsiaResponse['addressRegistration']): Address => {
+  const {
+    postcode,
+    region,
+    regionCode,
+    locality,
+    city,
+    street,
+    house,
+    building,
+    block,
+    apartment,
+  } = fields;
+
+  const place = locality || city;
+
+  const fullAddress = concatFullAddress([
+    postcode,
+    region,
+    place,
+    street ? `ул ${street}` : undefined,
+    house ? `д ${house}` : undefined,
+    block ? `к ${block}` : undefined,
+    building ? `стр ${building}` : undefined,
+    apartment ? `кв ${apartment}` : undefined,
+  ]);
+
+  return {
+    ...fields,
+    regionCode: regionCode?.key,
+    fullAddress,
+  };
+};

package/src/components/ApplicationLeadForm/useInitApplicationLead.ts

@@ -2,11 +2,13 @@ import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 
 import { updateProfileEsia } from '../../api/RetailAPI/updateProfileEsia';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
+import { type FormState } from './getInitialFormState';
+import { parseEsiaProfile } from './pasreEsiaProfile';
 
 export const useInitApplicationLead = (nextStepLink: string) => {
   const [isLoading, setIsLoading] = useState(false);
   const [profileId] = useLocalStorage<string>('profileId');
-  const [, setEsiaData] = useLocalStorage('esiaData');
+  const [leadForm, setLeadForm] = useLocalStorage<FormState>('leadForm');
   const params = new URLSearchParams(decodeURIComponent(globalThis.location?.search));
   const code = params.get('code');
   const state = params.get('state');
@@ -20,7 +22,11 @@ export const useInitApplicationLead = (nextStepLink: string) => {
         redirectUri: globalThis.location?.href,
       });
 
-      setEsiaData(JSON.stringify(data));
+      setLeadForm({
+        ...leadForm,
+        ...parseEsiaProfile(data),
+      });
+
       globalThis.location.href = nextStepLink;
     }
   }, []);
@@ -30,7 +36,6 @@ export const useInitApplicationLead = (nextStepLink: string) => {
       setIsLoading(true);
       updateEsiaProfile();
     } else {
-      setEsiaData('');
       sessionStorage.removeItem('accessToken');
       sessionStorage.removeItem('refreshToken');
     }