@redneckz/wildless-cms-uni-blocks 0.14.797 → 0.14.799

package/mobile/src/retail/api/uploadFile.ts

@@ -0,0 +1,28 @@
+import { type File } from '../model/LeadFormState';
+import { getAuthorizationHeaders } from './doRequest';
+
+export type DocumentCategory = 'CONFIRMING_EMPLOYMENT_DOC' | 'CONFIRMING_INCOME_DOC';
+
+export const uploadFile = async (
+  file: Blob,
+  taskId: string,
+  documentCategory: DocumentCategory,
+): Promise<File> => {
+  const fd = new FormData();
+  fd.append('taskId', taskId);
+  fd.append('documentCategory', documentCategory);
+  fd.append('file', file, 'file.pdf');
+
+  const res = await globalThis
+    ?.fetch?.(`/light-api-cash/v1/file`, {
+      method: 'POST',
+      headers: {
+        ...getAuthorizationHeaders(),
+      },
+      credentials: 'include',
+      body: fd,
+    })
+    .then((response) => response.json());
+
+  return res;
+};

package/mobile/src/retail/components/EsiaLoginDialog/EsiaLoginDialog.tsx

@@ -22,6 +22,7 @@ export const EsiaLoginDialog = JSX<EsiaLoginDialogProps>(({ onClose }) => {
 
     if (resp?.link) {
       navigator.assign(resp.link);
+      globalThis.location.href = resp.link;
     }
   }, []);
 

package/mobile/src/retail/components/Fields/DaDataInnField.tsx

@@ -4,37 +4,42 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { getOrganizationFromInn } from '../../api/getOrganizationFromInn';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const DaDataInnField = JSX<CustomFieldProps>(({ field, input }) => {
   const store = useRetailFormStore();
+  const { employerActivities, employerOrganization, organization, amountWorkers } = store;
   const esiaAccountTypeCd = field?.('esiaAccountTypeCd')?.value;
   const inn = field?.('inn')?.value;
 
   const onDaDataChange = useCallback((item: DaDataSuggestion) => {
-    field?.('organizationName')?.onChange?.(item.data?.name?.short_with_opf);
     updateOrganizationFields(store, field, item);
   }, []);
 
   useEffect(() => {
-    if (!esiaAccountTypeCd || !inn) {
+    if (
+      !esiaAccountTypeCd ||
+      !inn ||
+      !(employerActivities && employerOrganization && organization && amountWorkers)
+    ) {
       return;
     }
     (async () => {
-      const organization = await getOrganizationFromInn(inn as string);
-      if (organization) {
-        field?.('organizationName')?.onChange?.(organization.data?.name?.short_with_opf);
-        updateOrganizationFields(store, field, organization);
+      const organizationData = await getOrganizationFromInn(inn as string);
+      if (organizationData) {
+        updateOrganizationFields(store, field, organizationData);
       }
     })();
-  }, []);
+  }, [employerActivities, employerOrganization, organization, amountWorkers]);
 
   return (
     <DaDataInputControl
       label="ИНН"
       isInteger={true}
       maxLength={12}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}

package/mobile/src/retail/components/Fields/Experience5YearsField.tsx

@@ -2,6 +2,7 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { clamp } from '../../../utils/clamp';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const MAX_YEARS = 5;
@@ -19,6 +20,7 @@ export const Experience5YearsField = JSX<CustomFieldProps>(({ field, input }) =>
       label="Стаж"
       placeholder="За последние 5 лет"
       type="number"
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
       {...field(input?.name ?? '')}
       {...input}
       onChange={onChange}

package/mobile/src/retail/components/Fields/GeneralSeniorityField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -8,6 +9,7 @@ export const GeneralSeniorityField = JSX<CustomFieldProps>(({ field, input }) =>
     type="number"
     maxLength={2}
     placeholder="Количество лет"
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...field(input?.name ?? '')}
     {...input}
   />

package/mobile/src/retail/components/Fields/JobsNumberField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -8,6 +9,7 @@ export const JobsNumberField = JSX<CustomFieldProps>(({ field, input }) => (
     placeholder="Количество мест"
     isInteger={true}
     maxLength={2}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...field(input?.name ?? '')}
     {...input}
   />

package/mobile/src/retail/components/Fields/LastJobExperienceField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -8,6 +9,7 @@ export const LastJobExperienceField = JSX<CustomFieldProps>(({ field, input }) =
     placeholder="Количество лет"
     type="number"
     maxLength={2}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...field(input?.name ?? '')}
     {...input}
   />

package/mobile/src/retail/components/Fields/OrganizationNameField.tsx

@@ -3,6 +3,7 @@ import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { type DaDataSuggestion } from '../../api/dadataHints/dadataHintsType';
 import { useRetailFormStore } from '../../hooks/useRetailFormStore';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { updateOrganizationFields } from '../../utils/updateOrganizationFields';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
@@ -17,6 +18,7 @@ export const OrganizationNameField = JSX<CustomFieldProps>(({ field, input }) =>
   return (
     <DaDataInputControl
       label="Наименование организации"
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
       {...input}
       {...field(input?.name ?? '')}
       onDaDataChange={onDaDataChange}

package/mobile/src/retail/components/Fields/WagesField.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
@@ -7,6 +8,7 @@ export const WagesField = JSX<CustomFieldProps>(({ field, input }) => (
     label="Совокупный доход в месяц после вычета налогов (зарплата, премии)"
     placeholder="Введите значение"
     isInteger={true}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...field(input?.name ?? '')}
     {...input}
   />

package/mobile/src/retail/content.tsx

@@ -18,7 +18,7 @@ const PERSONAL_DATA: CreditCardSectionsProps[] = [
       { name: 'sex', required: true },
       { name: 'limitedBirthday', required: true, filledByEsia: true },
       { name: 'birthPlace', required: true, filledByEsia: true },
-      { name: 'phone', required: true, filledByEsia: true },
+      { name: 'phone', required: true },
       { name: 'email', required: true, dadata: true },
     ],
   },
@@ -105,13 +105,13 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
   {
     inputs: [
       { name: 'employment', required: true },
-      { name: 'organizationName', required: true, dadata: true },
+      { name: 'organizationName', required: true, dadata: true, filledByEsia: true },
     ],
   },
   {
     columns: 2,
     inputs: [
-      { name: 'inn', required: true, dadata: true },
+      { name: 'inn', required: true, dadata: true, filledByEsia: true },
       { name: 'legalForm', required: true },
     ],
   },
@@ -126,10 +126,10 @@ const EMPLOYMENT_CONTENT: CreditCardSectionsProps[] = [
     inputs: [
       { name: 'employerActivities', required: true },
       { name: 'employerOrganization', required: true },
-      { name: 'generalSeniority', required: true },
-      { name: 'lastJobExperience', required: true },
-      { name: 'experience5Years', required: true },
-      { name: 'jobsNumber', required: true },
+      { name: 'generalSeniority', required: true, filledByEsia: true },
+      { name: 'lastJobExperience', required: true, filledByEsia: true },
+      { name: 'experience5Years', required: true, filledByEsia: true },
+      { name: 'jobsNumber', required: true, filledByEsia: true },
     ],
   },
   {
@@ -194,7 +194,7 @@ const FAMILY_STATUS_AND_INCOME_CONTENT: CreditCardSectionsProps[] = [
   },
   {
     columns: 1,
-    inputs: [{ name: 'wages', required: true }],
+    inputs: [{ name: 'wages', required: true, filledByEsia: true }],
   },
   {
     columns: 1,

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

@@ -67,6 +67,19 @@ export interface CalculatorProps {
   isStateEmployee?: boolean;
 }
 
+export type File = {
+  fileId: number;
+  fileName: string;
+  contentType: string;
+  fileSize: number;
+  downloadLink: string;
+  taskId: number;
+  documentCategoryCd: {
+    key: string;
+    value: string;
+  };
+};
+
 export type FormRetailConsents = CreditFormConsents &
   CreditCardFormConsents &
   DebitCardFormConsents;
@@ -174,4 +187,5 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   latinName?: string;
   latinSurname?: string;
   regionHasDelivery?: boolean;
+  files?: File[];
 }

package/mobile/src/retail/utils/updateOrganizationFields.ts

@@ -14,7 +14,7 @@ export const updateOrganizationFields = (
   field: FormFieldRegisterer<any>,
   item: DaDataSuggestion,
 ) => {
-  const { okved, okopf, inn } = getOrganizationRequisites(item);
+  const { okved, okopf, inn, organizationName } = getOrganizationRequisites(item);
 
   field?.('legalForm')?.onChange?.(item.data?.opf?.short);
 
@@ -27,6 +27,7 @@ export const updateOrganizationFields = (
     employerActivities: getOrganizationActivityType(store?.employerActivities ?? [], okved),
     organization: getOrganizationType(store?.organization ?? [], okopf, inn),
     employerOrganization: getOrganizationKind(store?.employerOrganization ?? [], okopf),
+    organizationName,
   };
 
   for (const fieldName in organizationData) {
@@ -38,4 +39,5 @@ const getOrganizationRequisites = (item: DaDataSuggestion) => ({
   inn: item.data?.inn ?? '',
   okopf: Number(item.data?.opf?.code),
   okved: item.data?.okved ?? '',
+  organizationName: item.data?.name?.short_with_opf ?? '',
 });

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

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { isEsiaAuthorize } from '../../../retail/utils/isEsiaAuthorize';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
@@ -6,6 +7,7 @@ export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
   <InputControl
     label="Отчество (Обязательно, при наличии)"
     maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
     {...field(input?.name ?? '')}
     {...input}
   />

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

@@ -1,7 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { isEsiaAuthorize } from '../../../retail/utils/isEsiaAuthorize';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Имя" maxLength={60} {...field(input?.name ?? '')} {...input} />
+  <InputControl
+    label="Имя"
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
 ));

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

@@ -1,7 +1,14 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { isEsiaAuthorize } from '../../../retail/utils/isEsiaAuthorize';
 import { InputControl } from '../../Input/InputControl';
 import { type CustomFieldProps } from '../CustomFieldProps';
 
 export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <InputControl label="Фамилия" maxLength={60} {...field(input?.name ?? '')} {...input} />
+  <InputControl
+    label="Фамилия"
+    maxLength={60}
+    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+    {...field(input?.name ?? '')}
+    {...input}
+  />
 ));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.797",
+  "version": "0.14.799",
   "private": false,
   "license": "MIT",
   "author": "ЦК",
@@ -214,7 +214,7 @@
       "path": "lib/common.css"
     },
     {
-      "limit": "100 kB",
+      "limit": "101 kB",
       "path": "bundle/bundle.umd.min.js"
     }
   ],

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
 import { validatorObj } from '../../retail/validator/validatorObj';
@@ -10,6 +11,7 @@ import { inputColumnStyles } from '../../ui-kit/FormField/inputColumnStyle';
 import { renderTitle } from '../../ui-kit/FormField/renderTitle';
 import { Loader } from '../../ui-kit/Loader/Loader';
 import { ResponseTypeDialog } from '../../ui-kit/ResponseTypeDialog/ResponseTypeDialog';
+import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
@@ -32,6 +34,7 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     data,
     ...rest
   }) => {
+    const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
     const inputs = useMemo(
       () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
@@ -40,15 +43,17 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
 
     const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
 
-    const [initialFormState, { isLoading }] = useInitApplicationLead(
+    const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
       nextStepLink,
       productType,
-    );
+      setEsiaError,
+    });
     const { isSending, ok, handleSubmit } = useApplicationLeadApi({
       programId,
       nextStepLink,
       productType,
+      esiaError,
       data,
     });
 
@@ -82,6 +87,12 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
             </div>
           ))}
           {renderSubmitButton(button, isSending)}
+          {esiaError ? (
+            <Text size="text-m" font="font-medium" color="text-error">
+              Использовать Госуслуги для оформления заявки невозможно, необходимо заполнить поля
+              вручную.
+            </Text>
+          ) : null}
         </form>
       </ApplicationFormLayout>
     );

package/src/components/ApplicationLeadForm/parseEsiaProfile.ts

@@ -0,0 +1,185 @@
+/* eslint-disable max-lines */
+import { type UpdateProfileEsiaResponse } from '../../retail/api/updateProfileEsia';
+import { uploadFile, type DocumentCategory } from '../../retail/api/uploadFile';
+import { type Address, type File, type LeadFormState } from '../../retail/model/LeadFormState';
+import { normalizePhone } from '../../ui-kit/PhoneInput/normalizePhone';
+
+export const parseEsiaProfile = async (
+  esiaProfile: UpdateProfileEsiaResponse,
+  taskId: string,
+  isDebit: boolean,
+): Promise<LeadFormState> => {
+  isDebit ? checkEsiaDataForDebit(esiaProfile) : checkEsiaDataForCredit(esiaProfile);
+
+  const { profile, addInfo, document, addressRegistration, addressFact, esiaAdditionalDocument } =
+    esiaProfile;
+  const files: File[] = [];
+
+  if (!isDebit) {
+    await saveDocument({
+      document: esiaAdditionalDocument.pdfFileWorkbook,
+      taskId,
+      category: 'CONFIRMING_INCOME_DOC',
+      files,
+    });
+    await saveDocument({
+      document: esiaAdditionalDocument.pdfFilePayout,
+      taskId,
+      category: 'CONFIRMING_EMPLOYMENT_DOC',
+      files,
+    });
+  }
+
+  const mainData = {
+    name: profile.name,
+    surname: profile.surname,
+    middleName: profile.midname,
+    limitedBirthday: profile.birthDate,
+    phone: normalizePhone(profile.phone),
+    email: profile.email,
+    dulIssueDate: document.dulIssueDate,
+    dulIssuedBy: document.dulIssuedBy,
+    dulNumber: document.dulNumber,
+    dulSerie: document.dulSerie,
+    dulSubdivisionCode: document.dulSubdivisionCode,
+    birthPlace: addInfo.birthPlace,
+    addressRegistration: buildAddress(addressRegistration),
+    addressFact: buildAddress(addressFact),
+    esiaAccountTypeCd: profile.esiaAccountType,
+  };
+
+  return {
+    ...mainData,
+    ...(!isDebit && {
+      snils: addInfo.snils,
+      inn: esiaAdditionalDocument.inn,
+      wages: Math.floor(esiaAdditionalDocument.averageMonthlyIncome)?.toString(),
+      beginDate: esiaAdditionalDocument.startWorkDate,
+      experience5Years: getYearFromMonth(esiaAdditionalDocument.workLengthInFiveYears).toString(),
+      generalSeniority: getYearFromMonth(esiaAdditionalDocument.workLength).toString(),
+      lastJobExperience: getYearFromMonth(esiaAdditionalDocument.workLengthLastJob).toString(),
+      jobsNumber: esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
+      files,
+    }),
+  };
+};
+
+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,
+  };
+};
+
+const getYearFromMonth = (month: number) => Math.floor(month / 12);
+
+const saveDocument = async ({
+  document,
+  taskId,
+  category,
+  files,
+}: {
+  document: string;
+  taskId: string;
+  category: DocumentCategory;
+  files: File[];
+}) => {
+  await fetch(`data:'application/pdf';base64,${document}`)
+    .then((res) => res.blob())
+    .then((value) => uploadFile(value, taskId, category))
+    .then((file) => files.push(file));
+};
+
+const checkEsiaDataForCredit = (esiaProfile: UpdateProfileEsiaResponse) => {
+  const { profile, document, addressRegistration, esiaAdditionalDocument } = esiaProfile;
+
+  const data = [
+    profile.name,
+    profile.surname,
+    profile.midname,
+    profile.birthDate,
+    profile.phone,
+    profile.email,
+    document.dulIssueDate,
+    document.dulIssuedBy,
+    document.dulNumber,
+    document.dulSerie,
+    document.dulSubdivisionCode,
+    addressRegistration,
+    profile.esiaAccountType,
+    esiaAdditionalDocument.inn,
+    esiaAdditionalDocument.averageMonthlyIncome.toString(),
+    esiaAdditionalDocument.startWorkDate,
+    esiaAdditionalDocument.workLengthInFiveYears.toString(),
+    esiaAdditionalDocument.workLength.toString(),
+    esiaAdditionalDocument.workLengthLastJob.toString(),
+    esiaAdditionalDocument.jobsNumberInFiveYears.toString(),
+    esiaAdditionalDocument.pdfFilePayout,
+    esiaAdditionalDocument.pdfFileWorkbook,
+  ];
+
+  if (!data.every((_) => Boolean(_))) {
+    throw new Error();
+  }
+};
+
+const checkEsiaDataForDebit = (esiaProfile: UpdateProfileEsiaResponse) => {
+  const { profile, document, addressRegistration } = esiaProfile;
+
+  const data = [
+    profile.name,
+    profile.surname,
+    profile.midname,
+    profile.birthDate,
+    profile.phone,
+    profile.email,
+    document.dulIssueDate,
+    document.dulIssuedBy,
+    document.dulNumber,
+    document.dulSerie,
+    document.dulSubdivisionCode,
+    addressRegistration,
+    profile.esiaAccountType,
+  ];
+
+  if (!data.every((_) => Boolean(_))) {
+    throw new Error();
+  }
+};