@tap-payments/auth-jsconnect 2.0.125-test → 2.1.0

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/Individual/validation.js

@@ -1,17 +1,11 @@
 import { REGEX_FULL_NAME } from '../../../../constants';
 import * as yup from 'yup';
 export var IndividualValidation = yup.object().shape({
-    name: yup
-        .string()
-        .matches(REGEX_FULL_NAME, 'please write your first and last name')
-        .required('please write your first and last name'),
+    name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
     email: yup.string().email('email_not_valid').required('email_not_valid')
 });
 export var IndividualMobileValidation = yup.object().shape({
-    name: yup
-        .string()
-        .matches(REGEX_FULL_NAME, 'please write your first and last name')
-        .required('please write your first and last name'),
+    name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
     email: yup.string().email('email_not_valid').required('email_not_valid'),
     mobile: yup
         .string()

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

@@ -21,25 +21,21 @@ 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 { useLanguage } from '../../../../hooks';
+import { useAppSelector, 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'
 }); });
@@ -52,7 +48,9 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
+    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 selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -84,9 +82,19 @@ 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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -55,17 +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 { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
-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 ({
@@ -104,7 +101,7 @@ var BrandName = function (_a) {
     var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
     var t = useTranslation().t;
     var data = useAppSelector(connectSelector).data;
-    var control = useFormContext().control;
+    var _d = useFormContext(), control = _d.control, getValues = _d.getValues;
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
@@ -122,14 +119,15 @@ var BrandName = function (_a) {
     }); }, 500);
     var handleBrandNameChange = function (_a) {
         var target = _a.target;
-        var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
-        brandControl.field.onChange(value);
+        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) {
+        var brandName = data.brandData.brandName;
+        if (isValid && brandNameValue != brandName && isOtherBrand) {
             fetchingBrandName(true);
             checkBrand(brandNameValue);
         }
@@ -137,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,64 +10,76 @@ 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';
 import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
-import { AuthForType } from '../../../../@types';
-import { isKW, mapSalesChannel } from '../../../../utils';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
-import SocialMedia from './SocialMedia';
 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), isBrandListOpen = _e[0], setIsBrandListOpen = _e[1];
-    var _f = React.useState(false), isRequiredNewBrand = _f[0], setIsRequiredNewBrand = _f[1];
-    var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
-    var settingsData = useAppSelector(settingsSelector).data;
-    var isNewIndividual = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.is_new_individual;
-    var startWithNID = data.otpData.authFor === AuthForType.NATIONAL_ID;
-    var _h = data.brandData, brandName = _h.brandName, selectedBrandItem = _h.selectedBrandItem, termAndConditionChecked = _h.termAndConditionChecked, responseBody = _h.responseBody, salesChannels = _h.salesChannels;
+    var _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 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,
+            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
+            salesChannels: salesChannels,
+            segment: segment,
+            teamSize: teamSize
         },
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var brandListItem = methods.watch('selectedBrandItem');
+    var brandListItem = methods.getValues('selectedBrandItem');
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(__assign(__assign({}, formData), { isNewBrand: isRequiredNewBrand })));
     };
     var onBack = function () {
-        var _a;
-        if (isNewIndividual) {
-            dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
-            return;
-        }
-        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';
-        dispatch(handlePrevScreenStep(screen));
+        dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
     };
+    React.useEffect(function () {
+        methods.setValue('segment', segment);
+        methods.setValue('teamSize', teamSize);
+        if (brandName)
+            methods.trigger('brandName');
+    }, [segment, teamSize, brandName]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -76,19 +88,6 @@ var Merchant = function (_a) {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
             methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
-    React.useEffect(function () {
-        if (selectedBrandItem.id) {
-            methods.setValue('selectedBrandItem', selectedBrandItem);
-            var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
-            methods.setValue('salesChannels', sales, { shouldValidate: true });
-        }
-    }, [selectedBrandItem]);
-    React.useEffect(function () {
-        if (salesChannels.length > 0) {
-            var sales = mapSalesChannel(salesChannels);
-            methods.setValue('salesChannels', sales, { shouldValidate: true });
-        }
-    }, [salesChannels]);
     React.useEffect(function () {
         if (termAndConditionChecked === true)
             methods.setValue('termAndConditionChecked', termAndConditionChecked);
@@ -101,6 +100,12 @@ var Merchant = function (_a) {
     React.useEffect(function () {
         setIsRequiredNewBrand(isOtherBrand || isNewBrand);
     }, [isOtherBrand, isNewBrand]);
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: !(isOtherBrand || isNewBrand), list: brandList, onListOpen: function () { return setIsBrandListOpen(true); }, onListClose: function () { return setIsBrandListOpen(false); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !isBrandListOpen }, { children: _jsx(SalesChannels, {}) })), _jsx(SocialMedia, { show: !isBrandListOpen }), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !isBrandListOpen }), _jsx(Collapse, __assign({ in: !isBrandListOpen, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    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: hasBrandList && !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') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -1,6 +1,4 @@
-import * as React from 'react';
-export declare const MandatoryStyled: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, {}>;
-export declare const CollapseStyled: import("@emotion/styled").StyledComponent<import("../../../../components/Collapse").CollapseProps & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
+/// <reference types="react" />
 interface SalesChannelsProps {
 }
 declare const SalesChannels: ({}: SalesChannelsProps) => JSX.Element;

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

@@ -1,113 +1,38 @@
-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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import Box from '@mui/material/Box';
-import { alpha, styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
+import { jsx as _jsx } from "react/jsx-runtime";
+import * as React from 'react';
 import { useController, useFormContext } from 'react-hook-form';
-import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
-import Text from '../../../../components/Text';
+import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { connectSelector, clearError } from '../../../app/connect/connectStore';
-import CheckBox from '../../../../components/CheckBox';
-import Warning from '../../../../components/Warning';
-import Collapse from '../../../../components/Collapse';
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign({ margin: theme.spacing(2.5, 2.5, 0.5, 2.5), color: alpha(theme.palette.text.primary, 0.4) }, theme.typography.caption));
-});
-var ContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        flexDirection: 'row',
-        alignItems: 'center',
-        padding: theme.spacing(0, 0.5, 0, 0.5),
-        height: theme.spacing(3.625),
-        marginBlockEnd: theme.spacing(0.2)
-    });
-});
-var TextStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre' }, theme.typography.body2), { marginBlockStart: theme.spacing(1.75) }));
-});
-var CheckBoxStyled = styled(CheckBox)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        paddingInline: '15px',
-        marginInlineEnd: theme.spacing(-1),
-        '& .MuiSvgIcon-root': {
-            fontSize: 30
-        },
-        '&.Mui-checked': {
-            color: theme.palette.text.primary,
-            borderRadius: theme.spacing(2.5)
-        }
-    });
-});
-export var MandatoryStyled = styled('span')(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.error.light, 0.4) }, theme.typography.h6), { fontWeight: theme.typography.fontWeightLight, verticalAlign: 'sub' }));
-});
-export var CollapseStyled = styled(Collapse)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        marginBlockStart: theme.spacing(2)
-    });
-});
+import { mapSalesChannel } from '../../../../utils';
+import SalesChannel from '../../../shared/SalesChannels';
 var SalesChannels = function (_a) {
     var _b;
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
-    var _c = useFormContext(), control = _c.control, getValues = _c.getValues;
+    var _c = useFormContext(), control = _c.control, setValue = _c.setValue, getValues = _c.getValues;
     var dispatch = useAppDispatch();
-    var channelsControl = useController({ control: control, name: 'salesChannels' });
-    var _d = useAppSelector(connectSelector), data = _d.data, error = _d.error;
-    var channelList = (data.brandData.responseBody || {}).channel_list;
-    var isChecked = function (id) {
-        var item = channelsControl.field.value.find(function (item) { return item.id === id; });
-        return !!item;
-    };
-    var onChange = function (channel) {
-        if (error)
-            dispatch(clearError());
-        if (isChecked(channel.id)) {
-            var filterChannels = channelsControl.field.value.filter(function (item) { return item.id !== channel.id; });
-            channelsControl.field.onChange(filterChannels);
+    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 channelList = (responseBody || {}).channel_list;
+    var selectedBrandControl = getValues('selectedBrandItem');
+    React.useEffect(function () {
+        if (selectedBrandItem.id) {
+            setValue('selectedBrandItem', selectedBrandItem);
+            var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
+            field.onChange(sales);
         }
-        else {
-            var brandName = getValues('brandName');
-            var newChannel = __assign({}, channel);
-            if (newChannel.code === 'website' && brandName) {
-                var brandValue = brandName.replaceAll(' ', '-').toLowerCase();
-                var address = (brandValue[brandValue.length - 1] === '-' ? brandValue.slice(0, -1) : brandValue) + '.com';
-                newChannel.address = 'www.' + address;
-            }
-            channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsControl.field.value, true), [newChannel], false));
+    }, [selectedBrandItem]);
+    React.useEffect(function () {
+        if (defaultSalesChannels.length > 0) {
+            var sales = mapSalesChannel(defaultSalesChannels);
+            field.onChange(sales);
         }
+    }, [defaultSalesChannels]);
+    var selectedSalesChannels = React.useMemo(function () { return mapSalesChannel(field.value); }, [(field.value || []).length]);
+    var onChange = function (channels) {
+        if (error)
+            dispatch(clearError());
+        field.onChange(channels);
     };
-    var warningMessage = (_b = channelsControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var isSalesChannelError = warningMessage === 'choose_atleast_one_channel';
-    return (_jsxs(Box, __assign({ sx: { mb: 3 } }, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), (channelList || []).map(function (channel, index) {
-                var _a, _b;
-                return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id, disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: isChecked(channel.id), onChange: function () { return onChange(channel); } }), _jsxs(TextStyled, { children: [isAr ? (_a = channel === null || channel === void 0 ? void 0 : channel.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = channel === null || channel === void 0 ? void 0 : channel.name) === null || _b === void 0 ? void 0 : _b.en, " "] })] }, channel.id));
-            }), _jsx(CollapseStyled, __assign({ in: isSalesChannelError }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] })));
+    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 }));
 };
 export default SalesChannels;

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

@@ -0,0 +1,8 @@
+/// <reference types="react" />
+interface SegmentsProps {
+    show: boolean;
+    onListOpen?: () => void;
+    onListClose?: () => void;
+}
+declare const Segments: ({ show, onListOpen, onListClose }: SegmentsProps) => JSX.Element;
+export default Segments;

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

@@ -0,0 +1,66 @@
+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, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import { connectSelector } from '../../../app/connect/connectStore';
+import Collapse from '../../../../components/Collapse';
+import { ScreenContainer } from '../../../../features/shared/Containers';
+import InputSelect from '../../../../features/shared/InputSelect';
+import { useAppSelector, useLanguage } from '../../../../hooks';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useController, useFormContext } from 'react-hook-form';
+import SimpleList from '../../../../components/SimpleList';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import CheckIcon from '../../../shared/CheckIcon';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Text from '../../../../components/Text';
+var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected;
+    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+});
+var Segments = function (_a) {
+    var _b, _c, _d, _e;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
+    var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
+    var t = useTranslation().t;
+    var isAr = useLanguage().isAr;
+    var data = useAppSelector(connectSelector).data;
+    var control = useFormContext().control;
+    var segmentsList = ((_b = data.individualData.responseBody) === null || _b === void 0 ? void 0 : _b.segments_list) || [];
+    var segmentControl = useController({ control: control, name: 'segment' });
+    var segment = segmentControl.field.value;
+    var error = (_c = segmentControl.fieldState.error) === null || _c === void 0 ? void 0 : _c.message;
+    React.useEffect(function () {
+        if ((segmentsList === null || segmentsList === void 0 ? void 0 : segmentsList.length) > 0) {
+            setSegmentList(segmentsList);
+        }
+    }, [segmentsList]);
+    var onOpenList = function (event) {
+        setAnchorEl(event.currentTarget);
+        onListOpen === null || onListOpen === void 0 ? void 0 : onListOpen();
+    };
+    var onCloseList = function () {
+        setAnchorEl(null);
+        onListClose === null || onListClose === void 0 ? void 0 : onListClose();
+    };
+    var onSelectItem = function (segment) {
+        onCloseList();
+        segmentControl.field.onChange(segment);
+    };
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.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.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+                            var _a, _b;
+                            return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.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 === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
+                        } }) }))] })) })));
+};
+export default Segments;