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

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

@@ -40,7 +40,7 @@ import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
 import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
-import { isKW } from '../../../../utils';
+import { isKW, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column',
@@ -67,6 +67,13 @@ var Individual = function (_a) {
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, individualData, true);
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Name and Email Page Viewed'
+        });
+    }, []);
     React.useEffect(function () {
         if (defaultValues.countryCode.iso2 !== methods.getValues('countryCode.iso2'))
             methods.setValue('countryCode', defaultValues.countryCode);

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

@@ -35,8 +35,9 @@ import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
 import { removeAllCharsFromNumber } from '../../../../utils';
-import { useLanguage } from '../../../../hooks';
+import { useAppSelector, useLanguage } from '../../../../hooks';
 import Search from '../../../shared/Search';
+import { connectSelector } from '../../../app/connect/connectStore';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -72,23 +73,21 @@ var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
         marginInlineStart: theme.spacing(1)
     });
 });
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: 'ltr',
-        '& .MuiInputBase-input': {
-            cursor: 'auto'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
-    var _b, _c, _d;
+    var _b, _c, _d, _e, _f;
     var countries = _a.countries, rest = __rest(_a, ["countries"]);
-    var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
-    var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
+    var _g = React.useState(countries || []), countriesCode = _g[0], setCountries = _g[1];
+    var _h = React.useState(null), anchorEl = _h[0], setAnchorEl = _h[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
+    var _j = useFormContext(), control = _j.control, setValue = _j.setValue;
+    var data = useAppSelector(connectSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
@@ -99,6 +98,8 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
     var isStartsWith5 = mobileValue.startsWith('5');
     var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
+    var _k = ((_f = (_e = data.otpData.responseBody) === null || _e === void 0 ? void 0 : _e.contact) === null || _f === void 0 ? void 0 : _f.phone) || {}, number = _k.number, country_code = _k.country_code;
+    var readOnly = number && country_code && !error;
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -145,7 +146,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl || readOnly, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: readOnly ? undefined : function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                                 return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                             } })] }))] })) })));
 });

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

@@ -12,22 +12,18 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
-import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
 import { useController, useFormContext } from 'react-hook-form';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import Collapse from '../../../../components/Collapse';
 import { styled } from '@mui/material/styles';
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        input: {
-            textTransform: 'capitalize'
-        }
-    });
-});
+import { ScreenContainer } from '../../../shared/Containers';
+import Collapse from '../../../../components/Collapse';
+import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
+import Input from '../../../shared/Input';
+import { EndAdornment } from '../../../shared/EndAdornment';
+var InputStyled = styled(Input)(function () { return ({
+    input: {
+        textTransform: 'capitalize'
+    }
+}); });
 var Name = function (_a) {
     var _b;
     var show = _a.show;
@@ -43,6 +39,6 @@ var Name = function (_a) {
     var clearNumber = function () {
         nameControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 3, mt: 2.5 } }, { children: _jsx(InputStyled, { label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), warningType: 'alert', warningMessage: error && t(error), endAdornment: !error && nameValue ? _jsx(CheckIcon, {}) : nameValue && _jsx(ClearIcon, { onClick: clearNumber }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 3, mt: 2.5 } }, { children: _jsx(InputStyled, { label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: nameValue, error: error, onClear: clearNumber }) }) })) })));
 };
 export default React.memo(Name);

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

@@ -21,26 +21,20 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { connectSelector } from '../../../app/connect/connectStore';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFormContext, useController } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { useAppSelector, useLanguage } from '../../../../hooks';
+import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
+import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
 import { mapSalesChannel } from '../../../../utils';
-var InputStyled = styled(Input)(function () { return ({
-    '& .MuiInputBase-input': {
-        cursor: 'pointer'
-    }
-}); });
 var BrandContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -53,9 +47,7 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var data = useAppSelector(connectSelector).data;
-    var _c = data.individualData.responseBody || {}, segments_list = _c.segments_list, team_size_list = _c.team_size_list;
-    var _d = useFormContext(), control = _d.control, setValue = _d.setValue;
+    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -87,19 +79,9 @@ var BrandList = function (_a) {
             setValue('salesChannels', [], { shouldValidate: true });
             setValue('brandName', '');
         }
-        setValue('segment', segments_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
-        setValue('teamSize', team_size_list.find(function (_a) {
-            var _b, _c;
-            var id = _a.id;
-            return ((_c = (_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) === id;
-        }), { shouldValidate: true });
         onCloseBrandList();
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputSelect, { label: t('select_brand_label'), onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', space: 140, list: list, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherBrand(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
                         } }) }))] }) })));
 };

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

@@ -55,16 +55,14 @@ import { styled, alpha } from '@mui/material/styles';
 import InfoIcon from '@mui/icons-material/Info';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import { ScreenContainer } from '../../../shared/Containers';
-import CircularProgress from '@mui/material/CircularProgress';
 import Text from '../../../../components/Text';
 import Input from '../../../shared/Input';
-import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
-import CheckIcon from '../../../shared/CheckIcon';
 import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -124,13 +122,12 @@ var BrandName = function (_a) {
         brandControl.field.onChange(target.value);
     };
     React.useEffect(function () {
-        var _a, _b, _c;
         var brandList = (data.brandData.responseBody || {}).brand_list;
         var brandListItem = getValues('selectedBrandItem');
         var isOtherBrand = (brandList || []).length > 0 ? (brandListItem === null || brandListItem === void 0 ? void 0 : brandListItem.id) === 'other' : true;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
-        var brand = (_c = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.brand) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.en;
-        if (isValid && (brandNameValue === null || brandNameValue === void 0 ? void 0 : brandNameValue.toLowerCase()) != brand && isOtherBrand) {
+        var brandName = data.brandData.brandName;
+        if (isValid && brandNameValue != brandName && isOtherBrand) {
             fetchingBrandName(true);
             checkBrand(brandNameValue);
         }
@@ -138,6 +135,6 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: brandNameChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && brandNameValue ? (_jsx(CheckIcon, {})) : (brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName })) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName }) })] })) })));
 };
 export default React.memo(BrandName);

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

@@ -10,7 +10,6 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import TeamSize from '../../../connect/screens/Merchant/TeamSize';
 import * as React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -18,6 +17,7 @@ import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
+import { sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
@@ -28,30 +28,33 @@ import BrandName from './BrandName';
 import TAC from './TAC';
 import BrandList from './BrandList';
 import SalesChannels from './SalesChannels';
-import Segments from './Segments';
 var ListType;
 (function (ListType) {
-    ListType["SegmentsList"] = "SegmentsList";
-    ListType["TeamSizeList"] = "TeamSizeList";
     ListType["BrandList"] = "BrandList";
+    ListType["BusinessList"] = "BusinessList";
 })(ListType || (ListType = {}));
 var Merchant = function (_a) {
     var _b, _c;
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
     var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
-    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels, segment = _g.segment, teamSize = _g.teamSize;
+    var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels;
     var brandList = (responseBody || {}).brand_list;
     var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Brand Details Step'
+        });
+    }, []);
     var methods = useForm({
         resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
         defaultValues: {
             brandName: brandName || ((_b = selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.name) === null || _b === void 0 ? void 0 : _b.en),
             selectedBrandItem: selectedBrandItem,
             termAndConditionChecked: termAndConditionChecked,
-            salesChannels: salesChannels,
-            segment: segment,
-            teamSize: teamSize
+            salesChannels: salesChannels
         },
         mode: 'onChange'
     });
@@ -66,11 +69,9 @@ var Merchant = function (_a) {
         dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
     };
     React.useEffect(function () {
-        methods.setValue('segment', segment);
-        methods.setValue('teamSize', teamSize);
         if (brandName)
             methods.trigger('brandName');
-    }, [segment, teamSize, brandName]);
+    }, [brandName]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -94,9 +95,6 @@ var Merchant = function (_a) {
     var handleMenuClick = function (flag) {
         setListActive(flag);
     };
-    var isSegmentsListActive = listActive === ListType.SegmentsList;
-    var isTeamSizeListActive = listActive === ListType.TeamSizeList;
-    var isBrandListActive = listActive === ListType.BrandList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand) && !isTeamSizeListActive && !isSegmentsListActive, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Segments, { show: !isTeamSizeListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentsList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentsListActive && !isBrandListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _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') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _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(Merchant);

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

@@ -6,12 +6,12 @@ import { connectSelector, clearError } from '../../../app/connect/connectStore';
 import { mapSalesChannel } from '../../../../utils';
 import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
-    var _b;
-    var _c = useFormContext(), control = _c.control, setValue = _c.setValue, getValues = _c.getValues;
+    var _b, _c;
+    var _d = useFormContext(), control = _d.control, setValue = _d.setValue, getValues = _d.getValues;
     var dispatch = useAppDispatch();
-    var _d = useController({ control: control, name: 'salesChannels' }), fieldState = _d.fieldState, field = _d.field;
-    var _e = useAppSelector(connectSelector), data = _e.data, error = _e.error;
-    var _f = data.brandData, selectedBrandItem = _f.selectedBrandItem, responseBody = _f.responseBody, defaultSalesChannels = _f.salesChannels;
+    var _e = useController({ control: control, name: 'salesChannels' }), fieldState = _e.fieldState, field = _e.field;
+    var _f = useAppSelector(connectSelector), data = _f.data, error = _f.error;
+    var _g = data.brandData, selectedBrandItem = _g.selectedBrandItem, responseBody = _g.responseBody, defaultSalesChannels = _g.salesChannels;
     var channelList = (responseBody || {}).channel_list;
     var selectedBrandControl = getValues('selectedBrandItem');
     React.useEffect(function () {
@@ -33,6 +33,6 @@ var SalesChannels = function (_a) {
             dispatch(clearError());
         field.onChange(channels);
     };
-    return (_jsx(SalesChannel, { error: (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message, list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
+    return (_jsx(SalesChannel, { error: (_c = (_b = fieldState.error) === null || _b === void 0 ? void 0 : _b.message) === null || _c === void 0 ? void 0 : _c.trim(), list: channelList, selectFirstIconListener: selectedBrandControl === null || selectedBrandControl === void 0 ? void 0 : selectedBrandControl.id, onChange: onChange, defaultValue: selectedSalesChannels }));
 };
 export default SalesChannels;

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

@@ -9,8 +9,7 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segment: 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>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
@@ -21,8 +20,7 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segment: 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>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     salesChannels: import("yup/lib/array").RequiredArraySchema<yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
@@ -33,6 +31,5 @@ export declare const MerchantValidationSchema: (isNewBrand?: boolean) => yup.Obj
     }>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
         id: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
     }>>[] | undefined>;
-    segment: 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>>;
+    brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
 }>>>;

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

@@ -7,7 +7,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { REGEX_WEBSITE, LINKEDIN_URL, SOCIAL_USERNAME, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
+import { REGEX_WEBSITE, DIGITS_ONLY, REGEX_ALPHANUMERIC } from '../../../../constants';
 import * as yup from 'yup';
 var validationSalesChannels = function (channels) {
     if (channels === void 0) { channels = []; }
@@ -31,27 +31,21 @@ var validationSalesChannels = function (channels) {
             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);
-    }
     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)) {
+        if (key === 'linkedin' && value && !value.trim()) {
             return 'invalid_linkedin_profile_url';
         }
-        if (key === 'facebook' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'facebook' && value && !value.trim()) {
             return 'invalid_facebook_username';
         }
-        if (key === 'instagram' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'instagram' && value && !value.trim()) {
             return 'invalid_instagram_username';
         }
-        if (key === 'twitter' && value && !value.match(SOCIAL_USERNAME)) {
+        if (key === 'twitter' && value && !value.trim()) {
             return 'invalid_twitter_username';
         }
         if (key === 'physical_store' && value && value.length < 3) {
@@ -67,6 +61,12 @@ var validationSalesChannels = function (channels) {
             return 'invalid_call_center_number';
         }
     }
+    for (var key in dic) {
+        var values = dic[key];
+        var atLestOne = values.every(function (item) { return item === ''; });
+        if (atLestOne)
+            return ' ';
+    }
     return true;
 };
 export var MerchantValidationSchema = function (isNewBrand) {
@@ -86,11 +86,9 @@ export var MerchantValidationSchema = function (isNewBrand) {
             })
                 .required('enter_brand_name_english_chars_numbers_space'),
             termAndConditionChecked: yup.boolean().isTrue('check_terms_cond').required('check_terms_cond'),
-            segment: yup.object().required('alert_choose_segment'),
-            teamSize: yup.object().required('alert_choose_teamSize'),
             salesChannels: yup
                 .array()
-                .min(1, 'choose_atleast_one_channel')
+                .min(1, ' ')
                 .of(yup.object().shape({
                 id: yup.string().required('choose_atleast_one_channel')
             }))
@@ -111,7 +109,7 @@ export var MerchantValidationSchema = function (isNewBrand) {
     return yup.object().shape({
         salesChannels: yup
             .array()
-            .min(1, 'choose_atleast_one_channel')
+            .min(1, ' ')
             .of(yup.object().shape({
             id: yup.string().required('choose_atleast_one_channel')
         }))
@@ -128,7 +126,6 @@ export var MerchantValidationSchema = function (isNewBrand) {
             }
         })
             .required('choose_atleast_one_channel'),
-        segment: yup.object().required('alert_choose_segment'),
-        teamSize: yup.object().required('alert_choose_teamSize')
+        brandName: yup.string().optional()
     });
 };

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import Box from '@mui/material/Box';
@@ -36,7 +25,7 @@ import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
 import Divider from '@mui/material/Divider';
-import { isKW } from '../../../../utils';
+import { isKW, sendCustomEventToGTM } from '../../../../utils';
 import Text from '../../../../components/Text';
 import MIDTitle from './Title';
 import MobileNumber from './MobileNumber';
@@ -89,15 +78,18 @@ var Mobile = function (_a) {
     var settingsStore = useAppSelector(settingsSelector);
     var _c = useAppSelector(connectSelector), data = _c.data, loading = _c.loading, error = _c.error;
     var _d = React.useState(), listType = _d[0], setListType = _d[1];
-    var _e = data.mobileData, countryCode = _e.countryCode, mobile = _e.mobile;
     var dispatch = useAppDispatch();
-    var _f = data.mobileData, responseBody = _f.responseBody, defaultValues = __rest(_f, ["responseBody"]);
+    var _e = data.mobileData, mobile = _e.mobile, countryCode = _e.countryCode, termAndConditionChecked = _e.termAndConditionChecked;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
-        defaultValues: defaultValues,
+        defaultValues: {
+            mobile: mobile,
+            countryCode: countryCode,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.mobileData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var handleMenuListClick = function (flag) {
@@ -117,6 +109,11 @@ var Mobile = function (_a) {
     };
     var isKWCountry = React.useMemo(function () { var _a; return isKW((_a = settingsStore.data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2); }, [(_b = settingsStore.data.businessCountry) === null || _b === void 0 ? void 0 : _b.iso2]);
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Switch to ID Login Clicked'
+        });
         dispatch(handlePrevScreenStep(isKWCountry ? 'CONNECT_CIVIL_ID_STEP' : 'CONNECT_NID_STEP'));
     };
     React.useEffect(function () {

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

@@ -35,7 +35,7 @@ import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Input from '../../../shared/Input';
 import SimpleList from '../../../../components/SimpleList';
-import { removeAllCharsFromNumber } from '../../../../utils';
+import { removeAllCharsFromNumber, sendCustomEventToGTM } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
 import Search from '../../../shared/Search';
 var LabelContainerStyled = styled(Box)(function (_a) {
@@ -73,15 +73,12 @@ var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
         marginInlineStart: theme.spacing(1)
     });
 });
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: 'ltr',
-        '& .MuiInputBase-input': {
-            cursor: 'auto'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
     var countries = _a.countries, rest = __rest(_a, ["countries"]);
@@ -136,6 +133,13 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var onSelectItem = function (country) {
         onCloseCountryList();
         setValue('mobile', '');
+        var prevCountry = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.iso2;
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'switch mobile country clicked',
+            event_label: "From ".concat(prevCountry, " to ").concat(country.iso2)
+        });
         countryCodeControl.field.onChange(country);
     };
     var handleSearch = function (value) {

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

@@ -14,10 +14,10 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
-import DatePicker from '../../../../components/DatePicker';
 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) }));
@@ -42,6 +42,6 @@ var DOB = function (_a) {
     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);
-                    } } }, { children: t('enter_birth_date') })), _jsx(DatePicker, { defaultValue: dateValue ? new Date(dateValue) : new Date(), readOnly: true, dir: 'ltr', locale: 'en', onDateChange: handleBirthDateChange, onClick: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(true); }, onDatePicked: function () { return onDateClicked === null || onDateClicked === void 0 ? void 0 : onDateClicked(false); } })] }));
+                    } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
 };
 export default DOB;