@tap-payments/auth-jsconnect 1.0.95-test → 1.0.96-test

package/build/@types/app.d.ts

@@ -90,6 +90,11 @@ export interface SourceOfIncome {
     name_ar: string;
     name_en: string;
 }
+export interface Occupation {
+    id: string;
+    name_ar: string;
+    name_en: string;
+}
 export interface MonthlyIncome extends SourceOfIncome {
 }
 export interface AppInfo {

package/build/@types/form.d.ts

@@ -1,4 +1,4 @@
-import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, SalesChannel, SourceOfIncome } from './app';
+import { Activity, BrandInfo, CountryCode, CustomerLocation, ExpectedCustomer, ExpectedSaleRange, License, MonthlyIncome, Occupation, SalesChannel, SourceOfIncome } from './app';
 export declare type MobileFormValues = {
     mobile: string | null;
     countryCode: CountryCode;
@@ -56,6 +56,7 @@ export declare type TaxFormValues = {
     confirmPolicy: false;
 };
 export declare type IndividualExtraFormValues = {
+    occupation: Occupation | undefined;
     sourceIncome: SourceOfIncome | undefined;
     monthlyIncome: MonthlyIncome | undefined;
     employerName: string;

package/build/api/data.d.ts

@@ -5,5 +5,6 @@ declare const dataService: {
     getExpectedCustomerSales: () => Promise<import("axios").AxiosResponse<any, any>>;
     getSourceOfIncome: () => Promise<import("axios").AxiosResponse<any, any>>;
     getMonthlyIncome: (countryCode: string) => Promise<import("axios").AxiosResponse<any, any>>;
+    getOccupation: () => Promise<any>;
 };
 export { dataService };

package/build/api/data.js

@@ -1,4 +1,4 @@
-import instance from './axios';
+import instance, { httpClient } from './axios';
 import { ENDPOINT_PATHS } from '../constants';
 var getChannelsOfServices = function () {
     return instance.get("".concat(ENDPOINT_PATHS.CHANNEL));
@@ -18,12 +18,19 @@ var getSourceOfIncome = function () {
 var getMonthlyIncome = function (countryCode) {
     return instance.get("".concat(ENDPOINT_PATHS.MONTHLY_INCOME, "/").concat(countryCode));
 };
+var getOccupation = function () {
+    return httpClient({
+        method: 'get',
+        url: "".concat(ENDPOINT_PATHS.OCCUPATION)
+    });
+};
 var dataService = {
     getChannelsOfServices: getChannelsOfServices,
     getCustomerBases: getCustomerBases,
     getExpectedSales: getExpectedSales,
     getExpectedCustomerSales: getExpectedCustomerSales,
     getSourceOfIncome: getSourceOfIncome,
-    getMonthlyIncome: getMonthlyIncome
+    getMonthlyIncome: getMonthlyIncome,
+    getOccupation: getOccupation
 };
 export { dataService };

package/build/api/entity.d.ts

@@ -12,11 +12,12 @@ export declare type EntityInfoBody = {
     agree_chargeback?: boolean;
     agree_refund?: boolean;
     employer_name?: string;
-    employer_city?: string | null;
+    employer_country?: string | null;
     source_income?: Array<string | undefined>;
     actual_income?: string;
     is_relative_PEP?: boolean | null;
     is_influencer?: boolean | null;
+    occupation?: string;
     step_name: string;
     encryption_contract?: Array<string>;
 };
@@ -38,5 +39,6 @@ declare const entityService: {
     updateEntityInfo: ({ id, ...data }: EntityInfoBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     createBankAccount: (data: EntityBankUpdateBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     retrieveEntityInfo: (entity_id: string, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+    updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
 };
 export { entityService };

package/build/api/entity.js

@@ -10,7 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { ENDPOINT_PATHS } from '../constants';
-import instance from './axios';
+import instance, { httpClient } from './axios';
 var retrieveEntityInfo = function (entity_id, config) {
     return instance.get("".concat(ENDPOINT_PATHS.ENTITY, "/").concat(entity_id), config);
 };
@@ -25,10 +25,19 @@ var updateEntityInfo = function (_a, config) {
 var createBankAccount = function (data, config) {
     return instance.post("".concat(ENDPOINT_PATHS.BANK), data, config);
 };
+var updateIndividualInfo = function (_a) {
+    var id = _a.id, data = __rest(_a, ["id"]);
+    return httpClient({
+        method: 'put',
+        url: "".concat(ENDPOINT_PATHS.INDIVIDUAL, "/").concat(id, "/info"),
+        data: data
+    });
+};
 var entityService = {
     createEntityInfo: createEntityInfo,
     updateEntityInfo: updateEntityInfo,
     createBankAccount: createBankAccount,
-    retrieveEntityInfo: retrieveEntityInfo
+    retrieveEntityInfo: retrieveEntityInfo,
+    updateIndividualInfo: updateIndividualInfo
 };
 export { entityService };

package/build/api/index.d.ts

@@ -27,7 +27,7 @@ declare const API: {
         retrieveLead: (leadId: string) => Promise<import("axios").AxiosResponse<any, any>>;
         verifyLeadToken: (data: LeadVerifyBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         verifyLeadOTP: (data: LeadOTPVerifyBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
-        updateLeadIdentity: (data: LeadIdentityUpdateBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+        updateLeadIdentity: ({ id, ...data }: LeadIdentityUpdateBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         retrieveEntityList: (leadId: string) => Promise<import("axios").AxiosResponse<any, any>>;
     };
     entityService: {
@@ -35,6 +35,7 @@ declare const API: {
         updateEntityInfo: ({ id, ...data }: EntityInfoBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         createBankAccount: (data: EntityBankUpdateBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
         retrieveEntityInfo: (entity_id: string, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
+        updateIndividualInfo: ({ id, ...data }: EntityInfoBody) => Promise<any>;
     };
     availabilityServices: {
         checkEmail: (data: CheckEmailBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;
@@ -54,6 +55,7 @@ declare const API: {
         getExpectedCustomerSales: () => Promise<import("axios").AxiosResponse<any, any>>;
         getSourceOfIncome: () => Promise<import("axios").AxiosResponse<any, any>>;
         getMonthlyIncome: (countryCode: string) => Promise<import("axios").AxiosResponse<any, any>>;
+        getOccupation: () => Promise<any>;
     };
     individualService: {
         getBrandList: (data: BrandListBody, config?: import("axios").AxiosRequestConfig<any> | undefined) => Promise<import("axios").AxiosResponse<any, any>>;

package/build/api/lead.d.ts

@@ -77,6 +77,7 @@ export declare type CreateLeadBody = {
     country_code: string;
 };
 export declare type LeadIdentityUpdateBody = {
+    id: string;
     country_code: string;
     identification_id: string;
     identification_id_type: string;
@@ -90,7 +91,7 @@ declare const leadService: {
     retrieveLead: (leadId: string) => Promise<import("axios").AxiosResponse<any, any>>;
     verifyLeadToken: (data: LeadVerifyBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     verifyLeadOTP: (data: LeadOTPVerifyBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
-    updateLeadIdentity: (data: LeadIdentityUpdateBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
+    updateLeadIdentity: ({ id, ...data }: LeadIdentityUpdateBody, config?: AxiosRequestConfig) => Promise<import("axios").AxiosResponse<any, any>>;
     retrieveEntityList: (leadId: string) => Promise<import("axios").AxiosResponse<any, any>>;
 };
 export { leadService };

package/build/api/lead.js

@@ -1,3 +1,14 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import instance from './axios';
 import { ENDPOINT_PATHS } from '../constants';
 var createLead = function (data, config) {
@@ -15,8 +26,9 @@ var verifyLeadToken = function (data, config) {
 var verifyLeadOTP = function (data, config) {
     return instance.put("".concat(ENDPOINT_PATHS.LEAD_IDENTITY_VERIFY), data, config);
 };
-var updateLeadIdentity = function (data, config) {
-    return instance.put("".concat(ENDPOINT_PATHS.LEAD_IDENTITY), data, config);
+var updateLeadIdentity = function (_a, config) {
+    var id = _a.id, data = __rest(_a, ["id"]);
+    return instance.put("".concat(ENDPOINT_PATHS.LEAD, "/").concat(id, "/identity"), data, config);
 };
 var retrieveEntityList = function (leadId) {
     return instance.get("".concat(ENDPOINT_PATHS.RETRIEVE_ENTITY_LIST, "/").concat(leadId));

package/build/constants/api.d.ts

@@ -8,7 +8,6 @@ export declare const ENDPOINT_PATHS: {
     OPERATOR: string;
     AUTH: string;
     LEAD: string;
-    LEAD_IDENTITY: string;
     LEAD_IDENTITY_VERIFY: string;
     RETRIEVE_ENTITY_LIST: string;
     ENTITY: string;
@@ -26,4 +25,6 @@ export declare const ENDPOINT_PATHS: {
     BANK: string;
     IBAN_BANK: string;
     BRAND_LIST: string;
+    OCCUPATION: string;
+    INDIVIDUAL: string;
 };

package/build/constants/api.js

@@ -7,10 +7,10 @@ var IP_PATH = '/ip';
 var OPERATOR_PATH = '/operator';
 var AUTH_PATH = '/auth';
 var LEAD_PATH = '/lead';
-var LEAD_IDENTITY_PATH = '/lead/identity';
 var LEAD_IDENTITY_VERIFY_PATH = 'lead/identity/verify';
 var RETRIEVE_ENTITY_LIST_PATH = '/lead/entity/list';
 var ENTITY_PATH = '/entity';
+var INDIVIDUAL_PATH = '/individual';
 var BANK_PATH = '/entity/bankaccount';
 var IBAN_PATH = '/iban';
 var CHECK_EMAIL = '/lead/identity/emailcheck';
@@ -23,6 +23,7 @@ var EXPECTED_CUSTOMERS_PATH = '/v2/expectedCustomers';
 var SIGNUP_PATH = '/signup';
 var SOURCE_INCOME_PATH = '/v2/sourceOfIncome';
 var MONTHLY_INCOME_PATH = '/v2/monthlyIncome';
+var OCCUPATION_PATH = '/v2/occupation';
 var BRAND_LIST_PATH = '/brand/list';
 var FIREBASE_URL = 'https://goconnect-195cd-default-rtdb.asia-southeast1.firebasedatabase.app/locale.json';
 export var ENDPOINT_PATHS = {
@@ -35,7 +36,6 @@ export var ENDPOINT_PATHS = {
     OPERATOR: OPERATOR_PATH,
     AUTH: AUTH_PATH,
     LEAD: LEAD_PATH,
-    LEAD_IDENTITY: LEAD_IDENTITY_PATH,
     LEAD_IDENTITY_VERIFY: LEAD_IDENTITY_VERIFY_PATH,
     RETRIEVE_ENTITY_LIST: RETRIEVE_ENTITY_LIST_PATH,
     ENTITY: ENTITY_PATH,
@@ -52,5 +52,7 @@ export var ENDPOINT_PATHS = {
     MONTHLY_INCOME: MONTHLY_INCOME_PATH,
     BANK: BANK_PATH,
     IBAN_BANK: IBAN_PATH,
-    BRAND_LIST: BRAND_LIST_PATH
+    BRAND_LIST: BRAND_LIST_PATH,
+    OCCUPATION: OCCUPATION_PATH,
+    INDIVIDUAL: INDIVIDUAL_PATH
 };

package/build/features/app/bank/bankStore.js

@@ -219,13 +219,15 @@ export var updateLeadSuccess = createAsyncThunk('updateLeadBankSuccess', functio
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
+                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _g.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });

package/build/features/app/business/businessStore.d.ts

@@ -21,11 +21,9 @@ export declare const updateLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<{
         type: string;
         nid: string;
         dob: string;
-        isResend: boolean;
     };
-}, NIDFormValues & {
-    isResend: boolean;
-}, {}>;
+}, NIDFormValues, {}>;
+export declare const resendOTPLeadIdentity: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const retrieveEntityList: import("@reduxjs/toolkit").AsyncThunk<any, {
     leadId: string;
 }, {}>;

package/build/features/app/business/businessStore.js

@@ -159,19 +159,16 @@ export var verifyLeadOTP = createAsyncThunk('verifyLeadOTP', function (params, t
     });
 }); });
 export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, business, identification_id_type, stepName, headers, requestBody, data;
-    var _b, _c, _d, _e, _f;
-    return __generator(this, function (_g) {
-        switch (_g.label) {
+    var _a, settings, business, identification_id_type, stepName, requestBody, data;
+    var _b, _c, _d;
+    return __generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
-                headers = {
-                    lead_id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
-                    device_identifier: (_d = (_c = settings.data.deviceInfo) === null || _c === void 0 ? void 0 : _c.browser) === null || _d === void 0 ? void 0 : _d.browser_id
-                };
                 requestBody = {
+                    id: ((_b = business.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.id) || '',
                     identification_id: params.nid,
                     identification_id_type: identification_id_type,
                     date_of_birth: params.dob,
@@ -179,18 +176,46 @@ export var updateLeadIdentity = createAsyncThunk('updateLeadIdentity', function
                     step_name: stepName,
                     encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
                 };
-                return [4, API.leadService.updateLeadIdentity(requestBody, { headers: headers })];
+                return [4, API.leadService.updateLeadIdentity(requestBody)];
             case 1:
-                data = (_g.sent()).data;
-                if (!data.errors && !params.isResend) {
+                data = (_e.sent()).data;
+                if (!data.errors) {
                     thunkApi.dispatch(updateStepName(stepName));
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_f = (_e = settings.data.appConfig).onStepCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, settings.data.activeScreen.name, requestBody);
+                    (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
     });
 }); });
+export var resendOTPLeadIdentity = createAsyncThunk('resendOTPLeadIdentity', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, business, _b, nid, dob, type, stepName, requestBody, data;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, business = _a.business;
+                _b = business.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                stepName = BUSINESS_STEP_NAMES.IDENTITY_AUTH;
+                requestBody = {
+                    id: ((_c = business.data.verify.responseBody) === null || _c === void 0 ? void 0 : _c.id) || '',
+                    identification_id: nid,
+                    identification_id_type: type,
+                    date_of_birth: dob,
+                    country_code: settings.data.businessCountry.iso2,
+                    step_name: stepName,
+                    encryption_contract: ['country_code', 'identification_id', 'identification_id_type', 'date_of_birth']
+                };
+                return [4, API.leadService.updateLeadIdentity(requestBody)];
+            case 1:
+                data = (_d.sent()).data;
+                if (!data.errors) {
+                    thunkApi.dispatch(updateStepName(stepName));
+                }
+                return [2, data];
+        }
+    });
+}); });
 export var retrieveEntityList = createAsyncThunk('retrieveEntityList', function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var data;
     return __generator(this, function (_a) {
@@ -403,13 +428,15 @@ export var updateLeadSuccess = createAsyncThunk('businessUpdateLeadSuccess', fun
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_h.sent()).data;
+                if (!!data.errors) return [3, 3];
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_g = data.entity) === null || _g === void 0 ? void 0 : _g.id))];
             case 2:
                 _h.sent();
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _h.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -543,10 +570,8 @@ export var businessSlice = createSlice({
             state.loading = false;
             state.error = action.error.message;
         })
-            .addCase(updateLeadIdentity.pending, function (state, action) {
-            var _a;
-            if (!((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend))
-                state.loading = true;
+            .addCase(updateLeadIdentity.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(updateLeadIdentity.fulfilled, function (state, action) {
@@ -567,6 +592,25 @@ export var businessSlice = createSlice({
             .addCase(updateLeadIdentity.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(resendOTPLeadIdentity.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPLeadIdentity.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var data = action.payload;
+            var description = (((_a = data === null || data === void 0 ? void 0 : data.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.nidData.responseBody = data;
+            state.data.otpData.otp = '';
+            state.data.otpData.isNID = true;
+        })
+            .addCase(resendOTPLeadIdentity.rejected, function (state, action) {
+            state.error = action.error.message;
         })
             .addCase(retrieveEntityList.pending, function (state) {
             state.error = null;

package/build/features/app/connect/connectStore.d.ts

@@ -3,23 +3,18 @@ import { ResponseData, MobileFormValues, NIDFormValues, OTPFormValues, Individua
 import { CancelToken } from 'axios';
 export declare const createMobileAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
-    formData: MobileFormValues & {
-        isResend: boolean;
-    };
-}, MobileFormValues & {
-    isResend: boolean;
-}, {}>;
+    formData: MobileFormValues;
+}, MobileFormValues, {}>;
+export declare const resendOTPMobile: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const createNIDAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: {
         type: string;
         nid: string;
         dob: string;
-        isResend: boolean;
     };
-}, NIDFormValues & {
-    isResend: boolean;
-}, {}>;
+}, NIDFormValues, {}>;
+export declare const resendOTPNID: import("@reduxjs/toolkit").AsyncThunk<any, void, {}>;
 export declare const verifyAuth: import("@reduxjs/toolkit").AsyncThunk<{
     response: any;
     formData: OTPFormValues;

package/build/features/app/connect/connectStore.js

@@ -82,7 +82,7 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
                 data = (_c.sent()).data;
-                if (!data.errors && !params.isResend) {
+                if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 }
@@ -90,13 +90,37 @@ export var createMobileAuth = createAsyncThunk('createMobileAuth', function (par
         }
     });
 }); });
-export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, identification_id_type, requestBody, data;
-    var _b, _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
+export var resendOTPMobile = createAsyncThunk('resendOTPMobile', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, _b, mobile, countryCode, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                _b = connect.data.mobileData, mobile = _b.mobile, countryCode = _b.countryCode;
+                requestBody = {
+                    lang: settings.data.language,
+                    user_credentail: {
+                        phone: mobile || '',
+                        code: countryCode.idd_prefix.toString()
+                    },
+                    sign_in: false,
+                    step_name: CONNECT_STEP_NAMES.CREATE_AUTH_MOBILE,
+                    encryption_contract: ['user_credentail.phone', 'user_credentail.code']
+                };
+                return [4, API.authService.createAuth(requestBody)];
+            case 1:
+                data = (_c.sent()).data;
+                return [2, data];
+        }
+    });
+}); });
+export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var settings, identification_id_type, requestBody, data;
+    var _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                settings = thunkApi.getState().settings;
                 identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
                 requestBody = {
                     lang: settings.data.language,
@@ -117,15 +141,46 @@ export var createNIDAuth = createAsyncThunk('createNIDAuth', function (params, t
                 };
                 return [4, API.authService.createAuth(requestBody)];
             case 1:
-                data = (_d.sent()).data;
-                if (!data.errors && !params.isResend) {
+                data = (_c.sent()).data;
+                if (!data.errors) {
                     thunkApi.dispatch(handleNextScreenStep());
-                    (_c = (_b = settings.data.appConfig).onStepCompleted) === null || _c === void 0 ? void 0 : _c.call(_b, settings.data.activeScreen.name, requestBody.user_credentail);
+                    (_b = (_a = settings.data.appConfig).onStepCompleted) === null || _b === void 0 ? void 0 : _b.call(_a, settings.data.activeScreen.name, requestBody.user_credentail);
                 }
                 return [2, { response: data, formData: __assign(__assign({}, params), { type: identification_id_type }) }];
         }
     });
 }); });
+export var resendOTPNID = createAsyncThunk('resendOTPNID', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var _a, settings, connect, _b, nid, dob, type, requestBody, data;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = thunkApi.getState(), settings = _a.settings, connect = _a.connect;
+                _b = connect.data.nidData, nid = _b.nid, dob = _b.dob, type = _b.type;
+                requestBody = {
+                    lang: settings.data.language,
+                    user_credentail: {
+                        identification_id: nid,
+                        identification_id_type: type,
+                        date_of_birth: dob,
+                        country_code: settings.data.businessCountry.iso2
+                    },
+                    sign_in: false,
+                    step_name: CONNECT_STEP_NAMES.CREATE_AUTH_NID,
+                    encryption_contract: [
+                        'user_credentail.country_code',
+                        'user_credentail.identification_id',
+                        'user_credentail.identification_id_type',
+                        'user_credentail.date_of_birth'
+                    ]
+                };
+                return [4, API.authService.createAuth(requestBody)];
+            case 1:
+                data = (_c.sent()).data;
+                return [2, data];
+        }
+    });
+}); });
 export var verifyAuth = createAsyncThunk('verifyAuth', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, connect, settings, isAbsher, _b, mobileData, nidData, responseBody, payload, data, params_1, params_2;
     var _c, _d;
@@ -279,7 +334,14 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     id: (isExistingUser ? (_h = brandData.responseBody) === null || _h === void 0 ? void 0 : _h.lead_id : (_j = otpData.responseBody) === null || _j === void 0 ? void 0 : _j.lead_id) || '',
                     terms_conditions_accepted: params.termAndConditionChecked,
                     step_name: CONNECT_STEP_NAMES.UPDATE_LEAD_MERCHANT,
-                    encryption_contract: ['brand.name.en', 'brand.name.ar', 'brand.name.zh', 'brand.website']
+                    encryption_contract: [
+                        'brand.name.en',
+                        'brand.name.ar',
+                        'brand.name.zh',
+                        'brand.website',
+                        'brand.social[0]',
+                        'brand.social[1]'
+                    ]
                 };
                 return [4, API.leadService.updateLead(payload)];
             case 1:
@@ -437,7 +499,6 @@ export var connectSlice = createSlice({
             .addCase(createMobileAuth.fulfilled, function (state, action) {
             var _a;
             state.loading = false;
-            state.customLoading = false;
             state.error = null;
             var _b = action.payload, formData = _b.formData, response = _b.response;
             var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
@@ -449,16 +510,30 @@ export var connectSlice = createSlice({
             state.data.mobileData.responseBody = response;
             state.data.otpData.isAbsher = false;
         })
-            .addCase(createMobileAuth.pending, function (state, action) {
-            if (action.meta.arg.isResend)
-                state.customLoading = true;
-            if (!action.meta.arg.isResend)
-                state.loading = true;
+            .addCase(createMobileAuth.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(createMobileAuth.rejected, function (state, action) {
             state.loading = false;
-            state.customLoading = false;
+            state.error = action.error.message;
+        })
+            .addCase(resendOTPMobile.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var response = action.payload;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.mobileData.responseBody = response;
+            state.data.otpData.isAbsher = false;
+        })
+            .addCase(resendOTPMobile.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPMobile.rejected, function (state, action) {
             state.error = action.error.message;
         })
             .addCase(createNIDAuth.fulfilled, function (state, action) {
@@ -475,14 +550,31 @@ export var connectSlice = createSlice({
             state.data.nidData.responseBody = response;
             state.data.otpData.isAbsher = true;
         })
-            .addCase(createNIDAuth.pending, function (state, action) {
-            var _a;
-            state.loading = ((_a = action.meta.arg) === null || _a === void 0 ? void 0 : _a.isResend) ? false : true;
+            .addCase(createNIDAuth.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(createNIDAuth.rejected, function (state, action) {
             state.loading = false;
             state.error = action.error.message;
+        })
+            .addCase(resendOTPNID.fulfilled, function (state, action) {
+            var _a;
+            state.error = null;
+            var response = action.payload;
+            var description = (((_a = response === null || response === void 0 ? void 0 : response.errors) === null || _a === void 0 ? void 0 : _a[0]) || {}).description;
+            if (description) {
+                state.error = description;
+                return;
+            }
+            state.data.nidData.responseBody = response;
+            state.data.otpData.isAbsher = true;
+        })
+            .addCase(resendOTPNID.pending, function (state) {
+            state.error = null;
+        })
+            .addCase(resendOTPNID.rejected, function (state, action) {
+            state.error = action.error.message;
         })
             .addCase(verifyAuth.fulfilled, function (state, action) {
             var _a;

package/build/features/app/individual/individualStore.d.ts

@@ -12,6 +12,7 @@ export declare const retrieveDataList: import("@reduxjs/toolkit").AsyncThunk<{
     sourceIncome: any;
     monthlyIncome: any;
     countryCode: string;
+    occupation: any;
     countries: import("../../../@types").CountryCode[];
 }, string, {}>;
 export declare const retrieveEntityInfo: import("@reduxjs/toolkit").AsyncThunk<{

package/build/features/app/individual/individualStore.js

@@ -107,22 +107,23 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
     });
 }); });
 export var retrieveDataList = createAsyncThunk('individualRetrieveDataList', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, _a, sourceIncome, monthlyIncome, countries;
+    var _a, sourceIncome, monthlyIncome, occupation, settings, countries;
     return __generator(this, function (_b) {
         switch (_b.label) {
-            case 0:
-                settings = thunkApi.getState().settings;
-                return [4, Promise.all([
-                        API.dataService.getSourceOfIncome(),
-                        API.dataService.getMonthlyIncome(countryCode)
-                    ])];
+            case 0: return [4, Promise.all([
+                    API.dataService.getSourceOfIncome(),
+                    API.dataService.getMonthlyIncome(countryCode),
+                    API.dataService.getOccupation()
+                ])];
             case 1:
-                _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data;
+                _a = _b.sent(), sourceIncome = _a[0].data, monthlyIncome = _a[1].data, occupation = _a[2];
+                settings = thunkApi.getState().settings;
                 countries = settings.data.countries;
                 return [2, {
                         sourceIncome: sourceIncome,
                         monthlyIncome: monthlyIncome,
                         countryCode: countryCode,
+                        occupation: occupation,
                         countries: countries
                     }];
         }
@@ -157,7 +158,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
                 data = (_g.sent()).data;
-                if (!!data.errors) return [3, 5];
+                if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 5];
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, { otp: params.otp });
                 steps = responseBody === null || responseBody === void 0 ? void 0 : responseBody.steps;
                 hasIndividualCompleted = hasKey(steps, INDIVIDUAl_STEP_NAMES.INDIVIDUAl_SUCCESS);
@@ -184,20 +185,21 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
                 requestBody = {
-                    id: (_c = (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.entity) === null || _c === void 0 ? void 0 : _c.id,
+                    id: (_b = individual.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.individual_id,
+                    occupation: (_c = params.occupation) === null || _c === void 0 ? void 0 : _c.id,
                     employer_name: params.employerName,
-                    employer_city: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
+                    employer_country: (_d = params.employerLocation) === null || _d === void 0 ? void 0 : _d.iso2,
                     source_income: [(_e = params.sourceIncome) === null || _e === void 0 ? void 0 : _e.id],
                     actual_income: (_f = params.monthlyIncome) === null || _f === void 0 ? void 0 : _f.id,
                     is_relative_PEP: params.isPEP,
                     is_influencer: params.isInfluencer,
-                    encryption_contract: ['employer_name', 'employer_city', 'actual_income'],
+                    encryption_contract: ['employer_name', 'employer_city', 'actual_income', 'source_income[0]'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
-                return [4, API.entityService.updateEntityInfo(requestBody)];
+                return [4, API.entityService.updateIndividualInfo(requestBody)];
             case 1:
                 data = (_j.sent()).data;
-                if (!data.errors) {
+                if (!(data === null || data === void 0 ? void 0 : data.errors)) {
                     thunkApi.dispatch(handleNextScreenStep());
                     (_h = (_g = settings.data.appConfig).onStepCompleted) === null || _h === void 0 ? void 0 : _h.call(_g, settings.data.activeScreen.name, requestBody);
                 }
@@ -224,13 +226,15 @@ export var updateLeadSuccess = createAsyncThunk('individualUpdateLeadSuccess', f
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
+                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _g.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });
@@ -246,6 +250,7 @@ var initialState = {
             otp: ''
         },
         individualData: {
+            occupation: undefined,
             sourceIncome: undefined,
             monthlyIncome: undefined,
             employerName: '',
@@ -337,9 +342,9 @@ export var individualSlice = createSlice({
             .addCase(retrieveDataList.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries;
+            var _a = action.payload, sourceIncome = _a.sourceIncome, monthlyIncome = _a.monthlyIncome, countryCode = _a.countryCode, countries = _a.countries, occupation = _a.occupation;
             var data = state.data.individualData.responseBody;
-            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [] });
+            state.data.individualData.responseBody = __assign(__assign({}, data), { sourceIncomeList: sourceIncome || [], monthlyIncomeList: monthlyIncome || [], occupationList: occupation || [] });
             var selectedSourceIncome = sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome[0];
             if (!!selectedSourceIncome)
                 state.data.individualData.sourceIncome = selectedSourceIncome;

package/build/features/app/password/passwordStore.js

@@ -192,13 +192,15 @@ export var updateLeadSuccess = createAsyncThunk('passwordUpdateLeadSuccess', fun
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
+                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _g.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });

package/build/features/app/tax/taxStore.js

@@ -191,13 +191,15 @@ export var updateLeadSuccess = createAsyncThunk('taxUpdateLeadSuccess', function
                 return [4, API.leadService.updateLead(payload)];
             case 1:
                 data = (_g.sent()).data;
+                if (!!data.errors) return [3, 3];
                 return [4, thunkApi.dispatch(retrieveEntityInfo((_b = data.entity) === null || _b === void 0 ? void 0 : _b.id))];
             case 2:
                 _g.sent();
                 (_d = (_c = settings.data.appConfig).onStepCompleted) === null || _d === void 0 ? void 0 : _d.call(_c, settings.data.activeScreen.name, params);
                 (_f = (_e = settings.data.appConfig).onFlowCompleted) === null || _f === void 0 ? void 0 : _f.call(_e, { data: data });
                 thunkApi.dispatch(handleNextScreenStep());
-                return [2, { response: data, formData: params }];
+                _g.label = 3;
+            case 3: return [2, { response: data, formData: params }];
         }
     });
 }); });

package/build/features/business/screens/IDBOD/IDBOD.js

@@ -44,7 +44,7 @@ var IDBOD = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(updateLeadIdentity(__assign(__assign({}, data), { isResend: false })));
+        dispatch(updateLeadIdentity(data));
     };
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);

package/build/features/business/screens/OTP/OTPInput.js

@@ -17,8 +17,8 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { businessSelector, updateLeadIdentity } from '../../../app/business/businessStore';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { resendOTPLeadIdentity } from '../../../app/business/businessStore';
+import { useAppDispatch } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -32,19 +32,13 @@ var OTPInput = function (_a) {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
-    var data = useAppSelector(businessSelector).data;
-    var nidData = data.nidData;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
     var handleOnResendOTP = function () {
         if (otpControl.field.value)
             setValue('otp', '', { shouldValidate: true });
-        var params = {
-            nid: nidData.nid,
-            dob: nidData.dob
-        };
-        dispatch(updateLeadIdentity(__assign(__assign({}, params), { isResend: true })));
+        dispatch(resendOTPLeadIdentity());
     };
     var otpValue = otpControl.field.value;
     return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));

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

@@ -96,7 +96,7 @@ var Mobile = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (formData) {
-        dispatch(createMobileAuth(__assign(__assign({}, formData), { isResend: false })));
+        dispatch(createMobileAuth(formData));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());

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

@@ -72,7 +72,7 @@ var NID = function (_a) {
         handleClearError();
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createNIDAuth(__assign(__assign({}, data), { isResend: false })));
+        dispatch(createNIDAuth(data));
     };
     var handleCollapseOpenClose = function (flag) {
         setCollapse(flag);

package/build/features/connect/screens/OTP/OTPInput.js

@@ -17,7 +17,7 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
-import { connectSelector, createMobileAuth, createNIDAuth } from '../../../app/connect/connectStore';
+import { connectSelector, resendOTPMobile, resendOTPNID } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -33,8 +33,6 @@ var OTPInput = function (_a) {
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
     var data = useAppSelector(connectSelector).data;
-    var mobileData = data.mobileData;
-    var nidData = data.nidData;
     var isAbsher = data.otpData.isAbsher;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
@@ -42,20 +40,12 @@ var OTPInput = function (_a) {
     var handleOnResendOTP = function () {
         if (otpControl.field.value)
             setValue('otp', '', { shouldValidate: true });
-        var params = {
-            countryCode: mobileData.countryCode,
-            mobile: mobileData.mobile
-        };
-        dispatch(createMobileAuth(__assign(__assign({}, params), { isResend: true })));
+        dispatch(resendOTPMobile());
     };
     var handleOnResendAbsherOTP = function () {
         if (otpControl.field.value)
             setValue('otp', '', { shouldValidate: true });
-        var params = {
-            nid: nidData.nid,
-            dob: nidData.dob
-        };
-        dispatch(createNIDAuth(__assign(__assign({}, params), { isResend: true })));
+        dispatch(resendOTPNID());
     };
     var otpValue = otpControl.field.value;
     return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: isAbsher ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));

package/build/features/individual/screens/AdditionalIndividualInfo/AdditionalIndividualInfo.js

@@ -30,11 +30,13 @@ import EmployerName from './EmployerName';
 import EmployerLocation from './EmployerLocation';
 import SourceOfIncome from './SourceOfIncome';
 import { individualSelector, updateIndividualInfo } from '../../../app/individual/individualStore';
+import Occupation from './Occupation';
 var ListType;
 (function (ListType) {
     ListType["SourceOfIncomeList"] = "SourceOfIncomeList";
     ListType["EmployerLocationList"] = "EmployerLocationList";
     ListType["MonthlyIncomeList"] = "MonthlyIncomeList";
+    ListType["OccupationList"] = "OccupationList";
 })(ListType || (ListType = {}));
 var AdditionalIndividualInfo = function (_a) {
     var t = useTranslation().t;
@@ -75,7 +77,11 @@ var AdditionalIndividualInfo = function (_a) {
     var isSourceOfIncomeListActive = listActive === ListType.SourceOfIncomeList;
     var isEmployerLocationListActive = listActive === ListType.EmployerLocationList;
     var isMonthlyIncomeListActive = listActive === ListType.MonthlyIncomeList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive && employerFieldsActive && !isMonthlyIncomeListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var isOccupationListActive = listActive === ListType.OccupationList;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Occupation, { onListOpen: function () { return handleMenuClick(ListType.OccupationList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isSourceOfIncomeListActive }), _jsx(SourceOfIncome, { onListOpen: function () { return handleMenuClick(ListType.SourceOfIncomeList); }, onListClose: function () { return handleMenuClick(); }, show: !isEmployerLocationListActive && !isMonthlyIncomeListActive && !isOccupationListActive }), _jsx(MonthlyIncome, { show: !isEmployerLocationListActive && !isSourceOfIncomeListActive && !isOccupationListActive, onListOpen: function () { return handleMenuClick(ListType.MonthlyIncomeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(EmployerName, { show: false }), _jsx(EmployerLocation, { show: !isSourceOfIncomeListActive &&
+                                    employerFieldsActive &&
+                                    !isMonthlyIncomeListActive &&
+                                    !isOccupationListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.EmployerLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(PEPSwitch, { show: !listActive }), _jsx(InfluencerSwitch, { show: !listActive })] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: !methods.formState.isValid, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(AdditionalIndividualInfo);
 AdditionalIndividualInfo.defaultProps = {};

package/build/features/individual/screens/AdditionalIndividualInfo/Occupation.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import { Occupation as OccupationType } from '../../../../@types';
+interface OccupationProps {
+    show: boolean;
+    onSelectOccupation?: (occupation: OccupationType) => void;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const Occupation: ({ ...rest }: OccupationProps) => JSX.Element;
+export default Occupation;

package/build/features/individual/screens/AdditionalIndividualInfo/Occupation.js

@@ -0,0 +1,89 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import { individualSelector } from '../../../app/individual/individualStore';
+import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+import CheckIcon from '@mui/icons-material/Check';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import SimpleList from '../../../../components/SimpleList';
+var Container = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
+});
+var CheckIconStyled = styled(CheckIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: theme.palette.success.main,
+        display: 'flex',
+        alignItems: 'flex-end'
+    });
+});
+var Occupation = function (_a) {
+    var _b, _c;
+    var rest = __rest(_a, []);
+    var _d = React.useState([]), occupationList = _d[0], setOccupationList = _d[1];
+    var _e = React.useState(null), anchorEl = _e[0], setAnchorEl = _e[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var data = useAppSelector(individualSelector).data;
+    var control = useFormContext().control;
+    var occupationsList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.occupationList) || [];
+    var occupationControl = useController({ control: control, name: 'occupation' });
+    React.useEffect(function () {
+        if ((occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.length) > 0) {
+            setOccupationList(occupationsList);
+        }
+    }, [occupationsList === null || occupationsList === void 0 ? void 0 : occupationsList.occupation]);
+    var onOpenList = function (event) {
+        var _a;
+        setAnchorEl(event.currentTarget);
+        (_a = rest.onListOpen) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var onCloseList = function () {
+        var _a;
+        setAnchorEl(null);
+        (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+    };
+    var onSelectItem = function (occupation) {
+        onCloseList();
+        occupationControl.field.onChange(occupation);
+    };
+    var occupation = occupationControl.field.value;
+    var error = (_c = occupationControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('occupation_title'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_occupation'), value: (isAr ? occupation === null || occupation === void 0 ? void 0 : occupation.name_ar : occupation === null || occupation === void 0 ? void 0 : occupation.name_en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name_en', list: occupationList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            return (_jsxs(_Fragment, { children: [_jsx(Container, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) }, { children: isAr ? item.name_ar : item === null || item === void 0 ? void 0 : item.name_en })) }), item.id === (occupation === null || occupation === void 0 ? void 0 : occupation.id) && _jsx(CheckIconStyled, {})] }));
+                        } }) }))] })) })));
+};
+export default Occupation;

package/build/features/individual/screens/AdditionalIndividualInfo/validation.d.ts

@@ -2,18 +2,21 @@ import * as yup from 'yup';
 import { ObjectShape } from 'yup/lib/object';
 import { CountryCode } from '../../../../@types';
 export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<ObjectShape, {
+    occupation: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;
     isPEP: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
     isInfluencer: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<ObjectShape, {
+    occupation: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;
     isPEP: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
     isInfluencer: import("yup/lib/boolean").RequiredBooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<ObjectShape, {
+    occupation: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     sourceIncome: import("yup/lib/object").RequiredObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     monthlyIncome: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     employerLocation: import("yup/lib/object").OptionalObjectSchema<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<Partial<Record<keyof CountryCode, yup.AnySchema<any, any, any> | import("yup/lib/Reference").default<unknown> | import("yup/lib/Lazy").default<any, any>>>>>;

package/build/features/individual/screens/AdditionalIndividualInfo/validation.js

@@ -1,5 +1,6 @@
 import * as yup from 'yup';
 export var IndividualInfoValidationSchema = yup.object().shape({
+    occupation: yup.object().required('alert_choose_occupation'),
     sourceIncome: yup.object().required('choose_any_source_of_income'),
     monthlyIncome: yup.object().optional(),
     employerLocation: yup.object().when('sourceIncome', function (sourceIncome) {

package/package.json

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