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

package/build/features/individual/screens/IndividualOccupation/IndividualOccupation.js

@@ -0,0 +1,91 @@
+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 { useTranslation } from 'react-i18next';
+import { Box, alpha, styled } from '@mui/material';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
+import Button from '../../../../components/Button';
+import { clearError, individualSelector, storeOccupation } from '../../../app/individual/individualStore';
+import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/settings';
+import { ContainerWithHeader } from '../../../shared/Containers';
+import OccupationList from './OccupationList';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        borderTop: alpha(theme.palette.common.black, 0.05),
+        marginLeft: theme.spacing(3),
+        marginRight: theme.spacing(3),
+        marginTop: theme.spacing(1),
+        marginBottom: theme.spacing(1),
+        display: 'flex',
+        justifyContent: 'end',
+        alignItems: 'center',
+        gap: theme.spacing(0.5)
+    });
+});
+var ButtonStyled = styled(Button)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        minHeight: theme.spacing(5),
+        width: theme.spacing(12.5),
+        fontWeight: 600
+    });
+});
+var FlatButtonStyled = styled(ButtonStyled)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        color: theme.palette.mode === ThemeMode.DARK ? theme.palette.secondary.dark : theme.palette.text.disabled
+    });
+});
+var ContainedButtonStyled = styled(ButtonStyled)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        paddingInlineEnd: theme.spacing(0.75)
+    });
+});
+var IndividualOccupation = function (_a) {
+    var dispatch = useAppDispatch();
+    var t = useTranslation().t;
+    var _b = React.useState([]), list = _b[0], setList = _b[1];
+    var _c = React.useState(), selectedOccupation = _c[0], setSelectedOccupation = _c[1];
+    var _d = useAppSelector(individualSelector), data = _d.data, error = _d.error;
+    var individualData = (data || {}).individualData;
+    var occupationList = (individualData.responseBody || {}).occupationList;
+    React.useEffect(function () {
+        if ((occupationList === null || occupationList === void 0 ? void 0 : occupationList.length) > 0) {
+            setList(occupationList);
+        }
+    }, [occupationList]);
+    React.useEffect(function () {
+        if (!!individualData.occupation) {
+            setSelectedOccupation(individualData.occupation);
+        }
+    }, [individualData.occupation]);
+    var onSubmit = function () {
+        if (selectedOccupation)
+            dispatch(storeOccupation(selectedOccupation));
+        dispatch(handleNextScreenStep());
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep());
+    };
+    return (_jsxs(ContainerWithHeader, __assign({ titleBoxSx: { mb: 0 }, onBack: function () { return onBack(); }, title: 'individual_occupation_title', description: 'individual_occupation_description' }, { children: [_jsx(OccupationList, { data: { list: occupationList }, occupations: list, selectedOccupation: selectedOccupation, updateOccupations: function (occupation) {
+                    setList(occupation);
+                }, updateSelectedOccupation: function (occupation) {
+                    if (error)
+                        dispatch(clearError());
+                    setSelectedOccupation(occupation);
+                } }), _jsxs(BoxStyled, { children: [_jsx(FlatButtonStyled, __assign({ onClick: function () { return onBack(); }, variant: 'text' }, { children: t('cancel') })), _jsx(ContainedButtonStyled, __assign({ onClick: function () { return onSubmit(); }, variant: 'contained' }, { children: t('confirm') }))] })] })));
+};
+export default IndividualOccupation;

package/build/features/individual/screens/IndividualOccupation/OccupationList.d.ts

@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { Occupation } from '../../../../@types';
+export declare const NameContainer: import("@emotion/styled").StyledComponent<import("@mui/system").SystemProps<import("@mui/material/styles").Theme> & {
+    align?: "right" | "left" | "inherit" | "center" | "justify" | undefined;
+    children?: React.ReactNode;
+    classes?: Partial<import("@mui/material").TypographyClasses> | undefined;
+    gutterBottom?: boolean | undefined;
+    noWrap?: boolean | undefined;
+    paragraph?: boolean | undefined;
+    sx?: import("@mui/material/styles").SxProps<import("@mui/material/styles").Theme> | undefined;
+    variant?: "button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "subtitle1" | "subtitle2" | "body1" | "body2" | "overline" | undefined;
+    variantMapping?: Partial<Record<"button" | "caption" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "inherit" | "subtitle1" | "subtitle2" | "body1" | "body2" | "overline", string>> | undefined;
+} & import("@mui/material/OverridableComponent").CommonProps & Omit<Pick<React.DetailedHTMLProps<React.HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "key" | keyof React.HTMLAttributes<HTMLSpanElement>> & {
+    ref?: ((instance: HTMLSpanElement | null) => void) | React.RefObject<HTMLSpanElement> | null | undefined;
+}, keyof import("@mui/material/OverridableComponent").CommonProps | ("border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "right" | "bottom" | "left" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform") | "children" | "sx" | "variant" | "align" | "gutterBottom" | "noWrap" | "paragraph" | "variantMapping"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & {
+    isSelected?: boolean | undefined;
+    isAr?: boolean | undefined;
+}, {}, {}>;
+interface OccupationListProps {
+    data: {
+        list: Array<Occupation>;
+    };
+    occupations: Array<Occupation>;
+    selectedOccupation?: Occupation;
+    updateOccupations: (sales: Array<Occupation>) => void;
+    updateSelectedOccupation: (sale: Occupation) => void;
+}
+declare const OccupationList: ({ data, occupations, selectedOccupation, updateOccupations, updateSelectedOccupation }: OccupationListProps) => JSX.Element;
+export default OccupationList;

package/build/features/individual/screens/IndividualOccupation/OccupationList.js

@@ -0,0 +1,136 @@
+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 { styled, useTheme } from '@mui/material/styles';
+import { useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
+import SimpleList from '../../../../components/SimpleList';
+import Collapse from '../../../../components/Collapse';
+import Text from '../../../../components/Text';
+import ExpandIcon from '../../../../components/ExpandIcon';
+import { isExist } from '../../../../utils';
+import { ScreenContainer } from '../../../shared/Containers';
+import Search from '../../../shared/Search';
+import CheckIcon from '../../../shared/CheckIcon';
+import DropDownStyle from '../../../shared/DropDownStyle';
+var ScreenContainerStyled = styled(ScreenContainer)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        borderBottom: "1px solid ".concat(theme.palette.divider)
+    });
+});
+export var NameContainer = styled(Text, { shouldForwardProp: function (prop) { return !['isSelected', 'isAr'].includes(prop.toString()); } })(function (_a) {
+    var theme = _a.theme, isSelected = _a.isSelected, isAr = _a.isAr;
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.button), { textAlign: isAr ? 'right' : 'left', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight, paddingInlineEnd: theme.spacing(1), textTransform: 'none' }));
+});
+var ListItem = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        justifyContent: 'space-between',
+        width: '100%',
+        paddingInlineStart: theme.spacing(2),
+        paddingInlineEnd: theme.spacing(2),
+        paddingTop: theme.spacing(1.25),
+        paddingBottom: theme.spacing(1.25),
+        alignItems: 'center',
+        borderBottom: "1px solid ".concat(theme.palette.divider),
+        '&:hover': {
+            backgroundColor: theme.palette.action.hover
+        }
+    });
+});
+var ListItemContainer = styled(Box)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column',
+    width: '100%'
+}); });
+var SimpleListStyled = styled((SimpleList))(function () { return ({
+    height: 'fit-content',
+    maxHeight: 'calc(100vh - 355px)',
+    paddingTop: 0
+}); });
+var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        width: theme.spacing(1.375),
+        height: theme.spacing(1.375)
+    });
+});
+var OccupationList = function (_a) {
+    var data = _a.data, occupations = _a.occupations, selectedOccupation = _a.selectedOccupation, updateOccupations = _a.updateOccupations, updateSelectedOccupation = _a.updateSelectedOccupation;
+    var _b = React.useState(''), subIndex = _b[0], setSubIndex = _b[1];
+    var isAr = useLanguage().isAr;
+    var theme = useTheme();
+    var list = data.list;
+    var handleOpenSubMenu = function (index) {
+        if (subIndex === index)
+            setSubIndex('');
+        else
+            setSubIndex(index);
+    };
+    var onSelectItem = function (occupation) {
+        updateSelectedOccupation(occupation);
+    };
+    var getSelectedSaleName = function (item) {
+        return isAr ? item.name.ar : item.name.en;
+    };
+    var handleSearch = function (value) {
+        var filteredList = list === null || list === void 0 ? void 0 : list.filter(function (chapter) {
+            var _a, _b, _c;
+            return chapter.name.en.toLowerCase().includes(value.toLowerCase()) ||
+                chapter.name.en.toLowerCase().replace(',', '').includes(value.toLowerCase()) ||
+                chapter.name.ar.toLowerCase().includes(value.toLowerCase()) ||
+                ((_a = chapter.sub) === null || _a === void 0 ? void 0 : _a.find(function (obj) { return obj.name.en.toLowerCase().includes(value.toLowerCase()); })) ||
+                ((_b = chapter.sub) === null || _b === void 0 ? void 0 : _b.find(function (obj) { return obj.name.en.toLowerCase().replace(',', '').includes(value.toLowerCase()); })) ||
+                ((_c = chapter.sub) === null || _c === void 0 ? void 0 : _c.find(function (obj) { return obj.name.ar.toLowerCase().includes(value.toLowerCase()); }));
+        });
+        updateOccupations(filteredList);
+    };
+    var getSelectedSaleFlag = function (sale) {
+        var _a;
+        var findSub = (_a = sale === null || sale === void 0 ? void 0 : sale.sub) === null || _a === void 0 ? void 0 : _a.find(function (_a) {
+            var id = _a.id;
+            return id === (selectedOccupation === null || selectedOccupation === void 0 ? void 0 : selectedOccupation.id);
+        });
+        var findSale = (sale === null || sale === void 0 ? void 0 : sale.id) === (selectedOccupation === null || selectedOccupation === void 0 ? void 0 : selectedOccupation.id);
+        if (findSub || findSale)
+            return true;
+        return false;
+    };
+    React.useEffect(function () {
+        if (selectedOccupation) {
+            var item = isExist(list || [], selectedOccupation === null || selectedOccupation === void 0 ? void 0 : selectedOccupation.code);
+            if (item)
+                setSubIndex(item.code);
+        }
+    }, [selectedOccupation]);
+    return (_jsxs(ScreenContainerStyled, { children: [_jsx(Search, { sx: { p: 0, ml: 3, mr: 3, mt: 1 }, onSearchValue: handleSearch }), _jsx(DropDownStyle, __assign({ sx: { mt: 1, mb: 1.25, boxShadow: 'none' }, anchorEl: true }, { children: _jsx(SimpleListStyled, { space: 292, list: occupations, listItemProps: { sx: { padding: 0, margin: 0, '&:hover': { background: 'none' } } }, onSelectItem: function (item) {
+                        var isOnlyOneItem = !item.sub || item.sub.length === 1;
+                        if (isOnlyOneItem)
+                            onSelectItem(item);
+                        else
+                            handleOpenSubMenu(item.id);
+                    }, renderItem: function (item) {
+                        var _a;
+                        var isOnlyOneItem = !item.sub || ((_a = item.sub) === null || _a === void 0 ? void 0 : _a.length) === 1;
+                        var showCheck = getSelectedSaleFlag(item) && isOnlyOneItem;
+                        return (_jsxs(ListItemContainer, { children: [_jsxs(ListItem, { children: [_jsx(NameContainer, __assign({ isAr: isAr, isSelected: getSelectedSaleFlag(item) }, { children: getSelectedSaleName(item) })), showCheck ? (_jsx(CheckIcon, { sx: { width: theme.spacing(2), height: theme.spacing(2) } })) : (!isOnlyOneItem && _jsx(ExpandIconStyled, { anchorEl: subIndex === item.id }))] }), _jsx(Collapse, __assign({ in: item.id === subIndex && !isOnlyOneItem }, { children: _jsx(SimpleListStyled, { sx: { pt: 0, pb: 0 }, list: (!isOnlyOneItem && item.sub) || [], onSelectItem: onSelectItem, listItemProps: { sx: { padding: 0, margin: 0, '&:hover': { background: 'none' } } }, renderItem: function (item, idx) {
+                                            return (_jsxs(ListItem, { children: [_jsx(NameContainer, __assign({ sx: {
+                                                            paddingInlineStart: theme.spacing(1)
+                                                        }, isSelected: getSelectedSaleFlag(item) }, { children: getSelectedSaleName(item) })), getSelectedSaleFlag(item) && _jsx(CheckIcon, { sx: { width: theme.spacing(2), height: theme.spacing(2) } })] }, idx));
+                                        } }) }))] }));
+                    } }) }))] }));
+};
+export default OccupationList;

package/build/features/individual/screens/IndividualOccupation/index.d.ts

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

package/build/features/individual/screens/IndividualOccupation/index.js

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

package/build/features/individual/screens/IndividualPersonalInfo/BirthCity.d.ts

@@ -5,6 +5,7 @@ interface BirthCityProps {
     onListClose?: () => void;
     readOnly?: boolean;
     isVerified?: boolean;
+    isPopupMode: boolean;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<BirthCityProps & React.RefAttributes<unknown>>>;
 export default _default;

package/build/features/individual/screens/IndividualPersonalInfo/BirthCity.js

@@ -26,24 +26,26 @@ import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import CircularProgress from '@mui/material/CircularProgress';
 import { useAppDispatch, useAppSelector, useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
 import SimpleList from '../../../../components/SimpleList';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import { getCityList, individualSelector } from '../../../app/individual/individualStore';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import CheckIcon from '../../../shared/CheckIcon';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
 var CountryNameText = 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) }));
+    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) }));
 });
 var BirthCity = React.forwardRef(function (_a, ref) {
     var _b;
-    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var show = _a.show, onListOpen = _a.onListOpen, onListClose = _a.onListClose, readOnly = _a.readOnly, isVerified = _a.isVerified, isPopupMode = _a.isPopupMode;
     var _c = React.useState([]), locationCities = _c[0], setCities = _c[1];
     var _d = React.useState(null), anchorEl = _d[0], setAnchorEl = _d[1];
     var t = useTranslation().t;
@@ -96,7 +98,11 @@ var BirthCity = React.forwardRef(function (_a, ref) {
         var _a, _b;
         return isAr ? (_a = city === null || city === void 0 ? void 0 : city.name) === null || _a === void 0 ? void 0 : _a.ar : (_b = city === null || city === void 0 ? void 0 : city.name) === null || _b === void 0 ? void 0 : _b.en;
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('place_birth_city_label'), readOnly: readOnly, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', warningMessage: error && t(error), onClick: cityLoading ? undefined : !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect, endAdornment: cityLoading ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : (_jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified })) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 1.5 } }, { children: [_jsx(InputSelect, { label: t('place_birth_city_label'), InputProps: {
+                        endAdornment: cityLoading ? (_jsx(CircularProgress, { size: 25, thickness: 5, sx: { height: 'auto !important' } })) : (_jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }))
+                    }, inputProps: {
+                        readOnly: readOnly
+                    }, placeholder: t('choose_place_birth_city'), value: getName(cityValue) || '', helperText: error && t(error), onClick: cityLoading ? undefined : !!anchorEl ? function () { return onCloseCitySelect(); } : onOpenCitySelect }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseCitySelect }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: 'name.en', searchValuePath: ['name.en'], list: locationCities, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) }, { children: getName(item) })) }), item.id === (cityValue === null || cityValue === void 0 ? void 0 : cityValue.id) && _jsx(CheckIcon, { isVerified: isVerified })] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/BirthCountry.d.ts

@@ -7,6 +7,7 @@ interface BirthCountryProps {
     onListClose?: () => void;
     readOnly?: boolean;
     isVerified?: boolean;
+    isPopupMode: boolean;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<BirthCountryProps & React.RefAttributes<unknown>>>;
 export default _default;

package/build/features/individual/screens/IndividualPersonalInfo/BirthCountry.js

@@ -27,23 +27,25 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import { useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
 import SimpleList from '../../../../components/SimpleList';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import CheckIcon from '../../../shared/CheckIcon';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
 var CountryNameText = 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) }));
+    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) }));
 });
 var BirthCountry = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var countries = _a.countries, readOnly = _a.readOnly, isVerified = _a.isVerified, rest = __rest(_a, ["countries", "readOnly", "isVerified"]);
+    var countries = _a.countries, readOnly = _a.readOnly, isVerified = _a.isVerified, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["countries", "readOnly", "isVerified", "isPopupMode"]);
     var _e = React.useState(countries), locationCountries = _e[0], setCountries = _e[1];
     var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
     var t = useTranslation().t;
@@ -69,7 +71,11 @@ var BirthCountry = React.forwardRef(function (_a, ref) {
     };
     var location = placeOfBirthCountryControl.field.value;
     var error = (_b = placeOfBirthCountryControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 2.5 } }, { children: [_jsx(InputSelect, { label: t('place_of_birth_country_label'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }), placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', warningMessage: error && t(error) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { pt: 1.5 } }, { children: [_jsx(InputSelect, { label: t('place_of_birth_country_label'), InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified })
+                    }, inputProps: {
+                        readOnly: readOnly
+                    }, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, placeholder: t('choose_place_of_birth_country'), value: (isAr ? (_c = location === null || location === void 0 ? void 0 : location.name) === null || _c === void 0 ? void 0 : _c.arabic : (_d = location === null || location === void 0 ? void 0 : location.name) === null || _d === void 0 ? void 0 : _d.english) || '', helperText: error && t(error) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseCountrySelect }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: locationCountries, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsx(CountryItemContainer, { children: _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (location === null || location === void 0 ? void 0 : location.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english })) }), item.idd_prefix === (location === null || location === void 0 ? void 0 : location.idd_prefix) && _jsx(CheckIcon, { isVerified: isVerified })] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPersonalInfo/DOB.d.ts

@@ -5,5 +5,5 @@ interface BODProps {
     isVerified?: boolean;
     readOnly?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ onDateClicked, show, readOnly, isVerified }: BODProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: BODProps) => JSX.Element>;
 export default _default;

package/build/features/individual/screens/IndividualPersonalInfo/DOB.js

@@ -9,24 +9,18 @@ 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 { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { styled, alpha } from '@mui/material/styles';
-import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
-import Calender from '../../../shared/Calender';
+import { CustomCalender as Calender } from '../../../shared/Calender';
 import { ScreenContainer } from '../../../shared/Containers';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6) }, theme.typography.caption), { cursor: 'pointer' }));
-});
 var BOD = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked, show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
@@ -38,9 +32,6 @@ var BOD = function (_a) {
         dobControl.field.onChange(data);
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
-                            var spacing = _a.spacing;
-                            return spacing(2.5, 2.5, 2.5, 2.5);
-                        } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, disabled: readOnly, isVerified: isVerified, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 1.5 } }, { children: _jsx(Calender, { label: t('enter_birth_date'), readOnly: readOnly, isVerified: isVerified, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateChange: handleBirthDateChange }) })) })));
 };
 export default React.memo(BOD);

package/build/features/individual/screens/IndividualPersonalInfo/Email.js

@@ -16,7 +16,7 @@ import { useController, useFormContext } from 'react-hook-form';
 import { styled } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import { EndAdornment } from '../../../../features/shared/EndAdornment';
 var InputStyled = styled(Input)(function () { return ({
     input: {
@@ -37,6 +37,10 @@ var Email = function (_a) {
     var clearNumber = function () {
         emailControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { readOnly: readOnly, label: t('signup_email_lable'), value: emailValue, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: emailValue, isVerified: isVerified, onClear: clearNumber, error: error }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(InputStyled, { InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: emailValue, isVerified: isVerified, onClear: clearNumber, error: error })
+                }, inputProps: {
+                    readOnly: readOnly
+                }, label: t('signup_email_lable'), value: emailValue, onChange: handleEmailChange, type: 'email', placeholder: t('signup_email_placeholder'), helperText: error && t(error) }) }) })));
 };
 export default React.memo(Email);

package/build/features/individual/screens/IndividualPersonalInfo/ExpiryDate.d.ts

@@ -5,5 +5,5 @@ interface ExpiryDateProps {
     readOnly?: boolean;
     isVerified?: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ onDateClicked, show, readOnly, isVerified }: ExpiryDateProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, readOnly, isVerified }: ExpiryDateProps) => JSX.Element>;
 export default _default;

package/build/features/individual/screens/IndividualPersonalInfo/ExpiryDate.js

@@ -9,25 +9,19 @@ 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 { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { getFutureDate } from '../../../../utils';
-import { styled, alpha } from '@mui/material/styles';
-import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
-import Calender from '../../../shared/Calender';
+import { CustomCalender as Calender } from '../../../shared/Calender';
 import { ScreenContainer } from '../../../shared/Containers';
 import { individualSelector, clearError } from '../../../app/individual/individualStore';
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6) }, theme.typography.caption), { cursor: 'pointer' }));
-});
 var ExpiryDate = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked, show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
+    var show = _a.show, readOnly = _a.readOnly, isVerified = _a.isVerified;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
@@ -39,9 +33,6 @@ var ExpiryDate = function (_a) {
         dobControl.field.onChange(data);
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
-                            var spacing = _a.spacing;
-                            return spacing(2.5, 2.5, 2.5, 2.5);
-                        } } }, { children: t('enter_expiry_date') })), _jsx(Calender, { disabled: readOnly, isVerified: isVerified, maxDate: getFutureDate(), defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: 1.5 } }, { children: _jsx(Calender, { label: t('enter_expiry_date'), readOnly: readOnly, isVerified: isVerified, maxDate: getFutureDate(), defaultValue: dateValue ? new Date(dateValue) : undefined, onDateChange: handleBirthDateChange }) })) })));
 };
 export default React.memo(ExpiryDate);

package/build/features/individual/screens/IndividualPersonalInfo/Gender.js

@@ -12,10 +12,10 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { styled, alpha } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import InfoIcon from '@mui/icons-material/Info';
 import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
-import { IndividualGender } from '../../../../@types';
+import { IndividualGender, ThemeMode } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
 import RadioLabel from '../../../../components/RadioLabel';
@@ -25,7 +25,7 @@ import { ScreenContainer } from '../../../shared/Containers';
 import CheckIcon from '../../../shared/CheckIcon';
 var LabelTextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.caption), { color: alpha(theme.palette.text.primary, 0.6), marginBlockEnd: theme.spacing(0.625) }));
+    return (__assign(__assign({}, theme.typography.caption), { color: theme.palette.text.secondary, marginBlockEnd: theme.spacing(0.625) }));
 });
 var RadioGroupStyled = styled(RadioGroup)(function (_a) {
     var theme = _a.theme;
@@ -43,27 +43,31 @@ var RadioStyled = styled(Radio)(function (_a) {
         }
     });
 });
-var LabelStyled = styled('span')(function () { return ({
-    display: 'inline-flex',
-    alignItems: 'center'
-}); });
+var LabelStyled = styled('span')(function (_a) {
+    var theme = _a.theme;
+    return (__assign({ display: 'inline-flex', alignItems: 'center' }, theme.typography.subtitle2));
+});
 export var InfoIconStyled = styled(InfoIcon)(function (_a) {
     var theme = _a.theme;
     return ({
+        position: 'relative',
+        top: theme.spacing(0.125),
         width: theme.spacing(2.75),
-        height: theme.spacing(2.125),
+        height: theme.spacing(1.75),
         cursor: 'pointer',
-        color: alpha(theme.palette.text.primary, 0.4),
+        color: theme.palette.mode === ThemeMode.DARK ? theme.palette.text.disabled : theme.palette.primary.contrastText,
         display: 'inline-flex'
     });
 });
 export var InfoOutlinedIconStyled = styled(InfoOutlinedIcon)(function (_a) {
     var theme = _a.theme;
     return ({
+        position: 'relative',
+        top: theme.spacing(0.125),
         width: theme.spacing(2.75),
-        height: theme.spacing(2.125),
+        height: theme.spacing(1.75),
         cursor: 'pointer',
-        color: alpha(theme.palette.text.primary, 0.4),
+        color: theme.palette.mode === ThemeMode.DARK ? theme.palette.text.disabled : theme.palette.primary.contrastText,
         display: 'inline-flex'
     });
 });
@@ -79,6 +83,6 @@ var Gender = function (_a) {
         genderControl.field.onChange(target.value);
     };
     var genderValue = genderControl.field.value;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 2.5, pl: 2.5, pr: 2.5, pt: 2.5 } }, { children: [_jsx(LabelTextStyled, { children: t('individual_gender_title') }), _jsxs(RadioGroupStyled, __assign({ readOnly: readOnly, value: genderValue != null ? genderValue : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: IndividualGender.MALE, label: _jsxs(LabelStyled, { children: [t('gender_male'), genderValue === IndividualGender.MALE && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: IndividualGender.FEMALE, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('gender_female'), genderValue === IndividualGender.FEMALE && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { pb: 1.5, pl: 3, pr: 3, pt: 1.5 } }, { children: [_jsx(LabelTextStyled, { children: t('individual_gender_title') }), _jsxs(RadioGroupStyled, __assign({ readOnly: readOnly, value: genderValue != null ? genderValue : false, onChange: handleOnChange }, { children: [_jsx(RadioLabel, { value: IndividualGender.MALE, label: _jsxs(LabelStyled, { children: [t('gender_male'), genderValue === IndividualGender.MALE && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) }), _jsx(RadioLabel, { value: IndividualGender.FEMALE, sx: { marginInlineEnd: '0px' }, label: _jsxs(LabelStyled, { children: [t('gender_female'), genderValue === IndividualGender.FEMALE && isVerified && _jsx(CheckIcon, { sx: { marginInlineStart: '5px' }, isVerified: isVerified })] }), control: _jsx(RadioStyled, { color: 'primary', disableFocusRipple: true, disableRipple: true, disableTouchRipple: true, focusRipple: false }) })] }))] })) })));
 };
 export default Gender;

package/build/features/individual/screens/IndividualPersonalInfo/ID.js

@@ -17,7 +17,7 @@ import { removeAllCharsFromNumber } from '../../../../utils';
 import { ID_NUMBER_LENGTH } from '../../../../constants';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import { EndAdornment } from '../../../shared/EndAdornment';
 var IDNumber = function (_a) {
     var _b;
@@ -35,6 +35,11 @@ var IDNumber = function (_a) {
     };
     var nidValue = nidControl.field.value;
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { readOnly: readOnly, label: t('enter_national_id'), inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, isVerified: isVerified, onClear: clearIdNumber, error: error }), placeholder: '0000000000', warningType: 'alert', warningMessage: error && t(error, { number: '1' }) }) }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, { children: _jsx(Input, { label: t('enter_national_id'), InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: nidValue, isVerified: isVerified, onClear: clearIdNumber, error: error })
+                }, inputProps: {
+                    maxLength: ID_NUMBER_LENGTH,
+                    readOnly: readOnly
+                }, onChange: handleIdChange, value: nidValue, placeholder: '0000000000', helperText: error && t(error, { number: '1' }) }) }) })));
 };
 export default React.memo(IDNumber);