@redneckz/wildless-cms-uni-blocks 0.14.605 → 0.14.607

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

@@ -0,0 +1,41 @@
+import { doRequest } from './doRequest';
+
+export type UpdateUserTaskBody = {
+  sendToBank: boolean;
+  taskKind: 'SHORT' | 'FULL' | 'UNITED';
+  task: {
+    taskSource: string;
+    id: number;
+    participants: [
+      {
+        birthDate: string;
+        id: number;
+        midname: string;
+        name: string;
+        surname: string;
+        profile: {
+          id: number;
+        };
+        participantContacts: Array<{
+          contactTypeCd: {
+            key: 'EMAIL' | 'MAIN_PHONE';
+          };
+          value: string;
+        }>;
+        roleCd: {
+          key: string;
+          value: string;
+        };
+      },
+    ];
+  };
+};
+
+export type CreateUserProfileResponse = {
+  profile: {
+    id: number;
+  };
+};
+
+export const updateUserTask = (body: UpdateUserTaskBody) =>
+  doRequest<CreateUserProfileResponse>('/user-data/updateUserTask', 'PUT', body);

package/mobile/src/api/{RetailApi → RetailAPI}/utils/getUpdateUserProfile.ts

@@ -1,7 +1,7 @@
 import { type FormState } from '../../../components/ApplicationLeadForm/getInitialFormState';
 import { formatDate } from '../../../utils/formatDate';
 import { formatPhone } from '../../../utils/formatPhone';
-import { type UpdateUserProfileBody } from '../RetailApiTypes';
+import { type UpdateUserProfileBody } from '../updateUserProfile';
 
 export const getUpdateUserProfileData = (
   profileId: number,

package/mobile/src/api/{RetailApi → RetailAPI}/utils/getUpdateUserTask.ts

@@ -1,12 +1,18 @@
-import { type UpdateUserTaskBody } from '../RetailApiTypes';
+import { type UpdateUserTaskBody } from '../updateUserTask';
 
-/* eslint-disable max-params */
-export const getUpdateUserTaskData = (
-  participantId: number,
-  taskId: number,
-  profileId: number,
-  formatData?: Record<string, any>,
-): UpdateUserTaskBody => ({
+type getUpdateUserTaskDataType = {
+  participantId: number;
+  taskId: number;
+  profileId: number;
+  formData?: Record<string, any>;
+};
+
+export const getUpdateUserTaskData = ({
+  participantId,
+  taskId,
+  profileId,
+  formData,
+}: getUpdateUserTaskDataType): UpdateUserTaskBody => ({
   sendToBank: true,
   taskKind: 'SHORT',
   task: {
@@ -14,11 +20,11 @@ export const getUpdateUserTaskData = (
     id: taskId,
     participants: [
       {
-        birthDate: formatData?.birthDate,
+        birthDate: formData?.birthDate,
         id: participantId,
-        midname: formatData?.midname,
-        name: formatData?.name,
-        surname: formatData?.surname,
+        midname: formData?.midname,
+        name: formData?.name,
+        surname: formData?.surname,
         profile: {
           id: profileId,
         },
@@ -27,13 +33,13 @@ export const getUpdateUserTaskData = (
             contactTypeCd: {
               key: 'EMAIL',
             },
-            value: formatData?.email,
+            value: formData?.email,
           },
           {
             contactTypeCd: {
               key: 'MAIN_PHONE',
             },
-            value: formatData?.phone,
+            value: formData?.phone,
           },
         ],
         roleCd: {

package/mobile/src/api/apiBaseUrl.ts

@@ -0,0 +1 @@
+export const API_BASE_URI = '/api/v1';

package/mobile/src/api/dadataHints/dadataHints.ts

@@ -1,3 +1,4 @@
+import { API_BASE_URI } from '../apiBaseUrl';
 import { type DaDataSuggestion, type ListRequestOption } from './dadataHintsType';
 
 const DEFAULT_HINTS_COUNT = 10;
@@ -31,7 +32,7 @@ export const getDaDataHints = (options: ListRequestOption): Promise<Array<DaData
   const queryPrefixValue = queryPrefix ? `${queryPrefix}, ` : '';
   const combinedQuery = `${queryPrefixValue}${query}`;
 
-  const result = fetch(`/api/v1/suggestions/${url}`, {
+  const result = fetch(`${API_BASE_URI}/suggestions/${url}`, {
     method: 'POST',
     mode: 'cors',
     headers: {

package/mobile/src/components/ApplicationForm/getRegionUrl.tsx

@@ -1,4 +1,5 @@
-import { OUT_SERVICE_URL } from '../../ui-kit/FormField/constants';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 
+const OUT_SERVICE_URL = `${API_BASE_URI}/outservice/outserviceregions`;
 export const getRegionUrl = (typeForm?: string) =>
   typeForm === 'OUTSERVICE' ? OUT_SERVICE_URL : undefined;

package/mobile/src/components/ApplicationLeadForm/ApplicationLeadForm.example.json

@@ -61,22 +61,12 @@
               },
               {
                 "fieldType": "common",
-                "name": "consentPhotoFlg",
-                "required": true
-              },
-              {
-                "fieldType": "common",
-                "name": "consentAssignmentClaimsFlg",
-                "required": true
-              },
-              {
-                "fieldType": "common",
-                "name": "consentCollectionFlg",
+                "name": "consentInformFlg",
                 "required": true
               },
               {
                 "fieldType": "common",
-                "name": "consentInformFlg",
+                "name": "consentOthersFlg",
                 "required": true
               }
             ]

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

@@ -18,18 +18,6 @@ export const CONSENTS: Record<keyof FormConsents, ConsentData> = {
     text: 'Согласие на запрос в ПФР',
     docId: 3,
   },
-  consentPhotoFlg: {
-    text: 'Прочие согласия (согласие на фотографирование)',
-    docId: 1,
-  },
-  consentAssignmentClaimsFlg: {
-    text: 'Прочие согласия (согласие на уступку прав требований)',
-    docId: 1,
-  },
-  consentCollectionFlg: {
-    text: 'Прочие согласия (согласие на взыскание по исполнительной надписи нотариуса)',
-    docId: 1,
-  },
   consentInformFlg: {
     text: 'Согласие на информирование о продуктах и услугах Банка',
     docId: 14,
@@ -37,4 +25,8 @@ export const CONSENTS: Record<keyof FormConsents, ConsentData> = {
   consentToReceiveMaterials: {
     text: 'Согласен на получение информационных и аналитических материалов по электронной почте',
   },
+  consentOthersFlg: {
+    text: 'Прочие согласия',
+    docId: 1,
+  },
 };

package/mobile/src/components/ApplicationLeadForm/getInitialFormState.tsx

@@ -12,11 +12,9 @@ export interface FormConsents {
   processPersonalDataLeadFlg?: boolean;
   consentProviderFlg?: boolean;
   consentPfrFlg?: boolean;
-  consentPhotoFlg?: boolean;
-  consentAssignmentClaimsFlg?: boolean;
-  consentCollectionFlg?: boolean;
   consentInformFlg?: boolean;
   consentToReceiveMaterials?: boolean;
+  consentOthersFlg?: boolean;
 }
 
 export interface FormState extends FormConsents {
@@ -76,6 +74,9 @@ export interface FormState extends FormConsents {
   localities?: string[];
   partnerComments?: string;
   consentDataProcessing?: boolean;
+  consentPhotoFlg?: boolean;
+  consentAssignmentClaimsFlg?: boolean;
+  consentCollectionFlg?: boolean;
   familyStatus?: string;
   children?: number;
   familyMembers?: number;
@@ -126,9 +127,7 @@ const initialFormState = {
   consentDataProcessing: false,
   processPersonalDataLeadFlg: false,
   consentProviderFlg: false,
-  consentPhotoFlg: false,
-  consentAssignmentClaimsFlg: false,
-  consentCollectionFlg: false,
+  consentOthersFlg: false,
   consentInformFlg: false,
   participantAddress: '',
   participantDateRegistration: undefined,

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

@@ -1,7 +1,10 @@
 import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { RETAIL_API } from '../../api/RetailApi/RetailApi';
-import { getUpdateUserProfileData } from '../../api/RetailApi/utils/getUpdateUserProfile';
-import { getUpdateUserTaskData } from '../../api/RetailApi/utils/getUpdateUserTask';
+import { createDraftTask } from '../../api/RetailAPI/createDraftTask';
+import { createUserProfile } from '../../api/RetailAPI/createUserProfile';
+import { updateUserProfile } from '../../api/RetailAPI/updateUserProfile';
+import { updateUserTask } from '../../api/RetailAPI/updateUserTask';
+import { getUpdateUserProfileData } from '../../api/RetailAPI/utils/getUpdateUserProfile';
+import { getUpdateUserTaskData } from '../../api/RetailAPI/utils/getUpdateUserTask';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 import { getObjectValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { useVerifyPhoneDialog } from '../../ui-kit/VerifyPhoneDialog/useVerifyPhoneDialog';
@@ -38,22 +41,29 @@ export const useApplicationLeadApi = ({ inputs, programId, saveForm }: Applicati
     }
 
     try {
-      const { profile } = await RETAIL_API.CreateUserProfile({
+      const { profile } = await createUserProfile({
         profile: { phone: formatPhone(formData.phone as string) },
       });
       const profileId = profile?.id;
 
+      const transformedForm = transformOtherConsentsField(formData);
+
       if (profileId && formData?.phone) {
         const handleSuccessVerify = async () => {
           try {
-            await RETAIL_API.UpdateUserProfile(getUpdateUserProfileData(profileId, formData));
-            const { taskId, participantId } = await RETAIL_API.CreateDraftTask({
+            await updateUserProfile(getUpdateUserProfileData(profileId, transformedForm));
+            const { taskId, participantId } = await createDraftTask({
               profileId,
               programId,
             });
 
-            await RETAIL_API.UpdateUserTask(
-              getUpdateUserTaskData(participantId, taskId, profileId, formData),
+            await updateUserTask(
+              getUpdateUserTaskData({
+                participantId,
+                taskId,
+                profileId,
+                formData: transformedForm,
+              }),
             );
             saveUserData(participantId, taskId, profileId);
             saveForm(JSON.stringify(formData));
@@ -97,3 +107,14 @@ const verifyPhoneContent = (phone: string, consents: string[]) => ({
 
 const consentsToList = (consents?: string[]) =>
   `<ul>${consents?.map((_) => '<li>' + _ + '</li>').join('')}</ul>`;
+
+const transformOtherConsentsField = (formData: FormState): FormState => {
+  const { consentOthersFlg, ...form } = formData;
+
+  return {
+    ...form,
+    consentCollectionFlg: consentOthersFlg,
+    consentAssignmentClaimsFlg: consentOthersFlg,
+    consentPhotoFlg: consentOthersFlg,
+  };
+};

package/mobile/src/components/CalculatorBusinessDeposit/useBusinessDepositRates.ts

@@ -1,4 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 import { type RateParamsDef } from './CalculatorBusinessDepositContent';
 import { type BusinessDepositCalculatorSourceBookParams } from './useBusinessDepositParams';
@@ -14,7 +15,7 @@ export function useBusinessDepositRates(rateParams?: RateParamsDef): CalculatorB
   const serviceName = rateParams?.rateType ? DEPOSIT_RATES_SERVICE_MAP[rateParams?.rateType] : '';
 
   const { data } = useAsyncData(
-    serviceName ? `/api/v1/depositrates/${serviceName}` : null,
+    serviceName ? `${API_BASE_URI}/depositrates/${serviceName}` : null,
     fetchJSONUnsafe as FetchJSONUnsafeType<CalculatorBusinessDepositData>,
   );
 

package/mobile/src/components/Depository/DepositoryItem.tsx

@@ -1,3 +1,4 @@
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { useLink } from '../../hooks/useLink';
 import { Text } from '../../ui-kit/Text/Text';
 import { formatDate } from '../../utils/formatDate';
@@ -6,7 +7,7 @@ import { type DepositoryDataItem } from './useDepository';
 
 export const DepositoryItem = ({ title, timestamp, publicId }: DepositoryDataItem) => {
   const link = useLink();
-  const { href } = link({ href: `/api/v1/depository/${publicId}/file` });
+  const { href } = link({ href: `${API_BASE_URI}/depository/${publicId}/file` });
 
   return (
     <div

package/mobile/src/components/Depository/useDepository.ts

@@ -1,4 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 import { formatDate } from '../../utils/formatDate';
 import { type DepositoryFiltrationState } from './Depository';
@@ -19,7 +20,8 @@ interface UseDepositoryParams extends DepositoryFiltrationState {
   size: number;
   page: number;
 }
-const DEPOSITARY_URL = '/api/v1/depository';
+
+const DEPOSITARY_URL = `${API_BASE_URI}/depository`;
 
 export const useDepository = ({ size, page, query, startDate, endDate }: UseDepositoryParams) => {
   const formatStartDate = startDate ? formatDate(startDate, true) : '';

package/mobile/src/components/ExchangeRateTile/useFetchExchangeRateData.ts

@@ -1,4 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { type ExchangeCurrencyItem } from '../../components/ExchangeRateTile/ExchangeCurrencyCalculator';
 import { type Region } from '../../hooks/useRegions';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
@@ -10,7 +11,7 @@ export interface ExchangeData {
   address?: string;
 }
 
-const EXCHANGE_RATES_URL = '/api/v1/exchangerates';
+const EXCHANGE_RATES_URL = `${API_BASE_URI}/exchangerates`;
 
 export function useFetchExchangeRateData(currentRegion: Region) {
   const regionCode = currentRegion?.code || '000';

package/mobile/src/components/OfficesAtmsMap/useAtms.ts

@@ -1,11 +1,12 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { type Atm } from './OfficesAtmsMapProps';
 
 const EMPTY_VALUE = [];
 
 export function useAtms(regionCode?: string) {
-  const { data, error } = useAsyncData(`/api/v1/atms?regionCode=${regionCode}`, fetchMap);
+  const { data, error } = useAsyncData(`${API_BASE_URI}/atms?regionCode=${regionCode}`, fetchMap);
   const isLoad = !data && !error;
 
   return { data: data || EMPTY_VALUE, isLoad };

package/mobile/src/components/OfficesAtmsMap/useOffices.ts

@@ -1,12 +1,13 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSON } from '../../utils/fetchJSON';
 import { type Branch, type RemoteWorkplace } from './OfficesAtmsMapProps';
 
 const EMPTY_VALUE = { branches: [], remoteWorkplaces: [] };
 
-export function useOffices(regionCode?: string) {
+export function useOffices(regionCode = '000') {
   const { data, error } = useAsyncData(
-    `/api/v1/branchesAndRemoteWorkplaces?regionCode=${regionCode}`,
+    `${API_BASE_URI}/branchesAndRemoteWorkplaces?regionCode=${encodeURIComponent(regionCode)}`,
     fetchMap,
   );
   const isLoad = !data && !error;

package/mobile/src/components/SafeDepositRental/useGetRegions.ts

@@ -1,7 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../../utils/fetchJSON';
 
-const REGIONS_URL = '/api/v1/regions';
+const REGIONS_URL = `${API_BASE_URI}/regions`;
 
 export interface Region {
   id?: number;

package/mobile/src/components/SafeDepositRental/useSafeBoxes.ts

@@ -1,4 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../../api/apiBaseUrl';
 import { fetchJSON } from '../../utils/fetchJSON';
 
 export interface Tariff {
@@ -24,7 +25,7 @@ export interface Branch {
   safeBoxCaseVolumes?: SafeBoxCaseVolume[];
 }
 
-const SAFEBOXES_URL = '/api/v1/safeboxes';
+const SAFEBOXES_URL = `${API_BASE_URI}/safeboxes`;
 const EMPTY_VALUE = [];
 
 export function useSafeBoxes(regionCode?: string): Branch[] {

package/mobile/src/hooks/useBranches.ts

@@ -1,4 +1,5 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../api/apiBaseUrl';
 import { fetchJSON } from '../utils/fetchJSON';
 
 export interface Tariff {
@@ -24,7 +25,7 @@ export interface Branch {
   safeBoxCaseVolumes?: SafeBoxCaseVolume[];
 }
 
-const BRANCHES_URL = '/api/v1/branches';
+const BRANCHES_URL = `${API_BASE_URI}/branches`;
 const EMPTY_VALUE = [];
 
 export function useBranches(regionCode?: string): Branch[] {

package/mobile/src/hooks/useBranchesByRegions.ts

@@ -1,8 +1,9 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../api/apiBaseUrl';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
-const REGIONS_URL = '/api/v1/branchesByRegions';
-const PREMIUM_REGIONS_URL = '/api/v1/premiumBranchesByRegions';
+const REGIONS_URL = '/branchesByRegions';
+const PREMIUM_REGIONS_URL = '/premiumBranchesByRegions';
 
 export interface Region {
   region: string;
@@ -14,7 +15,7 @@ export interface Region {
 
 export function useBranchesByRegions(isPremium = false): Region[] {
   const { data } = useAsyncData(
-    isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL,
+    `${API_BASE_URI}${isPremium ? PREMIUM_REGIONS_URL : REGIONS_URL}`,
     fetchJSONUnsafe as FetchJSONUnsafeType<Region[]>,
   );
 

package/mobile/src/hooks/useLeadFormData.ts

@@ -8,7 +8,7 @@ type ErrorProps = {
 
 export const useLeadFormData = (typeField: string) => {
   const { data, error } = useAsyncData(
-    `https://portal-ui-cc.cprb.dev.rshbdev.ru/light-api-cash/v1/dictionary?dictionaryType=${typeField}`,
+    `/api/v1/dictionary?dictionaryType=${encodeURIComponent(typeField)}`,
     fetchData,
   );
   if (data && 'errorMessage' in data) {

package/mobile/src/hooks/useLocation.ts

@@ -1,11 +1,12 @@
 import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../api/apiBaseUrl';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
 import { useLatestEvent } from '../EventBus/useLatestEvent';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 import { type Region } from './useRegions';
 
-const REGION_URL = '/api/v1/region';
+const REGION_URL = `${API_BASE_URI}/region`;
 const LOCATION_STORAGE_KEY = 'location';
 
 export function useLocation(defaultLocation = 'Москва'): [Region, (_: Region) => void] {

package/mobile/src/hooks/useRegions.ts

@@ -1,7 +1,8 @@
 import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { API_BASE_URI } from '../api/apiBaseUrl';
 import { fetchJSONUnsafe, type FetchJSONUnsafeType } from '../utils/fetchJSON';
 
-const REGIONS_URL = '/api/v1/regions';
+const REGIONS_URL = `${API_BASE_URI}/regions`;
 
 export interface Region {
   id?: number;

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

@@ -5,8 +5,8 @@ import { Dialog } from '../DialogManager/Dialog';
 import { Icon } from '../Icon/Icon';
 import { Input } from '../Input/Input';
 import { Logo } from '../Logo/Logo';
-import { checkCaptcha } from './checkCaptcha';
-import { createCaptcha } from './createCaptcha';
+import { handleCheckCaptcha } from './handleCheckCaptcha';
+import { handleCreateCaptcha } from './handleCreateCaptcha';
 
 export interface CaptchaDialogProps {
   phoneNumber: string;
@@ -22,7 +22,7 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(
     const [hasError, setHasError] = useState(false);
 
     useEffect(() => {
-      createCaptcha(setCaptcha, phoneNumber);
+      handleCreateCaptcha(setCaptcha, phoneNumber);
     }, []);
 
     return (
@@ -32,10 +32,10 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(
         className="my-6xl max-w-lg w-full min-h-fit mx-auto rounded-lg"
       >
         <div className="flex flex-col gap-lg items-center rounded-md">
-          <div className="flex h-[140px] w-[300px]">
+          <div className="flex h-36 w-72">
             <img className="grow" src={captcha}></img>
             <div
-              onClick={() => createCaptcha(setCaptcha, phoneNumber)}
+              onClick={() => handleCreateCaptcha(setCaptcha, phoneNumber)}
               className="flex w-8 items-center justify-center cursor-pointer"
             >
               <Icon iconVersion="normal" name="RefreshIcon" />
@@ -55,7 +55,7 @@ export const CaptchaDialog = JSX<CaptchaDialogProps>(
             <Button
               type="submit"
               disabled={!code}
-              onClick={() => checkCaptcha({ code, setHasError, close, sendCode })}
+              onClick={() => handleCheckCaptcha({ code, setHasError, close, sendCode })}
               version="secondary"
             >
               Отправить

package/mobile/src/ui-kit/CaptchaDialog/{checkCaptcha.ts → handleCheckCaptcha.ts}

@@ -1,20 +1,20 @@
-import { RETAIL_API } from '../../api/RetailApi/RetailApi';
+import { checkCaptcha } from '../../api/RetailAPI/checkCaptcha';
 import { noop } from '../../utils/noop';
 
-interface CheckCaptchaProps {
+interface HandleCheckCaptchaProps {
   code: string;
   setHasError: (hasError: boolean) => void;
   sendCode?: () => void;
   close?: () => void;
 }
 
-export const checkCaptcha = async ({
+export const handleCheckCaptcha = async ({
   code,
   setHasError,
   close,
   sendCode = noop,
-}: CheckCaptchaProps) => {
-  const response = await RETAIL_API.CheckCaptcha({ captchaText: code });
+}: HandleCheckCaptchaProps) => {
+  const response = await checkCaptcha({ captchaText: code });
 
   if ((await response.text()) === 'ERROR') {
     setHasError(true);

package/mobile/src/ui-kit/CaptchaDialog/handleCreateCaptcha.ts

@@ -0,0 +1,9 @@
+import { createCaptcha } from '../../api/RetailAPI/createCaptcha';
+
+export const handleCreateCaptcha = async (
+  setCaptcha: (captcha: string) => void,
+  phoneNumber: string,
+) => {
+  const response = await createCaptcha(phoneNumber);
+  setCaptcha(URL.createObjectURL(await response.blob()));
+};

package/mobile/src/ui-kit/Checkbox/getDocument.ts

@@ -1,7 +1,7 @@
-import { RETAIL_API } from '../../api/RetailApi/RetailApi';
+import { feedbackById } from '../../api/RetailAPI/feedbackById';
 
 export const getDocument = async (id: number) => {
-  const response = await RETAIL_API.GetFileByID(id);
+  const response = await feedbackById(id);
 
-  return URL.createObjectURL(await response.blob());
+  return URL.createObjectURL(response);
 };

package/mobile/src/ui-kit/FormField/Fields/LocalitiesField.tsx

@@ -1,8 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { useRegions } from '../../../hooks/useRegions';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { getOutServiceRegions } from '../../../api/OutServiceAPI/OutServiceAPI';
 import { SelectControl } from '../../Select/SelectControl';
-import { OUT_SERVICE_URL } from '../constants';
 import { type CustomFieldProps } from '../CustomFieldProps';
 import { validatorObj } from '../getObjectValidator';
 import { getValidation } from '../getValidation';
@@ -12,7 +12,10 @@ type RegionFieldProps = CustomFieldProps;
 export const LocalitiesField = JSX<RegionFieldProps>(({ field, input }) => {
   const fieldRegion = field('region');
   const regionKey = fieldRegion?.value?.key;
-  const localities = useRegions(OUT_SERVICE_URL)
+
+  const { data: regions } = useAsyncData('outServiceRegions', getOutServiceRegions);
+
+  const localities = regions
     ?.find((_) => _.code === regionKey)
     ?.localities?.map((_) => ({ key: _, text: _ }));
 

package/mobile/src/ui-kit/FormField/NameFieldDef.ts

@@ -49,9 +49,7 @@ export type NameFieldDef =
   | 'partnerComments'
   | 'consentDataProcessing'
   | 'consentInformFlg'
-  | 'consentCollectionFlg'
-  | 'consentAssignmentClaimsFlg'
-  | 'consentPhotoFlg'
+  | 'consentOthersFlg'
   | 'consentPfrFlg'
   | 'consentProviderFlg'
   | 'processPersonalDataLeadFlg'

package/mobile/src/ui-kit/FormField/constants.tsx

@@ -25,5 +25,3 @@ export const FEEDBACK_METHOD: Option[] = [
   { key: 'phone', text: 'Телефонный звонок' },
   { key: 'email', text: 'Электронное сообщение' },
 ];
-
-export const OUT_SERVICE_URL = '/api/v1/outservice/outserviceregions';

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -131,9 +131,7 @@ export const getField =
       consentToReceiveMaterials: <ConsentField field={field} input={input} />,
       processPersonalDataLeadFlg: <ConsentField field={field} input={input} />,
       consentProviderFlg: <ConsentField field={field} input={input} />,
-      consentPhotoFlg: <ConsentField field={field} input={input} />,
-      consentAssignmentClaimsFlg: <ConsentField field={field} input={input} />,
-      consentCollectionFlg: <ConsentField field={field} input={input} />,
+      consentOthersFlg: <ConsentField field={field} input={input} />,
       consentInformFlg: <ConsentField field={field} input={input} />,
       consentPfrFlg: <ConsentField field={field} input={input} />,
       applicationDate: (

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -65,10 +65,8 @@ export const validatorObj: Record<string, Validator> = {
   consentToReceiveMaterials: agreementValidator,
   processPersonalDataLeadFlg: agreementValidator,
   consentProviderFlg: agreementValidator,
-  consentPhotoFlg: agreementValidator,
   consentPfrFlg: agreementValidator,
-  consentAssignmentClaimsFlg: agreementValidator,
-  consentCollectionFlg: agreementValidator,
+  consentOthersFlg: agreementValidator,
   consentInformFlg: agreementValidator,
   familyStatus: defaultValidator('Выберите семейное положение'),
   children: lengthStringValidator(2, 'Укажите количество детей'),