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

package/build/features/connectExpress/screens/Mobile/Mobile.js

@@ -15,15 +15,16 @@ import Box from '@mui/material/Box';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useTranslation } from 'react-i18next';
-import { styled, alpha } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
 import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
-import { useAppDispatch, useAppSelector, useCountry, useFormErrorAndUpdateReadOnly, useFormReadOnly } from '../../../../hooks';
+import { useAppDispatch, useAppSelector, useCountry, useFormErrorAndUpdateReadOnly, useFormReadOnly, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { clearError, resetStore, connectExpressSelector, createMobileAuthAsync } from '../../../app/connectExpress/connectExpressStore';
 import { useLanguage } from '../../../../hooks';
+import { DropDownMode } from '../../../../@types';
 import Divider from '@mui/material/Divider';
 import Text from '../../../../components/Text';
 import MobileNumber from './MobileNumber';
@@ -47,14 +48,14 @@ var InputsContainerStyled = styled(Box)(function (_a) {
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return ({
-        color: alpha(theme.palette.primary.dark, 0.4)
+        color: theme.palette.info.contrastText
     });
 });
 var DividerStyled = styled(Divider)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '45%',
-        borderColor: alpha(theme.palette.primary.dark, 0.4),
+        borderColor: theme.palette.divider,
         marginBlockEnd: theme.spacing(0.62)
     });
 });
@@ -63,9 +64,8 @@ var OrBoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         justifyContent: 'space-between',
-        marginBlockEnd: theme.spacing(1.62),
-        marginBlockStart: theme.spacing(-1.25),
-        marginInline: theme.spacing(2.5)
+        margin: theme.spacing(3),
+        marginTop: theme.spacing(0)
     });
 });
 var Mobile = function (_a) {
@@ -77,13 +77,20 @@ var Mobile = function (_a) {
     var isAr = useLanguage().isAr;
     var dispatch = useAppDispatch();
     var isKuwait = useCountry(settingData.businessCountry.iso2).isKuwait;
+    var _f = data.mobileData, mobile = _f.mobile, countryCode = _f.countryCode, termAndConditionChecked = _f.termAndConditionChecked;
     var responseData = data.responseData, isLeadIdPassed = data.isLeadIdPassed;
     var isLeadIdentityIdAvailable = !((_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id);
+    var isPopupMode = settingData.dropDownOpenMode === DropDownMode.popup;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema(isLeadIdPassed)),
-        defaultValues: data.mobileData,
+        defaultValues: {
+            mobile: mobile,
+            countryCode: countryCode,
+            termAndConditionChecked: termAndConditionChecked
+        },
         mode: 'onChange'
     });
+    useSetFromDefaultValues(methods, data.mobileData);
     React.useEffect(function () {
         if (error)
             dispatch(clearError());
@@ -99,14 +106,16 @@ var Mobile = function (_a) {
         dispatch(handlePrevScreenStep(screen));
     };
     var handleCountryOpen = function () {
-        setAnchor(true);
+        if (!isPopupMode)
+            setAnchor(true);
     };
     var handleCountryClose = function () {
-        setAnchor(false);
+        if (!isPopupMode)
+            setAnchor(false);
     };
     var originalReadOnly = useFormReadOnly(methods);
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { readOnly: readOnly['mobile'], show: true, countries: settingData.countries, onListOpen: handleCountryOpen, onListClose: handleCountryClose }) }), _jsxs(Collapse, __assign({ in: !anchor }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKuwait ? (_jsx(MobileButton, __assign({ disabled: loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'get_started', description: 'mobile_number_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { isPopupMode: isPopupMode, readOnly: readOnly['mobile'], show: true, countries: settingData.countries, onListOpen: handleCountryOpen, onListClose: handleCountryClose }) }), _jsxs(Collapse, __assign({ in: !anchor }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ sx: { mt: 5 }, onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled, loading: loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), isKuwait ? (_jsx(MobileButton, __assign({ disabled: loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) })) })));
 };
 export default React.memo(Mobile);

package/build/features/connectExpress/screens/Mobile/MobileNumber.d.ts

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

package/build/features/connectExpress/screens/Mobile/MobileNumber.js

@@ -25,7 +25,7 @@ import * as React from 'react';
 import Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { styled, alpha } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import Text from '../../../../components/Text';
 import Collapse from '../../../../components/Collapse';
 import ClearIcon from '../../../shared/ClearIcon';
@@ -33,19 +33,13 @@ import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { connectSelector } from '../../../app/connect/connectStore';
 import ExpandIcon from '../../../../components/ExpandIcon';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import SimpleList from '../../../../components/SimpleList';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { useLanguage, useAppSelector } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Search from '../../../shared/Search';
-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'
 }); });
@@ -53,35 +47,42 @@ 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, readOnly = _a.readOnly, rest = __rest(_a, ["countries", "readOnly"]);
+    var countries = _a.countries, readOnly = _a.readOnly, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["countries", "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;
@@ -144,11 +145,17 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: mobileValue ? '133px' : '0px' } }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('signup_enter_mobile') }) }), _jsx(InputStyled, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl || readOnly, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, 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: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { searchKeyPath: 'name.english', list: countriesCode, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: rest.show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref, sx: { minHeight: (mobileValue === null || mobileValue === void 0 ? void 0 : mobileValue.length) === requiredLen ? '133px' : '0px' } }, { 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: !!anchorEl || readOnly
+                    }, type: 'tel', required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, placeholder: "".concat(isSA ? '5' : '0', "00000000"), helperText: !anchorEl ? error && t(error, { length: requiredLen, number: '05|5' }) : undefined }), _jsxs(DropDownStyle, __assign({ isPopupMode: isPopupMode, anchorEl: anchorEl, onClosePopup: onCloseCountryList }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: '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/connectExpress/screens/Mobile/TAC.js

@@ -14,7 +14,7 @@ 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 Link from '@mui/material/Link';
 import { settingsSelector } from '../../../../app/settings';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
@@ -24,41 +24,29 @@ import Text from '../../../../components/Text';
 import Warning from '../../../../components/Warning';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
-var TACContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        flexDirection: 'row',
-        alignItems: 'center',
-        paddingInlineStart: theme.spacing(2.5)
-    });
-});
+var TACContainerStyled = styled(Box)(function () { return ({
+    display: 'flex',
+    flexDirection: 'row',
+    alignItems: 'center'
+}); });
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.body2));
+    return (__assign({ color: theme.palette.secondary.main, fontWeight: theme.typography.fontWeightRegular, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.caption));
 });
 var LinkStyled = styled(Link)(function (_a) {
     var theme = _a.theme;
     return ({
         color: theme.palette.primary.main,
         fontWeight: theme.typography.fontWeightMedium,
-        letterSpacing: theme.spacing(0)
+        letterSpacing: theme.spacing(0),
+        textDecorationColor: theme.palette.primary.main,
+        textDecorationThickness: theme.spacing(0.125)
     });
 });
 var CheckboxStyled = styled(CheckBox)(function (_a) {
     var theme = _a.theme;
     return ({
-        margin: theme.spacing(0),
-        padding: theme.spacing(0),
-        marginInlineEnd: theme.spacing(1.5),
-        color: theme.palette.primary.main,
-        '& .MuiSvgIcon-root': {
-            fontSize: theme.spacing(3.75)
-        },
-        '&.Mui-checked': {
-            color: theme.palette.text.primary,
-            borderRadius: theme.spacing(2.5)
-        }
+        marginInlineStart: theme.spacing(-1.125)
     });
 });
 var CollapseStyled = styled(Collapse)(function () { return ({
@@ -80,6 +68,6 @@ var TAC = function (_a) {
             return;
         tacControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(TACContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] }) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, ml: 3, mr: 3 } }, { children: [_jsxs(TACContainerStyled, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] }), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
 };
 export default React.memo(TAC);

package/build/features/connectExpress/screens/NID/DOB.d.ts

@@ -3,5 +3,5 @@ interface DOBProps {
     onDateClicked?: (flag: boolean) => void;
     readOnly?: boolean;
 }
-declare const DOB: ({ onDateClicked, readOnly }: DOBProps) => JSX.Element;
+declare const DOB: ({ readOnly }: DOBProps) => JSX.Element;
 export default DOB;

package/build/features/connectExpress/screens/NID/DOB.js

@@ -1,30 +1,13 @@
-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 { jsx as _jsx } from "react/jsx-runtime";
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
-import { alpha, styled } from '@mui/material/styles';
 import { clearError, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
-import Text from '../../../../components/Text';
-import Calender from '../../../shared/Calender';
-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) }));
-});
+import { CustomCalender as Calender } from '../../../shared/Calender';
 var DOB = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked, readOnly = _a.readOnly;
+    var readOnly = _a.readOnly;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
@@ -39,9 +22,6 @@ var DOB = function (_a) {
             dispatch(clearError());
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
-                        var spacing = _a.spacing;
-                        return spacing(2.5, 2.5, 1.5, 2.5);
-                    } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, disabled: readOnly, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
+    return (_jsx(ScreenContainer, { children: _jsx(Calender, { required: true, label: t('enter_birth_date'), readOnly: readOnly, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateChange: handleBirthDateChange }) }));
 };
 export default DOB;

package/build/features/connectExpress/screens/NID/IDNumber.js

@@ -9,33 +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 Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppSelector } from '../../../../hooks';
-import { styled, alpha } from '@mui/material/styles';
-import Text from '../../../../components/Text';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import Collapse from '../../../../components/Collapse';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { ID_NUMBER_LENGTH } from '../../../../constants';
 import { EndAdornment } from '../../../shared/EndAdornment';
 import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
-var LabelContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        justifyContent: 'space-between',
-        padding: theme.spacing(0, 2.5, 1.25, 2.5)
-    });
-});
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
-});
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b, _c, _d;
     var show = _a.show, readOnly = _a.readOnly;
@@ -55,6 +40,11 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     var error = (_b = nidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
     var isLeadIdPassed = data.isLeadIdPassed, responseData = data.responseData;
     var isLeadIdentityIdAvailable = !!((_d = (_c = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _c === void 0 ? void 0 : _c.identification) === null || _d === void 0 ? void 0 : _d.id);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { readOnly: readOnly, dir: 'ltr', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, disabled: isLeadIdPassed && isLeadIdentityIdAvailable, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber }), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
+    return (_jsx(Collapse, __assign({ in: show, sx: { pb: 1.5 } }, { children: _jsx(ScreenContainer, __assign({ ref: ref }, { children: _jsx(Input, { dir: 'ltr', type: 'tel', label: t('enter_national_id'), InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber })
+                }, inputProps: {
+                    maxLength: ID_NUMBER_LENGTH,
+                    readOnly: readOnly
+                }, disabled: isLeadIdPassed && isLeadIdentityIdAvailable, onChange: handleIdChange, value: nidValue, placeholder: t('national_id_placeholder'), helperText: error && t(error, { number: '1' }), required: true }) })) })));
 });
 export default React.memo(IDNumber);

package/build/features/connectExpress/screens/NID/NID.js

@@ -12,7 +12,7 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { alpha, styled } from '@mui/material/styles';
+import { styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { NIDValidationSchema } from './validation';
@@ -21,7 +21,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import { clearError, connectExpressSelector, createNIDAuthAsync } from '../../../app/connectExpress/connectExpressStore';
 import Form from '../../../../components/Form';
 import Button, { MobileButton } from '../../../shared/Button';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import Box from '@mui/material/Box';
 import Divider from '@mui/material/Divider';
@@ -37,14 +37,14 @@ var FormStyled = styled(Form)(function () { return ({
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return ({
-        color: alpha(theme.palette.primary.dark, 0.4)
+        color: theme.palette.info.contrastText
     });
 });
 var DividerStyled = styled(Divider)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '45%',
-        borderColor: alpha(theme.palette.primary.dark, 0.4),
+        borderColor: theme.palette.divider,
         marginBlockEnd: theme.spacing(0.62)
     });
 });
@@ -53,9 +53,8 @@ var OrBoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         justifyContent: 'space-between',
-        marginBlockEnd: theme.spacing(1.62),
-        marginBlockStart: theme.spacing(-1.25),
-        marginInline: theme.spacing(2.5)
+        margin: theme.spacing(3),
+        marginTop: theme.spacing(0)
     });
 });
 var NID = function (_a) {
@@ -90,6 +89,6 @@ var NID = function (_a) {
     var readOnly = useFormErrorAndUpdateReadOnly(methods, originalReadOnly);
     var disabled = !methods.formState.isValid || !!error;
     var isLeadIdentityIdAvailable = (_c = (_b = responseData === null || responseData === void 0 ? void 0 : responseData.leadData) === null || _b === void 0 ? void 0 : _b.identification) === null || _c === void 0 ? void 0 : _c.id;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse, readOnly: readOnly['nid'] }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose, readOnly: readOnly['dob'] }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'get_started', description: 'national_id_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse, readOnly: readOnly['nid'] }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose, readOnly: readOnly['dob'] }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(TAC, { show: isLeadIdPassed, readOnly: readOnly['termAndConditionChecked'] }), _jsx(Button, __assign({ sx: { mt: 5 }, loading: loading, isAr: isAr, disableBack: true, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: isLeadIdPassed ? !isLeadIdentityIdAvailable && !methods.formState.isValid : !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) })));
 };
 export default React.memo(NID);

package/build/features/connectExpress/screens/NID/TAC.js

@@ -14,7 +14,7 @@ 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 Link from '@mui/material/Link';
 import { settingsSelector } from '../../../../app/settings';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
@@ -25,37 +25,29 @@ import Warning from '../../../../components/Warning';
 import Collapse from '../../../../components/Collapse';
 import { ScreenContainer } from '../../../shared/Containers';
 export var TACContainerStyled = styled(Box, { shouldForwardProp: function (prop) { return prop !== 'readOnly'; } })(function (_a) {
-    var theme = _a.theme, readOnly = _a.readOnly;
-    return (__assign({ display: 'flex', flexDirection: 'row', alignItems: 'center', paddingInlineStart: theme.spacing(2.5) }, (readOnly && {
+    var readOnly = _a.readOnly;
+    return (__assign({ display: 'flex', flexDirection: 'row', alignItems: 'center' }, (readOnly && {
         opacity: '0.6'
     })));
 });
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
-    return (__assign({ color: alpha(theme.palette.text.primary, 0.4), fontWeight: theme.typography.fontWeightLight, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.body2));
+    return (__assign({ color: theme.palette.secondary.main, fontWeight: theme.typography.fontWeightRegular, whiteSpace: 'pre-line', height: 'fit-content' }, theme.typography.caption));
 });
 var LinkStyled = styled(Link)(function (_a) {
     var theme = _a.theme;
     return ({
         color: theme.palette.primary.main,
         fontWeight: theme.typography.fontWeightMedium,
-        letterSpacing: theme.spacing(0)
+        letterSpacing: theme.spacing(0),
+        textDecorationColor: theme.palette.primary.main,
+        textDecorationThickness: theme.spacing(0.125)
     });
 });
 var CheckboxStyled = styled(CheckBox)(function (_a) {
     var theme = _a.theme;
     return ({
-        margin: theme.spacing(0),
-        padding: theme.spacing(0),
-        marginInlineEnd: theme.spacing(1.5),
-        color: theme.palette.primary.main,
-        '& .MuiSvgIcon-root': {
-            fontSize: theme.spacing(3.75)
-        },
-        '&.Mui-checked': {
-            color: theme.palette.text.primary,
-            borderRadius: theme.spacing(2.5)
-        }
+        marginInlineStart: theme.spacing(-1.125)
     });
 });
 var CollapseStyled = styled(Collapse)(function () { return ({
@@ -77,6 +69,6 @@ var TAC = function (_a) {
             return;
         tacControl.field.onChange(checked);
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, ml: 3, mr: 3 } }, { children: [_jsxs(TACContainerStyled, __assign({ readOnly: readOnly }, { children: [_jsx(CheckboxStyled, { disableRipple: true, disableFocusRipple: true, focusRipple: false, checked: tacChecked, onChange: handleTACCheckedChange }), _jsxs(TextStyled, { children: [t('read_agree_terms_and_conditions_message'), _jsx(LinkStyled, __assign({ href: isAr ? TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_AR : TAP_WEBSITE + countryCode + EXTERNAL_LINKS.TOS_EN, target: '_blank', underline: 'always' }, { children: t('terms_and_conditions_link_title') }))] })] })), _jsx(CollapseStyled, __assign({ in: !!warningMessage }, { children: _jsx(Warning, __assign({ warningType: 'alert' }, { children: warningMessage && t(warningMessage) })) }))] })) })));
 };
 export default React.memo(TAC);

package/build/features/connectExpress/screens/NIDMissed/DOB.d.ts

@@ -2,5 +2,5 @@
 interface DOBProps {
     onDateClicked?: (flag: boolean) => void;
 }
-declare const DOB: ({ onDateClicked }: DOBProps) => JSX.Element;
+declare const DOB: ({}: DOBProps) => JSX.Element;
 export default DOB;

package/build/features/connectExpress/screens/NIDMissed/DOB.js

@@ -1,30 +1,12 @@
-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 { jsx as _jsx } from "react/jsx-runtime";
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { ScreenContainer } from '../../../shared/Containers';
-import { alpha, styled } from '@mui/material/styles';
 import { clearError, connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
-import Text from '../../../../components/Text';
-import Calender from '../../../shared/Calender';
-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) }));
-});
+import { CustomCalender as Calender } from '../../../shared/Calender';
 var DOB = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
@@ -39,9 +21,6 @@ var DOB = function (_a) {
             dispatch(clearError());
     };
     var dateValue = (_b = dobControl === null || dobControl === void 0 ? void 0 : dobControl.field) === null || _b === void 0 ? void 0 : _b.value;
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, __assign({ sx: { p: function (_a) {
-                        var spacing = _a.spacing;
-                        return spacing(2.5, 2.5, 1.5, 2.5);
-                    } } }, { children: t('enter_birth_date') })), _jsx(Calender, { isDob: true, defaultValue: dateValue ? new Date(dateValue) : undefined, onDateClicked: onDateClicked, onDateChange: handleBirthDateChange })] }));
+    return (_jsx(ScreenContainer, { children: _jsx(Calender, { label: t('enter_birth_date'), defaultValue: dateValue ? new Date(dateValue) : undefined, onDateChange: handleBirthDateChange }) }));
 };
 export default DOB;

package/build/features/connectExpress/screens/NIDMissed/IDNumber.js

@@ -9,31 +9,16 @@ 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 Box from '@mui/material/Box';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import { styled, alpha } from '@mui/material/styles';
-import Text from '../../../../components/Text';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import Collapse from '../../../../components/Collapse';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { removeAllCharsFromNumber } from '../../../../utils';
 import { ID_NUMBER_LENGTH } from '../../../../constants';
 import { EndAdornment } from '../../../shared/EndAdornment';
-var LabelContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        justifyContent: 'space-between',
-        padding: theme.spacing(0, 2.5, 1.25, 2.5)
-    });
-});
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
-});
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b;
     var show = _a.show;
@@ -50,6 +35,8 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     };
     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: _jsxs(ScreenContainer, __assign({ ref: ref }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_national_id') }) }), _jsx(Input, { dir: 'ltr', type: 'tel', inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, endAdornment: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber }), placeholder: t('national_id_placeholder'), warningType: 'alert', warningMessage: error && t(error, { number: '1' }), required: true })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ ref: ref, sx: { pb: 1.5 } }, { children: _jsx(Input, { label: t('enter_national_id'), dir: 'ltr', type: 'tel', InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: nidValue, error: error, onClear: clearIdNumber })
+                }, inputProps: { maxLength: ID_NUMBER_LENGTH }, onChange: handleIdChange, value: nidValue, placeholder: t('national_id_placeholder'), helperText: error && t(error, { number: '1' }), required: true }) })) })));
 });
 export default React.memo(IDNumber);