@tap-payments/auth-jsconnect 2.1.77-test → 2.1.79-test

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

@@ -241,8 +241,12 @@ export interface LocalProps {
 }
 export declare type BrandInfo = {
     segment?: {
-        type: string;
-        team: string;
+        type: {
+            id: string;
+        };
+        team: {
+            id: string;
+        };
     };
     id: string;
     name: {

package/build/api/entity.d.ts

@@ -44,10 +44,10 @@ export declare type BankDocumentInfo = {
 export declare type EntityBankUpdateBody = {
     wallet_id: string;
     bank_account: {
-        bank_name: string;
-        beneficiary_name: string;
+        bank_name?: string;
+        beneficiary_name?: string;
         bank_statement_file_id?: string;
-        iban: string;
+        iban?: string;
         swift_code?: string;
         account_number?: string;
         is_acknowledged: boolean;

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,10 @@
     "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",
+    "brand": "الاسم التجاري"
 }

package/build/assets/locales/en.json

@@ -412,5 +412,10 @@
     "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",
+    "brand": "Brand"
 }

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

@@ -48,7 +48,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var _a;
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import API from '../../../api';
-import { FlowsTypes } from '../../../@types';
+import { FieldType, FlowsTypes } from '../../../@types';
 import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { BANK_STEP_NAMES } from '../../../constants';
 export var verifyLeadToken = createAsyncThunk('bankVerifyLeadToken', function (_a, thunkApi) {
@@ -180,21 +180,26 @@ export var retrieveBoardDetails = createAsyncThunk('retrieveBankEntityInfo', fun
     });
 }); });
 export var createBankAccount = createAsyncThunk('createBankAccount', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, requestBody, data;
-    var _b, _c, _d, _e, _f, _g, _h;
-    return __generator(this, function (_j) {
-        switch (_j.label) {
+    var _a, settings, bank, iban, beneficiaryName, bankName, bankStatementId, confirmPolicy, bank_account, isIBANEditable, isBeneficiaryNameEditable, isBankNameEditable, isBankStatementIdEditable, requestBody, data;
+    var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+    return __generator(this, function (_o) {
+        switch (_o.label) {
             case 0:
                 _a = thunkApi.getState(), settings = _a.settings, bank = _a.bank;
                 iban = params.iban, beneficiaryName = params.beneficiaryName, bankName = params.bankName, bankStatementId = params.bankStatementId, confirmPolicy = params.confirmPolicy;
+                bank_account = (bank.data.verify.responseBody || {}).bank_account;
+                isIBANEditable = ((_b = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _b === void 0 ? void 0 : _b.iban) === FieldType.EDITABLE;
+                isBeneficiaryNameEditable = ((_c = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _c === void 0 ? void 0 : _c.beneficiary_name) === FieldType.EDITABLE;
+                isBankNameEditable = ((_d = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _d === void 0 ? void 0 : _d.bank_name) === FieldType.EDITABLE;
+                isBankStatementIdEditable = ((_e = bank_account === null || bank_account === void 0 ? void 0 : bank_account.data_status) === null || _e === void 0 ? void 0 : _e.bank_statement_file_id) === FieldType.EDITABLE;
                 requestBody = {
-                    wallet_id: (_f = (_e = (_d = (_c = (_b = bank.data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.business) === null || _c === void 0 ? void 0 : _c.entity) === null || _d === void 0 ? void 0 : _d.merchant) === null || _e === void 0 ? void 0 : _e.wallet) === null || _f === void 0 ? void 0 : _f.id,
+                    wallet_id: (_k = (_j = (_h = (_g = (_f = bank.data.verify.responseBody) === null || _f === void 0 ? void 0 : _f.business) === null || _g === void 0 ? void 0 : _g.entity) === null || _h === void 0 ? void 0 : _h.merchant) === null || _j === void 0 ? void 0 : _j.wallet) === null || _k === void 0 ? void 0 : _k.id,
                     bank_account: {
-                        iban: iban,
-                        beneficiary_name: beneficiaryName,
-                        bank_name: bankName,
+                        iban: isIBANEditable ? iban : undefined,
+                        beneficiary_name: isBeneficiaryNameEditable ? beneficiaryName : undefined,
+                        bank_name: isBankNameEditable ? bankName : undefined,
                         is_acknowledged: confirmPolicy,
-                        document: (bankStatementId || []).length > 0
+                        document: isBankStatementIdEditable && (bankStatementId || []).length > 0
                             ? {
                                 type: 'bank_statement',
                                 files: bankStatementId || []
@@ -206,10 +211,10 @@ export var createBankAccount = createAsyncThunk('createBankAccount', function (p
                 };
                 return [4, API.entityService.createBankAccount(requestBody)];
             case 1:
-                data = (_j.sent()).data;
+                data = (_o.sent()).data;
                 if (!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);
+                    (_m = (_l = settings.data.appConfig).onStepCompleted) === null || _m === void 0 ? void 0 : _m.call(_l, settings.data.activeScreen.name, requestBody);
                 }
                 return [2, { data: data, formData: params }];
         }

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)];
@@ -463,12 +463,12 @@ export var brandSlice = createSlice({
             var brand = boardResponse.brand, entity = boardResponse.entity;
             state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a;
-                return segment.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type);
+                var _a, _b;
+                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _b === void 0 ? void 0 : _b[0];
             var selectedTeamSize = (_c = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a;
-                return team.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team);
+                var _a, _b;
+                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _c === void 0 ? void 0 : _c[0];
             (_d = brand === null || brand === void 0 ? void 0 : brand.terms) === null || _d === void 0 ? void 0 : _d.forEach(function (element) {
                 if ((element === null || element === void 0 ? void 0 : element.term) === 'general') {
@@ -515,12 +515,12 @@ export var brandSlice = createSlice({
             state.data.otpData.responseBody = data;
             state.data.brandData.brandName = (_a = brand === null || brand === void 0 ? void 0 : brand.name) === null || _a === void 0 ? void 0 : _a.en;
             var selectedSegment = (_b = segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.filter(function (segment) {
-                var _a;
-                return segment.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type);
+                var _a, _b;
+                return segment.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _b === void 0 ? void 0 : _b[0];
             var selectedTeamSize = (_c = teamSizeList === null || teamSizeList === void 0 ? void 0 : teamSizeList.filter(function (team) {
-                var _a;
-                return team.id === ((_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team);
+                var _a, _b;
+                return team.id === ((_b = (_a = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _a === void 0 ? void 0 : _a.team) === null || _b === void 0 ? void 0 : _b.id);
             })) === null || _c === void 0 ? void 0 : _c[0];
             state.data.brandData.segment = selectedSegment;
             state.data.brandData.teamSize = selectedTeamSize;

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:
@@ -834,14 +834,14 @@ export var connectSlice = createSlice({
             var selectedBrand = ((_b = (_a = state.data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.brand_list[0]) || leadResponse.brand;
             state.data.brandData.brandName = (_c = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.name) === null || _c === void 0 ? void 0 : _c.en;
             state.data.brandData.segment = rest.segments_list.find(function (_a) {
-                var _b;
+                var _b, _c;
                 var id = _a.id;
-                return ((_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
             });
             state.data.brandData.teamSize = rest.team_size_list.find(function (_a) {
-                var _b;
+                var _b, _c;
                 var id = _a.id;
-                return ((_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+                return ((_c = (_b = selectedBrand === null || selectedBrand === void 0 ? void 0 : selectedBrand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
             });
             state.data.individualData = formData;
             state.data.individualData.responseBody = rest;

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

@@ -75,10 +75,10 @@ import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountry
 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:
@@ -341,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;
@@ -359,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';
@@ -396,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: {
@@ -418,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,
@@ -432,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) {
@@ -444,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
                     },
@@ -498,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;
@@ -509,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;
@@ -520,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 = {
@@ -538,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 }];
         }
     });
@@ -583,6 +598,7 @@ export var updateBoardSuccess = createAsyncThunk('individualUpdateBoardSuccess',
 var initialState = {
     error: null,
     loading: false,
+    cityLoading: false,
     data: {
         flowName: FlowsTypes.INDIVIDUAL,
         verify: {
@@ -838,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) {