@tap-payments/auth-jsconnect 2.0.109-test → 2.0.111-test

package/build/api/entity.d.ts

@@ -53,7 +53,7 @@ export declare type UploadFileBody = {
     title: string | undefined;
     purpose: string;
 };
-export declare type EntityLicenseBody = {
+export declare type UpdateEntityBody = {
     id: string;
     license: {
         type?: string;
@@ -64,20 +64,15 @@ export declare type EntityLicenseBody = {
         issuing_date: number;
         expiry_date?: string;
     };
-    encryption_contract?: Array<string>;
-};
-export declare type EntityActivitiesBody = {
-    id: string;
     activities?: Array<{
         id: string;
+        action: string;
     }>;
-};
-export declare type EntityNameBody = {
-    id: string;
     legal_name: {
         ar: string;
         en: string;
     };
+    encryption_contract?: Array<string>;
 };
 export declare type DocumentInfo = {
     type?: string;
@@ -99,10 +94,8 @@ declare const entityService: {
     retrieveEntityInfo: (entity_id: string, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
     uploadFileInfo: (data: UploadFileBody, config?: AxiosRequestConfig) => Promise<any>;
-    updateEntityLicense: ({ id, ...data }: EntityLicenseBody) => Promise<any>;
-    updateEntityName: ({ id, ...data }: EntityNameBody) => Promise<any>;
-    updateEntityActivities: ({ id, ...data }: EntityActivitiesBody) => Promise<any>;
     updateDocumentInfo: (data: DocumentUpdateBody) => Promise<any>;
     retrieveEntity: (entity_id: string) => Promise<any>;
+    updateEntity: ({ id, ...data }: UpdateEntityBody) => Promise<any>;
 };
 export { entityService };

package/build/api/entity.js

@@ -39,27 +39,11 @@ var retrieveEntity = function (entity_id) {
         url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(entity_id)
     });
 };
-var updateEntityActivities = function (_a) {
+var updateEntity = function (_a) {
     var id = _a.id, data = __rest(_a, ["id"]);
     return httpClient({
         method: 'put',
-        url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(id, "/activities/add"),
-        data: data
-    });
-};
-var updateEntityName = function (_a) {
-    var id = _a.id, data = __rest(_a, ["id"]);
-    return httpClient({
-        method: 'put',
-        url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(id, "/name"),
-        data: data
-    });
-};
-var updateEntityLicense = function (_a) {
-    var id = _a.id, data = __rest(_a, ["id"]);
-    return httpClient({
-        method: 'put',
-        url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(id, "/license"),
+        url: "".concat(ENDPOINT_PATHS.ENTITY, "/").concat(id),
         data: data
     });
 };
@@ -98,10 +82,8 @@ var entityService = {
     retrieveEntityInfo: retrieveEntityInfo,
     updateIndividualInfo: updateIndividualInfo,
     uploadFileInfo: uploadFileInfo,
-    updateEntityLicense: updateEntityLicense,
-    updateEntityName: updateEntityName,
-    updateEntityActivities: updateEntityActivities,
     updateDocumentInfo: updateDocumentInfo,
-    retrieveEntity: retrieveEntity
+    retrieveEntity: retrieveEntity,
+    updateEntity: updateEntity
 };
 export { entityService };

package/build/api/index.d.ts

@@ -3,7 +3,7 @@ import { ValidateOperatorBody } from './operator';
 import { CreateAuthBody, VerifyAuthBody, CreatePasswordBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, VerifyAuthKitOTPBody } from './auth';
 import { UpdateLeadBody, LeadVerifyBody, CreateLeadBody, LeadOTPVerifyBody, LeadIdentityUpdateBody } from './lead';
 import { CheckEmailBody, CheckBrandBody } from './availabilityServices';
-import { EntityInfoBody, EntityBankUpdateBody, UploadFileBody, EntityLicenseBody, EntityActivitiesBody, EntityNameBody, DocumentUpdateBody, DocumentInfo } from './entity';
+import { EntityInfoBody, EntityBankUpdateBody, UploadFileBody, UpdateEntityBody, DocumentUpdateBody, DocumentInfo } from './entity';
 import { CreateAccountBody } from './account';
 import { DataElementBody } from './data';
 import { BrandListBody, UpdateBrandBody, UpdateIndividualBody } from './individual';
@@ -45,11 +45,9 @@ declare const API: {
         retrieveEntityInfo: (entity_id: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
         uploadFileInfo: (data: UploadFileBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<any>;
-        updateEntityLicense: ({ id, ...data }: EntityLicenseBody) => Promise<any>;
-        updateEntityName: ({ id, ...data }: EntityNameBody) => Promise<any>;
-        updateEntityActivities: ({ id, ...data }: EntityActivitiesBody) => Promise<any>;
         updateDocumentInfo: (data: DocumentUpdateBody) => Promise<any>;
         retrieveEntity: (entity_id: string) => Promise<any>;
+        updateEntity: ({ id, ...data }: UpdateEntityBody) => Promise<any>;
     };
     availabilityServices: {
         checkEmail: (data: CheckEmailBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
@@ -109,6 +107,6 @@ declare const API: {
         updateBrandSales: ({ id, ...data }: import("./individual").UpdateSalesChannels) => void;
     };
 };
-export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, UpdateBoardBody, UpdateBrandBody, DataElementBody, UploadFileBody, EntityLicenseBody, EntityActivitiesBody, EntityNameBody, DocumentUpdateBody, DocumentInfo, VerifyAuthKitOTPBody, UpdateIndividualBody };
+export type { ValidateOperatorBody, CreateAuthBody, VerifyAuthBody, CreateLeadBody, UpdateLeadBody, LeadVerifyBody, LeadOTPVerifyBody, CheckEmailBody, CheckBrandBody, LeadIdentityUpdateBody, EntityInfoBody, CreateAccountBody, EntityBankUpdateBody, CreatePasswordBody, BrandListBody, VerifyOperationAuthBody, ResetPasswordVerifyAuthBody, UpdateBoardBody, UpdateBrandBody, DataElementBody, UploadFileBody, UpdateEntityBody, DocumentUpdateBody, DocumentInfo, VerifyAuthKitOTPBody, UpdateIndividualBody };
 export { setAxiosGlobalHeaders, removeAxiosGlobalHeaders, axiosInstance, getAxiosHeaders };
 export default API;

package/build/features/app/entity/entityStore.js

@@ -216,44 +216,32 @@ export var retrieveBoardDetails = createAsyncThunk('entityRetrieveEntityInfo', f
     });
 }); });
 export var updateEntity = createAsyncThunk('entityUpdateEntity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, entity, id, documentData, articleId, licenseBody, activitiesBody, nameBody, _b, nameData, activitiesData, licenseData, documentBody;
-    var _c, _d, _e, _f, _g;
-    return __generator(this, function (_h) {
-        switch (_h.label) {
+    var _a, settings, entity, id, documentData, articleId, payload, documentBody, data;
+    var _b, _c, _d, _e, _f;
+    return __generator(this, function (_g) {
+        switch (_g.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, entity = _a.entity;
-                id = (_d = (_c = entity.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.id;
+                id = (_c = (_b = entity.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id;
                 documentData = undefined;
                 articleId = entity.data.entityData.articleId;
-                licenseBody = {
+                payload = {
                     id: id,
+                    activities: (_d = (params.activities || [])) === null || _d === void 0 ? void 0 : _d.map(function (_a) {
+                        var id = _a.id;
+                        return ({ id: id, action: 'add' });
+                    }),
                     license: {
                         issuing_date: moment(params.operationStartDate).format('x'),
                         number: params.licenseNumber
-                    }
-                };
-                activitiesBody = {
-                    id: id,
-                    activities: (_e = (params.activities || [])) === null || _e === void 0 ? void 0 : _e.map(function (_a) {
-                        var id = _a.id;
-                        return ({ id: id });
-                    })
-                };
-                nameBody = {
-                    id: id,
+                    },
                     legal_name: {
                         ar: params.licenseName,
                         en: params.licenseName
-                    }
+                    },
+                    encryption_contract: ['license.issuing_date', 'license.number', 'legal_name.ar', 'legal_name.en']
                 };
-                return [4, Promise.all([
-                        API.entityService.updateEntityName(nameBody),
-                        API.entityService.updateEntityActivities(activitiesBody),
-                        API.entityService.updateEntityLicense(licenseBody)
-                    ])];
-            case 1:
-                _b = _h.sent(), nameData = _b[0], activitiesData = _b[1], licenseData = _b[2];
-                if (!articleId) return [3, 3];
+                if (!articleId) return [3, 2];
                 documentBody = {
                     entity_id: id || '',
                     documents: [
@@ -263,13 +251,15 @@ export var updateEntity = createAsyncThunk('entityUpdateEntity', function (param
                     ]
                 };
                 return [4, API.entityService.updateDocumentInfo(documentBody)];
-            case 2:
-                documentData = _h.sent();
-                _h.label = 3;
+            case 1:
+                documentData = _g.sent();
+                _g.label = 2;
+            case 2: return [4, API.entityService.updateEntity(payload)];
             case 3:
+                data = _g.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, id);
-                return [2, { data: __assign(__assign(__assign(__assign({}, nameData), activitiesData), licenseData), documentData), formData: params }];
+                (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, id);
+                return [2, { data: __assign(__assign({}, data), documentData), formData: params }];
         }
     });
 }); });

package/build/features/connect/screens/Individual/Individual.js

@@ -68,13 +68,13 @@ var Individual = function (_a) {
     }, [methods.formState.isValid]);
     React.useEffect(function () {
         var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
-        if (!!name)
+        if (name && !methods.getValues('name'))
             methods.setValue('name', name, { shouldValidate: true });
-        if (!!email)
+        if (email && !methods.getValues('email'))
             methods.setValue('email', email, { shouldValidate: true });
-        if (!!mobile)
+        if (mobile && !methods.getValues('mobile'))
             methods.setValue('mobile', mobile, { shouldValidate: true });
-        if (!!countryCode)
+        if (countryCode && !methods.getValues('countryCode'))
             methods.setValue('countryCode', countryCode, { shouldValidate: true });
     }, [individualData.name, individualData.email, individualData.mobile, individualData.countryCode]);
     var handleMenuListClick = function () {

package/build/features/connect/screens/Mobile/Mobile.js

@@ -78,10 +78,14 @@ var Mobile = function (_a) {
     var settingsStore = useAppSelector(settingsSelector);
     var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var _d = React.useState(), listType = _d[0], setListType = _d[1];
+    var _e = data.mobileData, countryCode = _e.countryCode, mobile = _e.mobile;
     var dispatch = useAppDispatch();
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
-        defaultValues: data.mobileData,
+        defaultValues: {
+            mobile: mobile || '',
+            countryCode: countryCode
+        },
         mode: 'onChange'
     });
     var t = useTranslation().t;
@@ -90,10 +94,10 @@ var Mobile = function (_a) {
         setListType(flag);
     };
     React.useEffect(function () {
-        if (data.mobileData.countryCode) {
-            methods.setValue('countryCode', data.mobileData.countryCode);
+        if (countryCode && !methods.getValues('countryCode')) {
+            methods.setValue('countryCode', countryCode);
         }
-    }, [data.mobileData]);
+    }, [countryCode]);
     React.useEffect(function () {
         dispatch(resetOTPScreen());
     }, []);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tap-payments/auth-jsconnect",
-	"version": "2.0.109-test",
+	"version": "2.0.111-test",
 	"description": "connect library, auth",
 	"private": false,
 	"main": "build/index.js",