@tap-payments/auth-jsconnect 2.6.8-test → 2.6.8

package/build/features/connect/Connect.js

@@ -53,32 +53,29 @@ import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepSta
 import { handleCurrentActiveScreen, settingsSelector, handleOpen } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectSelector, retrieveLead, setDefaultCountryCode } from '../app/connect/connectStore';
+import { connectSelector, retrieveLead, setDefaultCountryCode, storeLeadId } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { isKW, findOrCreateElementAndInject, initializeGTM, sendCustomEventToGTM, sendCustomDimension, sendPageView } from '../../utils';
+import { isKW, findOrCreateElementAndInject, initializeGTM, sendCustomEventToGTM, sendCustomDimension, sendPageView, isOtherThanKWOrSA } from '../../utils';
 import { CONNECT_SCREENS_NAVIGATION } from '../../constants';
 import { connectFeatureScreens } from '../featuresScreens';
 import Background from '../shared/Background';
 var Connect = memo(function (props) {
+    var _a, _b, _c, _d;
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var leadId = props.leadId, configToken = props.configToken;
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var _b = useAppSelector(connectSelector), connectError = _b.error, loading = _b.loading, customLoading = _b.customLoading;
+    var configToken = props.configToken;
+    var _e = useAppSelector(settingsSelector), data = _e.data, error = _e.error, settingLoading = _e.loading;
+    var _f = useAppSelector(connectSelector), connectError = _f.error, loading = _f.loading, customLoading = _f.customLoading, connectData = _f.data;
+    var leadId = connectData.leadId;
     var onVerifyConfigTokenSuccess = function (data) { return __awaiter(void 0, void 0, void 0, function () {
-        var id;
+        var lead, id;
         return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    id = (data === null || data === void 0 ? void 0 : data.lead_id) || leadId;
-                    if (!id) return [3, 2];
-                    return [4, dispatch(retrieveLead(id))];
-                case 1:
-                    _a.sent();
-                    _a.label = 2;
-                case 2: return [2];
-            }
+            lead = (data || {}).lead;
+            id = (lead === null || lead === void 0 ? void 0 : lead.id) || leadId;
+            if (id)
+                dispatch(storeLeadId(id));
+            return [2];
         });
     }); };
     useAppConfig(__assign(__assign(__assign({ navigation: CONNECT_SCREENS_NAVIGATION, maturity: 'full' }, props), { configToken: configToken }), (configToken && { onVerifyConfigTokenSuccess: onVerifyConfigTokenSuccess })));
@@ -88,43 +85,63 @@ var Connect = memo(function (props) {
         event_action: 'Registration Error'
     });
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant, appConfig = data.appConfig;
+    var animationDirection = open ? (_a = appConfig.features) === null || _a === void 0 ? void 0 : _a.dialogStartTransition : (_b = appConfig.features) === null || _b === void 0 ? void 0 : _b.dialogEndTransition;
     React.useEffect(function () {
         initializeGTM();
+        sendPageView({
+            title: 'Connect',
+            connect_flow: 'Normal'
+        });
+        if (props.leadId) {
+            dispatch(storeLeadId(props.leadId));
+        }
     }, []);
     React.useEffect(function () {
         var _a;
-        if (!settingLoading) {
-            if (isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2))
-                dispatch(handleCurrentActiveScreen('CONNECT_MOBILE_STEP'));
-            if (leadId && !configToken) {
-                dispatch(retrieveLead(leadId));
-            }
+        if (settingLoading)
+            return;
+        if (!data.isValidOperator) {
+            dispatch(handleCurrentActiveScreen('CONNECT_OPERATOR_ERROR_STEP'));
+            return;
         }
-    }, [settingLoading]);
+        if (leadId && !data.isMaturityExpress) {
+            dispatch(retrieveLead({ leadId: leadId, isRedirect: true }));
+            return;
+        }
+        if (!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
+            dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+            return;
+        }
+        if (isOtherThanKWOrSA(data.businessCountry.iso2) || isKW(data.businessCountry.iso2))
+            dispatch(handleCurrentActiveScreen('CONNECT_MOBILE_STEP'));
+    }, [settingLoading, leadId]);
     React.useEffect(function () {
         var _a, _b, _c;
         if (!!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2)) {
-            dispatch(setDefaultCountryCode(data.businessCountry));
+            if (!leadId) {
+                dispatch(setDefaultCountryCode(data.businessCountry));
+            }
             sendCustomEventToGTM({
                 event: 'Send Event',
                 event_category: 'User Registration Flow',
                 event_action: 'Registration Landing Page Viewed',
-                event_value: (_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2
+                event_label: (_b = data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2
             });
             sendCustomDimension({
                 event: 'PageView',
                 website_country: (_c = data.businessCountry) === null || _c === void 0 ? void 0 : _c.iso2
             });
-            sendPageView({
-                title: 'Connect'
-            });
         }
     }, [data.businessCountry]);
     var handleDialogClose = function () {
         dispatch(handleOpen(false));
+        setTimeout(function () {
+            var _a;
+            (_a = props.unmount) === null || _a === void 0 ? void 0 : _a.call(props);
+        }, 1100);
     };
-    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', onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading || data.isMaturityExpress }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, animationDirection: animationDirection, onClose: ((_c = appConfig.features) === null || _c === void 0 ? void 0 : _c.closeButton) ? handleDialogClose : undefined, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false, dialogEdgeFormat: data.appConfig.dialogEdgeFormat, features: __assign({ tapTextLogo: ((_d = appConfig.features) === null || _d === void 0 ? void 0 : _d.tapTextLogo) && activeScreen.name !== 'CONNECT_BUSINESS_COUNTRY_STEP', poweredBy: false }, appConfig.features) }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.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));
@@ -136,7 +153,7 @@ export function ConnectElement(props) {
 export function renderConnectLib(config, elementId) {
     var element = findOrCreateElementAndInject(elementId);
     var root = createRoot(element);
-    root.render(_jsx(ConnectElement, __assign({}, config)));
     var unmount = function () { return root.unmount(); };
+    root.render(_jsx(ConnectElement, __assign({}, config, { unmount: unmount })));
     return { unmount: unmount };
 }

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

@@ -24,23 +24,11 @@ import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrandSegment } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import { BrandSegmentValidationSchema } from './validation';
-import SegmentLocations from './SegmentLocations';
-import SegmentProfits from './SegmentProfits';
-import SegmentTechs from './SegmentTechs';
 import TeamSize from './TeamSize';
-var ListType;
-(function (ListType) {
-    ListType["SegmentLocationList"] = "SegmentLocationList";
-    ListType["SegmentProfitList"] = "SegmentProfitList";
-    ListType["SegmentTechList"] = "SegmentTechList";
-    ListType["TeamSizeList"] = "TeamSizeList";
-    ListType["BrandList"] = "BrandList";
-    ListType["BusinessList"] = "BusinessList";
-})(ListType || (ListType = {}));
 var BrandSegment = function (_a) {
     var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
-    var _c = data.brandSegmentData, segmentLocation = _c.segmentLocation, segmentProfit = _c.segmentProfit, segmentTech = _c.segmentTech, teamSize = _c.teamSize;
-    var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var _c = React.useState(false), listActive = _c[0], setListActive = _c[1];
+    var teamSize = data.brandSegmentData.teamSize;
     React.useEffect(function () {
         sendCustomEventToGTM({
             event: 'Send Event',
@@ -51,9 +39,6 @@ var BrandSegment = function (_a) {
     var methods = useForm({
         resolver: yupResolver(BrandSegmentValidationSchema()),
         defaultValues: {
-            segmentLocation: segmentLocation,
-            segmentProfit: segmentProfit,
-            segmentTech: segmentTech,
             teamSize: teamSize
         },
         mode: 'onChange'
@@ -71,14 +56,7 @@ var BrandSegment = function (_a) {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    var disabled = !methods.formState.isValid || !!error;
-    var handleMenuClick = function (flag) {
-        setListActive(flag);
-    };
-    var isSegmentLocationListActive = listActive === ListType.SegmentLocationList;
-    var isSegmentProfitListActive = listActive === ListType.SegmentProfitList;
-    var isSegmentTechListActive = listActive === ListType.SegmentTechList;
-    var isTeamSizeListActive = listActive === ListType.TeamSizeList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SegmentLocations, { show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentProfits, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentTechs, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(TeamSize, { show: true, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(BrandSegment);

package/build/features/connect/screens/BrandSegment/TeamSize.js

@@ -58,7 +58,7 @@ var TeamSize = function (_a) {
         onCloseList();
         teamSizeControl.field.onChange(teamSize);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('team_size_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_team_size'), value: (isAr ? (_d = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en', 'name.ar'], list: teamSizeList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 2.6 } }, { children: [_jsx(InputSelect, { required: true, label: t('team_size_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_team_size'), value: (isAr ? (_d = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en', 'name.ar'], list: teamSizeList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));

package/build/features/connect/screens/BrandSegment/validation.d.ts

@@ -1,17 +1,8 @@
 import * as yup from 'yup';
 export declare const BrandSegmentValidationSchema: () => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
-    segmentLocation: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentProfit: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
-    segmentTech: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
     teamSize: import("yup/lib/object").RequiredObjectSchema<import("yup/lib/object").ObjectShape, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").ObjectShape>>;
 }>>>;

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

@@ -1,9 +1,6 @@
 import * as yup from 'yup';
 export var BrandSegmentValidationSchema = function () {
     return yup.object().shape({
-        segmentLocation: yup.object().required('alert_choose_segment_location'),
-        segmentProfit: yup.object().required('alert_choose_segment_profit'),
-        segmentTech: yup.object().required('alert_choose_segment_tech'),
         teamSize: yup.object().required('alert_choose_teamSize')
     });
 };

package/build/features/connect/screens/BusinessCountry/BusinessCountry.d.ts

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

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

@@ -0,0 +1,113 @@
+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 __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useAppSelector, useAppDispatch, useLanguage } from '../../../../hooks';
+import { ScreenContainer } from '../../../shared/Containers';
+import BusinessCountry from '../../../shared/BusinessCountry';
+import Button from '../../../shared/Button';
+import { findCountryByIso2, isKW, isOtherThanKWOrSA, sendCustomEventToGTM, updateLocationUrlWithCountry } from '../../../../utils';
+import Collapse from '../../../../components/Collapse';
+import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
+import { connectSelector, setDefaultCountryCode, updateBusinessCountry, storeIsStartFromBusinessCountry, clearError } from '../../../app/connect/connectStore';
+var BusinessCountryScreen = function (_a) {
+    var dispatch = useAppDispatch();
+    var isAr = useLanguage().isAr;
+    var t = useTranslation().t;
+    var _b = React.useState(false), isListOpen = _b[0], setListOpen = _b[1];
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    React.useEffect(function () {
+        dispatch(clearError());
+        dispatch(storeIsStartFromBusinessCountry(true));
+    }, []);
+    var defaultValue = React.useMemo(function () {
+        var _a, _b;
+        var value = ((_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2) || ((_b = settingsData.ipCountry) === null || _b === void 0 ? void 0 : _b.iso2);
+        return value;
+    }, [settingsData.businessCountry, settingsData.ipCountry]);
+    var onSelectCountry = function (iso2) { return __awaiter(void 0, void 0, void 0, function () {
+        var countryCode;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!iso2)
+                        return [2];
+                    countryCode = findCountryByIso2(settingsData.countries, iso2);
+                    dispatch(handleSetCountryByIso2(iso2));
+                    sendCustomEventToGTM({
+                        event: 'Send Event',
+                        event_category: 'User Registration Flow',
+                        event_action: 'Country selection page view',
+                        event_label: iso2
+                    });
+                    if (settingsData.appConfig.mode !== 'popup')
+                        updateLocationUrlWithCountry(iso2);
+                    if (!data.leadId) return [3, 2];
+                    return [4, dispatch(updateBusinessCountry(iso2))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (countryCode)
+                        dispatch(setDefaultCountryCode(countryCode));
+                    if (isOtherThanKWOrSA(iso2) || isKW(iso2)) {
+                        dispatch(handleNextScreenStep('CONNECT_MOBILE_STEP'));
+                        return [2];
+                    }
+                    dispatch(handleNextScreenStep('CONNECT_NID_STEP'));
+                    return [2];
+            }
+        });
+    }); };
+    return (_jsxs(ScreenContainer, { children: [_jsx(BusinessCountry, { sx: { mb: 2.5 }, countries: settingsData.businessCountries, loading: loading, defaultCountryIso2: defaultValue, onSelectCountry: onSelectCountry, onListOpen: function () { return setListOpen(true); }, onListClose: function () { return setListOpen(false); } }), _jsx(Collapse, __assign({ in: !isListOpen }, { children: _jsx(Button, __assign({ onClick: function () {
+                        onSelectCountry(defaultValue);
+                    }, loading: loading, isAr: isAr, disableBack: true, disabled: !defaultValue, error: t(error || '') }, { children: t('next') })) }))] }));
+};
+export default React.memo(BusinessCountryScreen);

package/build/features/connect/screens/BusinessCountry/index.d.ts

@@ -0,0 +1,3 @@
+import BusinessCountryScreen, { BusinessCountryScreenProps } from './BusinessCountry';
+export type { BusinessCountryScreenProps };
+export default BusinessCountryScreen;

package/build/features/connect/screens/BusinessCountry/index.js

@@ -0,0 +1,2 @@
+import BusinessCountryScreen from './BusinessCountry';
+export default BusinessCountryScreen;

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

@@ -17,8 +17,8 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { deepCopy } from '../../../../utils';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
@@ -84,12 +84,20 @@ var CivilID = function (_a) {
             dispatch(clearError());
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Switch to mobile number Login Clicked'
+        });
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+    };
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
-    var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(CivilID);

package/build/features/{connectExpress/screens/NID → connect/screens/DOB}/DOB.d.ts

@@ -1,7 +1,6 @@
 /// <reference types="react" />
 interface DOBProps {
     onDateClicked?: (flag: boolean) => void;
-    readOnly?: boolean;
 }
-declare const DOB: ({ onDateClicked, readOnly }: DOBProps) => JSX.Element;
+declare const DOB: ({ onDateClicked }: DOBProps) => JSX.Element;
 export default DOB;

package/build/features/connect/screens/{NID → DOB}/DOB.js

@@ -15,9 +15,9 @@ import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
 import { alpha, styled } from '@mui/material/styles';
+import { clearError, connectSelector } from '../../../app/connect/connectStore';
 import Text from '../../../../components/Text';
 import Calender from '../../../shared/Calender';
-import { clearError, connectSelector } from '../../../app/connect/connectStore';
 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) }));
@@ -41,7 +41,7 @@ var DOB = function (_a) {
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
     return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
                         var spacing = _a.spacing;
-                        return spacing(2.5, 2.5, 1.5, 2.5);
+                        return spacing(0, 2.5, 1.5, 2.5);
                     } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
 };
 export default DOB;

package/build/features/connect/screens/DOB/DOBForm.d.ts

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

package/build/features/connect/screens/DOB/DOBForm.js

@@ -0,0 +1,59 @@
+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 { useTranslation } from 'react-i18next';
+import { styled } from '@mui/material/styles';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { DOBValidationSchema } from './validation';
+import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { clearError, connectSelector, updateLeadDOB } from '../../../app/connect/connectStore';
+import Form from '../../../../components/Form';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import Collapse from '../../../../components/Collapse';
+import DOB from './DOB';
+import { deepCopy } from '../../../../utils';
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var DOBForm = function (_a) {
+    var _b = React.useState(false), collapse = _b[0], setCollapse = _b[1];
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
+    var methods = useForm({
+        resolver: yupResolver(DOBValidationSchema),
+        defaultValues: data.dobData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var onSubmit = function (data) {
+        dispatch(updateLeadDOB(deepCopy(data)));
+    };
+    var handleCollapseOpenClose = function (flag) {
+        setCollapse(flag);
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(Button, __assign({ sx: { mt: 10 }, loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+};
+export default React.memo(DOBForm);

package/build/features/connect/screens/DOB/index.d.ts

@@ -0,0 +1,3 @@
+import DOBForm, { DOBFormProps } from './DOBForm';
+export type { DOBFormProps };
+export default DOBForm;

package/build/features/connect/screens/DOB/index.js

@@ -0,0 +1,2 @@
+import DOBForm from './DOBForm';
+export default DOBForm;

package/build/features/connect/screens/DOB/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const DOBValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    dob: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

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

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var DOBValidationSchema = yup.object().shape({
+    dob: yup.string().min(5).required('enter_valid_birth_date')
+});

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

@@ -37,7 +37,6 @@ import { ScreenContainer } from '../../../shared/Containers';
 import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
-import { countriesCode } from '../../../../constants';
 import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
@@ -55,7 +54,7 @@ var Individual = function (_a) {
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData;
+    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData, dobData = data.dobData;
     var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
     var isMobile = mobileData.mobile;
     var contact = (otpData.responseBody || {}).contact;
@@ -83,9 +82,16 @@ var Individual = function (_a) {
     };
     var onBack = function () {
         var _a;
-        dispatch(resetIndividualScreen());
+        if (!individualData.isPrevDob) {
+            dispatch(resetIndividualScreen());
+        }
         var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
-        var screen = startWithNID ? (isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP') : 'CONNECT_MOBILE_STEP';
+        var screen = 'CONNECT_MOBILE_STEP';
+        if (startWithNID) {
+            screen = individualData.isPrevDob ? 'CONNECT_DOB_STEP' : 'CONNECT_NID_STEP';
+            if (isKW(code))
+                screen = 'CONNECT_CIVIL_ID_STEP';
+        }
         dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
@@ -101,8 +107,8 @@ var Individual = function (_a) {
     }, [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 emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email;
     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') })) }))] })) })) }));
+    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: settingsData.countries }), _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') })) }))] })) })) }));
 };
 export default React.memo(Individual);