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

package/build/features/connect/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, sendCustomEventToGTM } 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,19 +47,15 @@ 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 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) }));
+    return (__assign(__assign({ cursor: 'pointer' }, theme.typography.body2), { color: theme.palette.mode === ThemeMode.DARK ? theme.palette.common.white : theme.palette.text.primary, fontWeight: theme.typography.fontWeightRegular, display: 'flex', alignItems: 'center', minWidth: theme.spacing(8.75), position: 'relative', bottom: theme.spacing(-1.125) }));
 });
 var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
     var theme = _a.theme;
@@ -73,15 +63,25 @@ var ExpandIconStyled = styled(ExpandIcon)(function (_a) {
         marginInlineStart: theme.spacing(1)
     });
 });
+var CodeExpandIconStyled = styled(ExpandIconStyled)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        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, rest = __rest(_a, ["countries"]);
+    var countries = _a.countries, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["countries", "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;
@@ -151,7 +151,10 @@ 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, required: true, onClick: onCloseCountryList, onChange: onPhoneNumberChange, onEnterPressed: function (e) { return loading && e.preventDefault(); }, value: !!anchorEl ? countryName : mobileValue, startAdornment: _jsxs(CountryCodeStyled, __assign({ onClick: 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 })) : !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: { maxLength: requiredLen, readOnly: !!anchorEl }, InputProps: {
+                        startAdornment: (_jsxs(CountryCodeStyled, __assign({ onClick: function () { return toggleCountryList(); } }, { children: ["+".concat(countryCodeValue === null || countryCodeValue === void 0 ? void 0 : countryCodeValue.idd_prefix), !anchorEl && _jsx(CodeExpandIconStyled, { anchorEl: !!anchorEl })] }))),
+                        endAdornment: !!anchorEl ? (_jsx(ExpandIconStyled, { onClick: function () { return toggleCountryList(); }, anchorEl: !!anchorEl })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber }))
+                    }, 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/connect/screens/NID/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/connect/screens/NID/DOB.js

@@ -1,37 +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, 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 Text from '../../../../components/Text';
-import Calender from '../../../shared/Calender';
+import { CustomCalender as Calender } from '../../../shared/Calender';
 import { clearError, connectSelector } from '../../../app/connect/connectStore';
-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 DOB = function (_a) {
     var _b;
-    var onDateClicked = _a.onDateClicked;
     var t = useTranslation().t;
     var control = useFormContext().control;
     var dispatch = useAppDispatch();
     var dobControl = useController({ control: control, name: 'dob' });
     var error = useAppSelector(connectSelector).error;
-    var handleBirthDateChange = function (data) {
-        dobControl.field.onChange(data);
+    var handleBirthDateChange = function (date) {
+        dobControl.field.onChange(date);
         handleClearError();
     };
     var handleClearError = function () {
@@ -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, { required: true, label: t('enter_birth_date'), defaultValue: dateValue ? new Date(dateValue) : undefined, onDateChange: handleBirthDateChange }) }));
 };
 export default DOB;

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

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

@@ -12,21 +12,21 @@ var __assign = (this && this.__assign) || function () {
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
-import { alpha, styled } from '@mui/material/styles';
 import { useForm, FormProvider } from 'react-hook-form';
+import { styled } from '@mui/material/styles';
+import Box from '@mui/material/Box';
+import Divider from '@mui/material/Divider';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { NIDValidationSchema } from './validation';
 import { useAppDispatch, useLanguage, useAppSelector } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import { clearError, connectSelector, createNIDAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
-import Form from '../../../../components/Form';
-import Button, { MobileButton } from '../../../shared/Button';
-import { ScreenContainer } from '../../../shared/Containers';
 import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import Collapse from '../../../../components/Collapse';
-import Box from '@mui/material/Box';
-import Divider from '@mui/material/Divider';
+import Form from '../../../../components/Form';
 import Text from '../../../../components/Text';
+import Button, { MobileButton } from '../../../shared/Button';
+import { ContainerWithHeader } from '../../../shared/Containers';
+import { clearError, connectSelector, createNIDAuth, resetMobileScreen, resetStore } from '../../../app/connect/connectStore';
+import { NIDValidationSchema } from './validation';
 import IDNumber from './IDNumber';
 import DOB from './DOB';
 var FormStyled = styled(Form)(function () { return ({
@@ -36,14 +36,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)
     });
 });
@@ -52,9 +52,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) {
@@ -99,6 +98,6 @@ var NID = function (_a) {
         dispatch(resetStore());
     }, []);
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Collapse, __assign({ in: !collapse }, { children: _jsx(IDNumber, { show: !collapse }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'get_started', description: '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 }) })), _jsx(DOB, { onDateClicked: handleCollapseOpenClose }), _jsxs(Collapse, __assign({ in: !collapse }, { children: [_jsx(Button, __assign({ sx: { mb: 2.625, mt: 5 }, loading: loading, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading || settingsStore.loading }, { children: t('mobile_button_label') }))] }))] }))] })) })) })));
 };
 export default React.memo(NID);

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

@@ -17,7 +17,7 @@ import { useTranslation } from 'react-i18next';
 import Text from '../../../../components/Text';
 import { clearError, connectSelector, resetOTPScreen, verifyAuth } from '../../../app/connect/connectStore';
 import Button from '../../../shared/Button';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useLanguage } from '../../../../hooks';
@@ -31,17 +31,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), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
+    return (__assign(__assign({}, theme.typography.body2), { color: theme.palette.secondary.main, fontWeight: theme.typography.fontWeightRegular, lineHeight: '19px', whiteSpace: 'pre-line' }));
 });
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
@@ -87,6 +84,6 @@ var OTP = function () {
     var phone = ((_a = data.mobileData.countryCode) === null || _a === void 0 ? void 0 : _a.idd_prefix) + (data.mobileData.mobile || '');
     var idNumber = data.nidData.nid;
     var title = startWithNID ? t('opt_nid_sent_title', { provider: 'ABSHER' }) : t('ide_opt_sent_title');
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'otp_authentication', description: 'otp_authentication_description', onBack: function () { return onBack(); } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? t('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: startWithNID ? maskID(idNumber) : maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') }))] })) })) })));
 };
 export default React.memo(OTP);

package/build/features/connect/screens/ThankYou/ThankYou.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, Trans } from 'react-i18next';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { connectSelector } from '../../../app/connect/connectStore';
 import { useAppSelector } from '../../../../hooks';
 import { maskEmail, sendCustomDimension, sendCustomEventToGTM } from '../../../../utils';
@@ -26,6 +38,6 @@ var ThankYou = function (_a) {
             lead_ID: id
         });
     }, []);
-    return (_jsx(SuccessScreen, { title: t("connect_completed_title"), description: _jsx(Trans, { i18nKey: 'connect_completed_description_dev', values: { email: email } }), showEmailProviders: true }));
+    return (_jsx(ContainerWithHeader, __assign({ title: t('connect_success'), description: t('connect_success_description') }, { children: _jsx(SuccessScreen, { title: t("connect_completed_title"), description: _jsx(Trans, { i18nKey: 'connect_completed_description_dev', values: { email: email } }), showEmailProviders: true }) })));
 };
 export default React.memo(ThankYou);

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

@@ -1,70 +1,9 @@
-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 Box from '@mui/material/Box/Box';
-import { styled } from '@mui/material/styles';
-import Text from '../../../../components/Text';
 import { connectSelector, verifyPACI as verifyPACIFun } from '../../../app/connect/connectStore';
 import PaciVerification from '../../../shared/PaciVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-var VerifyPACITitleContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        direction: theme.direction,
-        borderRadius: theme.spacing(0, 0, 1.25, 1.25),
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        marginBottom: theme.spacing(2.5)
-    });
-});
-var VerifyPACITitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightBold, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line' }));
-});
-var VerifyPACISubTitleStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({}, theme.typography.body1), { color: theme.palette.text.primary, fontWeight: theme.typography.fontWeightMedium, marginBlock: theme.spacing(1.75), marginInline: theme.spacing(2.5), lineHeight: 1.75, whiteSpace: 'pre-line', textAlign: 'center' }));
-});
-var Container = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        position: 'relative',
-        display: 'flex',
-        justifyContent: 'center',
-        alignItems: 'center',
-        maxHeight: '300px'
-    });
-});
-var BackButton = styled('button')(function (_a) {
-    var theme = _a.theme;
-    return ({
-        cursor: 'pointer',
-        pointerEvents: 'auto',
-        height: 44,
-        appearance: 'none',
-        background: 'none',
-        border: 'none',
-        color: theme.palette.primary.main,
-        fontSize: theme.typography.body1.fontSize,
-        fontWeight: theme.typography.fontWeightMedium,
-        textTransform: 'capitalize',
-        '&:hover': {
-            backgroundColor: 'transparent'
-        }
-    });
-});
 var VerifyPACI = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), isReady = _b[0], setIsReady = _b[1];

package/build/features/connectExpress/ConnectExpress.js

@@ -95,7 +95,7 @@ var ConnectExpress = memo(function (_a) {
     useAppConfig(__assign(__assign(__assign({ navigation: CONNECT_EXPRESS_SCREENS_NAVIGATION, maturity: 'express' }, props), { configToken: configToken }), (configToken && { onVerifyConfigTokenSuccess: onVerifyConfigTokenSuccess })));
     useErrorListener(connectExpressError || error);
     useStepStartedListener();
-    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open, merchant = data.merchant;
+    var activeScreen = data.activeScreen, isTapOrigin = data.isTapOrigin, open = data.open;
     React.useEffect(function () {
         if (!postURL)
             throw new Error('postURL is required and you ave to pass it in the lib configuration!');
@@ -126,11 +126,11 @@ var ConnectExpress = memo(function (_a) {
             dispatch(handleCurrentActiveScreen('CONNECT_EXPRESS_MOBILE_STEP'));
         }
     }, [settingLoading]);
-    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, merchantInfo: merchant, isMaturityExpress: true }, { children: _jsx(FeatureContainer, __assign({ isMaturityExpress: true }, { children: connectExpressFeatureScreens.map(function (_a, index) {
+    return (_jsx(ThemeProvider, __assign({ theme: theme }, { children: _jsx(Background, __assign({ open: open, isTapOrigin: isTapOrigin, loading: settingLoading || customLoading }, { children: _jsx(AnimationFlow, __assign({ countries: data.tapCountries, pointerEvents: loading ? 'none' : 'auto', isTapOrigin: isTapOrigin, loading: settingLoading || customLoading, error: error, open: open, screenId: activeScreen.name, isMaturityExpress: true }, { children: _jsx(FeatureContainer, { children: connectExpressFeatureScreens.map(function (_a, index) {
                         var Element = _a.element, name = _a.name;
                         var isActive = activeScreen.name === name;
                         return (_jsx(Collapse, __assign({ in: isActive, timeout: { enter: 1000, exit: 800 } }, { children: _jsx(Element, {}) }), index));
-                    }) })) })) })) })));
+                    }) }) })) })) })));
 });
 export function ConnectExpressElement(props) {
     return (_jsx(ReduxProvider, __assign({ store: store }, { children: _jsx(ConnectExpress, __assign({}, props)) })));

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

@@ -1,8 +1,20 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAppDispatch } from '../../../../hooks';
 import SuccessScreen from '../../../shared/SuccessScreen';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { handleOpen } from '../../../../app/settings';
 var AccountAlreadyCreated = function (_a) {
     var t = useTranslation().t;
@@ -10,6 +22,6 @@ var AccountAlreadyCreated = function (_a) {
     var onSuccess = function () {
         dispatch(handleOpen(false));
     };
-    return (_jsx(SuccessScreen, { title: t('express_account_already_created_title'), description: t('express_account_already_created_description'), onSuccess: onSuccess, successTitle: t('express_account_already_created_close_button') }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'express_account_already_created_details', description: 'express_account_already_created_summary' }, { children: _jsx(SuccessScreen, { title: t('express_account_already_created_title'), description: t('express_account_already_created_description'), onSuccess: onSuccess, successTitle: t('express_account_already_created_close_button') }) })));
 };
 export default React.memo(AccountAlreadyCreated);

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

@@ -18,7 +18,7 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useAppSelector, useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import CheckIcon from '../../../shared/CheckIcon';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
@@ -64,7 +64,9 @@ var Brand = function (_a) {
     var onSelectItem = function (brand) {
         selectedBrandControl.field.onChange(brand);
     };
-    return (_jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl }), placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: [], onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsxs(ScreenContainer, { children: [_jsx(InputStyled, { label: t('select_brand_label'), onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, InputProps: {
+                    endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl })
+                }, placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(Collapse, __assign({ in: !!anchorEl }, { children: _jsx(SimpleList, { searchKeyPath: 'id', list: [], onSelectItem: onSelectItem, renderItem: function (item) {
                         return (_jsxs(_Fragment, { children: [_jsx(BrandContainer, { children: _jsx(BrandNameText, __assign({ isSelected: getBrandId(item) === getBrandId(selectedBrand) }, { children: isOtherBrand(item) ? t(getBrandName(item)) : getBrandName(item) })) }), getBrandId(item) === getBrandId(selectedBrand) && _jsx(CheckIcon, {})] }));
                     } }) }))] }));
 };

package/build/features/connectExpress/screens/CivilID/CivilID.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 { civilIDValidationSchema } from './validation';
@@ -21,7 +21,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import { clearError, connectExpressSelector, createCivilIdAuthAsync, resetStore } 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';
@@ -35,14 +35,14 @@ var FormStyled = styled(Form)(function () { return ({
 var TextStyled = styled(Text)(function (_a) {
     var theme = _a.theme;
     return ({
-        color: alpha(theme.palette.primary.dark, 0.4)
+        color: theme.palette.info.contrastText
     });
 });
 var DividerStyled = styled(Divider)(function (_a) {
     var theme = _a.theme;
     return ({
         width: '45%',
-        borderColor: alpha(theme.palette.primary.dark, 0.4),
+        borderColor: theme.palette.divider,
         marginBlockEnd: theme.spacing(0.62)
     });
 });
@@ -51,9 +51,8 @@ var OrBoxStyled = styled(Box)(function (_a) {
     return ({
         display: 'flex',
         justifyContent: 'space-between',
-        marginBlockEnd: theme.spacing(1.62),
-        marginBlockStart: theme.spacing(-1.25),
-        marginInline: theme.spacing(2.5)
+        margin: theme.spacing(3),
+        marginTop: theme.spacing(0)
     });
 });
 var CivilID = function (_a) {
@@ -80,6 +79,6 @@ var CivilID = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, disableBack: true, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'get_started', description: 'civil_id_description' }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 5.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ sx: { mt: 5 }, loading: loading, isAr: isAr, disableBack: true, disabled: disabled, error: t(error || '') }, { children: t('next') })), _jsxs(Collapse, __assign({ in: !methods.formState.isValid }, { children: [_jsxs(OrBoxStyled, { children: [_jsx(DividerStyled, {}), _jsx(TextStyled, { children: t('or') }), _jsx(DividerStyled, {})] }), _jsx(MobileButton, __assign({ onClick: function () { return onBack(); }, disabled: loading }, { children: t('mobile_button_label') }))] }))] })) })) })));
 };
 export default React.memo(CivilID);

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

@@ -9,30 +9,15 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
-import Box from '@mui/material/Box';
-import { styled, alpha } from '@mui/material/styles';
-import Text from '../../../../components/Text';
 import { removeAllOtherThanCharsAndNumber } from '../../../../utils';
 import { CIVIL_ID_NUMBER_LENGTH } from '../../../../constants';
-import Input from '../../../shared/Input';
+import Input from '../../../shared/TextField';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 import { EndAdornment } from '../../../shared/EndAdornment';
-var LabelContainerStyled = styled(Box)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        display: 'flex',
-        justifyContent: 'space-between',
-        padding: theme.spacing(0, 2.5, 1.25, 2.5)
-    });
-});
-var InputLabelStyled = styled(Text)(function (_a) {
-    var theme = _a.theme;
-    return (__assign(__assign({ color: alpha(theme.palette.text.primary, 0.6), fontWeight: theme.typography.fontWeightMedium }, theme.typography.caption), { lineHeight: theme.spacing(2.5) }));
-});
 var IDNumber = React.forwardRef(function (_a, ref) {
     var _b;
     var sx = _a.sx;
@@ -49,6 +34,6 @@ var IDNumber = React.forwardRef(function (_a, ref) {
     };
     var idValue = civilIdControl.field.value;
     var error = (_b = civilIdControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsxs(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: [_jsx(LabelContainerStyled, { children: _jsx(InputLabelStyled, { children: t('enter_civil_id') }) }), _jsx(Input, { dir: 'ltr', type: 'text', inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, value: idValue, endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }), placeholder: t('civil_id_placeholder'), warningType: 'alert', warningMessage: error && t(error), required: true })] })));
+    return (_jsx(ScreenContainer, __assign({ ref: ref, sx: sx }, { children: _jsx(Input, { label: t('enter_civil_id'), dir: 'ltr', type: 'text', InputProps: { endAdornment: _jsx(EndAdornment, { value: idValue, error: error, onClear: clearIdNumber }) }, inputProps: { maxLength: CIVIL_ID_NUMBER_LENGTH }, onChange: handleIdChange, value: idValue, placeholder: t('civil_id_placeholder'), helperText: error && t(error), required: true }) })));
 });
 export default React.memo(IDNumber);

package/build/features/connectExpress/screens/CivilIDMissed/CivilID.js

@@ -21,7 +21,7 @@ import { handlePrevScreenStep } from '../../../../app/settings';
 import { clearError, connectExpressSelector, createCivilIDAuthIdentityAsync } from '../../../app/connectExpress/connectExpressStore';
 import Form from '../../../../components/Form';
 import Button from '../../../shared/Button';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import { deepCopy } from '../../../../utils';
 import IDNumber from './IDNumber';
 var FormStyled = styled(Form)(function () { return ({
@@ -49,6 +49,6 @@ var CivilID = function (_a) {
         dispatch(handlePrevScreenStep());
     };
     var disabled = !methods.formState.isValid || !!error;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 7.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'get_started', description: 'civil_id_description', onBack: onBack }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(IDNumber, { sx: { mb: methods.formState.isValid ? 5.5 : 0, transition: 'mb 0.3s' } }), _jsx(Button, __assign({ sx: { mt: 5 }, loading: loading, isAr: isAr, onBackClicked: onBack, disabled: disabled, error: t(error || '') }, { children: t('next') }))] })) })) })));
 };
 export default React.memo(CivilID);