@tap-payments/auth-jsconnect 2.1.92-test → 2.1.93-test

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

@@ -77,11 +77,13 @@ export declare type TaxFormValues = {
     confirmPolicy: false;
     documentId?: Array<string>;
 };
-export interface IndividualPersonalInfoFormValues {
-    name: string;
+export interface IndividualEmailMobileFormValues {
     email: string;
     mobile: string | null;
     countryCode: CountryCode;
+}
+export interface IndividualPersonalInfoFormValues extends IndividualEmailMobileFormValues {
+    name: string;
     gender: string | null;
     nid: string;
     issuedCountry: CountryCode | undefined;

package/build/api/individual.d.ts

@@ -128,7 +128,7 @@ export declare type UpdateIndividualBody = {
     occupation?: {
         id?: string;
     };
-    step_name: string;
+    step_name?: string;
     encryption_contract?: Array<string>;
 };
 export declare type GetIndividualListBody = {

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

@@ -576,13 +576,14 @@ export var brandSlice = createSlice({
             .addCase(updateBrand.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var data = action.payload.data;
+            var _a = action.payload, data = _a.data, formData = _a.formData;
             var brand = (state.data.verify.responseBody || {}).brand;
             var activities = data.brand_activities;
             var selectedActivity = activities === null || activities === void 0 ? void 0 : activities.filter(function (activity) {
                 var activities = (brand || {}).activities;
                 return activities === null || activities === void 0 ? void 0 : activities.find(function (value) { return activity.id === value.id; });
             });
+            state.data.brandData = formData;
             state.data.brandActivities.activities = (selectedActivity === null || selectedActivity === void 0 ? void 0 : selectedActivity.length) > 0 ? selectedActivity : [];
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { activities: data === null || data === void 0 ? void 0 : data.brand_activities });
         })
@@ -594,7 +595,7 @@ export var brandSlice = createSlice({
             state.loading = true;
             state.error = null;
         })
-            .addCase(updateBrandActivities.fulfilled, function (state, action) {
+            .addCase(updateBrandActivities.fulfilled, function (state) {
             state.loading = false;
             state.error = null;
         })

package/build/features/app/connectExpress/connectExpressStore.js

@@ -63,7 +63,7 @@ import { CONNECT_EXPRESS_STEP_NAMES, IDENTIFICATION_TYPE, OTHER_CR_LICENSE, OTHE
 import { defaultCountry } from '../../../constants';
 import { getIndividualName, capitalizeTheFirstLetterOfEachWord, getEighteenYearsAgo, sleep, findCountryByIddPrefix, concatenateObjectValues, isSA } from '../../../utils';
 export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retrieveLeadIdentityByIdAsync', function (leadId, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connectExpress, countryCode, showBoard, data, phone, status, board_id, board_info_id, isRegistered, _b, boardInfo, boardData, leadData;
+    var _a, settings, connectExpress, countryCode, showBoard, data, phone, status, board_id, board_info_id, isRegistered, _b, boardInfo, boardData;
     var _c, _d;
     return __generator(this, function (_e) {
         switch (_e.label) {
@@ -95,13 +95,12 @@ export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retr
                 if (!(isRegistered && board_id && board_info_id)) return [3, 3];
                 return [4, Promise.all([
                         API.boardService.retrieveBoardInfo({ id: board_id, infoId: board_info_id }),
-                        API.boardService.retrieveBoardDetails(board_id),
-                        thunkApi.dispatch(getLeadByIdAsync(leadId)).unwrap()
+                        API.boardService.retrieveBoardDetails(board_id)
                     ])];
             case 2:
-                _b = _e.sent(), boardInfo = _b[0], boardData = _b[1], leadData = _b[2];
+                _b = _e.sent(), boardInfo = _b[0], boardData = _b[1];
                 thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_SUCCESS_WITH_FLOW_BUTTONS_STEP'));
-                return [2, { data: __assign(__assign({}, data), leadData.data), countryCode: countryCode, boardInfo: boardInfo, boardData: boardData }];
+                return [2, { data: data, countryCode: countryCode, boardInfo: boardInfo, boardData: boardData }];
             case 3: return [2, { data: data, countryCode: countryCode }];
         }
     });

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

@@ -1,5 +1,5 @@
 import { RootState } from '../../../app/store';
-import { CountryCode, FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState, ActionState, User, IndividualPersonalInfoFormValues } from '../../../@types';
+import { CountryCode, FlowsTypes, IndividualExtraFormValues, OTPFormValues, ResponseData, SharedState, ActionState, User, IndividualPersonalInfoFormValues, IndividualEmailMobileFormValues } from '../../../@types';
 interface VerifyLeadTokenProps {
     token: string;
     isInternally?: boolean;
@@ -32,7 +32,14 @@ declare type AddDetailsParams = {
 export declare const addDetailsAsync: import("@reduxjs/toolkit").AsyncThunk<{
     userList: User[];
 }, AddDetailsParams, {}>;
-export declare const requestDetailsByEmail: import("@reduxjs/toolkit").AsyncThunk<any, User, {}>;
+declare type RequestEmail = {
+    user: User;
+    collectInfo: IndividualEmailMobileFormValues;
+};
+export declare const requestDetailsByEmail: import("@reduxjs/toolkit").AsyncThunk<{
+    data: any;
+    userData: any;
+}, RequestEmail, {}>;
 export declare const getIndividualList: import("@reduxjs/toolkit").AsyncThunk<any[], string, {}>;
 export declare const getCityList: import("@reduxjs/toolkit").AsyncThunk<any, string, {}>;
 declare type RetrieveIndividualInfoParams = {
@@ -91,6 +98,7 @@ declare type VerifyData = {
 export interface IndividualData {
     verify: ResponseData & VerifyData;
     otpData: OTPFormValues & ResponseData;
+    individualCollectData: IndividualEmailMobileFormValues & ResponseData;
     individualPersonalData: IndividualPersonalInfoFormValues & ResponseData;
     individualData: IndividualExtraFormValues & ResponseData;
     flowName: FlowsTypes;

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

@@ -71,7 +71,7 @@ import API from '../../../api';
 import { FlowsTypes, IndividualGender, IndividualType, FieldType } from '../../../@types';
 import { handleNextScreenStep, handleSetCountryByIso2 } from '../../../app/settings';
 import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES } from '../../../constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, getEighteenYearsAgo, getIndividualName, getUserName, sleep } from '../../../utils';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, getEighteenYearsAgo, getUserNameObject, getUserName, sleep, isValidEmail } 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 () {
@@ -214,14 +214,50 @@ export var addDetailsAsync = createAsyncThunk('individual/addDetailsAsync', func
         }
     });
 }); });
-export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsByEmail', function (user, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var individual, _a, merchant_id, board_id, id, type, payload, data;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsByEmail', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
+    var individual, _a, merchant_id, board_id, user, collectInfo, id, type, _b, resEmail, resPhone, isPhoneAndEmailAvailable, email, mobile, countryCode, hasContact, individualData, hasPhone, requestBody, data_1, payload, data;
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 individual = thunkApi.getState().individual;
                 _a = individual.data.verify.responseBody || {}, merchant_id = _a.merchant_id, board_id = _a.board_id;
+                user = params.user, collectInfo = params.collectInfo;
                 id = user.id, type = user.type;
+                _b = (user === null || user === void 0 ? void 0 : user.contact) || {}, resEmail = _b.email, resPhone = _b.phone;
+                isPhoneAndEmailAvailable = isValidEmail(resEmail) && (resPhone === null || resPhone === void 0 ? void 0 : resPhone.country_code) && (resPhone === null || resPhone === void 0 ? void 0 : resPhone.number);
+                email = collectInfo.email, mobile = collectInfo.mobile, countryCode = collectInfo.countryCode;
+                hasContact = !!email || !!mobile;
+                individualData = undefined;
+                if (!(!isPhoneAndEmailAvailable && hasContact)) return [3, 2];
+                hasPhone = mobile && (countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix);
+                requestBody = {
+                    id: id,
+                    type: type,
+                    contact: {
+                        email: email,
+                        phone: hasPhone
+                            ? {
+                                country_code: (_c = countryCode === null || countryCode === void 0 ? void 0 : countryCode.idd_prefix) === null || _c === void 0 ? void 0 : _c.toString(),
+                                number: mobile
+                            }
+                            : undefined
+                    }
+                };
+                return [4, API.individualService.updateIndividual(requestBody)];
+            case 1:
+                data_1 = _d.sent();
+                individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.user;
+                if (type === IndividualType.SHARE_HOLDER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.shareholder;
+                else if (type === IndividualType.BOARD_MEMBER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.board_member;
+                else if (type === IndividualType.BUYER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.buyer;
+                else if (type === IndividualType.CUSTOMER)
+                    individualData = data_1 === null || data_1 === void 0 ? void 0 : data_1.customer;
+                _d.label = 2;
+            case 2:
                 payload = {
                     id: board_id,
                     merchant_id: merchant_id,
@@ -239,9 +275,9 @@ export var requestDetailsByEmail = createAsyncThunk('individual/requestDetailsBy
                     }
                 };
                 return [4, API.boardService.requestDetailsByEmail(payload)];
-            case 1:
-                data = _b.sent();
-                return [2, data];
+            case 3:
+                data = _d.sent();
+                return [2, { data: data, userData: __assign(__assign({}, individualData), { type: type }) }];
         }
     });
 }); });
@@ -296,6 +332,10 @@ export var retrieveIndividualInfo = createAsyncThunk('individual/retrieveIndivid
                     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;
+                else if (type === IndividualType.BUYER)
+                    individualData = data === null || data === void 0 ? void 0 : data.buyer;
+                else if (type === IndividualType.CUSTOMER)
+                    individualData = data === null || data === void 0 ? void 0 : data.customer;
                 return [2, { data: __assign(__assign({}, (individualData || {})), { type: type }), countryCode: countryCode, countries: settings.data.countries }];
         }
     });
@@ -445,9 +485,9 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                 name = params.name, email = params.email, mobile = params.mobile, countryCode = params.countryCode, gender = params.gender, nid = params.nid, issuedCountry = params.issuedCountry, expiryDate = params.expiryDate, dob = params.dob, placeOfBirthCountry = params.placeOfBirthCountry, placeOfBirthCity = params.placeOfBirthCity, nationality = params.nationality;
                 code = entity === null || entity === void 0 ? void 0 : entity.country;
                 data_status = (user || {}).data_status;
-                userName = getIndividualName(name);
+                userName = getUserNameObject(name);
                 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;
+                isNameEditable = (data_status === null || data_status === void 0 ? void 0 : data_status.name) === FieldType.EDITABLE && userName.first;
                 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 && 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;
@@ -598,6 +638,8 @@ export var updateIndividualInfo = createAsyncThunk('updateIndividualInfo', funct
                     payload = boardMemberPayload;
                 if (type === IndividualType.BUYER)
                     payload = buyerMemberPayload;
+                if (type === IndividualType.CUSTOMER)
+                    payload = {};
                 requestBody = __assign(__assign({ id: id, type: type }, payload), { encryption_contract: [], step_name: INDIVIDUAl_STEP_NAMES.INDIVIDUAl_INFO });
                 return [4, API.individualService.updateIndividual(requestBody)];
             case 3:
@@ -651,6 +693,11 @@ var initialState = {
         otpData: {
             otp: ''
         },
+        individualCollectData: {
+            email: '',
+            mobile: '',
+            countryCode: defaultCountry
+        },
         individualPersonalData: {
             name: '',
             email: '',
@@ -779,10 +826,14 @@ export var individualSlice = createSlice({
             .addCase(requestDetailsByEmail.fulfilled, function (state, action) {
             state.loading = false;
             state.error = null;
-            var data = action.payload;
+            var _a = action.payload, data = _a.data, userData = _a.userData;
             var userList = (state.data.verify.responseBody || {}).userList;
             var list = userList || [];
-            list = list.map(function (user) { var _a, _b; return (user.id === ((_b = (_a = data === null || data === void 0 ? void 0 : data.notification) === null || _a === void 0 ? void 0 : _a.recipient) === null || _b === void 0 ? void 0 : _b.id) ? __assign(__assign({}, user), { isRequestedEmail: true }) : user); });
+            list = list.map(function (user) {
+                var _a, _b;
+                var userInfo = user.id === (userData === null || userData === void 0 ? void 0 : userData.id) ? userData : user;
+                return user.id === ((_b = (_a = data === null || data === void 0 ? void 0 : data.notification) === null || _a === void 0 ? void 0 : _a.recipient) === null || _b === void 0 ? void 0 : _b.id) ? __assign(__assign({}, userInfo), { isRequestedEmail: true }) : userInfo;
+            });
             state.data.verify.responseBody = __assign(__assign({}, state.data.verify.responseBody), { requestEmailData: data, userList: list });
         })
             .addCase(requestDetailsByEmail.rejected, function (state, action) {

package/build/features/brand/screens/BrandActivities/BrandActivities.js

@@ -39,6 +39,7 @@ var BrandActivities = function (_a) {
     var dispatch = useAppDispatch();
     var _c = useAppSelector(brandSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var brand = (data.verify.responseBody || {}).brand;
+    var _d = data.brandActivities, activities = _d.activities, customerLocations = _d.customerLocations, expectedCustomer = _d.expectedCustomer, expectedSale = _d.expectedSale, termAndConditionChecked = _d.termAndConditionChecked, refundPolicy = _d.refundPolicy, transactionPolicy = _d.transactionPolicy;
     var ListType;
     (function (ListType) {
         ListType["ActivitiesList"] = "ActivitiesList";
@@ -48,7 +49,15 @@ var BrandActivities = function (_a) {
     })(ListType || (ListType = {}));
     var methods = useForm({
         resolver: yupResolver(BrandActivitiesValidationSchema(brand)),
-        defaultValues: data.brandActivities,
+        defaultValues: {
+            activities: activities,
+            customerLocations: customerLocations,
+            expectedCustomer: expectedCustomer,
+            expectedSale: expectedSale,
+            termAndConditionChecked: termAndConditionChecked,
+            refundPolicy: refundPolicy,
+            transactionPolicy: transactionPolicy
+        },
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.brandActivities, true);

package/build/features/brand/screens/BrandInfo/BrandInfo.js

@@ -35,10 +35,17 @@ var BrandInfo = function (_a) {
     var _c = React.useState(false), brandNameChecking = _c[0], setBrandNameChecking = _c[1];
     var dispatch = useAppDispatch();
     var _d = useAppSelector(brandSelector), data = _d.data, loading = _d.loading, error = _d.error;
-    var responseBody = data.brandData.responseBody;
+    var _e = data.brandData, brandName = _e.brandName, segment = _e.segment, teamSize = _e.teamSize, salesChannels = _e.salesChannels, termAndConditionChecked = _e.termAndConditionChecked, selectedBrandItem = _e.selectedBrandItem, responseBody = _e.responseBody;
     var methods = useForm({
         resolver: yupResolver(BrandValidationSchema((responseBody === null || responseBody === void 0 ? void 0 : responseBody.brand) || {})),
-        defaultValues: data.brandData,
+        defaultValues: {
+            brandName: brandName,
+            segment: segment,
+            teamSize: teamSize,
+            salesChannels: salesChannels,
+            termAndConditionChecked: termAndConditionChecked,
+            selectedBrandItem: selectedBrandItem
+        },
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.brandData);

package/build/features/brand/screens/BrandInfo/SalesChannels.js

@@ -8,14 +8,22 @@ import { brandSelector, clearError } from '../../../app/brand/brandStore';
 import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
     var _b, _c;
-    var control = useFormContext().control;
+    var _d = useFormContext(), control = _d.control, setValue = _d.setValue, getValues = _d.getValues;
     var dispatch = useAppDispatch();
-    var _d = useController({ control: control, name: 'salesChannels' }), fieldState = _d.fieldState, field = _d.field;
-    var _e = useAppSelector(brandSelector), data = _e.data, error = _e.error;
-    var responseBody = data.verify.responseBody;
-    var _f = responseBody || {}, channelList = _f.channel_list, defaultSalesChannels = _f.salesChannels;
-    var brand = (data.verify.responseBody || {}).brand;
+    var _e = useController({ control: control, name: 'salesChannels' }), fieldState = _e.fieldState, field = _e.field;
+    var _f = useAppSelector(brandSelector), data = _f.data, error = _f.error;
+    var verify = data.verify, brandData = data.brandData;
+    var selectedBrandItem = brandData.selectedBrandItem, defaultSalesChannels = brandData.salesChannels;
+    var _g = verify.responseBody || {}, channelList = _g.channel_list, brand = _g.brand;
     var isNonEditable = ((_b = brand === null || brand === void 0 ? void 0 : brand.data_status) === null || _b === void 0 ? void 0 : _b.name) === FieldType.NON_EDITABLE;
+    var selectedBrandControl = getValues('selectedBrandItem');
+    React.useEffect(function () {
+        if (selectedBrandItem.id) {
+            setValue('selectedBrandItem', selectedBrandItem);
+            var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
+            field.onChange(sales);
+        }
+    }, [selectedBrandItem]);
     React.useEffect(function () {
         if ((defaultSalesChannels === null || defaultSalesChannels === void 0 ? void 0 : defaultSalesChannels.length) > 0) {
             var sales = mapSalesChannel(defaultSalesChannels);
@@ -28,6 +36,6 @@ var SalesChannels = function (_a) {
             dispatch(clearError());
         field.onChange(channels);
     };
-    return (_jsx(SalesChannel, { disabled: isNonEditable, error: (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message, list: channelList, onChange: onChange, defaultValue: selectedSalesChannels }));
+    return (_jsx(SalesChannel, { disabled: isNonEditable, error: (_c = fieldState.error) === null || _c === void 0 ? void 0 : _c.message, list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
 };
 export default SalesChannels;

package/build/features/connectExpress/screens/SuccessWithFlowButtons/SuccessWithFlowButtons.js

@@ -18,8 +18,8 @@ import { FlowsTypes } from '../../../../@types';
 var SuccessWithFlowButtons = function () {
     var data = useAppSelector(connectExpressSelector).data;
     var _a = data.responseData || {}, boardData = _a.boardData, leadData = _a.leadData, boardInfo = _a.boardInfo;
-    var _b = leadData || {}, brand = _b.brand, entity = _b.entity, name = _b.name;
-    var _c = boardData || {}, business = _c.business, merchant = _c.merchant, bank = _c.bank_account, user = _c.user, individuals = _c.individuals;
+    var name = (leadData || {}).name;
+    var _b = boardData || {}, business = _b.business, merchant = _b.merchant, bank = _b.bank_account, user = _b.user, individuals = _b.individuals, entity = _b.entity, brand = _b.brand;
     var flows = (boardInfo || {}).info;
     var boardInfoId = boardInfo === null || boardInfo === void 0 ? void 0 : boardInfo.id;
     var boardId = boardData === null || boardData === void 0 ? void 0 : boardData.id;

package/build/features/individual/screens/IndividualList/CollectPhoneEmail.d.ts

@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { User } from '../../../../@types';
+export interface CollectPhoneEmailProps {
+    activeUser?: User;
+}
+declare const _default: React.MemoExoticComponent<{
+    ({ activeUser }: CollectPhoneEmailProps): JSX.Element;
+    defaultProps: {};
+}>;
+export default _default;

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

@@ -0,0 +1,31 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { settingsSelector } from '../../../../app/settings';
+import Box from '@mui/material/Box';
+import { useAppSelector } from '../../../../hooks';
+import { isValidEmail } from '../../../../utils';
+import MobileNumber from './MobileNumber';
+import Email from './Email';
+var CollectPhoneEmail = function (_a) {
+    var activeUser = _a.activeUser;
+    var settingsData = useAppSelector(settingsSelector).data;
+    var countries = settingsData.countries;
+    var _b = (activeUser === null || activeUser === void 0 ? void 0 : activeUser.contact) || { email: '' }, email = _b.email, phone = _b.phone;
+    var isPhoneAvailable = (phone === null || phone === void 0 ? void 0 : phone.country_code) && (phone === null || phone === void 0 ? void 0 : phone.number);
+    var isEmailAvailable = isValidEmail(email);
+    var _c = React.useState(), listActive = _c[0], setListActive = _c[1];
+    return (_jsxs(Box, __assign({ sx: { mb: 0 } }, { children: [_jsx(MobileNumber, { sx: { mb: isEmailAvailable ? 0 : 3 }, show: !isPhoneAvailable, countries: countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Email, { show: !listActive && !isEmailAvailable })] })));
+};
+export default React.memo(CollectPhoneEmail);
+CollectPhoneEmail.defaultProps = {};

package/build/features/individual/screens/IndividualList/Email.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+export interface EmailProps {
+    show: boolean;
+}
+declare const _default: React.MemoExoticComponent<({ show }: EmailProps) => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,48 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
+import { useAppSelector } from '../../../../hooks';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import { individualSelector } from '../../../app/individual/individualStore';
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'lowercase'
+    }
+}); });
+var Email = function (_a) {
+    var _b;
+    var show = _a.show;
+    var t = useTranslation().t;
+    var control = useFormContext().control;
+    var emailControl = useController({ name: 'email', control: control });
+    var data = useAppSelector(individualSelector).data;
+    var emailValue = emailControl.field.value;
+    var error = (_b = emailControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
+    var verify = data.verify;
+    var user = (verify.responseBody || {}).user;
+    var handleEmailChange = function (event) {
+        emailControl.field.onChange(event.target.value);
+    };
+    var clearNumber = function () {
+        emailControl.field.onChange('');
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && emailValue ? _jsx(CheckIcon, {}) : emailValue && _jsx(ClearIcon, { onClick: clearNumber }) }) }) })));
+};
+export default React.memo(Email);

package/build/features/individual/screens/IndividualList/MobileNumber.d.ts

@@ -0,0 +1,12 @@
+import * as React from 'react';
+import { Theme, SxProps } from '@mui/material/styles';
+import { CountryCode } from '../../../../@types';
+interface MobileNumberProps {
+    countries: Array<CountryCode>;
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+    sx?: SxProps<Theme>;
+}
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<MobileNumberProps & React.RefAttributes<unknown>>>;
+export default _default;

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

@@ -0,0 +1,143 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import Box from '@mui/material/Box';
+import { styled, alpha } from '@mui/material/styles';
+import { removeAllCharsFromNumber } from '../../../../utils';
+import { useLanguage, useAppSelector } from '../../../../hooks';
+import Text from '../../../../components/Text';
+import Collapse from '../../../../components/Collapse';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import SimpleList from '../../../../components/SimpleList';
+import ClearIcon from '../../../shared/ClearIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import Input from '../../../shared/Input';
+import { individualSelector } from '../../../app/individual/individualStore';
+var LabelContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        padding: theme.spacing(0, 2.5, 1.25, 2.5)
+    });
+});
+var CountryItemContainer = styled(Box)(function () { return ({
+    display: 'flex'
+}); });
+var CountryCodeText = styled(Text, {
+    shouldForwardProp: function (prop) { return prop !== 'isSelected'; }
+})(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { width: theme.spacing(10), textAlign: 'start', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+});
+var CountryNameText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25) }));
+});
+var CountryCodeStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ cursor: 'pointer' }, theme.typography.body2), { fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75) }));
+});
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
+});
+var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        marginInlineStart: theme.spacing(1)
+    });
+});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
+var MobileNumber = React.forwardRef(function (_a, ref) {
+    var _b, _c, _d;
+    var countries = _a.countries, sx = _a.sx, rest = __rest(_a, ["countries", "sx"]);
+    var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
+    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
+    var data = useAppSelector(individualSelector).data;
+    var phoneControl = useController({ name: 'mobile', control: control });
+    var countryCodeControl = useController({ name: 'countryCode', control: control });
+    var countryCodeValue = countryCodeControl.field.value;
+    var mobileValue = phoneControl.field.value;
+    var countryName = (isAr ? (_b = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _b === void 0 ? void 0 : _b.arabic : (_c = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.name) === null || _c === void 0 ? void 0 : _c.english) || '';
+    var error = !!mobileValue ? (_d = phoneControl.fieldState.error) === null || _d === void 0 ? void 0 : _d.message : '';
+    var isSA = (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.iso2) === 'SA';
+    var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
+    var isStartsWith5 = mobileValue.startsWith('5');
+    var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    var verify = data.verify;
+    var user = (verify.responseBody || {}).user;
+    React.useEffect(function () {
+        if (mobileValue)
+            setValue('mobile', mobileValue, { shouldValidate: true });
+    }, []);
+    var onPhoneNumberChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllCharsFromNumber(target.value);
+        phoneControl.field.onChange(value);
+    };
+    var clearMobileNumber = function () {
+        phoneControl.field.onChange('');
+    };
+    var onCloseCountryList = function () {
+        var _a;
+        if (anchorEl) {
+            setAnchorEl(null);
+            (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+        }
+        setCountries(countries);
+    };
+    var toggleCountryList = function () {
+        var _a, _b;
+        if (anchorEl) {
+            setAnchorEl(null);
+            (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
+            setCountries(countries);
+        }
+        else {
+            (_b = rest.onListOpen) === null || _b === void 0 ? void 0 : _b.call(rest);
+            setAnchorEl(true);
+        }
+    };
+    var onSelectItem = function (country) {
+        onCloseCountryList();
+        setValue('mobile', '');
+        countryCodeControl.field.onChange(country);
+    };
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!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, {})] }));
+                        } }) }))] })) })));
+});
+export default React.memo(MobileNumber);

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

@@ -20,19 +20,24 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
+import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
+import { yupResolver } from '@hookform/resolvers/yup';
 import { alpha, styled, useTheme } from '@mui/material/styles';
 import Box from '@mui/material/Box';
-import { getUserName } from '../../../../utils';
-import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
+import { getUserName, isValidEmail } from '../../../../utils';
+import { useLanguage, useAppSelector, useAppDispatch, useSetFromDefaultValues } from '../../../../hooks';
 import { IndividualType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
+import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
 import CheckIcon from '../../../shared/CheckIcon';
 import { ScreenContainer } from '../../../shared/Containers';
 import { addDetailsAsync, individualSelector, requestDetailsByEmail, resetIndividualData } from '../../../app/individual/individualStore';
 import ListButton from '../../../shared/Button/ListButton';
+import { IndividualCollectInfoValidationSchema } from './validation';
+import CollectPhoneEmail from './CollectPhoneEmail';
 var ScreenContainerStyled = styled(ScreenContainer)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -58,29 +63,46 @@ var RoleTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return (__assign(__assign({}, theme.typography.subtitle2), { display: 'inline', paddingInlineStart: theme.spacing(1.5), color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightRegular, background: theme.palette.background.default }));
 });
+var CollapseStyled = styled(Collapse)(function () { return ({
+    width: '100%'
+}); });
 var IndividualRequestType;
 (function (IndividualRequestType) {
     IndividualRequestType[IndividualRequestType["ADD"] = 0] = "ADD";
     IndividualRequestType[IndividualRequestType["REQUEST_EMAIL"] = 1] = "REQUEST_EMAIL";
+    IndividualRequestType[IndividualRequestType["COLLECT_EMAIL_MOBILE"] = 2] = "COLLECT_EMAIL_MOBILE";
 })(IndividualRequestType || (IndividualRequestType = {}));
 var UserList = function (_a) {
     var _b = React.useState([]), usersMenuList = _b[0], setUsersMenuList = _b[1];
     var _c = React.useState(null), anchorEl = _c[0], setAnchorEl = _c[1];
-    var _d = React.useState(), activeUser = _d[0], setActiveUser = _d[1];
-    var _e = React.useState(IndividualRequestType.ADD), type = _e[0], setType = _e[1];
+    var _d = React.useState(false), showCollectForm = _d[0], setShowCollectForm = _d[1];
+    var _e = React.useState(), activeUser = _e[0], setActiveUser = _e[1];
+    var _f = React.useState(IndividualRequestType.ADD), type = _f[0], setType = _f[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var theme = useTheme();
-    var _f = useAppSelector(individualSelector), data = _f.data, loading = _f.loading;
+    var _g = useAppSelector(individualSelector), data = _g.data, loading = _g.loading;
+    var _h = data.individualCollectData, email = _h.email, mobile = _h.mobile;
     var verify = data.verify;
     var userList = (verify.responseBody || {}).userList;
+    var methods = useForm({
+        resolver: yupResolver(IndividualCollectInfoValidationSchema(activeUser)),
+        defaultValues: {
+            email: email,
+            mobile: mobile
+        },
+        mode: 'onChange'
+    });
+    useSetFromDefaultValues(methods, data.individualCollectData);
     React.useEffect(function () {
         if ((userList === null || userList === void 0 ? void 0 : userList.length) > 0) {
             var list = __spreadArray([], userList, true);
             setUsersMenuList(list);
-            if (!activeUser)
-                setActiveUser(list[0]);
+            var user = list.find(function (user) { return user.id === (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id); }) || list[0];
+            setActiveUser(user);
+            if (!isPhoneAndEmailAvailable(user))
+                resetFormData();
         }
     }, [userList]);
     var onOpenUserAction = function (event) {
@@ -89,7 +111,15 @@ var UserList = function (_a) {
     var onCloseUserAction = function () {
         setAnchorEl(null);
     };
+    var resetFormData = function () {
+        if (showCollectForm) {
+            methods.setValue('email', '', { shouldValidate: true });
+            methods.setValue('mobile', '', { shouldValidate: true });
+            setShowCollectForm(false);
+        }
+    };
     var onClickUser = function (user, e) {
+        resetFormData();
         setAnchorEl(null);
         setActiveUser(user);
         onOpenUserAction(e);
@@ -102,16 +132,27 @@ var UserList = function (_a) {
         }
     };
     var onRequestEmail = function () {
+        if (!isPhoneAndEmailAvailable(activeUser) && !methods.formState.isValid) {
+            setShowCollectForm(true);
+            return;
+        }
         setType(IndividualRequestType.REQUEST_EMAIL);
         if (activeUser) {
-            dispatch(requestDetailsByEmail(activeUser));
-            setActiveUser(__assign({}, activeUser));
+            var values = methods.getValues();
+            dispatch(requestDetailsByEmail({ user: activeUser, collectInfo: __assign({}, values) }));
         }
     };
     var getName = function (user) {
         var name = getUserName(user, isAr);
         return name;
     };
+    var isActiveUser = function (user) {
+        return (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id;
+    };
+    var isPhoneAndEmailAvailable = function (user) {
+        var _a = (user === null || user === void 0 ? void 0 : user.contact) || { email: '' }, resEmail = _a.email, phone = _a.phone;
+        return isValidEmail(resEmail) && (phone === null || phone === void 0 ? void 0 : phone.country_code) && (phone === null || phone === void 0 ? void 0 : phone.number);
+    };
     var getUserRole = function (user) {
         var _a, _b, _c, _d, _e;
         if ((((_a = user === null || user === void 0 ? void 0 : user.role) === null || _a === void 0 ? void 0 : _a.length) || 0) > 0)
@@ -122,18 +163,23 @@ var UserList = function (_a) {
             return t('type_board_member');
         return t('type_user');
     };
+    var getCollectForm = function (user) {
+        var show = showCollectForm && isActiveUser(user);
+        return (_jsx(CollapseStyled, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 1.5, mt: 0 } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsx(Form, { children: _jsx(CollectPhoneEmail, { activeUser: activeUser }) }) })) })) })));
+    };
+    var disabled = showCollectForm && !isPhoneAndEmailAvailable(activeUser) && !methods.formState.isValid;
     return (_jsx(ScreenContainerStyled, { children: usersMenuList.map(function (user, index) {
-            return (_jsxs(Box, __assign({ sx: index !== usersMenuList.length - 1 ? { borderBottom: "1px solid ".concat(alpha(theme.palette.divider, 0.8)) } : {} }, { children: [_jsxs(TextBoxStyled, __assign({ onClick: !!anchorEl && (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id ? function () { return onCloseUserAction(); } : function (e) { return onClickUser(user, e); } }, { children: [_jsxs(TextStyled, { children: [getName(user) || '', _jsx(RoleTextStyled, { children: getUserRole(user) || '' })] }), (user === null || user === void 0 ? void 0 : user.isRequestedEmail) ? _jsx(CheckIcon, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl && (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id })] })), _jsx(Collapse, __assign({ in: !!anchorEl && (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id, timeout: 300 }, { children: _jsx(ListButton, { isAr: isAr, addDetails: {
-                                show: true,
+            return (_jsxs(Box, __assign({ sx: index !== usersMenuList.length - 1 ? { borderBottom: "1px solid ".concat(alpha(theme.palette.divider, 0.8)) } : {} }, { children: [_jsxs(TextBoxStyled, __assign({ onClick: !!anchorEl && isActiveUser(user) ? function () { return onCloseUserAction(); } : function (e) { return onClickUser(user, e); } }, { children: [_jsxs(TextStyled, { children: [getName(user) || '', _jsx(RoleTextStyled, { children: getUserRole(user) || '' })] }), (user === null || user === void 0 ? void 0 : user.isRequestedEmail) ? _jsx(CheckIcon, {}) : _jsx(ExpandIcon, { anchorEl: !!anchorEl && isActiveUser(user) })] })), _jsx(Collapse, __assign({ in: !!anchorEl && isActiveUser(user), timeout: 300 }, { children: _jsx(ListButton, { isAr: isAr, addDetails: {
                                 title: t('add_details'),
                                 onClick: onAddDetails,
-                                loading: (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id && loading && type === IndividualRequestType.ADD
+                                loading: isActiveUser(user) && loading && type === IndividualRequestType.ADD
                             }, requestEmail: {
-                                show: true,
+                                children: getCollectForm(user),
                                 title: t('request_details_by_email'),
                                 isRequested: (user === null || user === void 0 ? void 0 : user.isRequestedEmail) || false,
-                                onClick: function () { return onRequestEmail(); },
-                                loading: (activeUser === null || activeUser === void 0 ? void 0 : activeUser.id) === user.id && loading && type === IndividualRequestType.REQUEST_EMAIL
+                                disabled: disabled,
+                                onClick: onRequestEmail,
+                                loading: isActiveUser(user) && loading && type === IndividualRequestType.REQUEST_EMAIL
                             } }) }))] }), index));
         }) }));
 };

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

@@ -0,0 +1,12 @@
+import * as yup from 'yup';
+import { User } from '../../../../@types';
+export declare const IndividualCollectInfoValidationSchema: (activeUser?: User) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    mobile: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    email: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    mobile: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    email: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    mobile: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+    email: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
+}>>>;

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

@@ -0,0 +1,39 @@
+import * as yup from 'yup';
+export var IndividualCollectInfoValidationSchema = function (activeUser) {
+    var _a = (activeUser === null || activeUser === void 0 ? void 0 : activeUser.contact) || {}, phone = _a.phone, email = _a.email;
+    var isPhoneAvailable = (phone === null || phone === void 0 ? void 0 : phone.number) && (phone === null || phone === void 0 ? void 0 : phone.country_code);
+    var isEmailAvailable = !!email;
+    return yup.object().shape({
+        mobile: isPhoneAvailable
+            ? yup.string().optional()
+            : yup
+                .string()
+                .test({
+                test: function (value) {
+                    if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
+                        var countryCode = this.parent.countryCode;
+                        var isSA = countryCode.iso2 === 'SA';
+                        var digits = countryCode.digits;
+                        var mobileValue = value || '';
+                        var valueLen = mobileValue.length;
+                        var isNumber = mobileValue.match(/^[0-9]/g);
+                        if (!isNumber)
+                            return this.createError({ message: 'enter_valid_mobile_number' });
+                        var isStartWithZero = mobileValue.startsWith('05');
+                        var isStartWith5 = mobileValue.startsWith('5');
+                        var isSaudiNumber = isStartWith5 || isStartWithZero;
+                        if (isSA) {
+                            if (!isSaudiNumber)
+                                return this.createError({ message: 'start_with_number' });
+                            var requiredLen = isStartWith5 ? digits - 1 : digits;
+                            return valueLen === requiredLen ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                        }
+                        return valueLen === digits ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                    }
+                    return true;
+                }
+            })
+                .required(),
+        email: isEmailAvailable ? yup.string().optional() : yup.string().email('email_not_valid').required()
+    });
+};

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

@@ -47,6 +47,7 @@ export var RoleTextStyled = styled(Text)(function (_a) {
 });
 var ListType;
 (function (ListType) {
+    ListType["MobileCountryList"] = "MobileCountryList";
     ListType["IssuedCountryList"] = "IssuedCountryList";
     ListType["BirthCountryList"] = "BirthCountryList";
     ListType["BirthCityList"] = "BirthCityList";
@@ -121,12 +122,18 @@ var IndividualPersonalInfo = function (_a) {
         return t('type_user');
     };
     var disabled = !methods.formState.isValid || cityLoading;
-    var showField = !listActive && !dobActive && !expiryDateActive;
+    var isDateFieldActive = dobActive || expiryDateActive;
+    var showField = !listActive && !isDateFieldActive;
+    var isMobileCountryListActive = listActive === ListType.MobileCountryList;
     var isIssuedCountryListActive = listActive === ListType.IssuedCountryList;
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;
     var isBirthCityListActive = listActive === ListType.BirthCityList;
     var isNationalityListActive = listActive === ListType.NationalityList;
-    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: showField && !!(user === null || user === void 0 ? void 0 : user.is_authorized), timeout: 500 }, { children: _jsxs(TextBoxStyled, { children: [getUserName() || '', _jsx(RoleTextStyled, { children: getUserOccupation() || '' })] }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField }), _jsx(MobileNumber, { show: showField, countries: countries }), _jsx(Email, { show: showField }), _jsx(Gender, { show: showField }), _jsx(ID, { show: showField }), _jsx(IssuedCountry, { show: !dobActive && !expiryDateActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive }), _jsx(BirthCountry, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BirthCity, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCountryListActive && !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Nationality, { show: !dobActive && !expiryDateActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); } })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: !(user === null || user === void 0 ? void 0 : user.is_authorized), disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
+    return (_jsxs(ScreenContainer, { children: [_jsx(Collapse, __assign({ in: showField && !!(user === null || user === void 0 ? void 0 : user.is_authorized), timeout: 500 }, { children: _jsxs(TextBoxStyled, { children: [getUserName() || '', _jsx(RoleTextStyled, { children: getUserOccupation() || '' })] }) })), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField }), _jsx(MobileNumber, { show: !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.MobileCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Email, { show: showField }), _jsx(Gender, { show: showField }), _jsx(ID, { show: showField }), _jsx(IssuedCountry, { show: !isMobileCountryListActive && !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive }), _jsx(BirthCountry, { show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BirthCity, { show: !isMobileCountryListActive &&
+                                        !isDateFieldActive &&
+                                        !isIssuedCountryListActive &&
+                                        !isBirthCountryListActive &&
+                                        !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Nationality, { show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); } })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: !(user === null || user === void 0 ? void 0 : user.is_authorized), disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) }))] }));
 };
 export default React.memo(IndividualPersonalInfo);
 IndividualPersonalInfo.defaultProps = {};

package/build/features/shared/Button/ListButton.d.ts

@@ -3,7 +3,8 @@ import { ButtonProps } from '../../../components/Button';
 declare type buttonProps = {
     title: string;
     loading: boolean;
-    show: boolean;
+    disabled?: boolean;
+    children?: React.ReactNode;
     onClick?: React.MouseEventHandler<HTMLButtonElement>;
 };
 interface ListButtonProps extends ButtonProps {

package/build/features/shared/Button/ListButton.js

@@ -79,16 +79,17 @@ export default function ListButton(_a) {
     var t = useTranslation().t;
     var theme = useTheme();
     var requestEmailLoaderColor = requestEmail.isRequested && !requestEmail.loading ? theme.palette.success.main : theme.palette.primary.main;
-    return (_jsxs(ButtonBoxStyled, { children: [_jsxs(ButtonStyled, __assign({ isLoading: addDetails.loading, sx: { mb: 1.5 }, type: 'button', variant: 'outlined', onClick: addDetails.onClick, startIcon: _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(Image, { src: ICONS_NAMES.ADD_DETAIL }) })), endIcon: _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(ArrowIconStyled, { isAr: isAr, src: ICONS_NAMES.BLUE_ARROW }) })) }, { children: [_jsx(Collapse, __assign({ in: addDetails.loading }, { children: _jsx(Loader, { style: {
+    return (_jsxs(ButtonBoxStyled, { children: [addDetails.children, _jsxs(ButtonStyled, __assign({ isLoading: addDetails.loading, sx: { mb: 1.5 }, type: 'button', variant: 'outlined', onClick: addDetails.onClick, startIcon: _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(Image, { src: ICONS_NAMES.ADD_DETAIL }) })), endIcon: _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(ArrowIconStyled, { isAr: isAr, src: ICONS_NAMES.BLUE_ARROW }) })) }, { children: [_jsx(Collapse, __assign({ in: addDetails.loading }, { children: _jsx(Loader, { style: {
                                 width: theme.spacing(3.75),
                                 height: theme.spacing(3.75)
-                            }, innerColor: theme.palette.primary.main, outerColor: theme.palette.primary.main, size: 15, toggleAnimation: addDetails.loading }) })), _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(TextStyled, { children: t(addDetails.title) }) }))] })), requestEmail.show && (_jsxs(ButtonStyled, __assign({ isLoading: requestEmail.loading, variant: 'outlined', type: 'button', sx: requestEmail.isRequested && !requestEmail.loading
+                            }, innerColor: theme.palette.primary.main, outerColor: theme.palette.primary.main, size: 15, toggleAnimation: addDetails.loading }) })), _jsx(Collapse, __assign({ in: !addDetails.loading }, { children: _jsx(TextStyled, { children: t(addDetails.title) }) }))] })), requestEmail.children, _jsxs(ButtonStyled, __assign({ isLoading: requestEmail.loading, variant: 'outlined', type: 'button', sx: requestEmail.isRequested && !requestEmail.loading
                     ? {
                         '&.MuiButton-outlined': {
                             backgroundColor: theme.palette.common.white,
                             border: "1px solid ".concat(theme.palette.success.main),
                             color: theme.palette.success.main,
                             '&:hover': {
+                                cursor: 'pointer',
                                 backgroundColor: theme.palette.success.main,
                                 color: theme.palette.common.white,
                                 img: {
@@ -100,8 +101,25 @@ export default function ListButton(_a) {
                             }
                         }
                     }
-                    : {}, onClick: requestEmail.onClick, startIcon: _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: _jsx(Image, { src: requestEmail.isRequested && !requestEmail.loading ? ICONS_NAMES.REQUEST_EMAIL_GREEN : ICONS_NAMES.REQUEST_EMAIL }) })), endIcon: _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: requestEmail.isRequested && !requestEmail.loading ? _jsx(CheckIconStyled, {}) : _jsx(ArrowIconStyled, { isAr: isAr, src: ICONS_NAMES.BLUE_ARROW }) })) }, { children: [_jsx(Collapse, __assign({ in: requestEmail.loading }, { children: _jsx(Loader, { style: {
+                    : {
+                        opacity: requestEmail.disabled ? 0.5 : 1,
+                        '&.MuiButton-outlined': requestEmail.disabled
+                            ? {
+                                '&:hover': {
+                                    cursor: 'default',
+                                    backgroundColor: theme.palette.common.white,
+                                    color: theme.palette.primary.main,
+                                    img: {
+                                        filter: 'none'
+                                    },
+                                    svg: {
+                                        filter: 'none'
+                                    }
+                                }
+                            }
+                            : {}
+                    }, onClick: requestEmail.onClick, startIcon: _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: _jsx(Image, { src: requestEmail.isRequested && !requestEmail.loading ? ICONS_NAMES.REQUEST_EMAIL_GREEN : ICONS_NAMES.REQUEST_EMAIL }) })), endIcon: _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: requestEmail.isRequested && !requestEmail.loading ? _jsx(CheckIconStyled, {}) : _jsx(ArrowIconStyled, { isAr: isAr, src: ICONS_NAMES.BLUE_ARROW }) })) }, { children: [_jsx(Collapse, __assign({ in: requestEmail.loading }, { children: _jsx(Loader, { style: {
                                 width: theme.spacing(3.75),
                                 height: theme.spacing(3.75)
-                            }, innerColor: requestEmailLoaderColor, outerColor: requestEmailLoaderColor, size: 15, toggleAnimation: requestEmail.loading }) })), _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: _jsx(TextStyled, { children: t(requestEmail.title) }) }))] })))] }));
+                            }, innerColor: requestEmailLoaderColor, outerColor: requestEmailLoaderColor, size: 15, toggleAnimation: requestEmail.loading }) })), _jsx(Collapse, __assign({ in: !requestEmail.loading }, { children: _jsx(TextStyled, { children: t(requestEmail.title) }) }))] }))] }));
 }

package/build/utils/string.d.ts

@@ -57,3 +57,14 @@ export declare const isPhysicalStore: (flag: string) => boolean;
 export declare const isCallCenter: (flag: string) => boolean;
 export declare const getChannelIcon: (channel: string) => string;
 export declare const getUserName: (user: User, isAr: boolean) => string;
+export declare const getUserNameObject: (name: string) => {
+    first?: undefined;
+    middle?: undefined;
+    third?: undefined;
+    last?: undefined;
+} | {
+    first: string;
+    middle: string;
+    third: string;
+    last: string;
+};

package/build/utils/string.js

@@ -271,3 +271,10 @@ export var getUserName = function (user, isAr) {
     var name = isAr ? nameAR || nameEN : nameEN;
     return name;
 };
+export var getUserNameObject = function (name) {
+    if (!name)
+        return {};
+    var _a = name.split(' '), first = _a[0], middle = _a[1], third = _a[2], rest = _a.slice(3);
+    var lastName = rest.join(' ') || '';
+    return { first: first, middle: middle || '', third: third || '', last: lastName };
+};

package/build/utils/validation.d.ts

@@ -15,3 +15,4 @@ export declare const keepLettersAndSpace: (str: string) => string;
 export declare const isTapDomain: (domain: string) => boolean;
 export declare const removeArabicWords: (str: string) => string;
 export declare const removeAllOtherThanArabicWords: (str: string) => string;
+export declare const isValidEmail: (email: string) => boolean;

package/build/utils/validation.js

@@ -49,3 +49,6 @@ export var removeArabicWords = function (str) {
 export var removeAllOtherThanArabicWords = function (str) {
     return str.replace(/[^ء-ي]/g, '');
 };
+export var isValidEmail = function (email) {
+    return /.+@.+\..+/.test(email);
+};

package/package.json

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