@tap-payments/auth-jsconnect 2.0.43-test → 2.0.44

package/build/features/connect/Connect.js

@@ -9,30 +9,58 @@ 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 } from "react/jsx-runtime";
-import { memo } from 'react';
+import React, { memo } from 'react';
 import { FeatureContainer } from '../shared/Containers';
-import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener } from '../../hooks';
-import { settingsSelector } from '../../app/settings';
+import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useAppDispatch } from '../../hooks';
+import { handleCurrentActiveScreen, settingsSelector, handleOpen } from '../../app/settings';
 import AnimationFlow from '../../components/AnimationFlow';
 import { store } from '../../app/store';
-import { connectSelector } from '../app/connect/connectStore';
+import { connectSelector, setDefaultCountryCode } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { reactElement, removeElement } from '../../utils';
+import { reactElement, removeElement, isKW } from '../../utils';
 import { CONNECT_SCREENS_NAVIGATION, DIALOG_ID } from '../../constants';
 import { connectFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
-var Connect = memo(function (props) {
+var Connect = memo(function (_a) {
+    var onClose = _a.onClose, props = __rest(_a, ["onClose"]);
     var theme = useAppTheme().theme;
-    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
-    var connectError = useAppSelector(connectSelector).error;
+    var dispatch = useAppDispatch();
+    var _b = useAppSelector(settingsSelector), data = _b.data, error = _b.error, settingLoading = _b.loading;
+    var _c = useAppSelector(connectSelector), connectError = _c.error, loading = _c.loading;
     useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION }, props));
     useErrorListener(connectError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { children: _jsx(FeatureContainer, { children: connectFeatureScreens.map(function (_a, index) {
+    React.useEffect(function () {
+        var _a;
+        if (!settingLoading) {
+            if (isKW((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2))
+                dispatch(handleCurrentActiveScreen('CONNECT_MOBILE_STEP'));
+        }
+    }, [settingLoading]);
+    React.useEffect(function () {
+        var _a;
+        if (!!((_a = data.businessCountry) === null || _a === void 0 ? void 0 : _a.iso2))
+            dispatch(setDefaultCountryCode(data.businessCountry));
+    }, [data.businessCountry]);
+    var handleDialogClose = function () {
+        dispatch(handleOpen(false));
+    };
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onClose: onClose, onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading, error: error, open: open, footer: _jsx(CustomFooter, {}), screenId: activeScreen.name }, { 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));
@@ -51,6 +79,6 @@ export function unmountConnectLib(elementId, unmountTimeout) {
         var _a;
         ((_a = element === null || element === void 0 ? void 0 : element.children) === null || _a === void 0 ? void 0 : _a.length) && element.removeChild(element.children[0]);
         removeElement(DIALOG_ID);
-        reactElement(elementId).unmount();
+        elementId && reactElement(elementId).unmount();
     }, unmountTimeout);
 }

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

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

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

@@ -0,0 +1,102 @@
+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 __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';
+import { alpha, styled } from '@mui/material/styles';
+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 { clearError, connectSelector, createCivilIdAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
+import Form from '../../../../components/Form';
+import Button, { MobileButton } from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import Collapse from '../../../../components/Collapse';
+import Box from '@mui/material/Box';
+import Divider from '@mui/material/Divider';
+import Text from '../../../../components/Text';
+import IDNumber from './IDNumber';
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var TextStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: alpha(theme.palette.primary.dark, 0.4)
+    });
+});
+var DividerStyled = styled(Divider)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        width: '45%',
+        borderColor: alpha(theme.palette.primary.dark, 0.4),
+        marginBlockEnd: theme.spacing(0.62)
+    });
+});
+var OrBoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        marginBlockEnd: theme.spacing(1.62),
+        marginBlockStart: theme.spacing(-1.25),
+        marginInline: theme.spacing(2.5)
+    });
+});
+var CivilID = function (_a) {
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    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 methods = useForm({
+        resolver: yupResolver(civilIDValidationSchema),
+        defaultValues: defaultValues,
+        mode: 'onChange'
+    });
+    useSetFromDefaultValues(methods, defaultValues);
+    React.useEffect(function () {
+        handleClearError();
+    }, [methods.formState.isValid]);
+    var onSubmit = function (data) {
+        dispatch(createCivilIdAuth(data));
+        dispatch(resetMobileScreen(settingsStore.data.businessCountry));
+    };
+    var handleClearError = function () {
+        if (error)
+            dispatch(clearError());
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep('CONNECT_MOBILE_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') }))] }))] })) })) }));
+};
+export default React.memo(CivilID);

package/build/features/connect/screens/CivilID/IDNumber.d.ts

@@ -0,0 +1,7 @@
+import * as React from 'react';
+import { SxProps, Theme } from '@mui/material/styles';
+interface IDNumberProps {
+    sx: SxProps<Theme> | undefined;
+}
+declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<IDNumberProps & React.RefAttributes<unknown>>>;
+export default _default;

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

@@ -0,0 +1,59 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, 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 { 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';
+var LabelContainerStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        padding: theme.spacing(0, 2.5, 1.25, 2.5)
+    });
+});
+var InputLabelStyled = styled(Text)(function (_a) {
+    var theme = _a.theme;
+    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 sx = _a.sx;
+    var t = useTranslation().t;
+    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
+    var civilIdControl = useController({ control: control, name: 'civilId' });
+    React.useEffect(function () {
+        if (civilIdControl.field.value)
+            setValue('civilId', civilIdControl.field.value, { shouldValidate: true });
+    }, []);
+    var handleIdChange = function (_a) {
+        var target = _a.target;
+        var value = removeAllOtherThanCharsAndNumber(target.value);
+        civilIdControl.field.onChange(value);
+    };
+    var clearIdNumber = function () {
+        civilIdControl.field.onChange('');
+    };
+    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 })] })));
+});
+export default React.memo(IDNumber);

package/build/features/connect/screens/CivilID/index.d.ts

@@ -0,0 +1,3 @@
+import CivilID, { CivilIDProps } from './CivilID';
+export type { CivilIDProps };
+export default CivilID;

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

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

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

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const civilIDValidationSchema: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    civilId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    civilId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    civilId: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

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

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var civilIDValidationSchema = yup.object().shape({
+    civilId: yup.string().matches(/^\d+$/, 'invalid_civil_id').min(12, 'invalid_civil_id').required('invalid_civil_id')
+});

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

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

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

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

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

@@ -34,6 +34,7 @@ import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
+import { mapSalesChannel } from '../../../../utils';
 var InputStyled = styled(Input)(function () { return ({
     '& .MuiInputBase-input': {
         cursor: 'pointer'
@@ -51,7 +52,7 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var control = useFormContext().control;
+    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
     var selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -64,22 +65,29 @@ var BrandList = function (_a) {
         setAnchorEl(null);
         (_a = rest.onListClose) === null || _a === void 0 ? void 0 : _a.call(rest);
     };
-    var getBrandName = function (item) {
-        var _a, _b;
-        return (isAr ? (_a = item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item.name) === null || _b === void 0 ? void 0 : _b.en) || '';
+    var getBrandName = function (_a) {
+        var name = _a.name;
+        return (isAr ? name === null || name === void 0 ? void 0 : name.ar : name === null || name === void 0 ? void 0 : name.en) || '';
     };
     var getBrandId = function (item) {
         return item.id || '';
     };
-    var isOtherLicense = function (item) {
-        return item.id === 'other';
+    var isOtherBrand = function (item) {
+        return getBrandId(item) === 'other';
     };
     var onSelectItem = function (brand) {
         selectedBrandControl.field.onChange(brand);
+        if (!isOtherBrand(brand)) {
+            setValue('salesChannels', mapSalesChannel(brand.channel_services || []), { shouldValidate: true });
+        }
+        if (isOtherBrand(brand)) {
+            setValue('salesChannels', [], { shouldValidate: true });
+            setValue('brandName', '');
+        }
         onCloseBrandList();
     };
     return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), readOnly: true, onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: list, onSelectItem: onSelectItem, renderItem: function (item) {
-                            return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherLicense(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
+                            return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherBrand(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
                         } }) }))] }) })));
 };
 export default React.memo(BrandList);

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

@@ -63,8 +63,8 @@ import Tooltip from '../../../../components/Tooltip';
 import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanCharsNumbersAndSpace } from '../../../../utils';
 import CheckIcon from '../../../shared/CheckIcon';
-import { checkBrandNameAvailability } from '../../../app/connect/connectStore';
-import { useAppDispatch } from '../../../../hooks';
+import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 var LabelContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
@@ -103,6 +103,7 @@ var BrandName = function (_a) {
     var dispatch = useAppDispatch();
     var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
     var t = useTranslation().t;
+    var data = useAppSelector(connectSelector).data;
     var control = useFormContext().control;
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
@@ -125,8 +126,10 @@ var BrandName = function (_a) {
         brandControl.field.onChange(value);
     };
     React.useEffect(function () {
+        var _a, _b, _c;
         var isValid = brandNameValue && !error && brandNameValue.length > 2;
-        if (isValid) {
+        var brand = (_c = (_b = (_a = data.otpData.responseBody) === null || _a === void 0 ? void 0 : _a.brand) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.en;
+        if (isValid && (brandNameValue === null || brandNameValue === void 0 ? void 0 : brandNameValue.toLowerCase()) != brand) {
             fetchingBrandName(true);
             checkBrand(brandNameValue);
         }
@@ -134,6 +137,6 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue, placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: brandNameChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && brandNameValue ? (_jsx(CheckIcon, {})) : (brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName })) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: brandNameChecking ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : !error && brandNameValue ? (_jsx(CheckIcon, {})) : (brandNameValue && _jsx(ClearIcon, { onClick: clearBrandName })) })] })) })));
 };
 export default React.memo(BrandName);