@tap-payments/auth-jsconnect 2.3.99-test → 2.4.0

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

@@ -0,0 +1,9 @@
+import * as yup from 'yup';
+export var BrandSegmentValidationSchema = function () {
+    return yup.object().shape({
+        segmentLocation: yup.object().required('alert_choose_segment_location'),
+        segmentProfit: yup.object().required('alert_choose_segment_profit'),
+        segmentTech: yup.object().required('alert_choose_segment_tech'),
+        teamSize: yup.object().required('alert_choose_teamSize')
+    });
+};

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

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

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

@@ -0,0 +1,103 @@
+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 { findCountryByIso2, isKW, isOtherThanKWOrSA } from '../../../../utils';
+import Collapse from '../../../../components/Collapse';
+import { handleNextScreenStep, handleSetCountryByIso2, settingsSelector } from '../../../../app/settings';
+import { connectSelector, setDefaultCountryCode, updateBusinessCountry, storeIsStartFromBusinessCountry, clearError } from '../../../app/connect/connectStore';
+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(connectSelector), 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:
+                    countryCode = findCountryByIso2(settingsData.countries, iso2);
+                    dispatch(handleSetCountryByIso2(iso2));
+                    if (!data.leadId) return [3, 2];
+                    return [4, dispatch(updateBusinessCountry(iso2))];
+                case 1:
+                    _a.sent();
+                    _a.label = 2;
+                case 2:
+                    if (countryCode)
+                        dispatch(setDefaultCountryCode(countryCode));
+                    if (isOtherThanKWOrSA(iso2) || isKW(iso2)) {
+                        dispatch(handleNextScreenStep('CONNECT_MOBILE_STEP'));
+                        return [2];
+                    }
+                    dispatch(handleNextScreenStep('CONNECT_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/connect/screens/BusinessCountry/index.d.ts

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

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

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

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

@@ -9,17 +9,6 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
@@ -28,7 +17,8 @@ import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { deepCopy } from '../../../../utils';
 import { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
@@ -72,10 +62,13 @@ var CivilID = function (_a) {
     var t = useTranslation().t;
     var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var settingsStore = useAppSelector(settingsSelector);
-    var _c = data.civilIdData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
+    var _c = data.civilIdData, civilId = _c.civilId, termAndConditionChecked = _c.termAndConditionChecked;
     var methods = useForm({
         resolver: yupResolver(civilIDValidationSchema),
-        defaultValues: defaultValues,
+        defaultValues: {
+            civilId: civilId,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
     useSetFromDefaultValues(methods, data.civilIdData);
@@ -83,7 +76,7 @@ var CivilID = function (_a) {
         handleClearError();
     }, [methods.formState.isValid]);
     var onSubmit = function (data) {
-        dispatch(createCivilIdAuth(data));
+        dispatch(createCivilIdAuth(deepCopy(data)));
         dispatch(resetMobileScreen(settingsStore.data.businessCountry));
     };
     var handleClearError = function () {
@@ -93,10 +86,13 @@ var CivilID = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep('CONNECT_MOBILE_STEP'));
     };
+    var onBackToCountryList = function () {
+        dispatch(handleCurrentActiveScreen('CONNECT_BUSINESS_COUNTRY_STEP'));
+    };
     React.useEffect(function () {
         dispatch(resetStore());
     }, []);
     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 || settingsStore.loading, 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 || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
+    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 || settingsStore.loading, 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 || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
 };
 export default React.memo(CivilID);

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

@@ -11,17 +11,16 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 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 Input from '../../../shared/Input';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 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';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -54,6 +53,6 @@ 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: !error && idValue ? _jsx(CheckIcon, {}) : idValue && _jsx(ClearIcon, { onClick: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
+    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 })] })));
 });
 export default React.memo(IDNumber);

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -47,19 +47,17 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import { useTranslation } from 'react-i18next';
+import { debounce } from 'lodash-es';
 import axios from 'axios';
-import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
 import { useController, useFormContext } from 'react-hook-form';
-import ClearIcon from '../../../shared/ClearIcon';
-import CheckIcon from '../../../shared/CheckIcon';
-import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useTranslation } from 'react-i18next';
+import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { debounce } from 'lodash-es';
 import Collapse from '../../../../components/Collapse';
-import { styled } from '@mui/material/styles';
-import CircularProgress from '@mui/material/CircularProgress';
+import { ScreenContainer } from '../../../shared/Containers';
+import Input from '../../../shared/Input';
+import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var InputStyled = styled(Input)(function () { return ({
     input: {
         textTransform: 'lowercase'
@@ -103,6 +101,6 @@ var Email = function (_a) {
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, readOnly: readOnly, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: emailChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && emailValue ? (_jsx(CheckIcon, {})) : (emailValue && _jsx(ClearIcon, { onClick: clearNumber })) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, readOnly: readOnly, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: emailValue, loading: emailChecking, error: error, onClear: clearNumber }) }) }) })));
 };
 export default React.memo(Email);

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

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

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

@@ -73,15 +73,12 @@ var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
         marginInlineStart: theme.spacing(1)
     });
 });
-var InputStyled = styled(Input)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: 'ltr',
-        '& .MuiInputBase-input': {
-            cursor: 'auto'
-        }
-    });
-});
+var InputStyled = styled(Input)(function () { return ({
+    direction: 'ltr',
+    '& .MuiInputBase-input': {
+        cursor: 'auto'
+    }
+}); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d, _e, _f;
     var countries = _a.countries, rest = __rest(_a, ["countries"]);

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

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

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

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

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

@@ -24,7 +24,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -55,16 +55,14 @@ import { styled, alpha } from '@mui/material/styles';
 import InfoIcon from '@mui/icons-material/Info';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import { ScreenContainer } from '../../../shared/Containers';
-import CircularProgress from '@mui/material/CircularProgress';
 import Text from '../../../../components/Text';
 import Input from '../../../shared/Input';
-import ClearIcon from '../../../shared/ClearIcon';
 import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
-import CheckIcon from '../../../shared/CheckIcon';
 import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
+import { EndAdornment } from '../../../shared/EndAdornment';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -137,6 +135,6 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: brandNameChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && brandNameValue ? (_jsx(CheckIcon, {})) : (brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName })) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName }) })] })) })));
 };
 export default React.memo(BrandName);

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

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

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

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

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

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