@tap-payments/auth-jsconnect 2.5.22-test → 3.0.0-test

package/build/features/business/screens/OTP/OTP.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 { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
@@ -32,7 +21,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { deepCopy, maskID } from '../../../../utils';
@@ -41,17 +30,14 @@ import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        background: theme.palette.common.white,
-        border: '1px solid',
-        borderColor: theme.palette.divider,
         direction: theme.direction,
-        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
-        marginBottom: theme.spacing(5.75)
+        paddingInline: theme.spacing(3),
+        paddingBottom: theme.spacing(5)
     });
 });
 var OTPTitleStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { fontWeight: theme.typography.fontWeightLight, color: theme.palette.text.primary, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
+    return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.secondary.main, fontWeight: theme.typography.fontWeightRegular, lineHeight: '19px', whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -60,13 +46,15 @@ var FormStyled = styled(Form)(function () { return ({
 var OTP = function (_a) {
     var _b = useAppSelector(businessSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var dispatch = useAppDispatch();
-    var _c = data.otpData, responseBody = _c.responseBody, defaultValues = __rest(_c, ["responseBody"]);
+    var otp = data.otpData.otp;
     var methods = useForm({
         resolver: yupResolver(OTPValidation),
-        defaultValues: defaultValues,
+        defaultValues: {
+            otp: otp
+        },
         mode: 'onChange'
     });
-    useSetFromDefaultValues(methods, defaultValues);
+    useSetFromDefaultValues(methods, data.otpData);
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     React.useEffect(function () {
@@ -84,7 +72,7 @@ var OTP = function (_a) {
     };
     var disabled = !methods.formState.isValid || !!error;
     var idNumber = data.nidData.nid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskID(idNumber || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'otp_authentication', description: 'otp_authentication_description', onBack: function () { return onBack(); } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('opt_nid_sent_title', { provider: 'ABSHER' }), ' ', !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskID(idNumber || '')) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) })));
 };
 OTP.defaultProps = {};
 export default React.memo(OTP);

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

@@ -1,8 +1,20 @@
+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 } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation, Trans } from 'react-i18next';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { businessSelector } from '../../../app/business/businessStore';
 import { useAppSelector, useAppDispatch } from '../../../../hooks';
 import { maskEmail } from '../../../../utils';
@@ -16,6 +28,6 @@ var ResetPasswordSuccess = function (_a) {
     var onBack = function () {
         dispatch(handlePrevScreenStep());
     };
-    return (_jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }));
+    return (_jsx(ContainerWithHeader, __assign({ onBack: function () { return onBack(); }, title: 'reset_password_success_header_title', description: 'reset_password_success_header_description' }, { children: _jsx(SuccessScreen, { title: t("reset_password_success_title"), description: _jsx(Trans, { i18nKey: 'reset_password_success_description_dev', values: { email: maskedEmail } }), showEmailProviders: true, enableBack: true, onBack: function () { return onBack(); } }) })));
 };
 export default React.memo(ResetPasswordSuccess);

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

@@ -1,8 +1,20 @@
+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 } from "react/jsx-runtime";
 import * as React from 'react';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { useTranslation } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { businessSelector, updateLeadSuccess } from '../../../app/business/businessStore';
 var Success = function (_a) {
     var t = useTranslation().t;
@@ -18,6 +30,6 @@ var Success = function (_a) {
     var onSuccess = function () {
         setClicked(true);
     };
-    return (_jsx(SuccessScreen, { title: t('business_completed_title'), description: t('business_completed_description'), onSuccess: onSuccess, successTitle: t('business_completed_button'), loading: clicked && updateLeadSuccessLoading, error: error || '' }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'business_success_title', description: 'business_success_description' }, { children: _jsx(SuccessScreen, { onSuccess: onSuccess, description: t('business_completed_description'), successTitle: t('continue'), loading: clicked && updateLeadSuccessLoading, error: error || '' }) })));
 };
 export default React.memo(Success);

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

@@ -14,9 +14,10 @@ import { memo } from 'react';
 import { useAppSelector } from '../../../../hooks';
 import { businessSelector } from '../../../app/business/businessStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
+import { ContainerWithHeader } from '../../../shared/Containers';
 var SuccessWithFlowButtons = function () {
     var data = useAppSelector(businessSelector).data;
     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, individuals = _a.individuals;
-    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, individuals: individuals, boardInfoId: board_info_id, flows: flows || [] }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'business_flows_title', description: 'business_flows_description' }, { children: _jsx(SuccessFlowButtons, { flowName: data.flowName, bank: bank, brand: brand, entity: entity, merchant: merchant, user: __assign({ names: { en: name } }, user), business: business, boardId: board_id, individuals: individuals, boardInfoId: board_info_id, flows: flows || [] }) })));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -22,7 +22,7 @@ import { useLanguage } from '../../../../hooks';
 import { deepCopy, maskPhone } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { businessSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/business/businessStore';
 import Button from '../../../shared/Button';
 import { OTPValidation } from './validation';
@@ -30,17 +30,14 @@ import OTPInput from './OTPInput';
 var OTPTitleContainerStyled = styled(Box)(function (_a) {
     var theme = _a.theme;
     return ({
-        background: theme.palette.common.white,
-        border: '1px solid',
-        borderColor: theme.palette.divider,
         direction: theme.direction,
-        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
-        marginBottom: theme.spacing(5.75)
+        paddingInline: theme.spacing(3),
+        paddingBottom: theme.spacing(5)
     });
 });
 var OTPTitleStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightLight, marginBlock: theme.spacing(1.75), marginInlineStart: theme.spacing(2.5), lineHeight: 1.75 }));
+    return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.secondary.main, fontWeight: theme.typography.fontWeightRegular, lineHeight: '19px', whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -73,6 +70,6 @@ var VerifyNumber = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'otp_authentication', description: 'otp_authentication_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), !loading && phone && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) })));
 };
 export default React.memo(VerifyNumber);

package/build/features/connect/Connect.js

@@ -88,7 +88,7 @@ var Connect = memo(function (props) {
         event_action: 'Registration Error'
     });
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
     React.useEffect(function () {
         initializeGTM();
     }, []);
@@ -124,11 +124,11 @@ var Connect = memo(function (props) {
     var handleDialogClose = function () {
         dispatch(handleOpen(false));
     };
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: false }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: false }, { children: connectFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ countries: data.tapCountries, pointerEvents: loading ? 'none' : 'auto', onConfirm: handleDialogClose, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, isMaturityExpress: false }, { 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 ConnectElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(Connect, __assign({}, props)) })));

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

@@ -16,10 +16,11 @@ import { useTranslation } from 'react-i18next';
 import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
+import { DropDownMode } from '../../../../@types';
 import Form from '../../../../components/Form';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrandSegment } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
@@ -39,8 +40,10 @@ var ListType;
 })(ListType || (ListType = {}));
 var BrandSegment = function (_a) {
     var _b = useAppSelector(connectSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var settingsStore = useAppSelector(settingsSelector);
     var _c = data.brandSegmentData, segmentLocation = _c.segmentLocation, segmentProfit = _c.segmentProfit, segmentTech = _c.segmentTech, teamSize = _c.teamSize;
     var _d = React.useState(), listActive = _d[0], setListActive = _d[1];
+    var isPopupMode = settingsStore.data.dropDownOpenMode === DropDownMode.popup;
     React.useEffect(function () {
         sendCustomEventToGTM({
             event: 'Send Event',
@@ -73,12 +76,13 @@ var BrandSegment = function (_a) {
     }, [methods.formState.isValid]);
     var disabled = !methods.formState.isValid || !!error;
     var handleMenuClick = function (flag) {
-        setListActive(flag);
+        if (!isPopupMode)
+            setListActive(flag);
     };
     var isSegmentLocationListActive = listActive === ListType.SegmentLocationList;
     var isSegmentProfitListActive = listActive === ListType.SegmentProfitList;
     var isSegmentTechListActive = listActive === ListType.SegmentTechList;
     var isTeamSizeListActive = listActive === ListType.TeamSizeList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SegmentLocations, { show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentProfits, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentTechs, { show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _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(ContainerWithHeader, __assign({ title: t('one_last_step'), description: 'brand_details_additional_info', onBack: function () { return onBack(); } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(SegmentLocations, { isPopupMode: isPopupMode, show: !isTeamSizeListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentLocationList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentProfits, { isPopupMode: isPopupMode, show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentProfitList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(SegmentTechs, { isPopupMode: isPopupMode, show: !isTeamSizeListActive && !isSegmentLocationListActive && !isSegmentProfitListActive, onListOpen: function () { return handleMenuClick(ListType.SegmentTechList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(TeamSize, { isPopupMode: isPopupMode, show: !isSegmentLocationListActive && !isSegmentProfitListActive && !isSegmentTechListActive, onListOpen: function () { return handleMenuClick(ListType.TeamSizeList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) })));
 };
 export default React.memo(BrandSegment);

package/build/features/connect/screens/BrandSegment/SegmentLocations.d.ts

@@ -3,6 +3,7 @@ interface SegmentLocationsProps {
     show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
+    isPopupMode: boolean;
 }
-declare const SegmentLocations: ({ show, onListOpen, onListClose }: SegmentLocationsProps) => JSX.Element;
+declare const SegmentLocations: ({ show, onListOpen, onListClose, isPopupMode }: SegmentLocationsProps) => JSX.Element;
 export default SegmentLocations;

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

@@ -19,18 +19,20 @@ import { useAppSelector, useLanguage } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
+import { ThemeMode } from '../../../../@types';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { ScreenContainer } from '../../../shared/Containers';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { connectSelector } from '../../../app/connect/connectStore';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
 });
 var SegmentLocations = function (_a) {
     var _b, _c, _d, _e;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, isPopupMode = _a.isPopupMode;
     var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
     var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
@@ -58,9 +60,11 @@ var SegmentLocations = function (_a) {
         onCloseList();
         segmentControl.field.onChange(segment);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_location_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputSelect, { required: true, label: t('segment_location_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl })
+                    }, placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', helperText: error && t(error) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
-                        } }) }))] })) })));
+                        } }) }))] }) })));
 };
 export default SegmentLocations;

package/build/features/connect/screens/BrandSegment/SegmentProfits.d.ts

@@ -3,6 +3,7 @@ interface SegmentProfitsProps {
     show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
+    isPopupMode: boolean;
 }
-declare const SegmentProfits: ({ show, onListOpen, onListClose }: SegmentProfitsProps) => JSX.Element;
+declare const SegmentProfits: ({ show, onListOpen, onListClose, isPopupMode }: SegmentProfitsProps) => JSX.Element;
 export default SegmentProfits;

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

@@ -19,18 +19,20 @@ import { useAppSelector, useLanguage } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
+import { ThemeMode } from '../../../../@types';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { ScreenContainer } from '../../../shared/Containers';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { connectSelector } from '../../../app/connect/connectStore';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
 });
 var SegmentProfits = function (_a) {
     var _b, _c, _d, _e;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, isPopupMode = _a.isPopupMode;
     var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
     var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
@@ -58,7 +60,9 @@ var SegmentProfits = function (_a) {
         onCloseList();
         segmentControl.field.onChange(segment);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_profit_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 1.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_profit_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl })
+                    }, placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', helperText: error && t(error) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));

package/build/features/connect/screens/BrandSegment/SegmentTechs.d.ts

@@ -3,6 +3,7 @@ interface SegmentTechsProps {
     show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
+    isPopupMode: boolean;
 }
-declare const SegmentTechs: ({ show, onListOpen, onListClose }: SegmentTechsProps) => JSX.Element;
+declare const SegmentTechs: ({ show, onListOpen, onListClose, isPopupMode }: SegmentTechsProps) => JSX.Element;
 export default SegmentTechs;

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

@@ -19,18 +19,20 @@ import { useAppSelector, useLanguage } from '../../../../hooks';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
+import { ThemeMode } from '../../../../@types';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { ScreenContainer } from '../../../shared/Containers';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { connectSelector } from '../../../app/connect/connectStore';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
 });
 var SegmentTechs = function (_a) {
     var _b, _c, _d, _e;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, isPopupMode = _a.isPopupMode;
     var _f = React.useState([]), segmentList = _f[0], setSegmentList = _f[1];
     var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
@@ -58,7 +60,9 @@ var SegmentTechs = function (_a) {
         onCloseList();
         segmentControl.field.onChange(segment);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_tech_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl }), placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.ar', 'name.en'], list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 1.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('segment_tech_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl })
+                    }, placeholder: t('choose_any_segment'), value: (isAr ? (_d = segment === null || segment === void 0 ? void 0 : segment.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = segment === null || segment === void 0 ? void 0 : segment.name) === null || _e === void 0 ? void 0 : _e.en) || '', helperText: error && t(error) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, list: segmentList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (segment === null || segment === void 0 ? void 0 : segment.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (segment === null || segment === void 0 ? void 0 : segment.id) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));

package/build/features/connect/screens/BrandSegment/TeamSize.d.ts

@@ -3,6 +3,7 @@ interface TeamSizeProps {
     show: boolean;
     onListOpen?: () => void;
     onListClose?: () => void;
+    isPopupMode: boolean;
 }
-declare const TeamSize: ({ show, onListOpen, onListClose }: TeamSizeProps) => JSX.Element;
+declare const TeamSize: ({ show, onListOpen, onListClose, isPopupMode }: TeamSizeProps) => JSX.Element;
 export default TeamSize;

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

@@ -20,17 +20,19 @@ import SimpleList from '../../../../components/SimpleList';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
+import { ThemeMode } from '../../../../@types';
 import { connectSelector } from '../../../app/connect/connectStore';
 import { ScreenContainer } from '../../../shared/Containers';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import CheckIcon from '../../../shared/CheckIcon';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var IncomeText = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'isSelected'; } })(function (_a) {
     var theme = _a.theme, isSelected = _a.isSelected;
-    return (__assign(__assign({ color: theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineStart: theme.spacing(1.25), textAlign: 'start' }));
 });
 var TeamSize = function (_a) {
     var _b, _c, _d, _e;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, isPopupMode = _a.isPopupMode;
     var _f = React.useState([]), teamSizeList = _f[0], setTeamSizeList = _f[1];
     var _g = React.useState(null), anchorEl = _g[0], setAnchorEl = _g[1];
     var t = useTranslation().t;
@@ -58,7 +60,9 @@ var TeamSize = function (_a) {
         onCloseList();
         teamSizeControl.field.onChange(teamSize);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('team_size_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_team_size'), value: (isAr ? (_d = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _e === void 0 ? void 0 : _e.en) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en', 'name.ar'], list: teamSizeList, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 1.5, mb: 0 } }, { children: [_jsx(InputSelect, { required: true, label: t('team_size_title'), onClick: !!anchorEl ? function () { return onCloseList(); } : onOpenList, InputProps: {
+                        endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl })
+                    }, placeholder: t('choose_team_size'), value: (isAr ? (_d = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _d === void 0 ? void 0 : _d.ar : (_e = teamSize === null || teamSize === void 0 ? void 0 : teamSize.name) === null || _e === void 0 ? void 0 : _e.en) || '', helperText: error && t(error) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, list: teamSizeList, onSelectItem: onSelectItem, renderItem: function (item) {
                             var _a, _b;
                             return (_jsxs(_Fragment, { children: [_jsx(Box, __assign({ display: 'flex' }, { children: _jsx(IncomeText, __assign({ isSelected: item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) }, { children: isAr ? (_a = item === null || item === void 0 ? void 0 : item.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = item === null || item === void 0 ? void 0 : item.name) === null || _b === void 0 ? void 0 : _b.en })) })), item.id === (teamSize === null || teamSize === void 0 ? void 0 : teamSize.id) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));

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

@@ -11,23 +11,23 @@ var __assign = (this && this.__assign) || function () {
 };
 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 { useTranslation } from 'react-i18next';
+import { styled } from '@mui/material/styles';
+import Box from '@mui/material/Box';
+import Divider from '@mui/material/Divider';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { civilIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { 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';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } 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';
+import { civilIDValidationSchema } from './validation';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -35,14 +35,14 @@ var FormStyled = styled(Form)(function () { return ({
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return ({
-        color: alpha(theme.palette.primary.dark, 0.4)
+        color: theme.palette.info.contrastText
     });
 });
 var DividerStyled = styled(Divider)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '45%',
-        borderColor: alpha(theme.palette.primary.dark, 0.4),
+        borderColor: theme.palette.divider,
         marginBlockEnd: theme.spacing(0.62)
     });
 });
@@ -51,9 +51,8 @@ var OrBoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         justifyContent: 'space-between',
-        marginBlockEnd: theme.spacing(1.62),
-        marginBlockStart: theme.spacing(-1.25),
-        marginInline: theme.spacing(2.5)
+        margin: theme.spacing(3),
+        marginTop: theme.spacing(0)
     });
 });
 var CivilID = function (_a) {
@@ -90,6 +89,6 @@ var CivilID = function (_a) {
         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(ContainerWithHeader, __assign({ title: 'get_started', description: 'civil_id_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 5.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ sx: { mt: 5 }, 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.js

@@ -9,30 +9,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-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 { 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 { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { CIVIL_ID_NUMBER_LENGTH } from '../../../../constants';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { EndAdornment } from '../../../shared/EndAdornment';
-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;
@@ -53,6 +38,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: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
+    return (_jsx(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: _jsx(Input, { dir: 'ltr', type: 'text', label: t('enter_civil_id'), inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, InputProps: { endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }) }, onChange: handleIdChange, value: idValue, placeholder: t('civil_id_placeholder'), helperText: error && t(error), required: true }) })));
 });
 export default React.memo(IDNumber);

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

@@ -55,7 +55,7 @@ import { styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import { checkEmailAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
 var InputStyled = styled(Input)(function () { return ({
@@ -101,6 +101,10 @@ 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: _jsx(EndAdornment, { value: emailValue, loading: emailChecking, error: error, onClear: clearNumber }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { label: t('signup_email_lable'), value: emailValue, inputProps: {
+                    readOnly: readOnly
+                }, InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: emailValue, loading: emailChecking, error: error, onClear: clearNumber })
+                }, onEnterPressed: function (e) { return e.preventDefault(); }, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), helperText: error && t(error) }) }) })));
 };
 export default React.memo(Email);