@tap-payments/auth-jsconnect 2.0.22 → 2.0.23

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

@@ -27,6 +27,7 @@ import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividua
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
+import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import { isKW } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
@@ -34,17 +35,18 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b, _c, _d, _e, _f, _g;
-    var _h = React.useState(false), listActive = _h[0], setListActive = _h[1];
-    var _j = React.useState(false), emailChecking = _j[0], setEmailChecking = _j[1];
+    var _b = React.useState(false), listActive = _b[0], setListActive = _b[1];
+    var _c = React.useState(false), emailChecking = _c[0], setEmailChecking = _c[1];
     var settingsData = useAppSelector(settingsSelector).data;
-    var _k = useAppSelector(connectSelector), data = _k.data, loading = _k.loading, error = _k.error;
+    var _d = useAppSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = (_b = data.otpData) === null || _b === void 0 ? void 0 : _b.isAbsher;
-    var isMobile = data.mobileData.mobile;
-    var individualData = data.individualData;
+    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData;
+    var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
+    var isMobile = mobileData.mobile;
+    var _e = otpData.responseBody || {}, contact = _e.contact, name = _e.name, userInfoMissed = _e.userInfoMissed, is_new_individual = _e.is_new_individual;
+    var is_available = (individualData.responseBody || {}).is_available;
     var methods = useForm({
         resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
         defaultValues: data.individualData,
@@ -57,7 +59,7 @@ var Individual = function (_a) {
         var _a;
         dispatch(resetIndividualScreen());
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
@@ -79,16 +81,17 @@ var Individual = function (_a) {
         listActive ? setListActive(false) : setListActive(true);
     };
     React.useEffect(function () {
-        var _a, _b;
-        if (((_b = (_a = data.individualData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.is_available) === false)
+        var _a;
+        if (((_a = individualData === null || individualData === void 0 ? void 0 : individualData.responseBody) === null || _a === void 0 ? void 0 : _a.is_available) === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
-    }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
-    var isLeadEmailAvailable = ((_e = (_d = data.otpData.responseBody) === null || _d === void 0 ? void 0 : _d.contact) === null || _e === void 0 ? void 0 : _e.email) === methods.watch('email');
-    var isEmailValid = ((_f = data.individualData.responseBody) === null || _f === void 0 ? void 0 : _f.is_available) === undefined
-        ? isLeadEmailAvailable
-        : (_g = data.individualData.responseBody) === null || _g === void 0 ? void 0 : _g.is_available;
+    }, [individualData === null || individualData === void 0 ? void 0 : individualData.responseBody]);
+    var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
+    var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var isNameRequired = (userInfoMissed && !name) || is_new_individual;
+    var isEmailRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.email)) || is_new_individual;
+    var isMobileRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.phone)) || is_new_individual;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive && isNameRequired }), _jsx(MobileNumber, { show: !isMobile && isMobileRequired, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive && isEmailRequired, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -22,6 +22,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
+import { AuthForType } from '../../../../@types';
 import { isKW } from '../../../../utils';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
@@ -37,7 +38,7 @@ var Merchant = function (_a) {
     var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
     var settingsData = useAppSelector(settingsSelector).data;
     var isNewIndividual = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.is_new_individual;
-    var isAbsher = data.otpData.isAbsher;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var _h = data.brandData, brandName = _h.brandName, selectedBrandItem = _h.selectedBrandItem, termAndConditionChecked = _h.termAndConditionChecked, responseBody = _h.responseBody, salesChannels = _h.salesChannels;
     var brandList = (responseBody || {}).brand_list;
     var methods = useForm({
@@ -64,7 +65,7 @@ var Merchant = function (_a) {
             return;
         }
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {

package/build/features/connect/screens/Merchant/SocialMedia.js

@@ -151,7 +151,9 @@ var SocialMedia = function (_a) {
         return ((_b = item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
     };
     var hasError = React.useMemo(function () {
-        return ['enter_at_least_one', 'invalid_url'].some(function (error) { var _a, _b; return (_b = (_a = salesChannelsState.error) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.includes(error); });
+        var _a;
+        var error = salesChannelsState.error;
+        return (error === null || error === void 0 ? void 0 : error.message) && 'choose_atleast_one_channel' !== ((_a = salesChannelsState.error) === null || _a === void 0 ? void 0 : _a.message);
     }, [salesChannelsState]);
     var linksErrorMsg = (_b = salesChannelsState.error) === null || _b === void 0 ? void 0 : _b.message;
     return (_jsx(Box, { children: _jsx(Collapse, __assign({ in: show && selectedChannels.length > 0 }, { children: _jsxs(Box, __assign({ sx: { mb: 3, direction: 'ltr' } }, { children: [_jsx(SocialMediaGroupStyled, __assign({ exclusive: true, onChange: function (e, value) {
@@ -174,6 +176,6 @@ var SocialMedia = function (_a) {
                         })) : (_jsx(Collapse, __assign({ in: isActive, timeout: 300 }, { children: _jsx(InputStyled, { onChange: function (e) {
                                     onChangeInput(e.target.value, channel.id);
                                 }, value: channel.address || '', startAdornment: _jsx(TextStyled, {}), placeholder: t(getPlaceHolder(channel)) }) }), index));
-                    }), _jsx(Collapse, __assign({ in: hasError }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(linksErrorMsg) })) }))] })) })) }));
+                    }), _jsx(Collapse, __assign({ in: !!hasError }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(linksErrorMsg) })) }))] })) })) }));
 };
 export default React.memo(SocialMedia);

package/build/features/connect/screens/Merchant/validation.js

@@ -7,8 +7,70 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { REGEX_WEBSITE, REGEX_BRAND_NAME } from '../../../../constants';
+import { REGEX_WEBSITE, REGEX_BRAND_NAME, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_PHONE_APP_NAME } from '../../../../constants';
 import * as yup from 'yup';
+var validationSalesChannels = function (channels) {
+    if (channels === void 0) { channels = []; }
+    var dic = {};
+    var typeDic = {};
+    channels.forEach(function (channel) {
+        var _a, _b, _c;
+        if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
+            var key_1 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+            if (key_1)
+                dic[key_1] = [];
+            channel.sub.forEach(function (sub) {
+                dic[key_1].push(sub.address || '');
+                typeDic[sub.code] = sub.address || '';
+            });
+        }
+        else {
+            var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+            if (key)
+                dic[key] = [channel.address || ''];
+            typeDic[key] = channel.address || '';
+        }
+    });
+    for (var key in dic) {
+        var values = dic[key];
+        var atLestOne = values.every(function (item) { return item === ''; });
+        if (atLestOne)
+            return "enter_at_least_one_".concat(key);
+    }
+    console.log('dic', dic);
+    console.log('typeDic', typeDic);
+    for (var key in typeDic) {
+        var value = typeDic[key];
+        if (key === 'website' && value && !value.match(REGEX_WEBSITE)) {
+            return 'invalid_url';
+        }
+        if (key === 'linkedin' && value && !value.match(LINKEDIN_URL)) {
+            return 'invalid_linkedin_profile_url';
+        }
+        if (key === 'facebook' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_facebook_username';
+        }
+        if (key === 'instagram' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_instagram_username';
+        }
+        if (key === 'twitter' && value && !value.match(SOCIAL_USERNAME)) {
+            return 'invalid_twitter_username';
+        }
+        if (key === 'physical_store' && value && value.length < 3) {
+            return 'invalid_physical_store_location';
+        }
+        if (key === 'ios' && value && !value.match(REGEX_PHONE_APP_NAME)) {
+            return 'invalid_ios_app';
+        }
+        if (key === 'android' && value && !value.match(REGEX_PHONE_APP_NAME)) {
+            return 'invalid_android_app';
+        }
+        if (key === 'call_center' && value && !value.match(DIGITS_ONLY)) {
+            return 'invalid_call_center_number';
+        }
+    }
+    return true;
+};
 export var MerchantValidationSchema = function (isNewBrand) {
     if (isNewBrand === void 0) { isNewBrand = true; }
     if (isNewBrand)
@@ -38,35 +100,10 @@ export var MerchantValidationSchema = function (isNewBrand) {
                     if (length === 0)
                         return true;
                     var channels = __spreadArray([], (value || []), true);
-                    var dic = {};
-                    channels.forEach(function (channel) {
-                        var _a, _b, _c;
-                        if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                            var key_1 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
-                            if (key_1)
-                                dic[key_1] = [];
-                            channel.sub.forEach(function (sub) {
-                                dic[key_1].push(sub.address || '');
-                            });
-                        }
-                        else {
-                            var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-                            if (key)
-                                dic[key] = [channel.address || ''];
-                        }
-                    });
-                    for (var key in dic) {
-                        var values = dic[key];
-                        var atLestOne = values.every(function (item) { return item === ''; });
-                        if (atLestOne)
-                            return this.createError({ message: "enter_at_least_one_".concat(key) });
-                        if (key === 'website') {
-                            var isWebsite = values.every(function (item) { return item === '' || item.match(REGEX_WEBSITE); });
-                            if (!isWebsite)
-                                return this.createError({ message: 'invalid_url' });
-                        }
-                    }
-                    return true;
+                    var result = validationSalesChannels(channels);
+                    if (result === true)
+                        return true;
+                    return this.createError({ message: result });
                 }
             })
                 .required('choose_atleast_one_channel')
@@ -84,35 +121,10 @@ export var MerchantValidationSchema = function (isNewBrand) {
                 if (length === 0)
                     return true;
                 var channels = __spreadArray([], (value || []), true);
-                var dic = {};
-                channels.forEach(function (channel) {
-                    var _a, _b, _c;
-                    if ((_a = channel.sub) === null || _a === void 0 ? void 0 : _a.length) {
-                        var key_2 = (_b = channel.code) === null || _b === void 0 ? void 0 : _b.toLowerCase();
-                        if (key_2)
-                            dic[key_2] = [];
-                        channel.sub.forEach(function (sub) {
-                            dic[key_2].push(sub.address || '');
-                        });
-                    }
-                    else {
-                        var key = (_c = channel.code) === null || _c === void 0 ? void 0 : _c.toLowerCase();
-                        if (key)
-                            dic[key] = [channel.address || ''];
-                    }
-                });
-                for (var key in dic) {
-                    var values = dic[key];
-                    var atLestOne = values.every(function (item) { return item === ''; });
-                    if (atLestOne)
-                        return this.createError({ message: "enter_at_least_one_".concat(key) });
-                    if (key === 'website') {
-                        var isWebsite = values.every(function (item) { return item === '' || item.match(REGEX_WEBSITE); });
-                        if (!isWebsite)
-                            return this.createError({ message: 'invalid_url' });
-                    }
-                }
-                return true;
+                var result = validationSalesChannels(channels);
+                if (result === true)
+                    return true;
+                return this.createError({ message: result });
             }
         })
             .required('choose_atleast_one_channel')

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

@@ -21,6 +21,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
+import { AuthForType } from '../../../../@types';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import Form from '../../../../components/Form';
@@ -57,7 +58,7 @@ var OTP = function () {
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = data.otpData.isAbsher;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -69,12 +70,12 @@ var OTP = function () {
         dispatch(verifyAuth(formData));
     };
     var onBack = function () {
-        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
+        dispatch(handlePrevScreenStep(startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
     var disabled = !methods.formState.isValid || !!error;
     var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
     var idNumber = data.nidData.nid;
-    var title = isAbsher ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: isAbsher ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

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

@@ -17,6 +17,7 @@ import Box from '@mui/material/Box/Box';
 import { styled } from '@mui/material/styles';
 import OTPField from '../../../shared/OTP';
 import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { AuthForType } from '../../../../@types';
 import { connectSelector, resendOTPMobile, resendOTPNID } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 var BoxStyled = styled(Box)(function (_a) {
@@ -33,7 +34,7 @@ var OTPInput = function (_a) {
     var dispatch = useAppDispatch();
     var otpControl = useController({ name: 'otp', control: control });
     var data = useAppSelector(connectSelector).data;
-    var isAbsher = data.otpData.isAbsher;
+    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var handleOnOTPChange = function (otp) {
         otpControl.field.onChange(otp);
     };
@@ -48,6 +49,6 @@ var OTPInput = function (_a) {
         dispatch(resendOTPNID());
     };
     var otpValue = otpControl.field.value;
-    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: isAbsher ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: startWithNID ? handleOnResendAbsherOTP : handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
 };
 export default React.memo(OTPInput);

package/build/features/entity/Entity.js

@@ -27,8 +27,8 @@ import Background from '../shared/Background';
 var Entity = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, loading = _a.loading;
-    var _b = useAppSelector(entitySelector), customLoading = _b.customLoading, entityError = _b.error;
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var _b = useAppSelector(entitySelector), customLoading = _b.customLoading, entityError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: ENTITY_SCREENS_NAVIGATION }, props));
     useErrorListener(entityError || error);
     useStepStartedListener();
@@ -43,10 +43,10 @@ var Entity = memo(function (props) {
         dispatch(verifyLeadToken(token));
     };
     useEffect(function () {
-        if (!loading)
+        if (!settingLoading)
             verifyToken();
-    }, [loading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: loading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, open: open, error: error, loading: loading || customLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: entityFeatureScreens.map(function (_a, index) {
+    }, [settingLoading]);
+    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, open: open, error: error, loading: settingLoading || customLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: entityFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

package/build/features/featuresScreens.d.ts

@@ -7,5 +7,4 @@ export declare const bankFeatureScreens: Array<FeatureScreenStep>;
 export declare const taxFeatureScreens: Array<FeatureScreenStep>;
 export declare const signInFeatureScreens: Array<FeatureScreenStep>;
 export declare const entityFeatureScreens: Array<FeatureScreenStep>;
-export declare const otpFeatureScreens: Array<FeatureScreenStep>;
 export declare const authFeatureScreens: Array<FeatureScreenStep>;

package/build/features/featuresScreens.js

@@ -47,7 +47,6 @@ import EntityInfoConfirmPage from './entity/screens/EntityInfoConfirm';
 import EntitySuccessPage from './entity/screens/Success';
 import EntitySuccessWithFlowPage from './entity/screens/SuccessWithFlowButtons';
 import EntityResetPasswordSuccessPage from './entity/screens/ResetPasswordSuccess';
-import OtpVerifyPage from '../features/otp/screens/OTPVerify';
 import AuthNIDPage from './auth/screens/NID';
 import AuthVerifyPage from './auth/screens/OTP';
 export var connectFeatureScreens = [
@@ -238,12 +237,6 @@ export var entityFeatureScreens = [
     },
     { name: 'ENTITY_RESET_PASSWORD_SUCCESS', element: EntityResetPasswordSuccessPage }
 ];
-export var otpFeatureScreens = [
-    {
-        name: 'OTP_VERIFY_STEP',
-        element: OtpVerifyPage
-    }
-];
 export var authFeatureScreens = [
     {
         name: 'AUTH_NID_STEP',

package/build/features/individual/Individual.js

@@ -28,7 +28,7 @@ var Individual = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(individualSelector), customLoading = _b.customLoading, individualError = _b.error;
+    var _b = useAppSelector(individualSelector), customLoading = _b.customLoading, individualError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: INDIVIDUAL_SCREENS_NAVIGATION }, props));
     useErrorListener(individualError || error);
     useStepStartedListener();
@@ -46,7 +46,7 @@ var Individual = memo(function (props) {
         if (!settingLoading && open)
             verifyToken();
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
+    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, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: individualFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -48,7 +48,7 @@ var SuccessWithFlowButtons = function () {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var data = useAppSelector(individualSelector).data;
-    var _e = data.verify.responseBody || {}, flows = _e.flows, nameObj = _e.name, entity = _e.entity, brand = _e.brand, bank = _e.bank_account, merchant = _e.merchant, identification_id = _e.identification_id, user = _e.user;
+    var _e = data.verify.responseBody || {}, flows = _e.flows, nameObj = _e.name, entity = _e.entity, brand = _e.brand, bank = _e.bank_account, merchant = _e.merchant, user = _e.user;
     var _f = useState([]), buttons = _f[0], setButtons = _f[1];
     var username = ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.first) || '') + ' ' + ((nameObj === null || nameObj === void 0 ? void 0 : nameObj.last) || '');
     var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
@@ -58,7 +58,7 @@ var SuccessWithFlowButtons = function () {
     var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
     var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
     var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
-    var identification = user.identification;
+    var identification = (user || {}).identification;
     var maskedId = !!(identification === null || identification === void 0 ? void 0 : identification.id) ? " ".concat(t('masking_symbols')).concat((_d = identification === null || identification === void 0 ? void 0 : identification.id) === null || _d === void 0 ? void 0 : _d.slice(-2)) : '';
     var settings = useAppSelector(settingsSelector);
     var _g = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _g.contact, board_id = _g.board_id, board_info_id = _g.board_info_id;

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

@@ -47,9 +47,9 @@ var FormStyled = styled(Form)(function () { return ({
     flexDirection: 'column'
 }); });
 var VerifyNumber = function (_a) {
-    var _b, _c, _d;
+    var _b, _c;
     var dispatch = useAppDispatch();
-    var _e = useAppSelector(individualSelector), data = _e.data, loading = _e.loading, error = _e.error;
+    var _d = useAppSelector(individualSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
         defaultValues: data.otpData,
@@ -57,8 +57,8 @@ var VerifyNumber = function (_a) {
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _f = React.useState(false), resendLoading = _f[0], setResendLoading = _f[1];
-    var phone = (_d = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.contact) === null || _c === void 0 ? void 0 : _c.phone) === null || _d === void 0 ? void 0 : _d.number;
+    var _e = React.useState(false), resendLoading = _e[0], setResendLoading = _e[1];
+    var phone = (_c = (_b = data.verify.responseBody) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to;
     React.useEffect(function () {
         if (error && methods.formState.isValid && phone)
             dispatch(clearError());

package/build/features/password/Password.js

@@ -28,7 +28,7 @@ var Password = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(passwordSelector), customLoading = _b.customLoading, passwordError = _b.error;
+    var _b = useAppSelector(passwordSelector), customLoading = _b.customLoading, passwordError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: PASSWORD_SCREENS_NAVIGATION }, props));
     useErrorListener(passwordError || error);
     useStepStartedListener();
@@ -53,7 +53,7 @@ var Password = memo(function (props) {
         if (!settingLoading && open)
             verifyToken();
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: passwordFeatureScreens.map(function (_a, index) {
+    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, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: passwordFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

package/build/features/signIn/SignIn.js

@@ -26,13 +26,13 @@ import { signInSelector } from '../app/signIn/signInStore';
 import Background from '../shared/Background';
 var SignIn = memo(function (props) {
     var theme = useAppTheme().theme;
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, loading = _a.loading;
-    var signInError = useAppSelector(signInSelector).error;
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var _b = useAppSelector(signInSelector), signInError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: SigIn_SCREENS_NAVIGATION }, props));
     useErrorListener(signInError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: loading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, open: open, error: error, loading: loading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: signInFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, open: open, error: error, loading: settingLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: signInFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

package/build/features/tax/Tax.js

@@ -27,8 +27,8 @@ import Background from '../shared/Background';
 var Tax = memo(function (props) {
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, loading = _a.loading;
-    var _b = useAppSelector(taxSelector), customLoading = _b.customLoading, taxError = _b.error;
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var _b = useAppSelector(taxSelector), customLoading = _b.customLoading, taxError = _b.error, loading = _b.loading;
     useAppConfig(__assign({ navigation: TAX_SCREENS_NAVIGATION }, props));
     useErrorListener(taxError || error);
     useStepStartedListener();
@@ -43,10 +43,10 @@ var Tax = memo(function (props) {
         dispatch(verifyLeadToken(token));
     };
     useEffect(function () {
-        if (!loading && open)
+        if (!settingLoading && open)
             verifyToken();
-    }, [loading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: loading || customLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, open: open, error: error, loading: loading || customLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
+    }, [settingLoading]);
+    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, open: open, error: error, loading: settingLoading || customLoading, breakpoint: 'sm', footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: taxFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

package/build/hooks/useAppDispatch.d.ts

@@ -8,6 +8,5 @@ export declare const useAppDispatch: () => import("redux-thunk").ThunkDispatch<{
     password: import("../features/app/password/passwordStore").PasswordState;
     signIn: import("../features/app/signIn/signInStore").SignInState;
     entity: import("../features/app/entity/entityStore").EntityState;
-    otp: import("../features/app/otp/otpStore").OtpState;
     auth: import("../features/app/auth/authStore").AuthState;
 }, undefined, import("redux").AnyAction> & import("redux").Dispatch<import("redux").AnyAction>;

package/build/index.d.ts

@@ -8,7 +8,6 @@ import { BankLib, renderBankLib, BankLibProps, unmountBankLib } from './features
 import { TaxLib, renderTaxLib, TaxLibProps, unmountTaxLib } from './features/tax';
 import { SignInLib, renderSignInLib, SignInLibProps, unmountSignInLib } from './features/signIn';
 import { EntityLib, EntityLibProps, renderEntityLib, unmountEntityLib } from './features/entity';
-import { OTPLib, OTPLibProps, renderOTPLib, unmountOTPLib } from './features/otp/OTP';
 import { AuthLib, AuthLibProps, renderAuthLib, unmountAuthLib } from './features/auth';
-export type { ConnectLibProps, BusinessLibProps, PasswordLibProps, IndividualLibProps, BankLibProps, TaxLibProps, EntityLibProps, OTPLibProps, AuthLibProps, SignInLibProps };
-export { ConnectLib, renderConnectLib, unmountConnectLib, BusinessLib, renderBusinessLib, unmountBusinessLib, PasswordLib, renderPasswordLib, unmountPasswordLib, IndividualLib, renderIndividualLib, unmountIndividualLib, BankLib, renderBankLib, unmountBankLib, TaxLib, renderTaxLib, unmountTaxLib, EntityLib, renderEntityLib, unmountEntityLib, OTPLib, renderOTPLib, unmountOTPLib, SignInLib, renderSignInLib, unmountSignInLib, AuthLib, renderAuthLib, unmountAuthLib };
+export type { ConnectLibProps, BusinessLibProps, PasswordLibProps, IndividualLibProps, BankLibProps, TaxLibProps, EntityLibProps, AuthLibProps, SignInLibProps };
+export { ConnectLib, renderConnectLib, unmountConnectLib, BusinessLib, renderBusinessLib, unmountBusinessLib, PasswordLib, renderPasswordLib, unmountPasswordLib, IndividualLib, renderIndividualLib, unmountIndividualLib, BankLib, renderBankLib, unmountBankLib, TaxLib, renderTaxLib, unmountTaxLib, EntityLib, renderEntityLib, unmountEntityLib, SignInLib, renderSignInLib, unmountSignInLib, AuthLib, renderAuthLib, unmountAuthLib };

package/build/index.js

@@ -8,9 +8,8 @@ import { BankLib, renderBankLib, unmountBankLib } from './features/bank';
 import { TaxLib, renderTaxLib, unmountTaxLib } from './features/tax';
 import { SignInLib, renderSignInLib, unmountSignInLib } from './features/signIn';
 import { EntityLib, renderEntityLib, unmountEntityLib } from './features/entity';
-import { OTPLib, renderOTPLib, unmountOTPLib } from './features/otp/OTP';
 import { AuthLib, renderAuthLib, unmountAuthLib } from './features/auth';
-export { ConnectLib, renderConnectLib, unmountConnectLib, BusinessLib, renderBusinessLib, unmountBusinessLib, PasswordLib, renderPasswordLib, unmountPasswordLib, IndividualLib, renderIndividualLib, unmountIndividualLib, BankLib, renderBankLib, unmountBankLib, TaxLib, renderTaxLib, unmountTaxLib, EntityLib, renderEntityLib, unmountEntityLib, OTPLib, renderOTPLib, unmountOTPLib, SignInLib, renderSignInLib, unmountSignInLib, AuthLib, renderAuthLib, unmountAuthLib };
+export { ConnectLib, renderConnectLib, unmountConnectLib, BusinessLib, renderBusinessLib, unmountBusinessLib, PasswordLib, renderPasswordLib, unmountPasswordLib, IndividualLib, renderIndividualLib, unmountIndividualLib, BankLib, renderBankLib, unmountBankLib, TaxLib, renderTaxLib, unmountTaxLib, EntityLib, renderEntityLib, unmountEntityLib, SignInLib, renderSignInLib, unmountSignInLib, AuthLib, renderAuthLib, unmountAuthLib };
 window['TapAuth'] = {
     renderConnectLib: renderConnectLib,
     unmountConnectLib: unmountConnectLib,
@@ -26,8 +25,6 @@ window['TapAuth'] = {
     unmountTaxLib: unmountTaxLib,
     renderEntityLib: renderEntityLib,
     unmountEntityLib: unmountEntityLib,
-    renderOTPLib: renderOTPLib,
-    unmountOTPLib: unmountOTPLib,
     renderSignInLib: renderSignInLib,
     unmountSignInLib: unmountSignInLib,
     renderAuthLib: renderAuthLib,

package/build/utils/object.d.ts

@@ -2,3 +2,4 @@ export declare const compareTwoObjects: (obj1: any, obj2: any) => boolean;
 export declare const encodeObjectBase64: (obj: any) => string;
 export declare const decodeObjectBase64: (str: string) => any;
 export declare const hasKey: (obj: any, key: string) => boolean;
+export declare const concatenateObjectValues: (data: Record<string, any>, keys: Array<string>) => string;

package/build/utils/object.js

@@ -21,3 +21,15 @@ export var hasKey = function (obj, key) {
         return false;
     return Object.keys(obj).includes(key);
 };
+export var concatenateObjectValues = function (data, keys) {
+    if (!data)
+        return '';
+    var result = '';
+    for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+        var key = keys_1[_i];
+        if (data[key]) {
+            result += data[key] + ' ';
+        }
+    }
+    return result.trim();
+};

package/package.json

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

package/build/features/app/otp/otpStore.d.ts

@@ -1,28 +0,0 @@
-import { RootState } from '../../../app/store';
-import { FlowsTypes, OTPFormValues, ResponseData, SharedState } from '../../../@types';
-export declare const resendOTP: import("@reduxjs/toolkit").AsyncThunk<{
-    data: any;
-}, void, {}>;
-export declare const verifyOtpLeadOTP: import("@reduxjs/toolkit").AsyncThunk<{
-    formData: OTPFormValues;
-}, OTPFormValues, {}>;
-declare type VerifyData = {
-    token: string;
-};
-export interface OtpData {
-    verify: ResponseData & VerifyData;
-    otpData: OTPFormValues & ResponseData;
-    flowName: FlowsTypes;
-}
-export interface OtpState extends SharedState<OtpData> {
-    customLoading?: boolean;
-}
-export declare const otpSlice: import("@reduxjs/toolkit").Slice<OtpState, {
-    clearError: (state: OtpState) => void;
-    stopLoader: (state: OtpState) => void;
-    resetOTPScreen: (state: OtpState) => void;
-}, "otp/store">;
-export declare const clearError: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, stopLoader: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>, resetOTPScreen: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<string>;
-declare const _default: import("redux").Reducer<OtpState, import("redux").AnyAction>;
-export default _default;
-export declare const otpSelector: (state: RootState) => OtpState;