@tap-payments/auth-jsconnect 2.1.76-test → 2.1.78-test

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

@@ -81,7 +81,7 @@ export interface IndividualPersonalInfoFormValues {
     name: string;
     email: string;
     mobile: string | null;
-    countryCode: CountryCode | undefined;
+    countryCode: CountryCode;
     gender: string | null;
     nid: string;
     issuedCountry: CountryCode | undefined;

package/build/api/individual.d.ts

@@ -53,8 +53,12 @@ export declare type UpdateBrandBody = {
         };
     };
     segment?: {
-        type: string;
-        team: string;
+        type: {
+            id: string;
+        };
+        team: {
+            id: string;
+        };
     };
     term?: Array<string>;
     step_name?: string;
@@ -102,7 +106,7 @@ export declare type UpdateIndividualBody = {
     identification?: {
         id?: string;
         issued_country_code?: string;
-        expiry?: string;
+        expiry?: number;
         type?: string;
     };
     nationality?: string;

package/build/assets/locales/ar.json

@@ -382,5 +382,9 @@
     "place_birth_city_label": "مكان الميلاد",
     "Choose_place_birth_city": "- اختر -",
     "nationality_label": "الجنسية",
-    "Choose_nationality": "- اختر -"
+    "Choose_nationality": "- اختر -",
+    "share_count_label": "عدد الأسهم",
+    "share_count_hint": "0",
+    "share_value_label": "قيمة السهم",
+    "share_value_hint": "0000"
 }

package/build/assets/locales/en.json

@@ -412,5 +412,9 @@
     "place_birth_city_label": "Place of Birth City",
     "choose_place_birth_city": "- Please select -",
     "nationality_label": "Nationality",
-    "choose_nationality": "- Please select -"
+    "choose_nationality": "- Please select -",
+    "share_count_label": "Share Count",
+    "share_count_hint": "0",
+    "share_value_label": "Share Value",
+    "share_value_hint": "0000"
 }

package/build/features/app/brand/brandStore.js

@@ -271,7 +271,7 @@ export var updateBrand = createAsyncThunk('brandUpdateBrand', function (params,
                 requestBody = {
                     id: id,
                     name: { en: params === null || params === void 0 ? void 0 : params.brandName, ar: params === null || params === void 0 ? void 0 : params.brandName },
-                    segment: { type: ((_d = params.segment) === null || _d === void 0 ? void 0 : _d.id) || '', team: ((_e = params.teamSize) === null || _e === void 0 ? void 0 : _e.id) || '' },
+                    segment: { type: { id: ((_d = params.segment) === null || _d === void 0 ? void 0 : _d.id) || '' }, team: { id: ((_e = params.teamSize) === null || _e === void 0 ? void 0 : _e.id) || '' } },
                     channel_services: channel_services
                 };
                 return [4, API.brandService.updateBrandInfo(requestBody)];

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

@@ -455,7 +455,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                 brandReqBody_1 = {
                     id: (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id) || '',
                     channel_services: channel_services,
-                    segment: { type: ((_b = params.segment) === null || _b === void 0 ? void 0 : _b.id) || '', team: ((_c = params.teamSize) === null || _c === void 0 ? void 0 : _c.id) || '' },
+                    segment: { type: { id: ((_b = params.segment) === null || _b === void 0 ? void 0 : _b.id) || '' }, team: { id: ((_c = params.teamSize) === null || _c === void 0 ? void 0 : _c.id) || '' } },
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody_1)];
@@ -491,7 +491,7 @@ export var updateLeadBrand = createAsyncThunk('updateLeadBrand', function (param
                     channel_services: channel_services,
                     term: ['general'],
                     step_name: CONNECT_STEP_NAMES.UPDATE_BRAND_INFO,
-                    segment: { type: ((_g = params.segment) === null || _g === void 0 ? void 0 : _g.id) || '', team: ((_h = params.teamSize) === null || _h === void 0 ? void 0 : _h.id) || '' }
+                    segment: { type: { id: ((_g = params.segment) === null || _g === void 0 ? void 0 : _g.id) || '' }, team: { id: ((_h = params.teamSize) === null || _h === void 0 ? void 0 : _h.id) || '' } }
                 };
                 return [4, API.brandService.updateBrandInfo(brandReqBody)];
             case 6:

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

@@ -97,6 +97,7 @@ export interface IndividualData {
 }
 export interface IndividualState extends SharedState<IndividualData> {
     customLoading?: boolean;
+    cityLoading?: boolean;
 }
 export declare const individualSlice: import("@reduxjs/toolkit").Slice<IndividualState, {
     clearError: (state: IndividualState) => void;

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

@@ -70,15 +70,15 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
 import { FlowsTypes, IndividualGender, IndividualType, FieldType } from '../../../@types';
 import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
-import { IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
+import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
 import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, getEighteenYearsAgo, getIndividualName, getUserName, sleep } from '../../../utils';
 export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally;
     return __awaiter(void 0, void 0, void 0, function () {
-        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, board_id, board_info_id, notification, _b, id, type, payload_1, info, hasIndividualCompleted;
-        var _c, _d, _e, _f, _g, _h, _j;
-        return __generator(this, function (_k) {
-            switch (_k.label) {
+        var payload, settings, data, boardData, individualData, countryCode, boardInfoData, boardInfoStatus, countries, board_id, board_info_id, notification, _b, id, type, payload_1, info, hasIndividualCompleted, birthCountry;
+        var _c, _d, _e, _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     payload = {
                         service_name: 'tap_email',
@@ -87,7 +87,7 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                     settings = thunkApi.getState().settings;
                     return [4, API.leadService.verifyLeadToken(payload)];
                 case 1:
-                    data = (_k.sent()).data;
+                    data = (_l.sent()).data;
                     boardInfoStatus = undefined;
                     countries = settings.data.countries;
                     if (((_c = data.errors) === null || _c === void 0 ? void 0 : _c.length) || (data === null || data === void 0 ? void 0 : data.mw_error))
@@ -104,24 +104,24 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                     if (!(board_id && board_info_id)) return [3, 4];
                     return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
                 case 2:
-                    boardInfoData = _k.sent();
+                    boardInfoData = _l.sent();
                     notification = (boardInfoData || {}).notification;
                     _b = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _b.id, type = _b.type;
                     if (!(id && type)) return [3, 4];
                     return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode }))];
                 case 3:
-                    payload_1 = (_k.sent()).payload;
+                    payload_1 = (_l.sent()).payload;
                     individualData = payload_1.data || {};
-                    _k.label = 4;
+                    _l.label = 4;
                 case 4:
                     if (!board_id) return [3, 7];
                     return [4, API.boardService.retrieveBoardDetails(board_id)];
                 case 5:
-                    boardData = _k.sent();
+                    boardData = _l.sent();
                     return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
                 case 6:
-                    boardInfoStatus = _k.sent();
-                    _k.label = 7;
+                    boardInfoStatus = _l.sent();
+                    _l.label = 7;
                 case 7:
                     if (!countryCode) {
                         countryCode = (_d = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _d === void 0 ? void 0 : _d.country;
@@ -138,20 +138,21 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                     if (!((_f = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _f === void 0 ? void 0 : _f.id)) return [3, 10];
                     return [4, thunkApi.dispatch(getIndividualList((_g = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _g === void 0 ? void 0 : _g.id))];
                 case 9:
-                    _k.sent();
-                    _k.label = 10;
+                    _l.sent();
+                    _l.label = 10;
                 case 10:
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                     return [3, 14];
                 case 11:
-                    if (!countryCode) return [3, 13];
-                    return [4, thunkApi.dispatch(getCityList(countryCode))];
+                    birthCountry = ((_h = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _h === void 0 ? void 0 : _h.country) || countryCode;
+                    if (!birthCountry) return [3, 13];
+                    return [4, thunkApi.dispatch(getCityList(birthCountry))];
                 case 12:
-                    _k.sent();
-                    _k.label = 13;
+                    _l.sent();
+                    _l.label = 13;
                 case 13:
                     thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
-                    _k.label = 14;
+                    _l.label = 14;
                 case 14: return [2, {
                         data: data,
                         boardResponse: {
@@ -160,8 +161,8 @@ export var verifyLeadToken = createAsyncThunk('individualVerifyLeadToken', funct
                             entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                             merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                             merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                            name: (_h = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _h === void 0 ? void 0 : _h.names,
-                            contact: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.contact,
+                            name: (_j = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _j === void 0 ? void 0 : _j.names,
+                            contact: (_k = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _k === void 0 ? void 0 : _k.contact,
                             individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
                             countries: countries,
                             countryCode: countryCode,
@@ -192,14 +193,14 @@ export var resendOTP = createAsyncThunk('resendOTPIndividual', function (params,
     });
 }); });
 export var addDetailsAsync = createAsyncThunk('individual/addDetailsAsync', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var settings, user, userList, id, type, countryCode;
+    var settings, user, userList, id, type, birth, countryCode;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 settings = thunkApi.getState().settings;
                 user = params.user, userList = params.userList;
-                id = user.id, type = user.type;
-                countryCode = settings.data.businessCountry.iso2;
+                id = user.id, type = user.type, birth = user.birth;
+                countryCode = (birth === null || birth === void 0 ? void 0 : birth.country) || settings.data.businessCountry.iso2;
                 if (!countryCode) return [3, 2];
                 return [4, thunkApi.dispatch(getCityList(countryCode))];
             case 1:
@@ -281,7 +282,7 @@ export var getCityList = createAsyncThunk('individual/getCityList', function (co
     });
 }); });
 export var retrieveIndividualInfo = createAsyncThunk('individual/retrieveIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var id, type, countryCode, settings, data;
+    var id, type, countryCode, settings, data, individualData;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
@@ -290,7 +291,12 @@ export var retrieveIndividualInfo = createAsyncThunk('individual/retrieveIndivid
                 return [4, API.individualService.retrieveIndividual(id, type)];
             case 1:
                 data = _a.sent();
-                return [2, { data: __assign(__assign({}, ((data === null || data === void 0 ? void 0 : data.user) || {})), { type: type }), countryCode: countryCode, countries: settings.data.countries }];
+                individualData = data === null || data === void 0 ? void 0 : data.user;
+                if (type === IndividualType.SHARE_HOLDER)
+                    individualData = data === null || data === void 0 ? void 0 : data.shareholder;
+                else if (type === IndividualType.BOARD_MEMBER)
+                    individualData = data === null || data === void 0 ? void 0 : data.board_member;
+                return [2, { data: __assign(__assign({}, (individualData || {})), { type: type }), countryCode: countryCode, countries: settings.data.countries }];
         }
     });
 }); });
@@ -336,10 +342,10 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveIndividualBoardDetai
     });
 }); });
 export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, countryCode, boardInfoStatus, notification, _c, id, type, payload_2, info, hasIndividualCompleted;
-    var _d, _e, _f, _g, _h, _j, _k, _l, _m;
-    return __generator(this, function (_o) {
-        switch (_o.label) {
+    var _a, individual, settings, responseBody, _b, board_id, board_info_id, countries, payload, data, boardInfoData, individualData, boardData, countryCode, boardInfoStatus, notification, _c, id, type, payload_2, info, hasIndividualCompleted, birthCountry;
+    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    return __generator(this, function (_p) {
+        switch (_p.label) {
             case 0:
                 _a = thunkApi.getState(), individual = _a.individual, settings = _a.settings;
                 responseBody = individual.data.verify.responseBody;
@@ -354,31 +360,31 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 };
                 return [4, API.leadService.verifyLeadOTP(payload)];
             case 1:
-                data = (_o.sent()).data;
+                data = (_p.sent()).data;
                 boardInfoStatus = undefined;
                 if (!!(data === null || data === void 0 ? void 0 : data.errors)) return [3, 14];
                 if (!board_id) return [3, 4];
                 return [4, API.boardService.retrieveBoardInfoStatus(board_id)];
             case 2:
-                boardInfoStatus = _o.sent();
+                boardInfoStatus = _p.sent();
                 return [4, API.boardService.retrieveBoardDetails(board_id)];
             case 3:
-                boardData = _o.sent();
-                _o.label = 4;
+                boardData = _p.sent();
+                _p.label = 4;
             case 4:
                 countryCode = (_e = boardData === null || boardData === void 0 ? void 0 : boardData.entity) === null || _e === void 0 ? void 0 : _e.country;
                 if (!(board_id && board_info_id)) return [3, 7];
                 return [4, API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id })];
             case 5:
-                boardInfoData = _o.sent();
+                boardInfoData = _p.sent();
                 notification = (boardInfoData || {}).notification;
                 _c = (notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
                 if (!(id && type)) return [3, 7];
                 return [4, thunkApi.dispatch(retrieveIndividualInfo({ id: id, type: type, countryCode: countryCode }))];
             case 6:
-                payload_2 = (_o.sent()).payload;
+                payload_2 = (_p.sent()).payload;
                 individualData = payload_2.data || {};
-                _o.label = 7;
+                _p.label = 7;
             case 7:
                 info = (boardInfoStatus || {}).info;
                 hasIndividualCompleted = ((_f = info === null || info === void 0 ? void 0 : info.find(function (flow) { return flow.name === 'individual'; })) === null || _f === void 0 ? void 0 : _f.status) === 'completed';
@@ -391,20 +397,21 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                 if (!((_j = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _j === void 0 ? void 0 : _j.id)) return [3, 10];
                 return [4, thunkApi.dispatch(getIndividualList((_k = boardData === null || boardData === void 0 ? void 0 : boardData.business) === null || _k === void 0 ? void 0 : _k.id))];
             case 9:
-                _o.sent();
-                _o.label = 10;
+                _p.sent();
+                _p.label = 10;
             case 10:
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_LIST_STEP'));
                 return [3, 14];
             case 11:
-                if (!countryCode) return [3, 13];
-                return [4, thunkApi.dispatch(getCityList(countryCode))];
+                birthCountry = ((_l = individualData === null || individualData === void 0 ? void 0 : individualData.birth) === null || _l === void 0 ? void 0 : _l.country) || countryCode;
+                if (!birthCountry) return [3, 13];
+                return [4, thunkApi.dispatch(getCityList(birthCountry))];
             case 12:
-                _o.sent();
-                _o.label = 13;
+                _p.sent();
+                _p.label = 13;
             case 13:
                 thunkApi.dispatch(handleNextScreenStep('INDIVIDUAL_PERSONAL_INDIVIDUAL_INFO_STEP'));
-                _o.label = 14;
+                _p.label = 14;
             case 14: return [2, {
                     data: data,
                     boardResponse: {
@@ -413,8 +420,8 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
                         entity: boardData === null || boardData === void 0 ? void 0 : boardData.entity,
                         merchant: boardData === null || boardData === void 0 ? void 0 : boardData.merchant,
                         merchant_id: boardInfoData === null || boardInfoData === void 0 ? void 0 : boardInfoData.merchant_id,
-                        name: (_l = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _l === void 0 ? void 0 : _l.names,
-                        contact: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.contact,
+                        name: (_m = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _m === void 0 ? void 0 : _m.names,
+                        contact: (_o = boardData === null || boardData === void 0 ? void 0 : boardData.user) === null || _o === void 0 ? void 0 : _o.contact,
                         individuals: boardData === null || boardData === void 0 ? void 0 : boardData.individuals,
                         countries: countries,
                         countryCode: countryCode,
@@ -427,7 +434,7 @@ export var verifyLeadOTP = createAsyncThunk('verifyIndividualLeadOTP', function
     });
 }); });
 export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateIndividualPersonalInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, notification, user, entity, _c, id, type, name, email, mobile, countryCode, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isNameEditable, isEmailEditable, isMobileNumberEditable, isMobileCountryEditable, isNidEditable, isIssuedCountryEditable, isExpiryEditable, isIdTypeEditable, isNationalityEditable, requestBody, data;
+    var _a, settings, individual, _b, notification, user, entity, _c, id, type, name, email, mobile, countryCode, gender, nid, issuedCountry, expiryDate, dob, placeOfBirthCountry, placeOfBirthCity, nationality, code, data_status, userName, identification_id_type, isNameEditable, isEmailEditable, isMobileNumberEditable, isMobileCountryEditable, isNidEditable, isIssuedCountryEditable, isExpiryEditable, isIdTypeEditable, isNationalityEditable, hasContact, hasPhone, hasIdentification, hasBirth, names, contact, requestBody, data;
     var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
     return __generator(this, function (_s) {
         switch (_s.label) {
@@ -439,40 +446,53 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                 code = entity === null || entity === void 0 ? void 0 : entity.country;
                 data_status = (user || {}).data_status;
                 userName = getIndividualName(name);
-                identification_id_type = params.nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
-                isNameEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.name) === FieldType.EDITABLE;
+                identification_id_type = nid && (nid === null || nid === void 0 ? void 0 : nid.startsWith('1')) ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA;
+                isNameEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.name) === FieldType.EDITABLE && userName;
                 isEmailEditable = ((_d = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _d === void 0 ? void 0 : _d.email) === FieldType.EDITABLE;
-                isMobileNumberEditable = ((_f = (_e = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _e === void 0 ? void 0 : _e.phone) === null || _f === void 0 ? void 0 : _f.number) === FieldType.EDITABLE;
+                isMobileNumberEditable = ((_f = (_e = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _e === void 0 ? void 0 : _e.phone) === null || _f === void 0 ? void 0 : _f.number) === FieldType.EDITABLE && mobile;
                 isMobileCountryEditable = ((_h = (_g = data_status === null || data_status === void 0 ? void 0 : data_status.contact) === null || _g === void 0 ? void 0 : _g.phone) === null || _h === void 0 ? void 0 : _h.country_code) === FieldType.EDITABLE;
-                isNidEditable = ((_j = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _j === void 0 ? void 0 : _j.id) === FieldType.EDITABLE;
+                isNidEditable = ((_j = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _j === void 0 ? void 0 : _j.id) === FieldType.EDITABLE && nid;
                 isIssuedCountryEditable = ((_k = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _k === void 0 ? void 0 : _k.issuer_country) === FieldType.EDITABLE;
-                isExpiryEditable = ((_l = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _l === void 0 ? void 0 : _l.expiry) === FieldType.EDITABLE;
-                isIdTypeEditable = ((_m = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _m === void 0 ? void 0 : _m.type) === FieldType.EDITABLE;
+                isExpiryEditable = ((_l = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _l === void 0 ? void 0 : _l.expiry) === FieldType.EDITABLE && expiryDate;
+                isIdTypeEditable = ((_m = data_status === null || data_status === void 0 ? void 0 : data_status.identification) === null || _m === void 0 ? void 0 : _m.type) === FieldType.EDITABLE && identification_id_type;
                 isNationalityEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.nationality) === FieldType.EDITABLE;
+                hasContact = email || mobile || countryCode;
+                hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
+                hasIdentification = nid || issuedCountry || identification_id_type || expiryDate;
+                hasBirth = placeOfBirthCity || placeOfBirthCountry;
+                names = isNameEditable
+                    ? {
+                        en: userName,
+                        ar: userName
+                    }
+                    : undefined;
+                contact = hasContact
+                    ? {
+                        email: isEmailEditable ? email : undefined,
+                        phone: hasPhone
+                            ? {
+                                country_code: isMobileCountryEditable ? (_o = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _o === void 0 ? void 0 : _o.toString() : undefined,
+                                number: isMobileNumberEditable ? mobile : undefined
+                            }
+                            : undefined
+                    }
+                    : undefined;
                 requestBody = {
                     id: id,
                     type: type,
-                    names: isNameEditable
+                    names: names,
+                    gender: gender || undefined,
+                    contact: contact,
+                    identification: hasIdentification
                         ? {
-                            en: userName,
-                            ar: userName
+                            id: isNidEditable ? nid : undefined,
+                            issued_country_code: isIssuedCountryEditable ? issuedCountry === null || issuedCountry === void 0 ? void 0 : issuedCountry.iso2 : undefined,
+                            expiry: isExpiryEditable ? new Date(expiryDate).getTime() : undefined,
+                            type: isIdTypeEditable ? identification_id_type : undefined
                         }
                         : undefined,
-                    gender: gender || '',
-                    contact: {
-                        email: isEmailEditable ? email : undefined,
-                        phone: {
-                            country_code: isMobileCountryEditable ? (_o = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _o === void 0 ? void 0 : _o.toString() : undefined,
-                            number: isMobileNumberEditable ? mobile || '' : undefined
-                        }
-                    },
-                    identification: {
-                        id: isNidEditable ? nid : undefined,
-                        issued_country_code: isIssuedCountryEditable ? issuedCountry === null || issuedCountry === void 0 ? void 0 : issuedCountry.iso2 : undefined,
-                        type: isIdTypeEditable ? identification_id_type : undefined
-                    },
                     date_of_birth: dob,
-                    birth: {
+                    birth: hasBirth && {
                         city: (_p = placeOfBirthCity === null || placeOfBirthCity === void 0 ? void 0 : placeOfBirthCity.name) === null || _p === void 0 ? void 0 : _p.en,
                         country: placeOfBirthCountry === null || placeOfBirthCountry === void 0 ? void 0 : placeOfBirthCountry.iso2
                     },
@@ -493,10 +513,10 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
     });
 }); });
 export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, individual, _b, notification, user, isOccupationEditable, isSourceIncomeEditable, isPEPEditable, isInfluencerEditable, _c, id, type, civilID, signatureFileId, businessCountry, documentsList, requestBody, documentBody, data;
-    var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    return __generator(this, function (_p) {
-        switch (_p.label) {
+    var _a, settings, individual, _b, notification, user, isOccupationEditable, isSourceIncomeEditable, isPEPEditable, isInfluencerEditable, occupation, employerName, sourceIncome, monthlyIncome, isPEP, isInfluencer, _c, id, type, civilID, signatureFileId, businessCountry, documentsList, requestBody, documentBody, data;
+    var _d, _e, _f, _g, _h, _j;
+    return __generator(this, function (_k) {
+        switch (_k.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, individual = _a.individual;
                 _b = individual.data.verify.responseBody || {}, notification = _b.notification, user = _b.user;
@@ -504,6 +524,7 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 isSourceIncomeEditable = ((_e = user === null || user === void 0 ? void 0 : user.data_status) === null || _e === void 0 ? void 0 : _e.source_of_income) === FieldType.EDITABLE;
                 isPEPEditable = ((_f = user === null || user === void 0 ? void 0 : user.data_status) === null || _f === void 0 ? void 0 : _f.is_relative_PEP) === FieldType.EDITABLE;
                 isInfluencerEditable = ((_g = user === null || user === void 0 ? void 0 : user.data_status) === null || _g === void 0 ? void 0 : _g.is_influencer) === FieldType.EDITABLE;
+                occupation = params.occupation, employerName = params.employerName, sourceIncome = params.sourceIncome, monthlyIncome = params.monthlyIncome, isPEP = params.isPEP, isInfluencer = params.isInfluencer;
                 _c = ((user === null || user === void 0 ? void 0 : user.is_authorized) ? user : notification === null || notification === void 0 ? void 0 : notification.recipient) || {}, id = _c.id, type = _c.type;
                 civilID = params.civilID, signatureFileId = params.signatureFileId;
                 businessCountry = settings.data.businessCountry;
@@ -515,14 +536,13 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 requestBody = {
                     id: id,
                     type: type,
-                    occupation: isOccupationEditable ? { id: (_h = params.occupation) === null || _h === void 0 ? void 0 : _h.id } : undefined,
-                    employer_name: params.employerName,
-                    employer_country: (_j = params.employerLocation) === null || _j === void 0 ? void 0 : _j.iso2,
-                    source_income: isSourceIncomeEditable ? [{ id: (_k = params.sourceIncome) === null || _k === void 0 ? void 0 : _k.id }] : undefined,
-                    monthly_income: { id: (_l = params.monthlyIncome) === null || _l === void 0 ? void 0 : _l.id },
-                    is_relative_PEP: isPEPEditable ? params.isPEP : undefined,
-                    is_influencer: isInfluencerEditable ? params.isInfluencer : undefined,
-                    encryption_contract: ['employer_name', 'employer_country'],
+                    occupation: isOccupationEditable ? { id: occupation === null || occupation === void 0 ? void 0 : occupation.id } : undefined,
+                    employer_name: employerName,
+                    source_income: isSourceIncomeEditable ? [{ id: sourceIncome === null || sourceIncome === void 0 ? void 0 : sourceIncome.id }] : undefined,
+                    monthly_income: { id: monthlyIncome === null || monthlyIncome === void 0 ? void 0 : monthlyIncome.id },
+                    is_relative_PEP: isPEPEditable ? isPEP : undefined,
+                    is_influencer: isInfluencerEditable ? isInfluencer : undefined,
+                    encryption_contract: ['employer_name'],
                     step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO
                 };
                 documentBody = {
@@ -533,13 +553,13 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                 if (!(documentsList.length > 0)) return [3, 2];
                 return [4, API.entityService.updateDocumentInfo(documentBody)];
             case 1:
-                _p.sent();
-                _p.label = 2;
+                _k.sent();
+                _k.label = 2;
             case 2: return [4, API.individualService.updateIndividual(requestBody)];
             case 3:
-                data = (_p.sent()).data;
+                data = (_k.sent()).data;
                 thunkApi.dispatch(handleNextScreenStep());
-                (_o = (_m = settings.data.appConfig).onStepCompleted) === null || _o === void 0 ? void 0 : _o.call(_m, settings.data.activeScreen.name, requestBody);
+                (_j = (_h = settings.data.appConfig).onStepCompleted) === null || _j === void 0 ? void 0 : _j.call(_h, settings.data.activeScreen.name, requestBody);
                 return [2, { data: data, formData: params }];
         }
     });
@@ -578,6 +598,7 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
 var initialState = {
     error: null,
     loading: false,
+    cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
         verify: {
@@ -590,7 +611,7 @@ var initialState = {
             name: '',
             email: '',
             mobile: '',
-            countryCode: undefined,
+            countryCode: defaultCountry,
             gender: IndividualGender.MALE,
             nid: '',
             issuedCountry: undefined,
@@ -739,7 +760,7 @@ export var individualSlice = createSlice({
             if ((_a = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _a === void 0 ? void 0 : _a.number)
                 state.data.individualPersonalData.mobile = (_b = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _b === void 0 ? void 0 : _b.number;
             if ((_c = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _c === void 0 ? void 0 : _c.country_code) {
-                state.data.individualPersonalData.countryCode = findCountryByIddPrefix(countries, (_d = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _d === void 0 ? void 0 : _d.country_code);
+                state.data.individualPersonalData.countryCode = findCountryByIddPrefix(countries, (_d = contact === null || contact === void 0 ? void 0 : contact.phone) === null || _d === void 0 ? void 0 : _d.country_code) || defaultCountry;
             }
             if (gender)
                 state.data.individualPersonalData.gender = gender.toLowerCase();
@@ -833,17 +854,17 @@ export var individualSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(getCityList.pending, function (state) {
-            state.loading = true;
+            state.cityLoading = true;
             state.error = null;
         })
             .addCase(getCityList.fulfilled, function (state, action) {
-            state.loading = false;
+            state.cityLoading = false;
             state.error = null;
             var data = state.data.verify.responseBody;
             state.data.verify.responseBody = __assign(__assign({}, data), { cityList: action.payload });
         })
             .addCase(getCityList.rejected, function (state, action) {
-            state.loading = false;
+            state.cityLoading = false;
             state.error = action.error.message;
         })
             .addCase(updateIndividualPersonalInfo.pending, function (state) {

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

@@ -64,7 +64,7 @@ var AdditionalIndividualInfo = function (_a) {
     var isAuthorizedUser = user === null || user === void 0 ? void 0 : user.is_authorized;
     var _c = data.individualData, occupation = _c.occupation, sourceIncome = _c.sourceIncome, monthlyIncome = _c.monthlyIncome, employerName = _c.employerName, employerLocation = _c.employerLocation, isPEP = _c.isPEP, isInfluencer = _c.isInfluencer, civilID = _c.civilID, signatureFileId = _c.signatureFileId, civilIDUploading = _c.civilIDUploading, signatureFileUploading = _c.signatureFileUploading;
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema(isAuthorizedUser, user === null || user === void 0 ? void 0 : user.type, user === null || user === void 0 ? void 0 : user.data_status)),
+        resolver: yupResolver(IndividualInfoValidationSchema(isAuthorizedUser, user)),
         defaultValues: {
             occupation: occupation,
             sourceIncome: sourceIncome,

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

@@ -75,7 +75,7 @@ var EmployerLocation = React.forwardRef(function (_a, ref) {
     };
     var location = employerLocationControl.field.value;
     var error = (_b = employerLocationControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('tap_js_employer_address_city'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_employee_location'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { required: true, label: t('tap_js_employer_address_city'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_employee_location'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

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

@@ -34,8 +34,8 @@ var ShareValue = function (_a) {
     var shareValueControl = useController({ control: control, name: 'shareValue' });
     var shareValueValue = shareValueControl.field.value;
     var error = (_b = shareValueControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('capital_share_value_label', {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { label: t('share_value_label', {
                     currency: t(findCurrencyByIso2(countryCode))
-                }), onChange: handleChange, value: shareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_share_value_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
+                }), onChange: handleChange, value: shareValueValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('share_value_hint'), warningType: 'alert', warningMessage: error && t(error) }) })) })));
 };
 export default React.memo(ShareValue);

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

@@ -1,7 +1,7 @@
 import * as yup from 'yup';
 import { ObjectShape } from 'yup/lib/object';
-import { IndividualType } from '../../../../@types';
-export declare const IndividualInfoValidationSchema: (isAuthorizedUser: boolean, type: IndividualType, dataStatus: any) => yup.ObjectSchema<import("yup/lib/object").Assign<ObjectShape, {
+import { User } from '../../../../@types';
+export declare const IndividualInfoValidationSchema: (isAuthorizedUser: boolean, user: User) => yup.ObjectSchema<import("yup/lib/object").Assign<ObjectShape, {
     occupation: import("yup/lib/object").OptionalObjectSchema<ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<ObjectShape>>;
     sourceIncome: import("yup/lib/object").OptionalObjectSchema<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>>;

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

@@ -1,10 +1,11 @@
 import * as yup from 'yup';
 import { IndividualType, FieldType } from '../../../../@types';
-export var IndividualInfoValidationSchema = function (isAuthorizedUser, type, dataStatus) {
-    var isOccupationOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.occupation) === FieldType.NON_EDITABLE;
-    var isSourceIncomeOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.source_of_income) === FieldType.NON_EDITABLE;
-    var isPEPOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.is_relative_PEP) === FieldType.NON_EDITABLE;
-    var isInfluencerOptional = (dataStatus === null || dataStatus === void 0 ? void 0 : dataStatus.is_influencer) === FieldType.NON_EDITABLE;
+export var IndividualInfoValidationSchema = function (isAuthorizedUser, user) {
+    var _a = user || {}, type = _a.type, data_status = _a.data_status, occupation = _a.occupation, source_income = _a.source_income, is_relative_PEP = _a.is_relative_PEP, is_influencer = _a.is_influencer;
+    var isOccupationOptional = !occupation && (data_status === null || data_status === void 0 ? void 0 : data_status.occupation) === FieldType.NON_EDITABLE;
+    var isSourceIncomeOptional = !source_income && (data_status === null || data_status === void 0 ? void 0 : data_status.source_of_income) === FieldType.NON_EDITABLE;
+    var isPEPOptional = is_relative_PEP === undefined && (data_status === null || data_status === void 0 ? void 0 : data_status.is_relative_PEP) === FieldType.NON_EDITABLE;
+    var isInfluencerOptional = is_influencer === undefined && (data_status === null || data_status === void 0 ? void 0 : data_status.is_influencer) === FieldType.NON_EDITABLE;
     return yup.object().shape({
         occupation: type === IndividualType.USER && !isOccupationOptional ? yup.object().required('alert_choose_occupation') : yup.object().optional(),
         sourceIncome: type === IndividualType.USER && !isSourceIncomeOptional ? yup.object().required('choose_any_source_of_income') : yup.object().optional(),

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

@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { styled } from '@mui/material/styles';
 import Box from '@mui/material/Box';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Text from '../../../../components/Text';
 import Button from '../../../../components/Button';
 import Collapse from '../../../../components/Collapse';
@@ -48,9 +48,8 @@ export var SubTitleStyled = styled(Text)(function (_a) {
 });
 var IndividualList = function () {
     var dispatch = useAppDispatch();
-    var isAr = useLanguage().isAr;
     var t = useTranslation().t;
-    var _a = useAppSelector(individualSelector), data = _a.data, loading = _a.loading, error = _a.error;
+    var error = useAppSelector(individualSelector).error;
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };

package/build/features/individual/screens/IndividualPersonalInfo/BirthCity.js

@@ -25,14 +25,15 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import CheckIcon from '@mui/icons-material/Check';
-import { useAppSelector } from '../../../../hooks';
+import CircularProgress from '@mui/material/CircularProgress';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Text from '../../../../components/Text';
 import SimpleList from '../../../../components/SimpleList';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { individualSelector } from '../../../app/individual/individualStore';
+import { getCityList, individualSelector } from '../../../app/individual/individualStore';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -54,16 +55,33 @@ var BirthCity = React.forwardRef(function (_a, ref) {
     var _c = React.useState([]), locationCities = _c[0], setCities = _c[1];
     var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
     var t = useTranslation().t;
-    var control = useFormContext().control;
-    var data = useAppSelector(individualSelector).data;
+    var dispatch = useAppDispatch();
+    var _e = useFormContext(), control = _e.control, getValues = _e.getValues, setValue = _e.setValue;
+    var _f = useAppSelector(individualSelector), data = _f.data, cityLoading = _f.cityLoading;
     var cityList = (data.verify.responseBody || {}).cityList;
     var placeOfBirthCityControl = useController({ control: control, name: 'placeOfBirthCity' });
+    var birthCountry = getValues('placeOfBirthCountry');
     React.useEffect(function () {
+        var _a;
         if ((cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0) {
+            var listCountry = (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country;
+            if (cityValue && listCountry !== cityValue.country)
+                setValue('placeOfBirthCity', undefined);
             var list = __spreadArray([], cityList, true);
             setCities(list);
         }
     }, [cityList]);
+    React.useEffect(function () {
+        var _a, _b;
+        var user = (data.verify.responseBody || {}).user;
+        var listCountry = (cityList === null || cityList === void 0 ? void 0 : cityList.length) > 0 ? (_a = cityList[0]) === null || _a === void 0 ? void 0 : _a.country : (_b = user === null || user === void 0 ? void 0 : user.birth) === null || _b === void 0 ? void 0 : _b.country;
+        var iso2 = (birthCountry || {}).iso2;
+        if (!listCountry || !iso2)
+            return;
+        if (listCountry !== iso2) {
+            dispatch(getCityList(iso2));
+        }
+    }, [birthCountry]);
     var onOpenCitySelect = function (event) {
         setAnchorEl(event.currentTarget);
         onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
@@ -83,7 +101,7 @@ var BirthCity = React.forwardRef(function (_a, ref) {
     };
     var cityValue = placeOfBirthCityControl.field.value;
     var error = (_b = placeOfBirthCityControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_birth_city_label'), readOnly: true, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_birth_city_label'), readOnly: true, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: cityLoading ? undefined : !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: cityLoading ? _jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } }) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) }, { children: getName(item) })) }), item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/BirthCountry.js

@@ -75,7 +75,7 @@ var BirthCountry = React.forwardRef(function (_a, ref) {
     };
     var location = placeOfBirthCountryControl.field.value;
     var error = (_b = placeOfBirthCountryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_of_birth_country_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('place_of_birth_country_label'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

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

@@ -22,7 +22,7 @@ import { IndividualType } from '../../../../@types';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
-import { individualSelector, updateIndividualPersonalInfo } from '../../../app/individual/individualStore';
+import { clearError, individualSelector, updateIndividualPersonalInfo } from '../../../app/individual/individualStore';
 import Button from '../../../shared/Button';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { IndividualInfoValidationSchema } from './validation';
@@ -56,7 +56,7 @@ var IndividualPersonalInfo = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error, cityLoading = _b.cityLoading;
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
     var verify = data.verify, individualPersonalData = data.individualPersonalData;
@@ -87,7 +87,13 @@ var IndividualPersonalInfo = function (_a) {
     var onSubmit = function (data) {
         dispatch(updateIndividualPersonalInfo(data));
     };
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
     var onBack = function () {
+        if (error)
+            dispatch(clearError());
         dispatch(handleCurrentActiveScreen('INDIVIDUAL_LIST_STEP'));
     };
     var handleMenuClick = function (flag) {
@@ -114,7 +120,7 @@ var IndividualPersonalInfo = function (_a) {
             return t('type_board_member');
         return t('type_user');
     };
-    var disabled = !methods.formState.isValid;
+    var disabled = !methods.formState.isValid || cityLoading;
     var showField = !listActive && !dobActive && !expiryDateActive;
     var isIssuedCountryListActive = listActive === ListType.IssuedCountryList;
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;

package/build/features/individual/screens/IndividualPersonalInfo/IssuedCountry.js

@@ -81,7 +81,7 @@ var IssuedCountry = React.forwardRef(function (_a, ref) {
     };
     var location = issuedCountryControl.field.value;
     var error = (_d = issuedCountryControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('issued_country_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_issued_country'), value: (isAr ? (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.arabic : (_f = location === null || location === void 0 ? void 0 : location.name) === null || _f === void 0 ? void 0 : _f.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('issued_country_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_issued_country'), value: (isAr ? (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.arabic : (_f = location === null || location === void 0 ? void 0 : location.name) === null || _f === void 0 ? void 0 : _f.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/MobileNumber.js

@@ -138,7 +138,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', disabled: disabled || !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: disabled ? undefined : function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: disabled ? (_jsx(_Fragment, {})) : !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', disabled: disabled || !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: disabled ? undefined : function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: disabled ? (_jsx(_Fragment, {})) : !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/Nationality.js

@@ -81,7 +81,7 @@ var Nationality = React.forwardRef(function (_a, ref) {
     };
     var location = nationalityControl.field.value;
     var error = (_c = nationalityControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('nationality_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_nationality'), value: (isAr ? (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.arabic : (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['idd_prefix', 'capital', 'name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(Input, { label: t('nationality_label'), readOnly: true, disabled: disabled, onClick: disabled ? undefined : !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: disabled ? _jsx(_Fragment, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_nationality'), value: (isAr ? (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.arabic : (_e = location === null || location === void 0 ? void 0 : location.name) === null || _e === void 0 ? void 0 : _e.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIconStyled, {})] }));
                         } }) }))] })) })));
 });

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     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, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
@@ -60,17 +49,19 @@ var FormStyled = styled(Form)(function () { return ({
 var VerifyNumber = function (_a) {
     var _b, _c;
     var dispatch = useAppDispatch();
-    var _d = useAppSelector(individualSelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var _e = data.otpData, responseBody = _e.responseBody, defaultValues = __rest(_e, ["responseBody"]);
+    var _d = useAppSelector(individualSelector), data = _d.data, loading = _d.loading, error = _d.error, cityLoading = _d.cityLoading;
+    var otp = data.otpData.otp;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            otp: otp
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.otpData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
+    var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
     var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
@@ -86,6 +77,8 @@ var VerifyNumber = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    var dataLoading = loading || cityLoading;
+    var showMobileNumber = !loading && !cityLoading && phone;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [dataLoading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), showMobileNumber && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(VerifyNumber);

package/package.json

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