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

package/build/features/connectExpress/screens/AuthenticationList/validation.js

@@ -0,0 +1,68 @@
+import * as yup from 'yup';
+import { ADD_ENTITY, LICENSE_NUMBER_MIN_LENGTH, REGEX_LEGAL_NAME } from '../../../../constants';
+var objectElements = {
+    id: yup.string().required(),
+    business_id: yup.string(),
+    legal_name: yup.object().shape({
+        ar: yup.string(),
+        en: yup.string()
+    }),
+    license: yup.object().shape({
+        number: yup.string()
+    })
+};
+export var AuthenticationListValidationSchema = yup.object().shape({
+    brandInfo: yup.object().required('auth_brand_required'),
+    entityInfo: yup.object().shape(objectElements).required('auth_entity_required'),
+    licenseNumber: yup
+        .string()
+        .when('entityInfo', function (entityInfo) {
+        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
+        if (!isAddEntity) {
+            return yup.string().optional();
+        }
+        return yup
+            .string()
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return length >= LICENSE_NUMBER_MIN_LENGTH ? true : this.createError({ message: 'enter_license_number' });
+            }
+        })
+            .required('');
+    })
+        .required(''),
+    licenseType: yup
+        .string()
+        .when('entityInfo', function (entityInfo) {
+        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
+        if (!isAddEntity) {
+            return yup.string().optional();
+        }
+        return yup.string().required('choose_license_type');
+    })
+        .required(''),
+    legalName: yup
+        .string()
+        .when('entityInfo', function (entityInfo) {
+        var isAddEntity = (entityInfo === null || entityInfo === void 0 ? void 0 : entityInfo.id) === ADD_ENTITY;
+        if (!isAddEntity) {
+            return yup.string().optional();
+        }
+        return yup
+            .string()
+            .required('')
+            .test({
+            test: function (value) {
+                var length = (value === null || value === void 0 ? void 0 : value.length) || 0;
+                if (length === 0)
+                    return true;
+                return (value === null || value === void 0 ? void 0 : value.match(REGEX_LEGAL_NAME)) && length >= 3 ? true : this.createError({ message: 'enter_valid_legal_name' });
+            }
+        })
+            .required('');
+    })
+        .required('')
+});

package/build/features/connectExpress/screens/Brand/Brand.d.ts

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

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

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

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

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

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

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

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

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

package/build/features/connectExpress/screens/CivilID/CivilID.d.ts

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

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

@@ -17,7 +17,7 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handleCurrentActiveScreen, handlePrevScreenStep } from '../../../../app/settings';
 import { clearError, connectExpressSelector, createCivilIdAuthAsync, resetStore } from '../../../app/connectExpress/connectExpressStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
@@ -27,6 +27,7 @@ import Box from '@mui/material/Box';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
 import IDNumber from './IDNumber';
+import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -56,10 +57,12 @@ var OrBoxStyled = styled(Box)(function (_a) {
     });
 });
 var CivilID = function (_a) {
+    var _b, _c;
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var t = useTranslation().t;
-    var _b = useAppSelector(connectExpressSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var _d = useAppSelector(connectExpressSelector), data = _d.data, loading = _d.loading, error = _d.error;
+    var isLeadIdPassed = data.isLeadIdPassed, responseData = data.responseData;
     var methods = useForm({
         resolver: yupResolver(civilIDValidationSchema),
         defaultValues: data.civilIdData,
@@ -73,12 +76,21 @@ var CivilID = function (_a) {
         dispatch(resetStore());
     }, []);
     var onSubmit = function (data) {
-        dispatch(createCivilIdAuthAsync(data));
+        dispatch(createCivilIdAuthAsync(deepCopy(data)));
     };
     var onBack = function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Switch to mobile number Login Clicked'
+        });
         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(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_BUSINESS_COUNTRY_STEP'));
+    };
+    var disabled = !methods.formState.isValid;
+    var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBackToCountryList, disableBack: !data.isStartFromBusinessCountry, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(CivilID);

package/build/features/connectExpress/screens/CivilID/IDNumber.js

@@ -16,11 +16,13 @@ import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled, alpha } from '@mui/material/styles';
 import Text from '../../../../components/Text';
+import { useAppSelector } from '../../../../hooks';
 import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { CIVIL_ID_NUMBER_LENGTH } from '../../../../constants';
 import Input from '../../../shared/Input';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -34,11 +36,12 @@ var InputLabelStyled = styled(Text)(function (_a) {
     return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
 });
 var IDNumber = React.forwardRef(function (_a, ref) {
-    var _b;
+    var _b, _c, _d;
     var sx = _a.sx;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var civilIdControl = useController({ control: control, name: 'civilId' });
+    var data = useAppSelector(connectExpressSelector).data;
     var handleIdChange = function (_a) {
         var target = _a.target;
         var value = removeAllOtherThanCharsAndNumber(target.value);
@@ -49,6 +52,8 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     };
     var idValue = civilIdControl.field.value;
     var error = (_b = civilIdControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_civil_id') }) }), _jsx(Input, { dir: 'ltr', type: 'text', inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, value: idValue, endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
+    var isLeadIdPassed = data.isLeadIdPassed, responseData = data.responseData;
+    var isLeadIdentityIdAvailable = !!((_d = (_c = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _c === void 0 ? void 0 : _c.identification) === null || _d === void 0 ? void 0 : _d.id);
+    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_civil_id') }) }), _jsx(Input, { dir: 'ltr', type: 'text', inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, disabled: isLeadIdPassed && isLeadIdentityIdAvailable, value: idValue, endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
 });
 export default React.memo(IDNumber);

package/build/features/connectExpress/screens/CivilIDMissed/CivilID.d.ts

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

package/build/features/connectExpress/screens/CivilIDMissed/CivilID.js

@@ -22,6 +22,7 @@ import { clearError, connectExpressSelector, createCivilIDAuthIdentityAsync } fr
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
+import { deepCopy } from '../../../../utils';
 import IDNumber from './IDNumber';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -42,12 +43,12 @@ var CivilID = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createCivilIDAuthIdentityAsync(data));
+        dispatch(createCivilIDAuthIdentityAsync(deepCopy(data)));
     };
     var onBack = 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(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    var disabled = !methods.formState.isValid;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: 5, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') }))] })) })) }));
 };
 export default React.memo(CivilID);

package/build/features/connectExpress/screens/CollectBusinessInfo/BrandName.d.ts

@@ -5,5 +5,5 @@ interface BrandNameProps {
     brandNameChecking: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName, readOnly }: BrandNameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName, readOnly }: BrandNameProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/connectExpress/screens/CollectBusinessInfo/BrandName.js

@@ -63,6 +63,8 @@ import Input from '../../../shared/Input';
 import { EndAdornment } from '../../../shared/EndAdornment';
 import { ScreenContainer } from '../../../shared/Containers';
 import { checkBrandNameAvailabilityAsync, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
+import { BRAND_NAME_MAX_LENGTH } from '../../../../constants';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -119,7 +121,8 @@ var BrandName = function (_a) {
     }); }, 500);
     var handleBrandNameChange = function (_a) {
         var target = _a.target;
-        brandControl.field.onChange(target.value);
+        var value = removeAllOtherThanCharsNumbersAndSpace(target.value);
+        brandControl.field.onChange(value);
     };
     React.useEffect(function () {
         var _a, _b, _c, _d;
@@ -133,6 +136,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: 2.5 } }, { 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, readOnly: readOnly, 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 }) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 2.5 } }, { 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, readOnly: readOnly, value: brandNameValue || '', inputProps: { maxLength: BRAND_NAME_MAX_LENGTH }, 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/connectExpress/screens/CollectBusinessInfo/CollectBusinessInfo.d.ts

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

package/build/features/connectExpress/screens/CollectBusinessInfo/CollectBusinessInfo.js

@@ -15,14 +15,14 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids } from '../../../../hooks';
-import { isSA } from '../../../../utils';
+import { deepCopy, isKW, isSA, sendCustomEventToGTM } from '../../../../utils';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { connectExpressSelector, clearError, updateLeadBusinessDataAsync } from '../../../app/connectExpress/connectExpressStore';
 import Button from '../../../shared/Button';
-import { KWBusinessDataSchema, BusinessDataSchema } from './validation';
+import { KWBusinessDataSchema, BusinessDataSchema, OtherThanKWOrSABusinessDataSchema } from './validation';
 import LicenseList from './LicenseList';
 import BrandName from './BrandName';
 import TAC from './TAC';
@@ -37,9 +37,17 @@ var CollectBusinessInfo = function (_a) {
     var dispatch = useAppDispatch();
     var _c = React.useState(false), listActive = _c[0], setListActive = _c[1];
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
+    var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
     var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var getSchema = React.useMemo(function () {
+        if (isKWCountry)
+            return KWBusinessDataSchema(isLeadIdPassed);
+        if (isSACountry)
+            return BusinessDataSchema(isLeadIdPassed);
+        return OtherThanKWOrSABusinessDataSchema(isLeadIdPassed);
+    }, [isLeadIdPassed]);
     var methods = useForm({
-        resolver: yupResolver(!isSACountry ? KWBusinessDataSchema(isLeadIdPassed) : BusinessDataSchema(isLeadIdPassed)),
+        resolver: yupResolver(getSchema),
         defaultValues: {
             brandName: brandName,
             selectedLicense: selectedLicense,
@@ -52,6 +60,13 @@ var CollectBusinessInfo = function (_a) {
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var getFelids = useExcludeReadOnlyFelids(methods, readOnly).getFelids;
+    React.useEffect(function () {
+        sendCustomEventToGTM({
+            event: 'Send Event',
+            event_category: 'User Registration Flow',
+            event_action: 'Business License Details Step'
+        });
+    }, []);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -67,17 +82,17 @@ var CollectBusinessInfo = function (_a) {
             licenseNumber: data.licenseNumber,
             termAndConditionChecked: data.termAndConditionChecked
         };
-        dispatch(updateLeadBusinessDataAsync(getFelids(dataValues)));
+        dispatch(updateLeadBusinessDataAsync(deepCopy(getFelids(dataValues))));
     };
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName || !!error;
+    var brandErrChecks = !methods.formState.isValid || !!methods.formState.errors.brandName;
     var disabled = brandErrChecks || brandNameChecking || isBrandNameAvailable == false;
     return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandName, { readOnly: readOnly['brandName'], show: true, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(LicenseList, { readOnly: readOnly['selectedLicense'], onListOpen: function () {
                             setListActive(true);
                         }, onListClose: function () {
                             setListActive(false);
-                        } }), _jsx(TAC, { show: !isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+                        } }), _jsxs(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: [_jsx(TAC, { show: !isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') }))] }))] })) })) }));
 };
 export default React.memo(CollectBusinessInfo);

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseList.d.ts

@@ -5,5 +5,5 @@ interface LicenseListProps {
     onListClose?: () => void;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ readOnly, ...rest }: LicenseListProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ readOnly, ...rest }: LicenseListProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseList.js

@@ -28,7 +28,7 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { BusinessType } from '../../../../@types';
-import { isOtherLicense, isSA } from '../../../../utils';
+import { isKW, isOtherLicense, isOtherThanKWOrSA, isSA } from '../../../../utils';
 import { settingsSelector } from '../../../../app/settings';
 import { OTHER_CR_LICENSE, OTHER_FL_LICENSE } from '../../../../constants';
 import SimpleList from '../../../../components/SimpleList';
@@ -80,6 +80,8 @@ var LicenseList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(country_code); }, [country_code]);
+    var isKWCountry = React.useMemo(function () { return isKW(country_code); }, [country_code]);
     var isSACountry = React.useMemo(function () { return isSA(country_code); }, [country_code]);
     React.useEffect(function () {
         if ((licenseList || []).length > 0)
@@ -95,8 +97,7 @@ var LicenseList = function (_a) {
     }, [licenseList, selectedLicense]);
     React.useEffect(function () {
         if (!!country_code) {
-            var isNonSA = !isSA(country_code);
-            if (isNonSA) {
+            if (isKWCountry) {
                 var license = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR ? OTHER_CR_LICENSE : OTHER_FL_LICENSE;
                 setValue('selectedLicense', license, { shouldValidate: true });
             }
@@ -132,8 +133,8 @@ var LicenseList = function (_a) {
     var licenseReadonly = !isOtherLicense(selected);
     var isCR = (selected === null || selected === void 0 ? void 0 : selected.type) === BusinessType.CR;
     var flValue = isOtherLicense(selected) ? t(getLicenseName(selected)) : getLicenseNumber(selected);
-    return (_jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: isSACountry }, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? t(getLicenseName(selected)) : flValue }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'legal_name?.en', list: licenseList || [], onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsxs(ScreenContainer, { children: [_jsxs(Collapse, __assign({ in: isSACountry || isOtherThanKWOrSACountry }, { children: [_jsx(InputStyled, { label: t('choose_any_license'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseLicenseList(); } : onOpenLicenseList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_license_cr'), value: isCR ? t(getLicenseName(selected)) : flValue }), _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(selected) }, { children: isOtherLicense(item) ? t(getLicenseName(item)) : getLicenseFullName(item) })) }), getLicenseNumber(item) === getLicenseNumber(selected) && _jsx(CheckIcon, {})] }));
-                            } }) }))] })), _jsx(LicenseType, { show: show && !isSACountry, readOnly: readOnly }), _jsx(LicenseNumber, { show: !isSACountry ? isCR : show, readOnly: licenseReadonly })] }));
+                            } }) }))] })), _jsx(LicenseType, { show: show && isKWCountry, readOnly: readOnly }), _jsx(LicenseNumber, { show: isKWCountry ? isCR : show, readOnly: licenseReadonly })] }));
 };
 export default React.memo(LicenseList);

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseNumber.d.ts

@@ -3,5 +3,5 @@ interface LicenseNumberProps {
     show: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, readOnly }: LicenseNumberProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly }: LicenseNumberProps) => import("react/jsx-runtime").JSX.Element>;
 export default _default;

package/build/features/connectExpress/screens/CollectBusinessInfo/LicenseNumber.js

@@ -14,7 +14,7 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { CR_MIN_LICENSE_LENGTH, CR_NUMBER_MAX_LENGTH, FL_MIN_LICENSE_LENGTH, FL_NUMBER_MAX_LENGTH, KW_MAX_LICENSE_LENGTH, KW_MIN_LICENSE_LENGTH } from '../../../../constants';
-import { removeAllOtherThanCharsAndNumber, isSA } from '../../../../utils';
+import { removeAllOtherThanCharsAndNumber, isKW, isOtherThanKWOrSA } from '../../../../utils';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -30,8 +30,9 @@ var LicenseNumber = function (_a) {
     var _c = useFormContext(), control = _c.control, watch = _c.watch, getValues = _c.getValues;
     var licenseNumberControl = useController({ control: control, name: 'licenseNumber' });
     var settingsData = useAppSelector(settingsSelector).data;
-    var isSACountry = React.useMemo(function () { return isSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
-    var selectedLicense = !isSACountry ? watch('selectedLicense') : getValues('selectedLicense');
+    var isKWCountry = React.useMemo(function () { return isKW(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var isOtherThanKWOrSACountry = React.useMemo(function () { return isOtherThanKWOrSA(settingsData.businessCountry.iso2); }, [settingsData.businessCountry.iso2]);
+    var selectedLicense = isKWCountry ? watch('selectedLicense') : getValues('selectedLicense');
     var isCR = (selectedLicense === null || selectedLicense === void 0 ? void 0 : selectedLicense.type) === BusinessType.CR;
     var handleFLNumberChange = function (_a) {
         var target = _a.target;
@@ -43,10 +44,10 @@ var LicenseNumber = function (_a) {
     };
     var licenseNumberValue = licenseNumberControl.field.value;
     var error = (_b = licenseNumberControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    var length = !isSACountry ? KW_MAX_LICENSE_LENGTH : isCR ? CR_NUMBER_MAX_LENGTH : FL_NUMBER_MAX_LENGTH;
-    var minLength = !isSACountry ? KW_MIN_LICENSE_LENGTH : isCR ? CR_MIN_LICENSE_LENGTH : FL_MIN_LICENSE_LENGTH;
+    var length = isKWCountry || isOtherThanKWOrSACountry ? KW_MAX_LICENSE_LENGTH : isCR ? CR_NUMBER_MAX_LENGTH : FL_NUMBER_MAX_LENGTH;
+    var minLength = isKWCountry || isOtherThanKWOrSACountry ? KW_MIN_LICENSE_LENGTH : isCR ? CR_MIN_LICENSE_LENGTH : FL_MIN_LICENSE_LENGTH;
     var label = isCR ? 'cr_number' : 'fl_number';
-    var showCheckIcon = !isSACountry ? (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) >= minLength : (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) === length;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t(label), required: !isSACountry, onChange: handleFLNumberChange, inputProps: { maxLength: length }, value: licenseNumberValue, endAdornment: showCheckIcon || (readOnly && licenseNumberValue) ? _jsx(CheckIcon, {}) : licenseNumberValue && _jsx(ClearIcon, { onClick: clearLicenseNumber }), placeholder: isCR ? t('cr_number_hint') : t('fl_number_hint'), warningType: 'alert', warningMessage: error && t(error, { length: minLength }) }) }) })));
+    var showCheckIcon = isKWCountry || isOtherThanKWOrSACountry ? (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) >= minLength : (licenseNumberValue === null || licenseNumberValue === void 0 ? void 0 : licenseNumberValue.length) === length;
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t(label), required: isKWCountry, onChange: handleFLNumberChange, inputProps: { maxLength: length }, value: licenseNumberValue, endAdornment: showCheckIcon || (readOnly && licenseNumberValue) ? _jsx(CheckIcon, {}) : licenseNumberValue && _jsx(ClearIcon, { onClick: clearLicenseNumber }), placeholder: isCR ? t('cr_number_hint') : t('fl_number_hint'), warningType: 'alert', warningMessage: error && t(error, { length: minLength }) }) }) })));
 };
 export default React.memo(LicenseNumber);