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

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

@@ -27,24 +27,24 @@ import Name from './Name';
 import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
+import Box from '@mui/material/Box';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
 import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { IndividualValidation, IndividualMobileValidation } from './validation';
 import Form from '../../../../components/Form';
-import Button from '../../../shared/Button';
-import { ScreenContainer } from '../../../shared/Containers';
-import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
-import { useLanguage } from '../../../../hooks';
-import MobileNumber from './MobileNumber';
 import { countriesCode } from '../../../../constants';
-import { AuthForType } from '../../../../@types';
+import { AuthForType, DropDownMode } from '../../../../@types';
 import Collapse from '../../../../components/Collapse';
 import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
+import { useLanguage } from '../../../../hooks';
+import Button from '../../../shared/Button';
+import { ContainerWithHeader } from '../../../shared/Containers';
+import { clearError, connectSelector, resetIndividualScreen, updateLeadIndividual } from '../../../app/connect/connectStore';
+import MobileNumber from './MobileNumber';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column',
-    minHeight: '240px',
     justifyContent: 'space-between'
 }); });
 var Individual = function (_a) {
@@ -61,6 +61,7 @@ var Individual = function (_a) {
     var contact = (otpData.responseBody || {}).contact;
     var responseBody = individualData.responseBody, defaultValues = __rest(individualData, ["responseBody"]);
     var is_available = (responseBody || {}).is_available;
+    var isPopupMode = settingsData.dropDownOpenMode === DropDownMode.popup;
     var methods = useForm({
         resolver: yupResolver(isMobile ? IndividualValidation : IndividualMobileValidation),
         defaultValues: individualData,
@@ -93,7 +94,8 @@ var Individual = function (_a) {
             dispatch(clearError());
     }, [methods.formState.isValid]);
     var handleMenuListClick = function () {
-        setListActive(!listActive);
+        if (!isPopupMode)
+            setListActive(!listActive);
     };
     React.useEffect(function () {
         if (is_available === false)
@@ -103,6 +105,6 @@ var Individual = function (_a) {
     var isEmailValid = typeof is_available === 'undefined' ? isLeadEmailAvailable : is_available;
     var emailErrChecks = !methods.formState.isValid || !!methods.formState.errors.email || !!error;
     var disabled = emailErrChecks || emailChecking || !isEmailValid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: t(error || '') }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: "".concat(t('hi'), ", ").concat(methods.watch('name')), description: 'individual_info_description', onBack: function () { return onBack(); } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsxs(Box, { children: [_jsx(Name, { show: !listActive }), _jsx(MobileNumber, { isPopupMode: isPopupMode, show: !isMobile, onListOpen: function () { return handleMenuListClick(); }, onListClose: function () { return handleMenuListClick(); }, countries: countriesCode }), _jsx(Email, { show: !listActive, fetchingEmail: function (v) { return setEmailChecking(v); }, emailChecking: emailChecking })] }), _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(Individual);

package/build/features/connect/screens/Individual/MobileNumber.d.ts

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

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

@@ -25,27 +25,21 @@ 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';
 import CheckIcon from '../../../shared/CheckIcon';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
 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 { useAppSelector, useLanguage } from '../../../../hooks';
+import { ThemeMode } from '../../../../@types';
 import Search from '../../../shared/Search';
 import { connectSelector } from '../../../app/connect/connectStore';
-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, _e, _f;
-    var countries = _a.countries, rest = __rest(_a, ["countries"]);
+    var countries = _a.countries, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["countries", "isPopupMode"]);
     var _g = React.useState(countries || []), countriesCode = _g[0], setCountries = _g[1];
     var _h = React.useState(null), anchorEl = _h[0], setAnchorEl = _h[1];
     var t = useTranslation().t;
@@ -146,7 +147,13 @@ var MobileNumber = React.forwardRef(function (_a, ref) {
         });
         setCountries(filteredCountries);
     };
-    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, { inputProps: { maxLength: requiredLen }, type: 'tel', readOnly: !!anchorEl || readOnly, 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 })) : !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' }) }), _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: { pb: 1.5 } }, { children: [_jsx(InputStyled, { label: t('signup_enter_mobile'), inputProps: {
+                        maxLength: requiredLen,
+                        readOnly: !!anchorEl || 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 })) : !error && mobileValue ? (_jsx(CheckIcon, {})) : (mobileValue && _jsx(ClearIcon, { onClick: clearMobileNumber }))
+                    }, type: 'tel', onClick: onCloseCountryList, onChange: onPhoneNumberChange, value: !!anchorEl ? countryName : mobileValue, placeholder: "".concat(isSA ? '5' : '0', "00000000"), helperText: error && t(error, { length: requiredLen, number: '05|5' }) }), _jsxs(DropDownStyle, __assign({ anchorEl: anchorEl, isPopupMode: isPopupMode, 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/Individual/Name.js

@@ -17,7 +17,7 @@ import { styled } from '@mui/material/styles';
 import { ScreenContainer } from '../../../shared/Containers';
 import Collapse from '../../../../components/Collapse';
 import { removeAllOtherThanAlphabetAndSpace } from '../../../../utils';
-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,8 @@ 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, { 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, error: error, onClear: clearNumber }) }) })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mb: 1.5 } }, { children: _jsx(InputStyled, { label: t('signup_merchant_name_label'), value: nameValue, onChange: handleNameChange, placeholder: t('signup_merchant_name_label'), helperText: error && t(error), InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: nameValue, error: error, onClear: clearNumber })
+                } }) })) })));
 };
 export default React.memo(Name);

package/build/features/connect/screens/Merchant/BrandList.d.ts

@@ -5,6 +5,7 @@ interface BrandListProps {
     list: Array<BrandInfo>;
     onListOpen?: () => void;
     onListClose?: () => void;
+    isPopupMode: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, list, ...rest }: BrandListProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, list, isPopupMode, ...rest }: BrandListProps) => JSX.Element>;
 export default _default;

package/build/features/connect/screens/Merchant/BrandList.js

@@ -28,22 +28,24 @@ import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
 import { useLanguage } from '../../../../hooks';
 import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import InputSelect from '../../../shared/InputSelect';
+import InputSelect from '../../../shared/TextFieldSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import SimpleList from '../../../../components/SimpleList';
 import Text from '../../../../components/Text';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import Collapse from '../../../../components/Collapse';
+import DropDownStyle from '../../../shared/DropDownStyle';
+import { ThemeMode } from '../../../../@types';
 import { mapSalesChannel } from '../../../../utils';
 var BrandContainer = styled(Box)(function () { return ({
     display: 'flex'
 }); });
 var BrandNameText = 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 }));
+    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 }));
 });
 var BrandList = function (_a) {
-    var show = _a.show, list = _a.list, rest = __rest(_a, ["show", "list"]);
+    var show = _a.show, list = _a.list, isPopupMode = _a.isPopupMode, rest = __rest(_a, ["show", "list", "isPopupMode"]);
     var _b = React.useState(null), anchorEl = _b[0], setAnchorEl = _b[1];
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
@@ -81,7 +83,9 @@ var BrandList = function (_a) {
         }
         onCloseBrandList();
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputSelect, { 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', space: 140, list: list, onSelectItem: onSelectItem, renderItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputSelect, { label: t('select_brand_label'), onClick: !!anchorEl ? onCloseBrandList : onOpenBrandList, InputProps: {
+                        endAdornment: _jsx(ExpandIcon, { anchorEl: !!anchorEl })
+                    }, placeholder: t('choose_brand'), value: t(getBrandName(selectedBrand)) }), _jsx(DropDownStyle, __assign({ anchorEl: anchorEl, isPopupMode: isPopupMode, onClosePopup: onCloseBrandList }, { children: _jsx(SimpleList, { isPopupMode: isPopupMode, searchKeyPath: 'id', space: 140, list: 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/connect/screens/Merchant/BrandName.d.ts

@@ -3,6 +3,7 @@ interface BrandNameProps {
     show: boolean;
     fetchingBrandName: (flag: boolean) => void;
     brandNameChecking: boolean;
+    hasBrandList: boolean;
 }
-declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName }: BrandNameProps) => JSX.Element>;
+declare const _default: React.MemoExoticComponent<({ show, brandNameChecking, fetchingBrandName, hasBrandList }: BrandNameProps) => JSX.Element>;
 export default _default;

package/build/features/connect/screens/Merchant/BrandName.js

@@ -45,63 +45,26 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-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 axios from 'axios';
-import { styled, alpha } from '@mui/material/styles';
-import InfoIcon from '@mui/icons-material/Info';
-import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined';
 import { ScreenContainer } from '../../../shared/Containers';
-import Text from '../../../../components/Text';
-import Input from '../../../shared/Input';
-import Tooltip from '../../../../components/Tooltip';
+import Input from '../../../shared/TextField';
 import Collapse from '../../../../components/Collapse';
 import { checkBrandNameAvailability, connectSelector } from '../../../app/connect/connectStore';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { debounce } from 'lodash-es';
 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, 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 InfoOutlinedIconStyled = styled(InfoOutlinedIcon)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        width: theme.spacing(2.75),
-        height: theme.spacing(2.125),
-        cursor: 'pointer',
-        color: alpha(theme.palette.text.primary, 0.4)
-    });
-});
-var InfoIconStyled = styled(InfoIcon)(function (_a) {
-    var theme = _a.theme;
-    return ({
-        width: theme.spacing(2.75),
-        height: theme.spacing(2.125),
-        cursor: 'pointer',
-        color: alpha(theme.palette.text.primary, 0.4)
-    });
-});
 var cancelToken = null;
 var BrandName = function (_a) {
     var _b;
-    var show = _a.show, brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName;
+    var show = _a.show, brandNameChecking = _a.brandNameChecking, fetchingBrandName = _a.fetchingBrandName, hasBrandList = _a.hasBrandList;
     var dispatch = useAppDispatch();
-    var _c = React.useState(false), isHovered = _c[0], setIsHovered = _c[1];
     var t = useTranslation().t;
     var data = useAppSelector(connectSelector).data;
-    var _d = useFormContext(), control = _d.control, getValues = _d.getValues;
+    var _c = useFormContext(), control = _c.control, getValues = _c.getValues;
     var brandControl = useController({ control: control, name: 'brandName' });
     var brandNameValue = brandControl.field.value;
     var error = (_b = brandControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
@@ -135,6 +98,8 @@ var BrandName = function (_a) {
     var clearBrandName = function () {
         brandControl.field.onChange('');
     };
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, __assign({ sx: { mt: 2.5, mb: 0 } }, { children: [_jsxs(LabelContainerStyled, { children: [_jsx(InputLabelStyled, { children: t('signup_brand_name_label') }), _jsx(Tooltip, __assign({ title: t('brand_name_hint'), onMouseOver: function () { return setIsHovered(true); }, onMouseLeave: function () { return setIsHovered(false); }, onTouchStartCapture: function () { return setIsHovered(true); } }, { children: isHovered ? _jsx(InfoIconStyled, {}) : _jsx(InfoOutlinedIconStyled, {}) }))] }), _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', placeholder: t('signup_brand_name_placeholder'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName }) })] })) })));
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsx(ScreenContainer, __assign({ sx: { mt: hasBrandList ? 1.5 : 0 } }, { children: _jsx(Input, { onChange: handleBrandNameChange, value: brandNameValue || '', label: t('signup_brand_name_label'), helperText: error && t(error), InputProps: {
+                    endAdornment: _jsx(EndAdornment, { value: brandNameValue, loading: brandNameChecking, error: error, onClear: clearBrandName })
+                } }) })) })));
 };
 export default React.memo(BrandName);

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

@@ -16,13 +16,14 @@ import { useTranslation } from 'react-i18next';
 import Collapse from '@mui/material/Collapse';
 import { yupResolver } from '@hookform/resolvers/yup';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
-import { handlePrevScreenStep } from '../../../../app/settings';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
 import { deepCopy, sendCustomEventToGTM } from '../../../../utils';
 import Form from '../../../../components/Form';
-import { ScreenContainer } from '../../../shared/Containers';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import Button from '../../../shared/Button';
 import { clearError, connectSelector, updateLeadBrand } from '../../../app/connect/connectStore';
 import { useLanguage } from '../../../../hooks';
+import { DropDownMode } from '../../../../@types';
 import { MerchantValidationSchema } from './validation';
 import BrandName from './BrandName';
 import TAC from './TAC';
@@ -38,9 +39,11 @@ var Merchant = function (_a) {
     var _d = React.useState(false), brandNameChecking = _d[0], setBrandNameChecking = _d[1];
     var _e = React.useState(false), isRequiredNewBrand = _e[0], setIsRequiredNewBrand = _e[1];
     var _f = useAppSelector(connectSelector), data = _f.data, loading = _f.loading, error = _f.error;
+    var settingsData = useAppSelector(settingsSelector).data;
     var _g = data.brandData, brandName = _g.brandName, selectedBrandItem = _g.selectedBrandItem, termAndConditionChecked = _g.termAndConditionChecked, responseBody = _g.responseBody, salesChannels = _g.salesChannels;
     var brandList = (responseBody || {}).brand_list;
     var _h = React.useState(), listActive = _h[0], setListActive = _h[1];
+    var isPopupMode = settingsData.dropDownOpenMode === DropDownMode.popup;
     React.useEffect(function () {
         sendCustomEventToGTM({
             event: 'Send Event',
@@ -93,8 +96,9 @@ var Merchant = function (_a) {
         setIsRequiredNewBrand(isOtherBrand || isNewBrand);
     }, [isOtherBrand, isNewBrand]);
     var handleMenuClick = function (flag) {
-        setListActive(flag);
+        if (!isPopupMode)
+            setListActive(flag);
     };
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { show: hasBrandList, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) }));
+    return (_jsx(ContainerWithHeader, __assign({ title: 'your_brand_details', description: 'brand_details_description', onBack: function () { return onBack(); } }, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(Form, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(BrandList, { isPopupMode: isPopupMode, show: hasBrandList, list: brandList, onListOpen: function () { return handleMenuClick(ListType.BrandList); }, onListClose: function () { return handleMenuClick(); } }), _jsx(BrandName, { hasBrandList: hasBrandList, show: (isNewBrand || isOtherBrand) && !listActive, brandNameChecking: brandNameChecking, fetchingBrandName: setBrandNameChecking }), _jsx(Collapse, __assign({ in: !listActive }, { children: _jsx(SalesChannels, {}) })), _jsx(TAC, { show: (isNewBrand || isOtherBrand) && !listActive }), _jsx(Collapse, __assign({ in: !listActive, timeout: 500 }, { children: _jsx(Button, __assign({ disableBack: true, disabled: disabled, isAr: isAr, error: t(error || ''), loading: loading }, { children: t('next') })) }))] })) })) })));
 };
 export default React.memo(Merchant);

package/build/features/connect/screens/Merchant/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 CheckBox from '../../../../components/CheckBox';
 import { ScreenContainer } from '../../../shared/Containers';
@@ -25,41 +25,29 @@ import Collapse from '../../../../components/Collapse';
 import { EXTERNAL_LINKS, TAP_WEBSITE } from '../../../../constants';
 import { settingsSelector } from '../../../../app/settings';
 import { useAppSelector } from '../../../../hooks';
-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 ({
@@ -79,6 +67,6 @@ var TAC = function (_a) {
     var handleTACCheckedChange = function (event, checked) {
         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: 3, 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/connect/screens/Mobile/Mobile.js

@@ -11,26 +11,25 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import * as React from 'react';
-import Box from '@mui/material/Box';
+import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
+import Box from '@mui/material/Box';
 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 Divider from '@mui/material/Divider';
 import Collapse from '../../../../components/Collapse';
 import Form from '../../../../components/Form';
-import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
-import { useAppDispatch, useAppSelector, useSetFromDefaultValues } from '../../../../hooks';
-import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
-import ScreenContainer from '../../../shared/Containers/ScreenContainer';
-import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
-import { useLanguage } from '../../../../hooks';
-import Divider from '@mui/material/Divider';
+import { DropDownMode } from '../../../../@types';
+import { ICONS_NAMES } from '../../../../constants';
 import { deepCopy, isKW, sendCustomEventToGTM } from '../../../../utils';
 import Text from '../../../../components/Text';
-import MIDTitle from './Title';
+import { useAppDispatch, useAppSelector, useSetFromDefaultValues, useLanguage } from '../../../../hooks';
+import { handlePrevScreenStep, settingsSelector } from '../../../../app/settings';
+import { clearError, connectSelector, createMobileAuth, resetNIDScreen, resetCivilScreen, resetOTPScreen, resetStore } from '../../../app/connect/connectStore';
+import Button, { AbsherButton, MobileButton } from '../../../shared/Button';
+import { ContainerWithHeader } from '../../../shared/Containers';
 import MobileNumber from './MobileNumber';
 import { PhoneValidationSchema } from './validation';
-import { ICONS_NAMES } from '../../../../constants';
 var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
@@ -47,14 +46,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 +62,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 ListType;
@@ -80,6 +78,7 @@ var Mobile = function (_a) {
     var _d = React.useState(), listType = _d[0], setListType = _d[1];
     var dispatch = useAppDispatch();
     var _e = data.mobileData, mobile = _e.mobile, countryCode = _e.countryCode, termAndConditionChecked = _e.termAndConditionChecked;
+    var isPopupMode = settingsStore.data.dropDownOpenMode === DropDownMode.popup;
     var methods = useForm({
         resolver: yupResolver(PhoneValidationSchema),
         defaultValues: {
@@ -93,7 +92,8 @@ var Mobile = function (_a) {
     var t = useTranslation().t;
     var isAr = useLanguage().isAr;
     var handleMenuListClick = function (flag) {
-        setListType(flag);
+        if (!isPopupMode)
+            setListType(flag);
     };
     React.useEffect(function () {
         dispatch(resetOTPScreen());
@@ -123,8 +123,6 @@ var Mobile = function (_a) {
     var isCountryListActive = listType === ListType.CountryCodeList;
     var listActive = isBusinessListActive || isCountryListActive;
     var disabled = !methods.formState.isValid || !!error;
-    var title = t('join_our_community');
-    var subTitle = t('ide_terms_and_conditions_description');
-    return (_jsxs(ScreenContainer, { children: [(title || subTitle) && _jsx(MIDTitle, { show: !listActive, title: title, description: subTitle }), _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(InputsContainerStyled, { children: _jsx(MobileNumber, { show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: 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, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || 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, show: !isBusinessListActive, countries: settingsStore.data.countries, onListOpen: function () { return handleMenuListClick(ListType.CountryCodeList); }, onListClose: function () { return handleMenuListClick(); } }) }), _jsxs(Collapse, __assign({ in: !listActive }, { children: [_jsx(Button, __assign({ sx: { mb: 2.625, mt: 5 }, onBackClicked: function () { return onBack(); }, isAr: isAr, disableBack: true, disabled: disabled || settingsStore.loading, loading: 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, {})] }), isKWCountry ? (_jsx(MobileButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); }, icon: ICONS_NAMES.PACI_ICON }, { children: t('paci_button_label') }))) : (_jsx(AbsherButton, __assign({ disabled: settingsStore.loading || loading, onClick: function () { return onBack(); } }, { children: t('absher_button_label') })))] }))] }))] })) })) })));
 };
 export default React.memo(Mobile);

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

@@ -3,6 +3,7 @@ import { CountryCode } from '../../../../@types';
 interface MobileNumberProps {
     countries: Array<CountryCode>;
     show: boolean;
+    isPopupMode: boolean;
     setMobileLength?: (length: number) => void;
     onSwitchToIdNumber?: () => void;
     onListOpen?: () => void;