@tap-payments/auth-jsconnect 2.9.14-development → 2.9.16-development

package/build/components/AnimationFlow/BottomSheet.js

@@ -79,7 +79,8 @@ var CloseIconStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
         width: theme.spacing(3.75),
-        height: theme.spacing(3.75)
+        height: theme.spacing(3.75),
+        cursor: 'pointer'
     });
 });
 var CloseBox = styled(Box)(function (_a) {
@@ -89,7 +90,6 @@ var CloseBox = styled(Box)(function (_a) {
         justifyContent: 'end',
         marginBlockStart: theme.spacing(2),
         marginInlineEnd: theme.spacing(2),
-        cursor: 'pointer',
         direction: theme.direction,
         position: 'absolute',
         right: 0,
@@ -134,6 +134,6 @@ var BottomSheetComponent = function (_a) {
     return (_jsxs(BottomSheetStyled, __assign({ languageBarHeight: getLanguageBarHeight(), dialogEdgeFormat: dialogEdgeFormat, sibling: hideFooter ? (_jsx(_Fragment, {})) : (open && (_jsx(LanguageFooterStyled, { children: _jsx(CustomFooter, {}) }))), isMaturityExpress: isMaturityExpress, showPoweredBy: !hidePoweredBy, sx: { pointerEvents: pointerEvents }, ref: sheetRef, open: open, snapPoints: function (_a) {
             var maxHeight = _a.maxHeight;
             return [getMinHeight(maxHeight), maxHeight * 0.95];
-        } }, rest, { children: [isMaturityExpress && !hideMerchantLogo && (_jsx(LogoBadge, { src: isMaturityExpress ? logo || ICONS_NAMES.LOGO_ICON : ICONS_NAMES.LOGO_ICON })), onClose && (_jsx(CloseBox, __assign({ id: 'close-container', onClick: handleOnCloseButton }, { children: _jsx(CloseIconStyled, { src: ICONS_NAMES.CLOSE_ICON }) }))), children, isMaturityExpress && !hidePoweredBy && (_jsx(FooterStyled, { children: _jsx(PoweredByFooter, { id: 'bottom-sheet-powered_by_footer', sx: { margin: '0px' }, textSx: { color: 'rgba(63, 66, 77, 0.6)' }, icon: isAr ? ICONS_NAMES.LOGO_WITH_NAME_DARK_AR_ICON : ICONS_NAMES.LOGO_WITH_NAME_DARK_EN_ICON }) }))] })));
+        } }, rest, { children: [isMaturityExpress && !hideMerchantLogo && (_jsx(LogoBadge, { src: isMaturityExpress ? logo || ICONS_NAMES.LOGO_ICON : ICONS_NAMES.LOGO_ICON })), onClose && (_jsx(CloseBox, __assign({ id: 'close-container' }, { children: _jsx(CloseIconStyled, { src: ICONS_NAMES.CLOSE_ICON, onClick: handleOnCloseButton }) }))), children, isMaturityExpress && !hidePoweredBy && (_jsx(FooterStyled, { children: _jsx(PoweredByFooter, { id: 'bottom-sheet-powered_by_footer', sx: { margin: '0px' }, textSx: { color: 'rgba(63, 66, 77, 0.6)' }, icon: isAr ? ICONS_NAMES.LOGO_WITH_NAME_DARK_AR_ICON : ICONS_NAMES.LOGO_WITH_NAME_DARK_EN_ICON }) }))] })));
 };
 export default React.memo(BottomSheetComponent);

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

@@ -71,7 +71,7 @@ import { handleCurrentActiveScreen, handleNextScreenStep, handleSetCountryByIso2
 import { COLLECT_DOB_INFO_NAFATH, CONNECT_STEP_NAMES, defaultCountry, IDENTIFICATION_TYPE, NAFATH_VERIFICATION_FAILED, OTHER_BRAND } from '../../../constants';
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
 import { AuthForType, FlowsTypes } from '../../../@types';
-import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep, sendCustomEventToGTM, isOtherThanKWOrSA, isKW, findCountryByIso2, getMetaData, isSA } from '../../../utils';
+import { capitalizeTheFirstLetterOfEachWord, concatenateObjectValues, findCountryByIddPrefix, fixBrandList, isTwitter, getIndividualName, isWebsite, sleep, sendCustomEventToGTM, isOtherThanKWOrSA, isKW, findCountryByIso2, getMetaData, isSA, isNetworkError } from '../../../utils';
 export var updateBusinessCountry = createAsyncThunk('connect/updateBusinessCountry', function (countryCode, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
     var connect, payload, data;
     return __generator(this, function (_a) {
@@ -363,7 +363,7 @@ export var verifyPACI = createAsyncThunk('connect/verifyPACI', function (params,
     });
 }); });
 export var verifyNafath = createAsyncThunk('connect/verifyNafath', function (params, thunkApi) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, isSuccess, isFailed, countryCode, lead_id, leadResponse, channels, brand, err_5, brands, err_6, phone, isNextScreenDob, stepName;
+    var _a, settings, connect, responseBody, expiry, interval, maxCalls, count, authResponse, error_1, isSuccess, isFailed, countryCode, lead_id, leadResponse, channels, brand, err_5, brands, err_6, phone, isNextScreenDob, stepName;
     var _b, _c, _d, _e, _f, _g, _h;
     return __generator(this, function (_j) {
         switch (_j.label) {
@@ -376,58 +376,70 @@ export var verifyNafath = createAsyncThunk('connect/verifyNafath', function (par
                 count = 1;
                 _j.label = 1;
             case 1:
-                if (!(count <= maxCalls)) return [3, 16];
+                if (!(count <= maxCalls)) return [3, 19];
                 if (thunkApi.signal.aborted) {
-                    return [3, 16];
+                    return [3, 19];
                 }
-                return [4, API.authService.getVerifyAuth(responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token)];
+                authResponse = void 0;
+                _j.label = 2;
             case 2:
+                _j.trys.push([2, 4, , 5]);
+                return [4, API.authService.getVerifyAuth(responseBody === null || responseBody === void 0 ? void 0 : responseBody.auth_token)];
+            case 3:
                 authResponse = _j.sent();
-                isSuccess = ((_b = authResponse.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
+                return [3, 5];
+            case 4:
+                error_1 = _j.sent();
+                if (!isNetworkError(error_1.message)) {
+                    throw new Error(error_1);
+                }
+                return [3, 5];
+            case 5:
+                isSuccess = ((_b = authResponse === null || authResponse === void 0 ? void 0 : authResponse.status) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'success';
                 isFailed = ((_c = authResponse === null || authResponse === void 0 ? void 0 : authResponse.status) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'failed';
                 countryCode = settings.data.businessCountry;
                 if (isFailed) {
                     (_d = params.onFailure) === null || _d === void 0 ? void 0 : _d.call(params);
                     return [2, { authResponse: authResponse, countryCode: countryCode }];
                 }
-                if (!isSuccess) return [3, 13];
+                if (!isSuccess) return [3, 16];
                 lead_id = authResponse.lead_id;
                 if (!lead_id)
                     throw new Error('Lead id is missing');
                 return [4, API.leadService.retrieveLead(lead_id)];
-            case 3:
+            case 6:
                 leadResponse = (_j.sent()).data;
                 if ((_e = leadResponse.errors) === null || _e === void 0 ? void 0 : _e.length)
                     throw new Error(leadResponse.errors[0].description);
                 return [4, API.dataService.getChannelsOfServices({ page: 0 })];
-            case 4:
+            case 7:
                 channels = (_j.sent()).list;
                 leadResponse.channel_list = channels;
-                _j.label = 5;
-            case 5:
-                _j.trys.push([5, 7, , 8]);
+                _j.label = 8;
+            case 8:
+                _j.trys.push([8, 10, , 11]);
                 return [4, API.brandService.retrieveBrand(leadResponse.brand.id)];
-            case 6:
+            case 9:
                 brand = (_j.sent()).brand;
                 leadResponse.brand = __assign(__assign({}, leadResponse.brand), brand);
-                return [3, 8];
-            case 7:
+                return [3, 11];
+            case 10:
                 err_5 = _j.sent();
-                return [3, 8];
-            case 8:
-                _j.trys.push([8, 10, , 11]);
+                return [3, 11];
+            case 11:
+                _j.trys.push([11, 13, , 14]);
                 return [4, API.brandService.getBrandList({ individual_id: leadResponse.individual_id })];
-            case 9:
+            case 12:
                 brands = (_j.sent()).brands;
                 leadResponse.brand_list = fixBrandList(brands, channels);
-                return [3, 11];
-            case 10:
+                return [3, 14];
+            case 13:
                 err_6 = _j.sent();
-                return [3, 11];
-            case 11:
+                return [3, 14];
+            case 14:
                 (_f = params.onSuccess) === null || _f === void 0 ? void 0 : _f.call(params);
                 return [4, sleep(3000)];
-            case 12:
+            case 15:
                 _j.sent();
                 phone = (leadResponse.contact || {}).phone;
                 if (phone === null || phone === void 0 ? void 0 : phone.country_code)
@@ -437,14 +449,14 @@ export var verifyNafath = createAsyncThunk('connect/verifyNafath', function (par
                 stepName = isNextScreenDob ? 'CONNECT_DOB_STEP' : 'CONNECT_INDIVIDUAL_STEP';
                 thunkApi.dispatch(handleNextScreenStep(stepName));
                 return [2, { authResponse: authResponse, leadResponse: leadResponse, countryCode: countryCode, isNextScreenDob: isNextScreenDob }];
-            case 13: return [4, sleep(interval * 1000)];
-            case 14:
+            case 16: return [4, sleep(interval * 1000)];
+            case 17:
                 _j.sent();
-                _j.label = 15;
-            case 15:
+                _j.label = 18;
+            case 18:
                 count++;
                 return [3, 1];
-            case 16: throw new Error(NAFATH_VERIFICATION_FAILED);
+            case 19: throw new Error(NAFATH_VERIFICATION_FAILED);
         }
     });
 }); });

package/build/features/business/screens/MobileOwnership/CollectMobileOwnership.js

@@ -21,7 +21,7 @@ import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
 import { Button as SharedButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { businessSelector, skipUpdateLeadMobile, updateLeadMobile } from '../../../../features/app/business/businessStore';
 import Button from '../../../../components/Button';
 import MobileNumber from './MobileNumber';
@@ -84,10 +84,11 @@ var CollectMobileOwnership = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _a = useAppSelector(businessSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema()),
-        defaultValues: { mobile: '', countryCode: data.mobileData.countryCode },
+        defaultValues: { mobile: '', countryCode: settingsData.businessCountry },
         mode: 'onChange'
     });
     var onSubmit = function (data) {

package/build/features/business/screens/MobileOwnership/MobileNumber.js

@@ -22,7 +22,7 @@ import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { businessSelector } from '../../../../features/app/business/businessStore';
+import { settingsSelector } from '../../../../app/settings';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -45,9 +45,9 @@ var MobileNumber = function () {
     var _a;
     var t = useTranslation().t;
     var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
-    var data = useAppSelector(businessSelector).data;
+    var data = useAppSelector(settingsSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
-    var countryCodeValue = data.mobileData.countryCode;
+    var countryCodeValue = data.businessCountry;
     var mobileValue = phoneControl.field.value || '';
     var error = !!mobileValue ? (_a = phoneControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';

package/build/features/connect/screens/MobileOwnership/CollectMobileOwnership.js

@@ -21,7 +21,7 @@ import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
 import { Button as SharedButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { connectSelector, skipUpdateLeadMobile, updateLeadMobile } from '../../../../features/app/connect/connectStore';
 import Button from '../../../../components/Button';
 import MobileNumber from './MobileNumber';
@@ -85,10 +85,11 @@ var CollectMobileOwnership = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _a = useAppSelector(connectSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema()),
-        defaultValues: { mobile: '', countryCode: data.mobileData.countryCode },
+        defaultValues: { mobile: '', countryCode: settingsData.businessCountry },
         mode: 'onChange'
     });
     var onSubmit = function (data) {

package/build/features/connect/screens/MobileOwnership/MobileNumber.js

@@ -22,7 +22,7 @@ import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { connectSelector } from '../../../../features/app/connect/connectStore';
+import { settingsSelector } from '../../../../app/settings';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -45,9 +45,9 @@ var MobileNumber = function () {
     var _a;
     var t = useTranslation().t;
     var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
-    var data = useAppSelector(connectSelector).data;
+    var data = useAppSelector(settingsSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
-    var countryCodeValue = data.mobileData.countryCode;
+    var countryCodeValue = data.businessCountry;
     var mobileValue = phoneControl.field.value || '';
     var error = !!mobileValue ? (_a = phoneControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';

package/build/features/connectExpress/screens/MobileOwnership/CollectMobileOwnership.js

@@ -21,7 +21,7 @@ import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
 import { Button as SharedButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { connectExpressSelector, skipUpdateLeadMobile, updateLeadMobile } from '../../../../features/app/connectExpress/connectExpressStore';
 import { AuthForType } from '../../../../@types';
 import Button from '../../../../components/Button';
@@ -86,11 +86,12 @@ var CollectMobileOwnership = function () {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _a = useAppSelector(connectExpressSelector), data = _a.data, loading = _a.loading, error = _a.error;
     var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema()),
-        defaultValues: { mobile: '', countryCode: data.mobileData.countryCode },
+        defaultValues: { mobile: '', countryCode: settingsData.businessCountry },
         mode: 'onChange'
     });
     var onSubmit = function (data) {

package/build/features/connectExpress/screens/MobileOwnership/MobileNumber.js

@@ -22,7 +22,7 @@ import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
-import { connectExpressSelector } from '../../../../features/app/connectExpress/connectExpressStore';
+import { settingsSelector } from '../../../../app/settings';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -45,9 +45,9 @@ var MobileNumber = function () {
     var _a;
     var t = useTranslation().t;
     var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
-    var data = useAppSelector(connectExpressSelector).data;
+    var data = useAppSelector(settingsSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
-    var countryCodeValue = data.mobileData.countryCode;
+    var countryCodeValue = data.businessCountry;
     var mobileValue = phoneControl.field.value || '';
     var error = !!mobileValue ? (_a = phoneControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message : '';
     var isSA = countryCodeValue.iso2 === 'SA';

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

@@ -241,6 +241,6 @@ export default function FlowsButtons(_a) {
                             onResetPassword();
                         else
                             onRedirect({ title: title, href: href, src: src, hoverSrc: hoverSrc, isCompleted: isCompleted, name: name, status: status, token: token });
-                    } }, { children: _jsx(ButtonStyled, __assign({ variant: 'outlined', disabled: isResetPassword(name, status) && loading, isCompleted: isCompleted, hasUrl: !!href, sx: __assign({ mb: isLast ? 2.5 : 1.8 }, sx), endIcon: isResetPassword(name, status) && loading ? (_jsx(_Fragment, {})) : isCompleted ? (_jsx(CheckIconStyled, {})) : (_jsxs("div", __assign({ style: { display: 'flex', alignItems: 'center' } }, { children: [name !== 'password' && _jsx(Dot, { completed: status === 'complete' || status === 'completed' || status === 'reviewed' }), _jsx(Image, { sx: { height: 15, transform: isAr ? 'scale(-1)' : 'scale(1)', marginInlineStart: 0 }, src: ICONS_NAMES.Arrow_filled_right_icon })] }))), startIcon: isResetPassword(name, status) && loading ? (_jsx(_Fragment, {})) : isBrand(name) ? (_jsx(_Fragment, { children: _jsx(BrandImage, { children: _jsx(BrandNameStyled, { children: brandName }) }) })) : (_jsx(Image, { src: src, alt: title })), type: 'button' }, { children: title })) }), idx));
+                    } }, { children: _jsx(ButtonStyled, __assign({ variant: 'outlined', disabled: isResetPassword(name, status) && loading, isCompleted: isCompleted, hasUrl: !!href, sx: __assign({ mb: isLast ? 2.5 : 1.8 }, sx), endIcon: isResetPassword(name, status) && loading ? (_jsx(_Fragment, {})) : isCompleted ? (_jsx(CheckIconStyled, {})) : (_jsxs("div", __assign({ style: { display: 'flex', alignItems: 'center' } }, { children: [name !== 'password' && _jsx(Dot, { completed: ['complete', 'completed', 'reviewed'].includes(status === null || status === void 0 ? void 0 : status.toLowerCase()) }), _jsx(Image, { sx: { height: 15, transform: isAr ? 'scale(-1)' : 'scale(1)', marginInlineStart: 0 }, src: ICONS_NAMES.Arrow_filled_right_icon })] }))), startIcon: isResetPassword(name, status) && loading ? (_jsx(_Fragment, {})) : isBrand(name) ? (_jsx(_Fragment, { children: _jsx(BrandImage, { children: _jsx(BrandNameStyled, { children: brandName }) }) })) : (_jsx(Image, { src: src, alt: title })), type: 'button' }, { children: title })) }), idx));
             }), onClose && (_jsx(SharedButton, __assign({ sx: { mt: 2.5, ml: 0, mr: 0 }, isAr: isAr, disableBack: true, loading: storeLoading, onClick: onClose }, { children: t('close_and_complete_later') })))] }));
 }

package/build/features/shared/Dialog/DialogContainer.js

@@ -21,7 +21,8 @@ var CloseIconStyled = styled(Icon)(function (_a) {
     var theme = _a.theme;
     return ({
         width: theme.spacing(3.75),
-        height: theme.spacing(3.75)
+        height: theme.spacing(3.75),
+        cursor: 'pointer'
     });
 });
 var CloseBox = styled(Box, { shouldForwardProp: function (prop) { return prop !== 'isTapOrigin'; } })(function (_a) {
@@ -31,7 +32,6 @@ var CloseBox = styled(Box, { shouldForwardProp: function (prop) { return prop !=
         justifyContent: 'end',
         marginBlockStart: theme.spacing(2),
         marginInlineEnd: theme.spacing(2),
-        cursor: 'pointer',
         direction: theme.direction,
         position: isTapOrigin ? 'initial' : 'absolute',
         right: 0,
@@ -53,5 +53,5 @@ export default function Dialog(_a) {
     var handleOnCancel = function () {
         setOpen(false);
     };
-    return (_jsxs(_Fragment, { children: [onClose && (_jsx(CloseBox, __assign({ isTapOrigin: isTapOrigin, id: 'close-container', onClick: handleOnCloseButton }, { children: _jsx(CloseIconStyled, { src: ICONS_NAMES.CLOSE_ICON }) }))), children, onClose && (_jsx(CloseDialog, { message: t('confirm_close_flow_title'), confirmTitle: t('confirm_close_flow_yes'), closeTitle: t('confirm_close_flow_no'), open: open, onConfirm: handleOnConfirm, onCancel: handleOnCancel }))] }));
+    return (_jsxs(_Fragment, { children: [onClose && (_jsx(CloseBox, __assign({ isTapOrigin: isTapOrigin, id: 'close-container' }, { children: _jsx(CloseIconStyled, { src: ICONS_NAMES.CLOSE_ICON, onClick: handleOnCloseButton }) }))), children, onClose && (_jsx(CloseDialog, { message: t('confirm_close_flow_title'), confirmTitle: t('confirm_close_flow_yes'), closeTitle: t('confirm_close_flow_no'), open: open, onConfirm: handleOnConfirm, onCancel: handleOnCancel }))] }));
 }

package/package.json

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