@tap-payments/auth-jsconnect 1.0.51 → 1.0.54

package/build/features/business/screens/BusinessType/CRNumber.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 interface CRNumberProps {
     show: boolean;
+    readOnly: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show }: CRNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: CRNumberProps) => JSX.Element>;
 export default _default;

package/build/features/business/screens/BusinessType/CRNumber.js

@@ -22,7 +22,7 @@ import Input from '../../../shared/Input';
 import Collapse from '../../../../components/Collapse';
 var CRNumber = function (_a) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var crNumberControl = useController({ control: control, name: 'crNumber' });
@@ -36,6 +36,6 @@ var CRNumber = function (_a) {
     };
     var crNumberValue = crNumberControl.field.value;
     var error = (_b = crNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_commercial_register_no'), onChange: handleFLNumberChange, inputProps: { maxLength: CR_NUMBER_LENGTH }, value: crNumberValue, endAdornment: (crNumberValue === null || crNumberValue === void 0 ? void 0 : crNumberValue.length) === CR_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (crNumberValue && _jsx(ClearIcon, { onClick: clearCRNumber })), placeholder: '0123456789', warningType: 'alert', warningMessage: error && t(error, { length: CR_NUMBER_LENGTH }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_commercial_register_no'), onChange: handleFLNumberChange, inputProps: { maxLength: CR_NUMBER_LENGTH }, value: crNumberValue, endAdornment: (crNumberValue === null || crNumberValue === void 0 ? void 0 : crNumberValue.length) === CR_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (crNumberValue && _jsx(ClearIcon, { onClick: clearCRNumber })), placeholder: '0123456789', warningType: 'alert', warningMessage: error && t(error, { length: CR_NUMBER_LENGTH }) }) }) })));
 };
 export default React.memo(CRNumber);

package/build/features/business/screens/BusinessType/CompanyLicense.js

@@ -115,12 +115,13 @@ var CompanyLicense = function (_a) {
     };
     var hasList = (licenseList === null || licenseList === void 0 ? void 0 : licenseList.length) > 0;
     var showCRNumber = !anchorEl;
+    var crReadonly = !isOtherLicense(selectedLicense);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('enter_commercial_register_no'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: t(getLicenseName(selectedLicense)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList, onSelectItem: onSelectItem, renderItem: function (item) {
                                     return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selectedLicense) }, { children: isOtherLicense(item)
                                                         ? t(getLicenseNumber(item))
                                                         : isAr
                                                             ? getLicenseName(item)
                                                             : getLicenseNumber(item) + '-' + getLicenseName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selectedLicense) && _jsx(CheckIcon, {})] }));
-                                } }) }))] })), _jsx(CRNumber, { show: showCRNumber })] }) })));
+                                } }) }))] })), _jsx(CRNumber, { show: showCRNumber, readOnly: crReadonly })] }) })));
 };
 export default React.memo(CompanyLicense);

package/build/features/business/screens/BusinessType/FLNumber.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 interface FLNumberProps {
     show: boolean;
+    readOnly: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show }: FLNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: FLNumberProps) => JSX.Element>;
 export default _default;

package/build/features/business/screens/BusinessType/FLNumber.js

@@ -22,7 +22,7 @@ import Input from '../../../shared/Input';
 import Collapse from '../../../../components/Collapse';
 var FLNumber = function (_a) {
     var _b;
-    var show = _a.show;
+    var show = _a.show, readOnly = _a.readOnly;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var flNumberControl = useController({ control: control, name: 'flNumber' });
@@ -36,6 +36,6 @@ var FLNumber = function (_a) {
     };
     var flNumberValue = flNumberControl.field.value;
     var error = (_b = flNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_license_no'), onChange: handleFLNumberChange, inputProps: { maxLength: FL_NUMBER_LENGTH }, value: flNumberValue, endAdornment: (flNumberValue === null || flNumberValue === void 0 ? void 0 : flNumberValue.length) === FL_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (flNumberValue && _jsx(ClearIcon, { onClick: clearFLNumber })), placeholder: '12345678', warningType: 'alert', warningMessage: error && t(error, { length: FL_NUMBER_LENGTH }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_license_no'), onChange: handleFLNumberChange, inputProps: { maxLength: FL_NUMBER_LENGTH }, value: flNumberValue, endAdornment: (flNumberValue === null || flNumberValue === void 0 ? void 0 : flNumberValue.length) === FL_NUMBER_LENGTH ? (_jsx(CheckIcon, {})) : (flNumberValue && _jsx(ClearIcon, { onClick: clearFLNumber })), placeholder: '12345678', warningType: 'alert', warningMessage: error && t(error, { length: FL_NUMBER_LENGTH }) }) }) })));
 };
 export default React.memo(FLNumber);

package/build/features/business/screens/BusinessType/FreelanceLicense.js

@@ -115,12 +115,13 @@ var FreelanceLicense = function (_a) {
     };
     var hasList = (licenseList === null || licenseList === void 0 ? void 0 : licenseList.length) > 0;
     var showFLNumber = !anchorEl;
+    var flReadonly = !isOtherLicense(selectedLicense);
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('enter_freelance_license'), readOnly: true, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_fl'), value: t(getLicenseName(selectedLicense)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList, onSelectItem: onSelectItem, renderItem: function (item) {
                                     return (_jsxs(_Fragment, { children: [_jsx(LicenseContainer, { children: _jsx(LicenseNameText, __assign({ isSelected: getLicenseNumber(item) === getLicenseNumber(selectedLicense) }, { children: isOtherLicense(item)
                                                         ? t(getLicenseNumber(item))
                                                         : isAr
                                                             ? getLicenseName(item)
                                                             : getLicenseNumber(item) + '-' + getLicenseName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selectedLicense) && _jsx(CheckIcon, {})] }));
-                                } }) }))] })), _jsx(FLNumber, { show: showFLNumber })] }) })));
+                                } }) }))] })), _jsx(FLNumber, { show: showFLNumber, readOnly: flReadonly })] }) })));
 };
 export default React.memo(FreelanceLicense);

package/build/features/business/screens/Confirm/Confirm.js

@@ -51,6 +51,6 @@ var Confirm = function () {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputStyled, { label: t(isCR ? 'signup_business_cr_info_title' : 'signup_business_fl_info_title'), value: licenseNumber, disabled: true }), _jsx(InputStyled, { label: t('signup_brand_name_label'), placeholder: t('signup_brand_name_label'), value: brandName, disabled: true }), _jsx(InputStyled, { sx: { marginBlockEnd: 0 }, label: t('signup_legal_name_label'), placeholder: t('signup_legal_name_label'), value: legalName, disabled: true }), _jsx(Button, __assign({ disabled: disabled, loading: loading, error: t(error || ''), onBackClicked: function () { return onBack(); }, isAr: isAr }, { children: t('confirm') }))] })) })) }));
 };
 export default React.memo(Confirm);

package/build/features/business/screens/Customers/Customers.js

@@ -68,11 +68,11 @@ var Customers = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     React.useEffect(function () {
-        var customerLocations = customerData.customerLocations, expectedCustomers = customerData.expectedCustomers, expectedSalesRange = customerData.expectedSalesRange;
+        var customerLocations = customerData.customerLocations, expectedCustomer = customerData.expectedCustomer, expectedSalesRange = customerData.expectedSalesRange;
         methods.setValue('customerLocations', customerLocations);
-        methods.setValue('expectedCustomers', expectedCustomers);
+        methods.setValue('expectedCustomer', expectedCustomer);
         methods.setValue('expectedSalesRange', expectedSalesRange);
-    }, [customerData.customerLocations, customerData.expectedCustomers, customerData.expectedSalesRange]);
+    }, [customerData.customerLocations, customerData.expectedCustomer, customerData.expectedSalesRange]);
     var isCustomerLocationsListActive = listActive === ListType.CustomerLocationsList;
     var isExpectedCustomersListActive = listActive === ListType.ExpectedCustomersList;
     var isExpectedSalesListActive = listActive === ListType.ExpectedSalesList;

package/build/features/business/screens/Customers/ExpectedCustomers.js

@@ -51,7 +51,7 @@ var ExpectedCustomers = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var control = useFormContext().control;
-    var expectedCustomersControl = useController({ name: 'expectedCustomers', control: control });
+    var expectedCustomerControl = useController({ name: 'expectedCustomer', control: control });
     var data = useSelector(businessSelector).data;
     var activitiesData = data.activitiesData;
     var response = activitiesData.responseBody;
@@ -72,10 +72,10 @@ var ExpectedCustomers = function (_a) {
         }
     }, [response === null || response === void 0 ? void 0 : response.expectedCustomerSales]);
     var onSelectItem = function (expectedCustomers) {
-        expectedCustomersControl.field.onChange(expectedCustomers);
+        expectedCustomerControl.field.onChange(expectedCustomers);
         onCloseList();
     };
-    var expectedCustomersValue = expectedCustomersControl.field.value;
+    var expectedCustomersValue = expectedCustomerControl.field.value;
     var expectedCustomersSelected = expectedCustomersValue;
     return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_customers_to_serve') }), _jsx(InputStyled, { readOnly: true, value: isAr ? expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.titleAr : expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.title, onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }) }), _jsx(Collapse, __assign({ in: !!anchorEl, timeout: 300 }, { children: _jsx(SimpleListStyled, { searchKeyPath: 'name', list: expectedCustomersList, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(ListItemContainer, { children: _jsx(NameContainer, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.id) === (expectedCustomersValue === null || expectedCustomersValue === void 0 ? void 0 : expectedCustomersValue.id) }, { children: isAr ? item.titleAr : item.title })) }), item.id === (expectedCustomersSelected === null || expectedCustomersSelected === void 0 ? void 0 : expectedCustomersSelected.id) && _jsx(CheckIconStyled, {})] }));

package/build/features/connect/Connect.js

@@ -27,14 +27,14 @@ var Connect = memo(function (props) {
     var open = React.useState(true)[0];
     var theme = useAppTheme().theme;
     var dispatch = useAppDispatch();
-    var data = useAppSelector(settingsSelector).data;
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
     useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION }, props));
     useErrorListener();
     var activeScreen = data.activeScreen;
     useEffect(function () {
         dispatch(getCountries());
     }, []);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(AnimationFlow, __assign({ loading: settingLoading, error: error, open: open, breakpoint: 'sm', footer: _jsx(CustomFooter, {}) }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
                     var Element = _a.element, name = _a.name;
                     var isActive = activeScreen.name === name;
                     return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));

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

@@ -5,8 +5,6 @@ interface BrandListProps {
     list: Array<BrandInfo>;
     onListOpen?: () => void;
     onListClose?: () => void;
-    showTerms?: () => void;
-    hideTerms?: () => void;
 }
 declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
 export default _default;

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

@@ -20,18 +20,10 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-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, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 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';
@@ -42,7 +34,6 @@ import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
-import { OTHER_BRAND } from '../../../../constants';
 var InputStyled = styled(Input)(function () { return ({
     '& .MuiInputBase-input': {
         cursor: 'pointer'
@@ -57,11 +48,14 @@ var BrandNameText = styled(Text, { shouldForwardProp: function (prop) { return p
 });
 var BrandList = function (_a) {
     var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
-    var _b = React.useState(list), brandList = _b[0], setBrandList = _b[1];
-    var _c = React.useState(), selectedBrand = _c[0], setSelectedBrand = _c[1];
-    var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
+    var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
+    var _c = useFormContext(), setValue = _c.setValue, control = _c.control;
+    var linksControl = useController({ control: control, name: 'links' });
+    var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
+    var links = linksControl.field.value;
+    var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
         var _a;
         setAnchorEl(event.currentTarget);
@@ -72,42 +66,24 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    React.useEffect(function () {
-        var array = list;
-        if ((array === null || array === void 0 ? void 0 : array.length) > 0) {
-            var hasOther = array === null || array === void 0 ? void 0 : array.find(function (item) { return isOtherLicense(item); });
-            var first = array[0];
-            if (first) {
-                setSelectedBrand(first);
-                if (!hasOther)
-                    array = __spreadArray(__spreadArray([], array, true), [OTHER_BRAND], false);
-                setBrandList(array);
-            }
-        }
-    }, [show, list]);
     var getBrandName = function (item) {
         var _a, _b;
-        return (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) || '';
+        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 getBrandId = function (item) {
-        return (item === null || item === void 0 ? void 0 : item.id) || '';
+        return item.id || '';
     };
     var isOtherLicense = function (item) {
-        return (item === null || item === void 0 ? void 0 : item.id) === 'other';
+        return item.id === 'other';
     };
     var onSelectItem = function (brand) {
-        var _a, _b;
-        setSelectedBrand(brand);
+        selectedBrandControl.field.onChange(brand);
         onCloseBrandList();
-        if (isOtherLicense(brand)) {
-            (_a = rest.showTerms) === null || _a === void 0 ? void 0 : _a.call(rest);
-            return;
-        }
-        (_b = rest.hideTerms) === null || _b === void 0 ? void 0 : _b.call(rest);
+        var website = brand.website;
+        setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
     };
-    var hasList = (brandList === null || brandList === void 0 ? void 0 : brandList.length) > 0;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsxs(Collapse, __assign({ in: hasList }, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? function () { return 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: brandList, 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 (_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, {})] }));
+                        } }) }))] }) })));
 };
 export default React.memo(BrandList);

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

@@ -23,27 +23,34 @@ import { ScreenContainer } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
-import { MerchantValidationSchema } from './validation';
+import { MerchantValidationSchema, ValidationOptions } from './validation';
 import BrandName from './BrandName';
 import SocialMedia from './SocialMedia';
 import TAC from './TAC';
 import BrandList from './BrandList';
 var Merchant = function (_a) {
-    var _b, _c, _d, _e, _f, _g, _h;
-    var _j = React.useState(false), brandNameChecking = _j[0], setBrandNameChecking = _j[1];
-    var _k = useSelector(connectSelector), data = _k.data, loading = _k.loading, error = _k.error;
+    var _b, _c, _d;
+    var _e = React.useState(false), brandNameChecking = _e[0], setBrandNameChecking = _e[1];
+    var _f = React.useState(ValidationOptions.NEW_USER), userType = _f[0], setUserType = _f[1];
+    var _g = React.useState(false), listActive = _g[0], setListActive = _g[1];
+    var _h = useSelector(connectSelector), data = _h.data, loading = _h.loading, error = _h.error;
     var isNewUser = (_b = data.otpData.responseBody) === null || _b === void 0 ? void 0 : _b.new_user;
-    var _l = React.useState(isNewUser), isOther = _l[0], setIsOther = _l[1];
+    var isAbsher = data.otpData.isAbsher;
+    var brandList = ((_c = data.brandData.responseBody) === null || _c === void 0 ? void 0 : _c.brands) || [];
+    var _j = data.brandData, brandName = _j.brandName, links = _j.links, selectedBrandItem = _j.selectedBrandItem, termAndConditionChecked = _j.termAndConditionChecked, responseBody = _j.responseBody;
     var methods = useForm({
-        resolver: yupResolver(MerchantValidationSchema(isOther)),
-        defaultValues: data.brandData,
+        resolver: yupResolver(MerchantValidationSchema(userType)),
+        defaultValues: {
+            brandName: brandName,
+            links: links,
+            selectedBrandItem: selectedBrandItem,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
-    var isAbsher = data.otpData.isAbsher;
-    var _m = React.useState(false), listActive = _m[0], setListActive = _m[1];
     var onSubmit = function (formData) {
         dispatch(updateLeadBrand(formData));
     };
@@ -54,26 +61,38 @@ var Merchant = function (_a) {
         }
         dispatch(handlePrevScreenStep(isAbsher ? 'CONNECT_NID_STEP' : 'CONNECT_MOBILE_STEP'));
     };
-    React.useEffect(function () {
-        if (!isNewUser) {
-            methods.setValue('brandName', '', { shouldValidate: true });
-            methods.setValue('termAndConditionChecked', false, {
-                shouldValidate: true
-            });
-        }
-    }, [isOther]);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
     }, [methods.formState.isValid]);
     React.useEffect(function () {
-        var _a, _b;
-        if (((_b = (_a = data.brandData) === null || _a === void 0 ? void 0 : _a.responseBody) === null || _b === void 0 ? void 0 : _b.response_code) === '5')
+        if ((responseBody === null || responseBody === void 0 ? void 0 : responseBody.response_code) === '5')
             methods.setError('brandName', { message: 'Profile Name already exists' });
-    }, [(_c = data.brandData) === null || _c === void 0 ? void 0 : _c.responseBody]);
+    }, [responseBody]);
+    React.useEffect(function () {
+        if (isNewUser === true) {
+            setUserType(ValidationOptions.NEW_USER);
+        }
+        if (isNewUser === false && methods.getValues('selectedBrandItem').id === 'other') {
+            setUserType(ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND);
+            methods.clearErrors();
+            setTimeout(function () { return methods.setValue('brandName', '', { shouldValidate: true }); }, 100);
+        }
+        if (isNewUser === false && methods.getValues('selectedBrandItem').id !== 'other') {
+            setUserType(ValidationOptions.EXISTING_USER_WITH_EXIST_BRAND);
+            methods.clearErrors();
+            var sites_1 = __assign(__assign({}, links), { website: selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.website });
+            setTimeout(function () { return methods.setValue('links', sites_1, { shouldValidate: true }); }, 100);
+        }
+    }, [methods.getValues('selectedBrandItem'), isNewUser]);
+    React.useEffect(function () {
+        if (selectedBrandItem === null || selectedBrandItem === void 0 ? void 0 : selectedBrandItem.id)
+            methods.setValue('selectedBrandItem', selectedBrandItem, { shouldValidate: true });
+    }, [selectedBrandItem]);
     var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
-    var disabled = brandErrChecks || brandNameChecking || ((_e = (_d = data.brandData) === null || _d === void 0 ? void 0 : _d.responseBody) === null || _e === void 0 ? void 0 : _e.response_code) === '5';
-    var showBrandList = ((_g = (((_f = data.brandData) === null || _f === void 0 ? void 0 : _f.brandList) || [])) === null || _g === void 0 ? void 0 : _g.length) > 0 && !isNewUser;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: showBrandList, list: ((_h = data.brandData) === null || _h === void 0 ? void 0 : _h.brandList) || [], onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); }, showTerms: function () { return setIsOther(true); }, hideTerms: function () { return setIsOther(false); } }), _jsx(BrandName, { show: !listActive && isOther, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(SocialMedia, { show: !listActive, sx: !isOther ? { mb: 0 } : {} }), _jsx(TAC, { show: !listActive && isOther }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    var disabled = brandErrChecks || brandNameChecking || ((_d = data.brandData.responseBody) === null || _d === void 0 ? void 0 : _d.response_code) === '5';
+    var isBrandListAvailable = userType !== ValidationOptions.NEW_USER && brandList.length > 0;
+    var askingForBrandInfo = userType === ValidationOptions.NEW_USER || 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(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') })) }))] })) })) }));
 };
 export default React.memo(Merchant);

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

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

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

@@ -57,12 +57,13 @@ var ClearIconStyled = styled(ClearIcon)(function (_a) {
 });
 var SocialMedia = function (_a) {
     var _b, _c, _d;
-    var show = _a.show, sx = _a.sx;
+    var show = _a.show, sx = _a.sx, isNewUser = _a.isNewUser;
     var _e = React.useState(SocialMediaTypes.WEB), socialMediaType = _e[0], setSocialMediaType = _e[1];
     var t = useTranslation().t;
-    var control = useFormContext().control;
+    var _f = useFormContext(), control = _f.control, setValue = _f.setValue, watch = _f.watch;
     var linksControl = useController({ control: control, name: 'links' });
     var links = linksControl.field.value;
+    var brandName = watch('brandName');
     var handleChange = function (_a) {
         var _b;
         var target = _a.target;
@@ -72,6 +73,32 @@ var SocialMedia = function (_a) {
         var _a;
         linksControl.field.onChange(__assign(__assign({}, links), (_a = {}, _a[socialMediaType] = '', _a)));
     };
+    var handleBlueWebsite = function () {
+        if (!!links.website) {
+            var website = links.website;
+            var isWebHasPrefix = !!website.includes('www.');
+            var isWebHasSuffix = !!website.includes('.com');
+            if (!isWebHasPrefix)
+                website = "www.".concat(website);
+            if (!isWebHasSuffix)
+                website = "".concat(website, ".com");
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+    };
+    React.useEffect(function () {
+        if (!!brandName) {
+            var website = "www.".concat(brandName.replaceAll(' ', '-'), ".com");
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+        if (!brandName && isNewUser === false) {
+            var website = "other.com";
+            setValue('links', __assign(__assign({}, links), { website: website }), { shouldValidate: true });
+        }
+        if (!brandName && isNewUser === true) {
+            var website = '';
+            setValue('links', __assign(__assign({}, links), { website: website }));
+        }
+    }, [brandName]);
     var websiteValue = links.website || '';
     var twitterValue = links.twitter || '';
     var instagramValue = links.instagram || '';
@@ -81,6 +108,6 @@ var SocialMedia = function (_a) {
     var instagramError = (_d = errors === null || errors === void 0 ? void 0 : errors.instagram) === null || _d === void 0 ? void 0 : _d.message;
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: __assign({ mt: 3, mb: 3, direction: 'ltr' }, sx) }, { children: [_jsx(SocialMediaGroupStyled, { defaultValue: socialMediaType, exclusive: true, onChange: function (e, value) {
                         setSocialMediaType(value);
-                    } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));
+                    } }), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.WEB, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: websiteValue, onBlur: function () { return handleBlueWebsite(); }, startAdornment: _jsx(TextStyled, { children: "https://" }), placeholder: t('signup_website_placeholder'), warningType: 'alert', warningMessage: websiteError && t(websiteError), endAdornment: !websiteError && websiteValue ? _jsx(CheckIcon, {}) : websiteValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.TWITTER, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: twitterValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_twitter_placeholder'), warningType: 'alert', warningMessage: twitterError && t(twitterError), endAdornment: !twitterError && twitterValue ? _jsx(CheckIcon, {}) : twitterValue && _jsx(ClearIconStyled, { onClick: handleClear }) }) })), _jsx(Collapse, __assign({ in: socialMediaType === SocialMediaTypes.INSTAGRAM, timeout: 300 }, { children: _jsx(InputStyled, { onChange: handleChange, value: instagramValue, startAdornment: _jsx(TextStyled, { children: "@" }), placeholder: t('signup_instagram_placeholder'), warningType: 'alert', warningMessage: instagramError && t(instagramError), endAdornment: !instagramError && instagramValue ? (_jsx(CheckIcon, {})) : (instagramValue && _jsx(ClearIconStyled, { onClick: handleClear })) }) }))] })) })));
 };
 export default React.memo(SocialMedia);

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

@@ -1,5 +1,10 @@
 import * as yup from 'yup';
-export declare const MerchantValidationSchema: (isOther: boolean) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+export declare enum ValidationOptions {
+    NEW_USER = "NEW_USER",
+    EXISTING_USER_WITH_EXIST_BRAND = "EXISTING_USER_WITH_EXIST_BRAND",
+    EXISTING_USER_WITH_OTHER_BRAND = "EXISTING_USER_WITH_OTHER_BRAND"
+}
+export declare const MerchantValidationSchema: (userType: ValidationOptions) => yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
     brandName: yup.StringSchema<string | undefined, import("yup/lib/types").AnyObject, string | undefined>;
     termAndConditionChecked: yup.BooleanSchema<boolean | undefined, import("yup/lib/types").AnyObject, boolean | undefined>;
     links: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {

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

@@ -1,15 +1,75 @@
 import { REGEX_WEBSITE } from '../../../../constants';
 import * as yup from 'yup';
-export var MerchantValidationSchema = function (isOther) {
-    return yup.object().shape({
-        brandName: isOther
-            ? yup
+export var ValidationOptions;
+(function (ValidationOptions) {
+    ValidationOptions["NEW_USER"] = "NEW_USER";
+    ValidationOptions["EXISTING_USER_WITH_EXIST_BRAND"] = "EXISTING_USER_WITH_EXIST_BRAND";
+    ValidationOptions["EXISTING_USER_WITH_OTHER_BRAND"] = "EXISTING_USER_WITH_OTHER_BRAND";
+})(ValidationOptions || (ValidationOptions = {}));
+export var MerchantValidationSchema = function (userType) {
+    var askingForBrandInfo = userType === ValidationOptions.NEW_USER || userType === ValidationOptions.EXISTING_USER_WITH_OTHER_BRAND;
+    if (askingForBrandInfo) {
+        return yup.object().shape({
+            brandName: yup
                 .string()
                 .min(3, 'enter_brand_name_english_chars_numbers_space')
                 .max(250, 'enter_brand_name_english_chars_numbers_space')
-                .required('enter_valid_brand_name')
-            : yup.string().optional(),
-        termAndConditionChecked: isOther ? yup.boolean().required().isTrue('check_terms_cond') : yup.boolean().optional(),
+                .required('enter_valid_brand_name'),
+            termAndConditionChecked: yup.boolean().required().isTrue('check_terms_cond'),
+            links: yup.object().shape({
+                website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
+                    if (!instagram && !twitter) {
+                        return yup
+                            .string()
+                            .matches(REGEX_WEBSITE, 'ide_not_valid_url')
+                            .transform(function (value) { return (!!value ? value : null); })
+                            .nullable()
+                            .required('enter_at_least_one');
+                    }
+                    else {
+                        return yup
+                            .string()
+                            .matches(REGEX_WEBSITE, 'ide_not_valid_url')
+                            .transform(function (value) { return (!!value ? value : null); })
+                            .nullable()
+                            .optional();
+                    }
+                }),
+                instagram: yup
+                    .string()
+                    .nullable()
+                    .transform(function (value) { return (!!value ? value : null); })
+                    .when(['twitter', 'website'], function (twitter, website) {
+                    if (!website && !twitter) {
+                        return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
+                    }
+                    else {
+                        return yup.string().optional();
+                    }
+                }),
+                twitter: yup
+                    .string()
+                    .nullable()
+                    .transform(function (value) { return (!!value ? value : null); })
+                    .min(2, 'enter_at_least_one')
+                    .when(['website', 'instagram'], function (website, instagram) {
+                    if (!website && !instagram) {
+                        return yup.string().min(2, 'enter_at_least_one').required('enter_at_least_one');
+                    }
+                    else {
+                        return yup.string().optional();
+                    }
+                })
+            }, [
+                ['instagram', 'website'],
+                ['twitter', 'website'],
+                ['instagram', 'twitter']
+            ])
+        });
+    }
+    return yup.object().shape({
+        brandName: yup.string().optional(),
+        termAndConditionChecked: yup.boolean().optional(),
         links: yup.object().shape({
             website: yup.string().when(['instagram', 'twitter'], function (instagram, twitter) {
                 if (!instagram && !twitter) {

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

@@ -116,7 +116,7 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: requiredLen }, type: 'tel', 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' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _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 }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(Input, { sx: { direction: 'ltr' }, inputProps: { maxLength: requiredLen }, type: 'tel', 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: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _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, {})] }));
                         } }) }))] })) })));
 });