@tap-payments/auth-jsconnect 2.0.44 → 2.0.45

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

@@ -9,104 +9,14 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-import { memo, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { styled } from '@mui/material/styles';
-import { FlowsButtons } from '../../../shared/Button';
-import { ICONS_NAMES, PASSWORD_OPERATION_TYPE } from '../../../../constants';
-import { useAppSelector, useLanguage } from '../../../../hooks';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { memo } from 'react';
+import { useAppSelector } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
-import { concatenateObjectValues, getResetFlowUrl, showLastFour } from '../../../../utils';
-import Box from '@mui/material/Box';
-import Text from '../../../../components/Text';
-import Container from '../../../shared/Containers/ScreenContainer';
-import AcceptancePayouts from '../../../shared/AcceptancePayouts';
-import { settingsSelector } from '../../../../app/settings';
-var TitleStyled = styled(Text)(function (_a) {
-    var _b;
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), (_b = { fontWeight: theme.typography.fontWeightBold, color: theme.palette.text.primary, lineHeight: 1.75, paddingBottom: theme.spacing(3) }, _b[theme.breakpoints.down('sm')] = {}, _b)));
-});
-var ContainerStyled = styled(Container)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        justifyContent: 'space-between',
-        minHeight: theme.spacing(30),
-        alignItems: 'center'
-    });
-});
-var ButtonGroupStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        width: '100%',
-        paddingTop: theme.spacing(3)
-    });
-});
+import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
 var SuccessWithFlowButtons = function () {
-    var _a, _b, _c, _d;
-    var t = useTranslation().t;
-    var isAr = useLanguage().isAr;
     var data = useAppSelector(businessSelector).data;
-    var _e = data.verify.responseBody || {}, flows = _e.flows, nameObj = _e.name, entity = _e.entity, brand = _e.brand, bank = _e.bank_account, merchant = _e.merchant, identification = _e.identification;
-    var _f = useState([]), buttons = _f[0], setButtons = _f[1];
-    var _g = nameObj || {}, en = _g.en, ar = _g.ar;
-    var username = isAr
-        ? concatenateObjectValues(ar || en, ['first', 'last'])
-        : concatenateObjectValues(en, ['first', 'last']);
-    var licenseNumber = ((_a = entity === null || entity === void 0 ? void 0 : entity.license) === null || _a === void 0 ? void 0 : _a.number) || '';
-    var bankName = (bank === null || bank === void 0 ? void 0 : bank.bank_name) || t('bank');
-    var iban = showLastFour((bank === null || bank === void 0 ? void 0 : bank.iban) || '');
-    var taxID = (entity === null || entity === void 0 ? void 0 : entity.vat_id) || '';
-    var brandName = (isAr ? (_b = brand === null || brand === void 0 ? void 0 : brand.name) === null || _b === void 0 ? void 0 : _b.ar : (_c = brand === null || brand === void 0 ? void 0 : brand.name) === null || _c === void 0 ? void 0 : _c.en) || '';
-    var isAcceptance = merchant === null || merchant === void 0 ? void 0 : merchant.is_acceptance_allowed;
-    var isPayout = merchant === null || merchant === void 0 ? void 0 : merchant.is_payout_allowed;
-    var maskedId = (identification === null || identification === void 0 ? void 0 : identification.id) ? " ".concat(t('masking_symbols')).concat((_d = identification === null || identification === void 0 ? void 0 : identification.id) === null || _d === void 0 ? void 0 : _d.slice(-2)) : '';
-    var settings = useAppSelector(settingsSelector);
-    var _h = data.verify.responseBody || { contact: {}, board_id: '' }, contact = _h.contact, board_id = _h.board_id, board_info_id = _h.board_info_id;
-    var email = (contact || { email: '' }).email;
-    var url = getResetFlowUrl('/password', settings.data.language, PASSWORD_OPERATION_TYPE.RESET_PASSWORD, board_id, board_info_id);
-    var reMapFlowData = function (flows) {
-        if (flows === void 0) { flows = []; }
-        var images = ICONS_NAMES;
-        var mappedFlows = flows
-            .filter(function (item) { return item === null || item === void 0 ? void 0 : item.name; })
-            .map(function (_a) {
-            var name = _a.name, url = _a.url, status = _a.status;
-            var type = status === 'completed' ? 'completed' : 'pending';
-            var title = t("".concat(name, "_flow_").concat(type), {
-                individual_name: username.toLowerCase() + maskedId,
-                business_type: brandName,
-                license_number: licenseNumber ? t('masking_symbols') + showLastFour(licenseNumber) : '',
-                bank_name: bankName,
-                iban: iban ? t('masking_symbols') + iban : '',
-                tax_id: taxID ? t('masking_symbols') + showLastFour(taxID) : ''
-            });
-            var isCompleted = status === 'completed' && name !== 'password';
-            var isIndividual = name === 'individual';
-            var src = isCompleted ? "".concat(name, "_green_icon") : "".concat(name, "_filled_icon");
-            var hoverSrc = "".concat(name, "_white_icon");
-            return {
-                name: name,
-                status: status,
-                title: title,
-                href: url,
-                src: images[src],
-                hoverSrc: images[hoverSrc],
-                isCompleted: isCompleted,
-                sx: isIndividual ? { textTransform: 'capitalize' } : {}
-            };
-        });
-        setButtons(mappedFlows);
-    };
-    useEffect(function () {
-        if ((flows === null || flows === void 0 ? void 0 : flows.length) > 0)
-            reMapFlowData(flows);
-    }, [flows, isAr]);
-    return (_jsxs(ContainerStyled, { children: [_jsxs(TitleStyled, { children: [t('account_details'), " "] }), _jsx(AcceptancePayouts, { showAcceptance: isAcceptance, showPayout: isPayout }), _jsx(ButtonGroupStyled, { children: _jsx(FlowsButtons, { buttons: buttons, data: {
-                        flowName: data.flowName,
-                        email: email,
-                        emailUrl: url
-                    } }) })] }));
+    var _a = data.verify.responseBody || {}, flows = _a.flows, entity = _a.entity, brand = _a.brand, bank = _a.bank_account, merchant = _a.merchant, user = _a.user, business = _a.business, board_id = _a.board_id, board_info_id = _a.board_info_id, name = _a.name;
+    return (_jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, boardInfoId: board_info_id, flows: flows || [] }));
 };
 export default memo(SuccessWithFlowButtons);

package/build/features/business/screens/VerifyPACI/VerifyPACI.d.ts

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

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

@@ -1,159 +1,34 @@
-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 (_) 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 { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
-import Box from '@mui/material/Box/Box';
-import { styled } from '@mui/material/styles';
-import { useTranslation } from 'react-i18next';
-import Text from '../../../../components/Text';
 import { businessSelector, verifyPACI as verifyPACIFun } from '../../../app/business/businessStore';
 import { handlePrevScreenStep } from '../../../../app/settings';
-import { ScreenContainer } from '../../../shared/Containers';
-import { MobileButton } from '../../../shared/Button';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import Collapse from '../../../../components/Collapse';
-import Warning from '../../../../components/Warning';
-import { mobileOS, sleep } from '../../../../utils';
-import VerifyPACILoading from './VerifyPACILoading';
-import VerifyPACISuccess from './VerifyPACISuccess';
-var VerifyPACITitleContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: theme.direction,
-        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        marginBottom: theme.spacing(2.5)
-    });
-});
-var VerifyPACITitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightBold, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
-});
-var VerifyPACISubTitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line', textAlign: 'center' }));
-});
-var Container = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        position: 'relative',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-        maxHeight: '300px'
-    });
-});
-var BackButton = styled('button')(function (_a) {
-    var theme = _a.theme;
-    return ({
-        cursor: 'pointer',
-        height: 44,
-        appearance: 'none',
-        background: 'none',
-        pointerEvents: 'auto',
-        border: 'none',
-        color: theme.palette.primary.main,
-        fontSize: theme.typography.body1.fontSize,
-        fontWeight: theme.typography.fontWeightMedium,
-        textTransform: 'capitalize',
-        '&:hover': {
-            backgroundColor: 'transparent'
-        }
-    });
-});
+import PaciVerification from '../../../shared/PaciVerification';
 var VerifyPACI = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), isReady = _b[0], setIsReady = _b[1];
     var dispatch = useAppDispatch();
-    var _c = useAppSelector(businessSelector), data = _c.data, error = _c.error;
+    var data = useAppSelector(businessSelector).data;
     var responseBody = data.civilIdData.responseBody;
-    var t = useTranslation().t;
-    var onSuccess = function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    setSuccess(true);
-                    return [4, sleep(2000)];
-                case 1:
-                    _a.sent();
-                    return [2];
-            }
-        });
-    }); };
+    var _c = responseBody || {}, expiry = _c.expiry, app_url_android = _c.app_url_android, app_url_ios = _c.app_url_ios;
     React.useEffect(function () {
-        if (responseBody) {
+        if (responseBody && !isReady) {
             setIsReady(true);
         }
     }, [responseBody]);
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyPACIFun({ onSuccess: onSuccess }));
+        var promise = dispatch(verifyPACIFun({ onSuccess: function () { return setSuccess(true); } }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
     }, [isReady]);
-    var onRedirect = React.useCallback(function () {
-        if (os === 'Android') {
-            window.open(responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_android, '_blank');
-        }
-        if (os === 'iOS') {
-            window.open(responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios, '_blank');
-        }
-    }, [responseBody]);
     var onBack = React.useCallback(function () {
         dispatch(handlePrevScreenStep());
     }, []);
-    var os = React.useMemo(function () { return mobileOS(); }, []);
-    var isAndroid = React.useMemo(function () { return os === 'Android' && (responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios); }, [os, responseBody]);
-    var isIOS = React.useMemo(function () { return os === 'iOS' && (responseBody === null || responseBody === void 0 ? void 0 : responseBody.app_url_ios); }, [os, responseBody]);
-    return (_jsxs(ScreenContainer, __assign({ sx: { mb: 2.5 } }, { children: [_jsxs(VerifyPACITitleContainerStyled, { children: [_jsx(Container, { children: success ? _jsx(VerifyPACISuccess, {}) : _jsx(VerifyPACILoading, { loop: !error }) }), _jsx(VerifyPACITitleStyled, { children: t('authenticate_kuwait_mobile_title') }), _jsx(VerifyPACISubTitleStyled, { children: t('authenticate_kuwait_mobile_description') })] }), _jsx(Collapse, __assign({ in: !!error, sx: { width: '100%' } }, { children: _jsx(Warning, { children: t(error) }) })), (isAndroid || isIOS) && (_jsx(MobileButton, __assign({ onClick: onRedirect, hideIcon: true }, { children: t('Open Kuwait Mobile ID') }))), _jsx(BackButton, __assign({ onClick: onBack }, { children: t('back') }))] })));
+    if (!isReady)
+        return null;
+    return (_jsx(PaciVerification, { expiryInSeconds: expiry, success: success, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyPACI);

package/build/features/connect/Connect.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { LibConfig } from '../../@types';
 export interface ConnectLibProps extends LibConfig {
-    onClose?: () => void;
 }
-export declare function ConnectLib(props: ConnectLibProps): JSX.Element;
-export declare function renderConnectLib(config: ConnectLibProps, elementId: string): void;
-export declare function unmountConnectLib(elementId: string, unmountTimeout?: number): void;
+export declare function ConnectElement(props: ConnectLibProps): JSX.Element;
+export declare function renderConnectLib(config: ConnectLibProps, elementId: string): {
+    unmount: () => void;
+};

package/build/features/connect/Connect.js

@@ -9,19 +9,9 @@ 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 React, { memo } from 'react';
+import { createRoot } from 'react-dom/client';
 import { FeatureContainer } from '../shared/Containers';
 import { useAppTheme, useAppSelector, useAppConfig, useErrorListener, useStepStartedListener, useAppDispatch } from '../../hooks';
 import { handleCurrentActiveScreen, settingsSelector, handleOpen } from '../../app/settings';
@@ -30,18 +20,17 @@ import { store } from '../../app/store';
 import { connectSelector, setDefaultCountryCode } from '../app/connect/connectStore';
 import { ReduxProvider, ThemeProvider } from '../../components/Providers';
 import Collapse from '../../components/Collapse';
-import { reactElement, removeElement, isKW } from '../../utils';
-import { CONNECT_SCREENS_NAVIGATION, DIALOG_ID } from '../../constants';
+import { isKW, createElementAndInject } from '../../utils';
+import { CONNECT_SCREENS_NAVIGATION } from '../../constants';
 import { connectFeatureScreens } from '../featuresScreens';
 import CustomFooter from '../shared/Footer';
 import Background from '../shared/Background';
-var Connect = memo(function (_a) {
-    var onClose = _a.onClose, props = __rest(_a, ["onClose"]);
+var Connect = memo(function (props) {
     var theme = useAppTheme().theme;
     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));
+    var _a = useAppSelector(settingsSelector), data = _a.data, error = _a.error, settingLoading = _a.loading;
+    var _b = useAppSelector(connectSelector), connectError = _b.error, loading = _b.loading;
+    useAppConfig(__assign({ navigation: CONNECT_SCREENS_NAVIGATION, maturity: 'full' }, props));
     useErrorListener(connectError || error);
     useStepStartedListener();
     var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
@@ -60,25 +49,19 @@ var Connect = memo(function (_a) {
     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) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', 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));
                     }) }) })) })) })));
 });
-export function ConnectLib(props) {
+export function ConnectElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Connect, __assign({}, props)) })));
 }
 export function renderConnectLib(config, elementId) {
-    reactElement(elementId).render(_jsx(ConnectLib, __assign({}, config)));
-}
-export function unmountConnectLib(elementId, unmountTimeout) {
-    if (unmountTimeout === void 0) { unmountTimeout = 1000; }
-    var element = document.getElementById(elementId);
-    setTimeout(function () {
-        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);
-        elementId && reactElement(elementId).unmount();
-    }, unmountTimeout);
+    var element = createElementAndInject(elementId);
+    var root = createRoot(element);
+    root.render(_jsx(ConnectElement, __assign({}, config)));
+    var unmount = function () { return root.unmount(); };
+    return { unmount: unmount };
 }

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

@@ -78,7 +78,7 @@ var CivilID = function (_a) {
         defaultValues: defaultValues,
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.civilIdData);
     React.useEffect(function () {
         handleClearError();
     }, [methods.formState.isValid]);

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]) {

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

@@ -58,15 +58,15 @@ var Individual = function (_a) {
     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 contact = (otpData.responseBody || {}).contact;
     var responseBody = individualData.responseBody, defaultValues = __rest(individualData, ["responseBody"]);
     var is_available = (responseBody || {}).is_available;
     var methods = useForm({
         resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
-        defaultValues: defaultValues,
+        defaultValues: individualData,
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues, true);
+    useSetFromDefaultValues(methods, individualData, true);
     React.useEffect(function () {
         if (defaultValues.countryCode.iso2 !== methods.getValues('countryCode.iso2'))
             methods.setValue('countryCode', defaultValues.countryCode);
@@ -86,7 +86,7 @@ var Individual = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var handleMenuListClick = function () {
-        listActive ? setListActive(false) : setListActive(true);
+        setListActive(!listActive);
     };
     React.useEffect(function () {
         if (is_available === false)
@@ -96,9 +96,6 @@ var Individual = function (_a) {
     var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     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') })) }))] })) })) }));
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, 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') })) }))] })) })) }));
 };
 export default React.memo(Individual);

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

@@ -1,17 +1,11 @@
 import { REGEX_FULL_NAME } from '../../../../constants';
 import * as yup from 'yup';
 export var IndividualValidation = yup.object().shape({
-    name: yup
-        .string()
-        .matches(REGEX_FULL_NAME, 'please write your first and last name')
-        .required('please write your first and last name'),
+    name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
     email: yup.string().email('email_not_valid').required('email_not_valid')
 });
 export var IndividualMobileValidation = yup.object().shape({
-    name: yup
-        .string()
-        .matches(REGEX_FULL_NAME, 'please write your first and last name')
-        .required('please write your first and last name'),
+    name: yup.string().matches(REGEX_FULL_NAME, 'please write your first and last name').required('please write your first and last name'),
     email: yup.string().email('email_not_valid').required('email_not_valid'),
     mobile: yup
         .string()

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

@@ -21,12 +21,13 @@ 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 { useLanguage } from '../../../../hooks';
+import { useAppSelector, useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import Input from '../../../shared/Input';
 import CheckIcon from '../../../shared/CheckIcon';
@@ -52,7 +53,9 @@ var BrandList = function (_a) {
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
-    var _c = useFormContext(), control = _c.control, setValue = _c.setValue;
+    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 selectedBrandControl = useController({ control: control, name: 'selectedBrandItem' });
     var selectedBrand = selectedBrandControl.field.value;
     var onOpenBrandList = function (event) {
@@ -84,6 +87,16 @@ var BrandList = function (_a) {
             setValue('salesChannels', [], { shouldValidate: true });
             setValue('brandName', '');
         }
+        setValue('segment', segments_list.find(function (_a) {
+            var _b;
+            var id = _a.id;
+            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.type) === id;
+        }), { shouldValidate: true });
+        setValue('teamSize', team_size_list.find(function (_a) {
+            var _b;
+            var id = _a.id;
+            return ((_b = brand === null || brand === void 0 ? void 0 : brand.segment) === null || _b === void 0 ? void 0 : _b.team) === id;
+        }), { shouldValidate: true });
         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) {

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]) {