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

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

@@ -54,8 +54,8 @@ import Input from '../../../shared/Input';
 import { useController, useFormContext } from 'react-hook-form';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkEmailAvailability } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
 import { styled } from '@mui/material/styles';
@@ -72,7 +72,9 @@ var cancelToken = null;
 var Email = function (_a) {
     var _b;
     var show = _a.show, fetchingEmail = _a.fetchingEmail, emailChecking = _a.emailChecking;
+    var _c = React.useState(''), storedEmail = _c[0], setStoredEmail = _c[1];
     var dispatch = useAppDispatch();
+    var data = useAppSelector(connectSelector).data;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var emailControl = useController({ name: 'email', control: control });
@@ -93,9 +95,15 @@ var Email = function (_a) {
     var handleEmailChange = function (event) {
         emailControl.field.onChange(event.target.value);
     };
+    React.useEffect(function () {
+        var _a, _b;
+        var email = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.email;
+        if (!!email)
+            setStoredEmail(email);
+    }, [data.otpData.responseBody]);
     React.useEffect(function () {
         var isValid = emailValue && !error && emailValue.length > 3;
-        if (isValid) {
+        if (isValid && emailValue != storedEmail) {
             fetchingEmail(true);
             checkEmail(emailValue);
         }

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

@@ -9,6 +9,17 @@ 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 { styled } from '@mui/material/styles';
 import Email from './Email';
@@ -17,8 +28,8 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { IndividualValidation, IndividualMobileValidation } from './validation';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
@@ -27,58 +38,61 @@ import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividua
 import { useLanguage } from '../../../../hooks';
 import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
+import { AuthForType } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
+import { isKW } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
 var Individual = function (_a) {
-    var _b, _c, _d;
-    var _e = React.useState(false), listActive = _e[0], setListActive = _e[1];
-    var _f = React.useState(false), emailChecking = _f[0], setEmailChecking = _f[1];
-    var _g = useAppSelector(connectSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var _b = React.useState(false), listActive = _b[0], setListActive = _b[1];
+    var _c = React.useState(false), emailChecking = _c[0], setEmailChecking = _c[1];
+    var settingsData = useAppSelector(settingsSelector).data;
+    var _d = useAppSelector(connectSelector), data = _d.data, loading = _d.loading, error = _d.error;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var isAbsher = (_b = data.otpData) === null || _b === void 0 ? void 0 : _b.isAbsher;
-    var individualData = data.individualData;
+    var individualData = data.individualData, otpData = data.otpData, mobileData = data.mobileData;
+    var startWithNID = otpData.authFor === AuthForType.NATIONAL_ID;
+    var isMobile = mobileData.mobile;
+    var _e = otpData.responseBody || {}, contact = _e.contact, name = _e.name, userInfoMissed = _e.userInfoMissed, is_new_individual = _e.is_new_individual;
+    var responseBody = individualData.responseBody, defaultValues = __rest(individualData, ["responseBody"]);
+    var is_available = (responseBody || {}).is_available;
     var methods = useForm({
-        resolver: yupResolver(isAbsher ? IndividualMobileValidation : IndividualValidation),
-        defaultValues: data.individualData,
+        resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
+        defaultValues: defaultValues,
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, defaultValues, true);
     var onSubmit = function (formData) {
         dispatch(updateLeadIndividual(formData));
     };
     var onBack = function () {
+        var _a;
         dispatch(resetIndividualScreen());
-        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
+        var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
+        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
-    React.useEffect(function () {
-        var name = individualData.name, email = individualData.email, mobile = individualData.mobile, countryCode = individualData.countryCode;
-        if (!!name)
-            methods.setValue('name', name, { shouldValidate: true });
-        if (!!email)
-            methods.setValue('email', email, { shouldValidate: true });
-        if (!!mobile)
-            methods.setValue('mobile', mobile, { shouldValidate: true });
-        if (!!countryCode)
-            methods.setValue('countryCode', countryCode, { shouldValidate: true });
-    }, [individualData.name, individualData.email, individualData.mobile, individualData.countryCode]);
     var handleMenuListClick = function () {
         listActive ? setListActive(false) : setListActive(true);
     };
     React.useEffect(function () {
-        var _a, _b;
-        if (((_b = (_a = data.individualData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.is_available) === false)
+        if (is_available === false)
             methods.setError('email', { message: 'tap_js_email_already_exist' });
-    }, [(_c = data.individualData) === null || _c === void 0 ? void 0 : _c.responseBody]);
+    }, [responseBody]);
+    var isLeadEmailAvailable = (contact === null || contact === void 0 ? void 0 : contact.email) === methods.watch('email');
+    var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
-    var disabled = emailErrChecks || emailChecking || !((_d = data.individualData.responseBody) === null || _d === void 0 ? void 0 : _d.is_available);
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: isAbsher, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    var disabled = emailErrChecks || emailChecking || !isEmailValid;
+    var isNameRequired = (userInfoMissed && !name) || is_new_individual;
+    var isEmailRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.email)) || is_new_individual;
+    var isMobileRequired = (userInfoMissed && !(contact === null || contact === void 0 ? void 0 : contact.phone)) || is_new_individual;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive && isNameRequired }), _jsx(MobileNumber, { show: !isMobile && isMobileRequired, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive && isEmailRequired, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -34,6 +34,7 @@ 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'
@@ -51,7 +52,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 control = useFormContext().control;
+    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) {
@@ -64,22 +65,29 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var getBrandName = function (item) {
-        var _a, _b;
-        return (isAr ? (_a = item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    var getBrandName = function (_a) {
+        var name = _a.name;
+        return (isAr ? name === null || name === void 0 ? void 0 : name.ar : name === null || name === void 0 ? void 0 : name.en) || '';
     };
     var getBrandId = function (item) {
         return item.id || '';
     };
-    var isOtherLicense = function (item) {
-        return item.id === 'other';
+    var isOtherBrand = function (item) {
+        return getBrandId(item) === 'other';
     };
     var onSelectItem = function (brand) {
         selectedBrandControl.field.onChange(brand);
+        if (!isOtherBrand(brand)) {
+            setValue('salesChannels', mapSalesChannel(brand.channel_services || []), { shouldValidate: true });
+        }
+        if (isOtherBrand(brand)) {
+            setValue('salesChannels', [], { shouldValidate: true });
+            setValue('brandName', '');
+        }
         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 (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
+                            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, {})] }));
                         } }) }))] }) })));
 };
 export default React.memo(BrandList);

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

@@ -63,8 +63,8 @@ import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -103,6 +103,7 @@ var BrandName = function (_a) {
     var dispatch = useAppDispatch();
     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 brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
@@ -125,8 +126,10 @@ var BrandName = function (_a) {
         brandControl.field.onChange(value);
     };
     React.useEffect(function () {
+        var _a, _b, _c;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
-        if (isValid) {
+        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) {
             fetchingBrandName(true);
             checkBrand(brandNameValue);
         }
@@ -134,6 +137,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: brandNameChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && brandNameValue ? (_jsx(CheckIcon, {})) : (brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName })) })] })) })));
 };
 export default React.memo(BrandName);

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

@@ -16,14 +16,15 @@ import { useTranslation } from 'react-i18next';
 import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
-import { INSTAGRAM_URL, TWITTER_URL } from '../../../../constants';
 import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
-import { MerchantValidationSchema, ValidationOptions } from './validation';
+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';
@@ -32,37 +33,40 @@ import SalesChannels from './SalesChannels';
 var Merchant = function (_a) {
     var _b, _c;
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
-    var _e = React.useState(ValidationOptions.NEW_USER), userType = _e[0], setUserType = _e[1];
-    var _f = React.useState(false), listActive = _f[0], setListActive = _f[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 isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
-    var isAbsher = data.otpData.isAbsher;
-    var _h = data.brandData.responseBody || {}, brands = _h.brands, channelList = _h.channelList;
-    var brandList = brands || [];
-    var _j = data.brandData, brandName = _j.brandName, links = _j.links, selectedBrandItem = _j.selectedBrandItem, termAndConditionChecked = _j.termAndConditionChecked, responseBody = _j.responseBody, salesChannels = _j.salesChannels;
+    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 brandList = (responseBody || {}).brand_list;
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema(userType)),
+        resolver: yupResolver(MerchantValidationSchema(isRequiredNewBrand)),
         defaultValues: {
             brandName: brandName,
-            links: links,
             selectedBrandItem: selectedBrandItem,
-            termAndConditionChecked: termAndConditionChecked
+            termAndConditionChecked: termAndConditionChecked,
+            salesChannels: salesChannels
         },
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var formDataSelectedBrand = methods.getValues('selectedBrandItem');
+    var brandListItem = methods.watch('selectedBrandItem');
     var onSubmit = function (formData) {
-        dispatch(updateLeadBrand(formData));
+        dispatch(updateLeadBrand(__assign(__assign({}, formData), { isNewBrand: isRequiredNewBrand })));
     };
     var onBack = function () {
-        if (isNewUser) {
+        var _a;
+        if (isNewIndividual) {
             dispatch(handlePrevScreenStep('CONNECT_INDIVIDUAL_STEP'));
             return;
         }
-        dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
+        var code = (_a = settingsData.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2;
+        var screen = isKW(code) ? 'CONNECT_CIVIL_ID_STEP' : startWithNID ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP';
+        dispatch(handlePrevScreenStep(screen));
     };
     React.useEffect(function () {
         if (error)
@@ -70,60 +74,33 @@ var Merchant = function (_a) {
     }, [methods.formState.isValid]);
     React.useEffect(function () {
         if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
-            methods.setError('brandName', { message: 'Profile Name already exists' });
+            methods.setError('brandName', { message: 'brand_name_already_exist' });
     }, [responseBody]);
     React.useEffect(function () {
-        var _a, _b, _c, _d, _e;
-        if (isNewUser === true) {
-            setUserType(ValidationOptions.NEW_USER);
+        if (selectedBrandItem.id) {
+            methods.setValue('selectedBrandItem', selectedBrandItem);
+            var sales = mapSalesChannel(selectedBrandItem.channel_services || []);
+            methods.setValue('salesChannels', sales, { shouldValidate: true });
         }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) === 'other') {
-            setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
-            methods.clearErrors();
-            setTimeout(function () {
-                var sites = { website: '', twitter: '', instagram: '' };
-                methods.setValue('brandName', '', { shouldValidate: true });
-                methods.setValue('links', sites);
-                methods.setValue('salesChannels', []);
-            }, 100);
-        }
-        if (isNewUser === false && (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0 && (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) !== 'other') {
-            setUserType(ValidationOptions.EXISTING_USER_WITH_EXIST_BRAND);
-            methods.clearErrors();
-            var twitter = ((_b = (_a = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _a === void 0 ? void 0 : _a.find(function (item) { return item.includes('twitter.com'); })) === null || _b === void 0 ? void 0 : _b.replaceAll("".concat(TWITTER_URL, "/"), '')) || '';
-            var instagram = ((_d = (_c = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.social) === null || _c === void 0 ? void 0 : _c.find(function (item) { return item.includes('instagram.com'); })) === null || _d === void 0 ? void 0 : _d.replaceAll("".concat(INSTAGRAM_URL, "/"), '')) || '';
-            var website = (_e = formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.website) === null || _e === void 0 ? void 0 : _e.replaceAll(/(https|http):\/\//g, '');
-            var sites_1 = __assign(__assign({}, links), { website: website, twitter: twitter, instagram: instagram });
-            setTimeout(function () { return methods.setValue('links', sites_1, { shouldValidate: true }); }, 100);
-            var selectedChannels = (!!(channelList === null || channelList === void 0 ? void 0 : channelList[0]) && [channelList === null || channelList === void 0 ? void 0 : channelList[0]]) || [];
-            var _f = formDataSelectedBrand || {}, websiteUrl = _f.website, social = _f.social;
-            var isHasWebsite = (websiteUrl === null || websiteUrl === void 0 ? void 0 : websiteUrl.length) > 0;
-            var isHasTwitter = social === null || social === void 0 ? void 0 : social.find(function (s) { return s.includes('twitter.com'); });
-            var isHasInstagram = social === null || social === void 0 ? void 0 : social.find(function (s) { return s.includes('instagram.com'); });
-            var websiteData = channelList === null || channelList === void 0 ? void 0 : channelList.find(function (c) { return c.name_en.toLocaleLowerCase() === 'website'; });
-            var socialData = channelList === null || channelList === void 0 ? void 0 : channelList.find(function (c) { return c.name_en.toLocaleLowerCase() === 'social'; });
-            if (isHasWebsite && (isHasTwitter || isHasInstagram))
-                selectedChannels = [websiteData, socialData];
-            else if (isHasTwitter || isHasInstagram)
-                selectedChannels = [socialData];
-            else if (isHasWebsite)
-                selectedChannels = [websiteData];
-            methods.setValue('salesChannels', selectedChannels);
-        }
-    }, [formDataSelectedBrand, isNewUser]);
-    React.useEffect(function () {
-        if (!(formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) && (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id))
-            methods.setValue('selectedBrandItem', selectedBrandItem, { shouldValidate: true });
     }, [selectedBrandItem]);
     React.useEffect(function () {
-        methods.setValue('salesChannels', salesChannels);
+        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);
+    }, [termAndConditionChecked]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
     var disabled = brandErrChecks || brandNameChecking || ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.response_code) === '5';
-    var isBrandListAvailable = userType !== ValidationOptions.NEW_USER && brandList.length > 0;
-    var askingForBrandInfo = userType === ValidationOptions.NEW_USER ||
-        brandList.length === 0 ||
-        userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: isBrandListAvailable, list: brandList, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(BrandName, { show: !listActive && askingForBrandInfo, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(SocialMedia, { show: !listActive, isNewUser: isNewUser }), _jsx(TAC, { show: !listActive && askingForBrandInfo }), _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 hasBrandList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
+    var isOtherBrand = (brandListItem === null || brandListItem === void 0 ? void 0 : brandListItem.id) === 'other' && hasBrandList;
+    var isNewBrand = (brandList === null || brandList === void 0 ? void 0 : brandList.length) === 0 || BrandList === undefined;
+    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') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

@@ -1,5 +1,7 @@
 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>, {}, {}>;
-declare const SalesChannels: () => JSX.Element;
+interface SalesChannelsProps {
+}
+declare const SalesChannels: ({}: SalesChannelsProps) => JSX.Element;
 export default SalesChannels;

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

@@ -19,7 +19,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import * as React from 'react';
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import { useTranslation } from 'react-i18next';
@@ -30,7 +29,6 @@ import { connectSelector, clearError } from '../../../app/connect/connectStore';
 import CheckBox from '../../../../components/CheckBox';
 import Warning from '../../../../components/Warning';
 import Collapse from '../../../../components/Collapse';
-import { ScreenContainer } from '../../../shared/Containers';
 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));
@@ -53,6 +51,7 @@ var TextStyled = styled(Text)(function (_a) {
 var CheckBoxStyled = styled(CheckBox)(function (_a) {
     var theme = _a.theme;
     return ({
+        paddingInline: '15px',
         marginInlineEnd: theme.spacing(-1),
         '& .MuiSvgIcon-root': {
             fontSize: 30
@@ -73,42 +72,42 @@ export var CollapseStyled = styled(Collapse)(function (_a) {
         marginBlockStart: theme.spacing(2)
     });
 });
-var SalesChannels = function () {
-    var _a;
-    var _b = React.useState([]), channelsMenuList = _b[0], setChannelsMenuList = _b[1];
+var SalesChannels = function (_a) {
+    var _b;
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _c = useFormContext(), control = _c.control, getValues = _c.getValues;
     var dispatch = useAppDispatch();
-    var channelsControl = useController({ name: 'salesChannels', control: control });
-    var channelsChecked = channelsControl.field.value;
-    var warningMessage = (_a = channelsControl.fieldState.error) === null || _a === void 0 ? void 0 : _a.message;
+    var channelsControl = useController({ control: control, name: 'salesChannels' });
     var _d = useAppSelector(connectSelector), data = _d.data, error = _d.error;
-    var channelList = (data.brandData.responseBody || {}).channelList;
-    var salesChannels = (data.brandData || {}).salesChannels;
-    var formDataSelectedBrand = getValues('selectedBrandItem');
-    React.useEffect(function () {
-        if ((channelList === null || channelList === void 0 ? void 0 : channelList.length) > 0) {
-            setChannelsMenuList(channelList);
-        }
-    }, [channelList]);
-    var handleSalesChannelChange = function (event) {
-        var selected = channelsMenuList.find(function (channel) { return channel.id === event.target.id; });
-        var isExists = channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (selected === null || selected === void 0 ? void 0 : selected.id); });
-        if (isExists) {
-            var updatedIdList = channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.filter(function (channel) { return channel.id !== (selected === null || selected === void 0 ? void 0 : selected.id); });
-            channelsControl.field.onChange(updatedIdList);
-            return;
-        }
-        channelsControl.field.onChange(__spreadArray(__spreadArray([], channelsChecked, true), [selected], false));
+    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);
+        }
+        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));
+        }
     };
-    var getSelectedChannelsFlag = function (item) {
-        if (channelsChecked)
-            return !!(channelsChecked === null || channelsChecked === void 0 ? void 0 : channelsChecked.find(function (channel) { return channel.id === (item === null || item === void 0 ? void 0 : item.id); }));
-    };
-    var selectedBrandIsOther = (formDataSelectedBrand === null || formDataSelectedBrand === void 0 ? void 0 : formDataSelectedBrand.id) === 'other';
-    return (_jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('channel_of_service'), " ", _jsx(MandatoryStyled, { children: "*" })] }), (channelsMenuList || []).map(function (channel) { return (_jsxs(ContainerStyled, { children: [_jsx(CheckBoxStyled, { id: channel.id, disableRipple: true, disableFocusRipple: true, focusRipple: false, disabled: !selectedBrandIsOther && (salesChannels === null || salesChannels === void 0 ? void 0 : salesChannels.find(function (c) { return c.id === (channel === null || channel === void 0 ? void 0 : channel.id); })) ? true : false, checked: getSelectedChannelsFlag(channel), onChange: handleSalesChannelChange }), _jsxs(TextStyled, { children: [isAr ? channel.name_ar : channel.name_en, " "] })] }, channel.id)); }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: t(warningMessage) })) }))] }));
+    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) })) }))] })));
 };
 export default SalesChannels;

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

@@ -1,9 +1,6 @@
 import * as React from 'react';
-import { Theme, SxProps } from '@mui/material/styles';
 interface SocialMediaProps {
     show: boolean;
-    sx?: SxProps<Theme>;
-    isNewUser: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, sx, isNewUser }: SocialMediaProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show }: SocialMediaProps) => JSX.Element>;
 export default _default;