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

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

@@ -18,13 +18,14 @@ import { handleCurrentActiveScreen, handlePrevScreenStep, settingsSelector } fro
 import Box from '@mui/material/Box';
 import { alpha, styled } from '@mui/material/styles';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage, useFormReadOnly, useDataNoneEditable, useFormErrorAndUpdateReadOnly, useExcludeReadOnlyFelids, useDataVerified } from '../../../../hooks';
+import { DropDownMode } from '../../../../@types';
 import { convertToEnglishDateFormat, deepCopy, getUserName } from '../../../../utils';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
 import Text from '../../../../components/Text';
 import { clearError, individualSelector, retrieveBoardStatus, updateIndividualPersonalInfo } from '../../../app/individual/individualStore';
 import Button from '../../../shared/Button';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { IndividualInfoValidationSchema } from './validation';
 import Name from './Name';
 import MobileNumber from './MobileNumber';
@@ -56,6 +57,7 @@ var IndividualPersonalInfo = function (_a) {
     var dispatch = useAppDispatch();
     var _l = useAppSelector(individualSelector), data = _l.data, loading = _l.loading, error = _l.error, cityLoading = _l.cityLoading;
     var settingsData = useAppSelector(settingsSelector).data;
+    var isPopupMode = settingsData.dropDownOpenMode === DropDownMode.popup;
     var countries = settingsData.countries;
     var verify = data.verify, individualPersonalData = data.individualPersonalData;
     var _m = verify.responseBody || {}, user = _m.user, flows = _m.flows;
@@ -156,7 +158,8 @@ var IndividualPersonalInfo = function (_a) {
         dispatch(retrieveBoardStatus());
     };
     var handleMenuClick = function (flag) {
-        setListActive(flag);
+        if (!isPopupMode)
+            setListActive(flag);
     };
     var handleDobActive = function (flag) {
         setDobActive(flag);
@@ -172,11 +175,11 @@ var IndividualPersonalInfo = function (_a) {
     var isBirthCountryListActive = listActive === ListType.BirthCountryList;
     var isBirthCityListActive = listActive === ListType.BirthCityList;
     var isNationalityListActive = listActive === ListType.NationalityList;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField, readOnly: readOnly['name'] || (noneEditable['name.en'] && noneEditable['name.ar']), isVerified: isNameVerified }), _jsx(MobileNumber, { readOnly: readOnly['mobile'] || noneEditable['contact.phone.number'] || noneEditable['contact.phone.country_code'], show: !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive && !isIssuedCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.MobileCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isPhoneNumberVerified }), _jsx(Email, { show: showField, readOnly: readOnly['email'] || noneEditable['contact.email'], isVerified: isEmailVerified }), _jsx(Gender, { show: showField, readOnly: readOnly['gender'] || noneEditable['gender'], isVerified: isGenderVerified }), _jsx(ID, { show: showField, readOnly: readOnly['nid'] || noneEditable['identification.id'], isVerified: isIDVerified }), _jsx(IssuedCountry, { readOnly: readOnly['issuedCountry'] || noneEditable['identification.issuer_country'], show: !isMobileCountryListActive && !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isIssuedCountryVerified }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive, readOnly: readOnly['expiryDate'] || noneEditable['identification.expiry'], isVerified: isExpiryDateVerified }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive, readOnly: readOnly['dob'] || noneEditable['birth.date'], isVerified: isDOBVerified }), _jsx(BirthCountry, { readOnly: readOnly['placeOfBirthCountry'] || noneEditable['birth.country'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCountryVerified }), _jsx(BirthCity, { readOnly: readOnly['placeOfBirthCity'] || noneEditable['birth.city'], show: !isMobileCountryListActive &&
+    return (_jsx(ContainerWithHeader, __assign({ onBack: function () { return onBack(); }, title: 'individual_personal_title', description: 'individual_personal_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: showField, readOnly: readOnly['name'] || (noneEditable['name.en'] && noneEditable['name.ar']), isVerified: isNameVerified }), _jsx(MobileNumber, { isPopupMode: isPopupMode, readOnly: readOnly['mobile'] || noneEditable['contact.phone.number'] || noneEditable['contact.phone.country_code'], show: !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive && !isIssuedCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.MobileCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isPhoneNumberVerified }), _jsx(Email, { show: showField, readOnly: readOnly['email'] || noneEditable['contact.email'], isVerified: isEmailVerified }), _jsx(Gender, { show: showField, readOnly: readOnly['gender'] || noneEditable['gender'], isVerified: isGenderVerified }), _jsx(ID, { show: showField, readOnly: readOnly['nid'] || noneEditable['identification.id'], isVerified: isIDVerified }), _jsx(IssuedCountry, { isPopupMode: isPopupMode, readOnly: readOnly['issuedCountry'] || noneEditable['identification.issuer_country'], show: !isMobileCountryListActive && !isDateFieldActive && !isBirthCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.IssuedCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isIssuedCountryVerified }), _jsx(ExpiryDate, { show: !listActive && !dobActive, onDateClicked: handleExpiryDateActive, readOnly: readOnly['expiryDate'] || noneEditable['identification.expiry'], isVerified: isExpiryDateVerified }), _jsx(DOB, { show: !listActive && !expiryDateActive, onDateClicked: handleDobActive, readOnly: readOnly['dob'] || noneEditable['birth.date'], isVerified: isDOBVerified }), _jsx(BirthCountry, { isPopupMode: isPopupMode, readOnly: readOnly['placeOfBirthCountry'] || noneEditable['birth.country'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isNationalityListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.BirthCountryList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCountryVerified }), _jsx(BirthCity, { isPopupMode: isPopupMode, readOnly: readOnly['placeOfBirthCity'] || noneEditable['birth.city'], show: !isMobileCountryListActive &&
                                     !isDateFieldActive &&
                                     !isIssuedCountryListActive &&
                                     !isBirthCountryListActive &&
-                                    !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCityVerified }), _jsx(Nationality, { readOnly: readOnly['nationality'] || noneEditable['nationality'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isNationalityVerified })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+                                    !isNationalityListActive, onListOpen: function () { return handleMenuClick(ListType.BirthCityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isBirthCityVerified }), _jsx(Nationality, { isPopupMode: isPopupMode, readOnly: readOnly['nationality'] || noneEditable['nationality'], show: !isMobileCountryListActive && !isDateFieldActive && !isIssuedCountryListActive && !isBirthCityListActive && !isBirthCountryListActive, countries: countries, onListOpen: function () { return handleMenuClick(ListType.NationalityList); }, onListClose: function () { return handleMenuClick(); }, isVerified: isNationalityVerified })] }), _jsx(Collapse, __assign({ in: showField, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: true, isAr: isAr, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) })));
 };
 IndividualPersonalInfo.defaultProps = {};
 export default React.memo(IndividualPersonalInfo);

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

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

package/build/features/individual/screens/IndividualPersonalInfo/IssuedCountry.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 IssuedCountry = 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 IssuedCountry = React.forwardRef(function (_a, ref) {
     };
     var location = issuedCountryControl.field.value;
     var error = (_b = issuedCountryControl.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('issued_country_label'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }), placeholder: t('choose_issued_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('issued_country_label'), InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified })
+                    }, inputProps: {
+                        readOnly: readOnly
+                    }, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, placeholder: t('choose_issued_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/MobileNumber.d.ts

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

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

@@ -25,25 +25,19 @@ 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 { styled } from '@mui/material/styles';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import SimpleList from '../../../../components/SimpleList';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 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)
-    });
-});
+import DropDownStyle from '../../../shared/DropDownStyle';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -51,38 +45,45 @@ var CountryCodeText = 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), { width: theme.spacing(10), textAlign: 'start', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { width: theme.spacing(10), textAlign: 'start', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
 });
 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 CountryCodeStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ cursor: 'pointer' }, theme.typography.body2), { fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75) }));
+var CountryCodeStyled = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'readOnly'; } })(function (_a) {
+    var theme = _a.theme, readOnly = _a.readOnly;
+    return (__assign(__assign({ cursor: readOnly ? 'auto' : 'pointer', color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75), position: 'relative', bottom: theme.spacing(-1.125) }));
 });
-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 ExpandIconStyled = styled(ExpandIcon, { shouldForwardProp: function (prop) { return prop !== 'readOnly'; } })(function (_a) {
+    var theme = _a.theme, readOnly = _a.readOnly;
+    return ({
+        cursor: readOnly ? 'auto' : 'pointer',
+        marginInlineStart: theme.spacing(1)
+    });
 });
-var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
+var CodeExpandIconStyled = styled(ExpandIconStyled)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginInlineStart: theme.spacing(1)
+        width: theme.spacing(0.875),
+        height: theme.spacing(0.875)
     });
 });
 var InputStyled = styled(Input)(function (_a) {
-    var readOnly = _a.readOnly;
+    var inputProps = _a.inputProps;
     return ({
         direction: 'ltr',
         '& .MuiInputBase-input': {
-            cursor: readOnly ? 'default' : 'pointer'
+            cursor: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.readOnly) ? 'default' : 'pointer'
+        },
+        label: {
+            transformOrigin: 'top left'
         }
     });
 });
 var MobileNumber = 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 || []), countriesCode = _e[0], setCountries = _e[1];
     var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
     var t = useTranslation().t;
@@ -135,7 +136,13 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 3 } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: readOnly ? undefined : function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : (_jsx(EndAdornment, { value: mobileValue, isVerified: isVerified, onClear: clearMobileNumber, error: error })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { mb: 1.5 } }, { children: [_jsx(InputStyled, { label: t('signup_enter_mobile'), inputProps: {
+                        maxLength: requiredLen,
+                        readOnly: readOnly
+                    }, InputProps: {
+                        startAdornment: (_jsxs(CountryCodeStyled, __assign({ readOnly: readOnly, onClick: readOnly ? undefined : function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(CodeExpandIconStyled, { readOnly: readOnly, anchorEl: !!anchorEl })] }))),
+                        endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : (_jsx(EndAdornment, { value: mobileValue, isVerified: isVerified, onClear: clearMobileNumber, error: error }))
+                    }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, placeholder: "".concat(isSA ? '5' : '0', "00000000"), helperText: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseCountryList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, { isVerified: isVerified })] }));
                         } }) }))] })) })));
 });

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

@@ -17,7 +17,7 @@ import { styled } from '@mui/material/styles';
 import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
 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 InputStyled = styled(Input)(function () { return ({
     input: {
@@ -39,6 +39,10 @@ var Name = function (_a) {
     var clearNumber = function () {
         nameControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 3, mt: 2.5 } }, { children: _jsx(InputStyled, { readOnly: readOnly, label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: nameValue, isVerified: isVerified, onClear: clearNumber, error: error }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 1.5 } }, { children: _jsx(InputStyled, { InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: nameValue, isVerified: isVerified, onClear: clearNumber, error: error })
+                }, inputProps: {
+                    readOnly: readOnly
+                }, label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), helperText: error && t(error) }) })) })));
 };
 export default React.memo(Name);

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

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

package/build/features/individual/screens/IndividualPersonalInfo/Nationality.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 Nationality = 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 isPopupMode = _a.isPopupMode, countries = _a.countries, readOnly = _a.readOnly, isVerified = _a.isVerified, rest = __rest(_a, ["isPopupMode", "countries", "readOnly", "isVerified"]);
     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 Nationality = React.forwardRef(function (_a, ref) {
     };
     var location = nationalityControl.field.value;
     var error = (_b = nationalityControl.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('nationality_label'), readOnly: readOnly, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }), placeholder: t('choose_nationality'), 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('nationality_label'), InputProps: {
+                        endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified })
+                    }, inputProps: {
+                        readOnly: readOnly
+                    }, onClick: !!anchorEl ? function () { return onCloseCountrySelect(); } : onOpenCountrySelect, placeholder: t('choose_nationality'), 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(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/IndividualPhoneInfo/MobileNumber.d.ts

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

package/build/features/individual/screens/IndividualPhoneInfo/MobileNumber.js

@@ -25,9 +25,10 @@ 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 { styled } from '@mui/material/styles';
 import { removeAllCharsFromNumber } from '../../../../utils';
-import { useLanguage, useAppSelector } from '../../../../hooks';
+import { useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
@@ -35,16 +36,8 @@ import SimpleList from '../../../../components/SimpleList';
 import ClearIcon from '../../../shared/ClearIcon';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
-import { individualSelector } from '../../../app/individual/individualStore';
-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)
-    });
-});
+import Input from '../../../shared/TextField';
+import DropDownStyle from '../../../shared/DropDownStyle';
 var CountryItemContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
@@ -52,41 +45,47 @@ var CountryCodeText = 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), { width: theme.spacing(10), textAlign: 'start', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
+    return (__assign(__assign({ color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { width: theme.spacing(10), textAlign: 'start', fontWeight: isSelected ? theme.typography.fontWeightMedium : theme.typography.fontWeightLight }));
 });
 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 CountryCodeStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ cursor: 'pointer' }, theme.typography.body2), { fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75) }));
+var CountryCodeStyled = styled(Text, { shouldForwardProp: function (prop) { return prop !== 'readOnly'; } })(function (_a) {
+    var theme = _a.theme, readOnly = _a.readOnly;
+    return (__assign(__assign({ cursor: readOnly ? 'auto' : 'pointer', color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary }, theme.typography.body2), { fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75), position: 'relative', bottom: theme.spacing(-1.125) }));
 });
-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 ExpandIconStyled = styled(ExpandIcon, { shouldForwardProp: function (prop) { return prop !== 'readOnly'; } })(function (_a) {
+    var theme = _a.theme, readOnly = _a.readOnly;
+    return ({
+        cursor: readOnly ? 'auto' : 'pointer',
+        marginInlineStart: theme.spacing(1)
+    });
 });
-var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
+var CodeExpandIconStyled = styled(ExpandIconStyled)(function (_a) {
     var theme = _a.theme;
     return ({
-        marginInlineStart: theme.spacing(1)
+        width: theme.spacing(0.875),
+        height: theme.spacing(0.875)
     });
 });
 var InputStyled = styled(Input)(function () { return ({
     direction: 'ltr',
     '& .MuiInputBase-input': {
         cursor: 'auto'
+    },
+    label: {
+        transformOrigin: 'top left'
     }
 }); });
 var MobileNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
-    var countries = _a.countries, sx = _a.sx, readOnly = _a.readOnly, rest = __rest(_a, ["countries", "sx", "readOnly"]);
+    var countries = _a.countries, sx = _a.sx, readOnly = _a.readOnly, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["countries", "sx", "readOnly", "isPopupMode"]);
     var _e = React.useState(countries || []), countriesCode = _e[0], setCountries = _e[1];
     var _f = React.useState(null), anchorEl = _f[0], setAnchorEl = _f[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var _g = useFormContext(), control = _g.control, setValue = _g.setValue;
-    var data = useAppSelector(individualSelector).data;
     var phoneControl = useController({ name: 'mobile', control: control });
     var countryCodeControl = useController({ name: 'countryCode', control: control });
     var countryCodeValue = countryCodeControl.field.value;
@@ -97,7 +96,6 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
     var mobileLen = countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.digits;
     var isStartsWith5 = mobileValue.startsWith('5');
     var requiredLen = isSA && isStartsWith5 ? mobileLen - 1 : mobileLen;
-    var verify = data.verify;
     React.useEffect(function () {
         if (mobileValue)
             setValue('mobile', mobileValue, { shouldValidate: true });
@@ -135,11 +133,17 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         setValue('mobile', '');
         countryCodeControl.field.onChange(country);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { readOnly: readOnly, inputProps: { maxLength: requiredLen }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: function () {
-                            if (readOnly)
-                                return;
-                            toggleCountryList();
-                        } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(ExpandIconStyled, { anchorEl: !!anchorEl })] })), endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber })), placeholder: "".concat(isSA ? '5' : '0', "00000000"), warningType: 'alert', warningMessage: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(InputStyled, { label: t('signup_enter_mobile'), InputProps: {
+                        startAdornment: (_jsxs(CountryCodeStyled, __assign({ readOnly: readOnly, onClick: function () {
+                                if (readOnly)
+                                    return;
+                                toggleCountryList();
+                            } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(CodeExpandIconStyled, { readOnly: readOnly, anchorEl: !!anchorEl })] }))),
+                        endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber }))
+                    }, inputProps: {
+                        maxLength: requiredLen,
+                        readOnly: readOnly
+                    }, type: 'tel', disabled: !!anchorEl, onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, placeholder: "".concat(isSA ? '5' : '0', "00000000"), helperText: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsx(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseCountryList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: 'name.english', searchValuePath: ['name.arabic', 'name.english'], list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
                             return (_jsxs(_Fragment, { children: [_jsxs(CountryItemContainer, { children: [_jsxs(CountryCodeText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: ["+", item.idd_prefix] })), _jsx(CountryNameText, __assign({ isSelected: (item === null || item === void 0 ? void 0 : item.idd_prefix) === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) }, { children: isAr ? item.name.arabic : item.name.english }))] }), item.idd_prefix === (countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix) && _jsx(CheckIcon, {})] }));
                         } }) }))] })) })));
 });

package/build/features/individual/screens/IndividualPhoneInfo/PhoneInfo.js

@@ -18,9 +18,10 @@ import { styled } from '@mui/material/styles';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppDispatch, useExcludeReadOnlyFelids, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
 import { useLanguage, useAppSelector } from '../../../../hooks';
+import { DropDownMode } from '../../../../@types';
 import Form from '../../../../components/Form';
 import Collapse from '../../../../components/Collapse';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { individualSelector, clearError, updatePhoneInfo } from '../../../app/individual/individualStore';
 import Button from '../../../shared/Button';
 import { IndividualPhoneInfoValidationSchema } from './validation';
@@ -35,6 +36,7 @@ var PhoneInfo = function (_a) {
     var settingsData = useAppSelector(settingsSelector).data;
     var countries = settingsData.countries;
     var _b = useAppSelector(individualSelector), data = _b.data, loading = _b.loading, error = _b.error;
+    var isPopupMode = settingsData.dropDownOpenMode === DropDownMode.popup;
     var _c = data.individualPhoneInfo, mobile = _c.mobile, countryCode = _c.countryCode;
     var methods = useForm({
         resolver: yupResolver(IndividualPhoneInfoValidationSchema),
@@ -59,6 +61,12 @@ var PhoneInfo = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, sx: { mb: 7.5 }, countries: countries, onListOpen: function () { return setListActive(true); }, onListClose: function () { return setListActive(false); } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'individual_phone_title', description: 'individual_phone_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(MobileNumber, { isPopupMode: isPopupMode, readOnly: readOnly['mobile'], show: true, sx: { mb: 7.5 }, countries: countries, onListOpen: function () {
+                            if (!isPopupMode)
+                                setListActive(true);
+                        }, onListClose: function () {
+                            if (!isPopupMode)
+                                setListActive(false);
+                        } }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) })));
 };
 export default React.memo(PhoneInfo);

package/build/features/individual/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 { Trans, useTranslation } from 'react-i18next';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { maskEmail } from '../../../../utils';
 import { individualSelector } from '../../../../features/app/individual/individualStore';
 import { useAppSelector, useAppDispatch } from '../../../../hooks';
@@ -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/individual/screens/Success/Success.js

@@ -1,7 +1,19 @@
+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 } from 'react-i18next';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { individualSelector, updateBoardSuccess } from '../../../app/individual/individualStore';
 import SuccessScreen from '../../../shared/SuccessScreen';
 var Success = function (_a) {
@@ -15,6 +27,6 @@ var Success = function (_a) {
     var onSuccess = function () {
         setClicked(true);
     };
-    return (_jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: clicked && loading, error: error || '' }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'individual_success_header_title', description: 'individual_success_header_description' }, { children: _jsx(SuccessScreen, { title: t('individual_success_title'), onSuccess: onSuccess, successTitle: t('continue'), loading: clicked && loading, error: error || '' }) })));
 };
 export default React.memo(Success);

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

@@ -14,9 +14,10 @@ import { memo } from 'react';
 import { useAppSelector } from '../../../../hooks';
 import { individualSelector } from '../../../app/individual/individualStore';
 import SuccessFlowButtons from '../../../shared/SuccessFlowButtons';
+import { ContainerWithHeader } from '../../../shared/Containers';
 var SuccessWithFlowButtons = function () {
     var data = useAppSelector(individualSelector).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, boardInfoId: board_info_id, individuals: individuals, flows: flows || [] }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'individual_flows_title' }, { 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, boardInfoId: board_info_id, individuals: individuals, flows: flows || [] }) })));
 };
 export default memo(SuccessWithFlowButtons);

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

@@ -21,7 +21,7 @@ import { useLanguage, useAppSelector } 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 { individualSelector, clearError, resetOTPScreen, verifyLeadOTP } from '../../../app/individual/individualStore';
 import Button from '../../../shared/Button';
 import { OTPValidation } from './validation';
@@ -29,17 +29,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',
@@ -75,6 +72,6 @@ var VerifyNumber = function (_a) {
     var disabled = !methods.formState.isValid || !!error || !phone || resendLoading;
     var dataLoading = loading || cityLoading;
     var showMobileNumber = !loading && !cityLoading && phone;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [dataLoading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), showMobileNumber && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, 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: [dataLoading ? t('ide_otp_waiting_title') : t('ide_opt_sent_title'), showMobileNumber && _jsx("span", __assign({ dir: 'ltr' }, { children: "".concat(maskPhone(phone || '')) }))] }) }), _jsx(OTPInput, { loading: resendLoading, setLoading: setResendLoading }), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) })));
 };
 export default React.memo(VerifyNumber);