@tap-payments/auth-jsconnect 2.6.16-test → 2.6.18-test

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

@@ -82,7 +82,7 @@ export var retrieveLeadIdentityByIdAsync = createAsyncThunk('expressConnect/retr
                     countryCode = findCountryByIddPrefix(settings.data.countries, phone.country_code);
                 status = data.status, board_id = data.board_id, board_info_id = data.board_info_id;
                 isRegistered = (status === null || status === void 0 ? void 0 : status.toLowerCase()) === 'registered';
-                if (!isRegistered && !(data === null || data === void 0 ? void 0 : data.identification) && (data === null || data === void 0 ? void 0 : data.phone)) {
+                if (!isRegistered && !(data === null || data === void 0 ? void 0 : data.identification) && phone) {
                     thunkApi.dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
                     return [2, { data: data, countryCode: countryCode }];
                 }
@@ -1277,6 +1277,10 @@ export var connectSlice = createSlice({
             state.error = null;
             state.loading = false;
             var _a = action.payload, brandList = _a.brandList, entityList = _a.entityList;
+            if (brandList === null || brandList === void 0 ? void 0 : brandList.length)
+                state.data.authenticationData.brandInfo = brandList[0];
+            if (entityList === null || entityList === void 0 ? void 0 : entityList.length)
+                state.data.authenticationData.entityInfo = entityList[0];
             state.data.responseData = __assign(__assign({}, state.data.responseData), { authenticationData: { brandList: brandList, entityList: entityList } });
         })
             .addCase(retrieveAuthenticationListAsync.pending, function (state) {
@@ -1366,6 +1370,9 @@ export var connectSlice = createSlice({
             state.error = null;
             var data = state.data.responseData;
             var merchantList = action.payload;
+            if (merchantList === null || merchantList === void 0 ? void 0 : merchantList.length) {
+                state.data.authenticationData.merchantInfo = merchantList[0];
+            }
             state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { merchantList: merchantList }) });
         })
             .addCase(getMerchantListAsync.rejected, function (state, action) {
@@ -1381,6 +1388,9 @@ export var connectSlice = createSlice({
             state.error = null;
             var data = state.data.responseData;
             var terminalList = action.payload;
+            if (terminalList === null || terminalList === void 0 ? void 0 : terminalList.length) {
+                state.data.authenticationData.terminalInfo = terminalList[0];
+            }
             state.data.responseData = __assign(__assign({}, data), { authenticationData: __assign(__assign({}, data === null || data === void 0 ? void 0 : data.authenticationData), { terminalList: terminalList }) });
         })
             .addCase(getTerminalListAsync.rejected, function (state, action) {

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

@@ -71,7 +71,7 @@ import API from '../../../api';
 import { FlowsTypes, IndividualGender, DocumentPurpose } from '../../../@types';
 import { handleNextScreenStep, handlePrevScreenStep, handlePublicKey, handleSetCountryByIso2, onCloseComplete } from '../../../app/settings';
 import { defaultCountry, IDENTIFICATION_TYPE, INDIVIDUAl_STEP_NAMES, MONTHLY_INCOME_LIST } from '../../../constants';
-import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType } from '../../../utils';
+import { convertNumbers2English, dateFormat, findCountryByIddPrefix, findCountryByIso2, hasNoneEditableValue, getUserNameObject, getUserName, sleep, isValidEmail, getRecentDocumentBasedOnPurpose, formatNumberAsCurrency, removeAllCharsFromNumber, mapUserList, sortUserList, getIndividualType, isOtherThanKWOrSA } from '../../../utils';
 export var verifyToken = createAsyncThunk('individual/verifyToken', function (_a, thunkApi) {
     var token = _a.token, isInternally = _a.isInternally, isUpdatePhoneInfo = _a.isUpdatePhoneInfo;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -568,6 +568,9 @@ export var updateIndividualPersonalInfo = createAsyncThunk('individual/updateInd
                     data_status = (user || {}).data_status;
                     userName = getUserNameObject(name);
                     identification_id_type = nid ? (nid.startsWith('1') ? IDENTIFICATION_TYPE.NID : IDENTIFICATION_TYPE.IQAMA) : undefined;
+                    if (isOtherThanKWOrSA(settings.data.businessCountry.iso2)) {
+                        identification_id_type = IDENTIFICATION_TYPE.NID;
+                    }
                     isGenderNonEditable = hasNoneEditableValue(data_status, 'gender');
                     isNameENNonEditable = hasNoneEditableValue(data_status, 'name.en');
                     isNameARNonEditable = hasNoneEditableValue(data_status, 'name.ar');

package/build/features/connectExpress/ConnectExpress.js

@@ -124,11 +124,10 @@ var ConnectExpress = memo(function (_a) {
         }
     }, [data.isValidOperator, settingLoading]);
     React.useEffect(function () {
-        var _a, _b;
-        if (!settingLoading && (isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2) || isOtherThanKWOrSA((_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2))) {
+        if (data.businessCountry.iso2 && (isKW(data.businessCountry.iso2) || isOtherThanKWOrSA(data.businessCountry.iso2))) {
             dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
         }
-    }, [settingLoading]);
+    }, [data.businessCountry]);
     return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: true }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true }, { children: connectExpressFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;

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

@@ -74,6 +74,14 @@ var AuthenticationList = function (_a) {
         var screen = startWithNID ? (isKW(code) ? 'CONNECT_EXPRESS_CIVIL_ID_STEP' : 'CONNECT_EXPRESS_NID_STEP') : 'CONNECT_EXPRESS_MOBILE_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
+    React.useEffect(function () {
+        if (merchantInfo && !methods.getValues('merchantInfo'))
+            methods.setValue('merchantInfo', merchantInfo, { shouldValidate: true });
+    }, [merchantInfo]);
+    React.useEffect(function () {
+        if (terminalInfo && !methods.getValues('terminalInfo'))
+            methods.setValue('terminalInfo', terminalInfo, { shouldValidate: true });
+    }, [terminalInfo]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());

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

@@ -13,8 +13,10 @@ 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 { removeAllCharsFromNumber } from '../../../../utils';
+import { isOtherThanKWOrSA, removeAllCharsFromNumber } from '../../../../utils';
 import { ID_NUMBER_LENGTH } from '../../../../constants';
+import { useAppSelector } from '../../../../hooks';
+import { settingsSelector } from '../../../../app/settings';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
@@ -24,7 +26,9 @@ var IDNumber = function (_a) {
     var show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
     var t = useTranslation().t;
     var control = useFormContext().control;
+    var settingsData = useAppSelector(settingsSelector).data;
     var nidControl = useController({ control: control, name: 'nid' });
+    var isOtherCountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var handleIdChange = function (_a) {
         var target = _a.target;
         var value = removeAllCharsFromNumber(target.value);
@@ -35,6 +39,6 @@ var IDNumber = function (_a) {
     };
     var nidValue = nidControl.field.value;
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_national_id'), inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, isVerified: isVerified, onClear: clearIdNumber, error: error }), placeholder: '0000000000', warningType: 'alert', warningMessage: error && t(error, { number: '1' }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_national_id'), inputProps: isOtherCountry ? {} : { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, isVerified: isVerified, onClear: clearIdNumber, error: error }), placeholder: '0000000000', warningType: 'alert', warningMessage: error && t(error, { number: '1' }) }) }) })));
 };
 export default React.memo(IDNumber);

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

@@ -18,7 +18,7 @@ import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } fro
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
-import { convertToEnglishDateFormat, deepCopy, getUserName } from '../../../../utils';
+import { convertToEnglishDateFormat, deepCopy, getUserName, isOtherThanKWOrSA } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
@@ -61,8 +61,9 @@ var IndividualPersonalInfo = function (_a) {
     var _m = verify.responseBody || {}, user = _m.user, flows = _m.flows;
     var name = individualPersonalData.name, email = individualPersonalData.email, mobile = individualPersonalData.mobile, countryCode = individualPersonalData.countryCode, gender = individualPersonalData.gender, nid = individualPersonalData.nid, issuedCountry = individualPersonalData.issuedCountry, expiryDate = individualPersonalData.expiryDate, dob = individualPersonalData.dob, placeOfBirthCountry = individualPersonalData.placeOfBirthCountry, placeOfBirthCity = individualPersonalData.placeOfBirthCity, nationality = individualPersonalData.nationality;
     var _o = user || {}, data_status = _o.data_status, is_authorized = _o.is_authorized, data_verification = _o.data_verification, contact = _o.contact, genderRes = _o.gender, identification = _o.identification, birth = _o.birth, nationalityRes = _o.nationality;
+    var isOtherCountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var methods = useForm({
-        resolver: yupResolver(IndividualInfoValidationSchema),
+        resolver: yupResolver(IndividualInfoValidationSchema(isOtherCountry)),
         defaultValues: {
             name: name,
             email: email,

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

@@ -1,5 +1,5 @@
 import * as yup from 'yup';
-export declare const IndividualInfoValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare const IndividualInfoValidationSchema: (isOtherCountry: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     name: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     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/IndividualPersonalInfo/validation.js

@@ -1,68 +1,72 @@
 import * as yup from 'yup';
 import { REGEX_FULL_NAME } from '../../../../constants';
-export var IndividualInfoValidationSchema = yup.object().shape({
-    name: yup
-        .string()
-        .test({
-        test: function (value) {
-            if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
-                var name_1 = value || '';
-                var isMatch = name_1.match(REGEX_FULL_NAME);
-                return isMatch ? true : this.createError({ message: 'please write your first and last name' });
-            }
-            return true;
-        }
-    })
-        .optional(),
-    mobile: 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' });
+export var IndividualInfoValidationSchema = function (isOtherCountry) {
+    return yup.object().shape({
+        name: yup
+            .string()
+            .test({
+            test: function (value) {
+                if (((value === null || value === void 0 ? void 0 : value.length) || 0) > 0) {
+                    var name_1 = value || '';
+                    var isMatch = name_1.match(REGEX_FULL_NAME);
+                    return isMatch ? true : this.createError({ message: 'please write your first and last name' });
                 }
-                return valueLen === digits ? true : this.createError({ message: 'enter_valid_mobile_number' });
+                return true;
             }
-            return true;
-        }
-    })
-        .optional(),
-    email: yup.string().email('email_not_valid').optional(),
-    gender: yup.string().optional(),
-    nid: yup
-        .string()
-        .test({
-        test: function (value) {
-            var id = value || '';
-            if (id.length > 0) {
-                if (id.length < 10)
-                    return this.createError({ message: 'signup_invalid_national_id' });
-                var isMatch = id.match(/^(1|2)([0-9]{1,})$/g);
-                return isMatch ? true : this.createError({ message: 'signup_invalid_national_id_format' });
+        })
+            .optional(),
+        mobile: 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;
             }
-            return true;
-        }
-    })
-        .optional(),
-    issuedCountry: yup.object().optional(),
-    expiryDate: yup.string().min(5).optional(),
-    dob: yup.string().min(5).optional(),
-    placeOfBirthCountry: yup.object().optional(),
-    placeOfBirthCity: yup.object().optional(),
-    nationality: yup.object().optional()
-});
+        })
+            .optional(),
+        email: yup.string().email('email_not_valid').optional(),
+        gender: yup.string().optional(),
+        nid: isOtherCountry
+            ? yup.string().min(3, 'signup_invalid_national_id').required('signup_invalid_national_id')
+            : yup
+                .string()
+                .test({
+                test: function (value) {
+                    var id = value || '';
+                    if (id.length > 0) {
+                        if (id.length < 10)
+                            return this.createError({ message: 'signup_invalid_national_id' });
+                        var isMatch = id.match(/^(1|2)([0-9]{1,})$/g);
+                        return isMatch ? true : this.createError({ message: 'signup_invalid_national_id_format' });
+                    }
+                    return true;
+                }
+            })
+                .optional(),
+        issuedCountry: yup.object().optional(),
+        expiryDate: yup.string().min(5).optional(),
+        dob: yup.string().min(5).optional(),
+        placeOfBirthCountry: yup.object().optional(),
+        placeOfBirthCity: yup.object().optional(),
+        nationality: yup.object().optional()
+    });
+};

package/package.json

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