@tap-payments/auth-jsconnect 2.10.8-beta → 2.10.8-development

package/build/features/auth/screens/OTP/OTP.d.ts

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

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

@@ -14,9 +14,9 @@ import * as React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm, FormProvider } from 'react-hook-form';
 import Box from '@mui/material/Box/Box';
-import { styled } from '@mui/material/styles';
+import { styled, useTheme } from '@mui/material/styles';
 import Text from '../../../../components/Text';
-import { clearError, authSelector, verifyMobileOtp, resetOTPValue, verifyEmailOtp } from '../../../app/auth/authStore';
+import { clearError, authSelector, verifyMobileOtp, resetOTPValue, verifyEmailOtp, createEmailAuth, createMobileAuth } from '../../../app/auth/authStore';
 import Button from '../../../shared/Button';
 import { ScreenContainer } from '../../../shared/Containers';
 import { useAppDispatch, useAppSelector, useLanguage, useSanitizedTranslation } from '../../../../hooks';
@@ -46,8 +46,13 @@ var FormStyled = styled(Form)(function () { return ({
     display: 'flex',
     flexDirection: 'column'
 }); });
+export var PasscodeLoginStyled = styled(Text)(function (_a) {
+    var _b = _a.theme, spacing = _b.spacing, palette = _b.palette, typography = _b.typography;
+    return (__assign(__assign({}, typography.caption), { color: palette.primary.main, lineHeight: 1.75, textAlign: 'center', marginTop: spacing(5), cursor: 'pointer' }));
+});
 var OTP = function () {
     var _a;
+    var spacing = useTheme().spacing;
     var dispatch = useAppDispatch();
     var _b = useAppSelector(authSelector), data = _b.data, loading = _b.loading, error = _b.error;
     var t = useTranslation().t;
@@ -112,7 +117,14 @@ var OTP = function () {
             screen = 'AUTH_EMAIL_STEP';
         dispatch(handlePrevScreenStep(screen));
     };
+    var onOTPLoginClick = function () {
+        if (isEmailAuth)
+            dispatch(createEmailAuth({ email: data.emailData.email }));
+        else
+            dispatch(createMobileAuth({ mobile: data.mobileData.mobile, countryCode: data.mobileData.countryCode }));
+    };
     var disabled = !methods.formState.isValid;
-    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('ide_otp_waiting_title') : getTitle(), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: getNumber() }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, { children: t('next') }))] })) })) }));
+    var showLoginWithPasscode = data.passcodeData.allowOTPToPasscodeRedirection;
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(OTPTitleContainerStyled, { children: _jsxs(OTPTitleStyled, { children: [loading ? st('ide_otp_waiting_title') : getTitle(), !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: getNumber() }))] }) }), _jsx(OTPInput, {}), showLoginWithPasscode && _jsx(PasscodeLoginStyled, __assign({ onClick: onOTPLoginClick }, { children: st('login_with_passcode') })), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, (showLoginWithPasscode && { sx: { marginTop: spacing(2.25) } }), { children: t('next') }))] })) })) }));
 };
 export default React.memo(OTP);

package/build/features/auth/screens/OTP/index.d.ts

@@ -1,3 +1,2 @@
-import OTP, { OTPProps } from './OTP';
-export type { OTPProps };
+import OTP from './OTP';
 export default OTP;

package/build/features/auth/screens/Passcode/Passcode.d.ts

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

package/build/features/auth/screens/Passcode/Passcode.js

@@ -0,0 +1,82 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import * as React from 'react';
+import Box from '@mui/material/Box/Box';
+import { yupResolver } from '@hookform/resolvers/yup';
+import { useForm, FormProvider } from 'react-hook-form';
+import { styled, useTheme } from '@mui/material/styles';
+import Form from '../../../../components/Form';
+import Text from '../../../../components/Text';
+import { deepCopy } from '../../../../utils';
+import Button from '../../../shared/Button';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { ScreenContainer } from '../../../shared/Containers';
+import { AuthForType } from '../../../../@types';
+import { useAppDispatch, useAppSelector, useLanguage, useSanitizedTranslation } from '../../../../hooks';
+import { clearError, authSelector, verifyPasscode, createEmailAuth, createMobileAuth } from '../../../app/auth/authStore';
+import { validation } from './validation';
+import PasscodeInput from './PasscodeInput';
+var TitleContainerStyled = 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)
+    });
+});
+var TitleStyled = 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' }));
+});
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+export var OTPSignInStyled = styled(Text)(function (_a) {
+    var _b = _a.theme, spacing = _b.spacing, palette = _b.palette, typography = _b.typography;
+    return (__assign(__assign({}, typography.caption), { color: palette.primary.main, lineHeight: 1.75, textAlign: 'center', marginTop: spacing(11.625), cursor: 'pointer' }));
+});
+var Passcode = function () {
+    var spacing = useTheme().spacing;
+    var isAr = useLanguage().isAr;
+    var dispatch = useAppDispatch();
+    var st = useSanitizedTranslation();
+    var _a = useAppSelector(authSelector), _b = _a.data, passcodeData = _b.passcodeData, otpData = _b.otpData, emailData = _b.emailData, mobileData = _b.mobileData, loading = _a.loading, error = _a.error;
+    var methods = useForm({
+        resolver: yupResolver(validation),
+        defaultValues: passcodeData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    var startWithEmail = otpData.authFor === AuthForType.EMAIL;
+    var onSubmit = function (formData) {
+        dispatch(verifyPasscode(deepCopy(formData)));
+    };
+    var onBack = function () {
+        dispatch(handlePrevScreenStep(startWithEmail ? 'AUTH_EMAIL_STEP' : 'AUTH_MOBILE_STEP'));
+    };
+    var onOTPLoginClick = function () {
+        if (startWithEmail)
+            dispatch(createEmailAuth({ email: emailData.email, skipPasscode: true }));
+        else
+            dispatch(createMobileAuth({ mobile: mobileData.mobile, countryCode: mobileData.countryCode, skipPasscode: true }));
+    };
+    return (_jsx(ScreenContainer, { children: _jsx(FormProvider, __assign({}, methods, { children: _jsxs(FormStyled, __assign({ onSubmit: methods.handleSubmit(onSubmit) }, { children: [_jsx(TitleContainerStyled, { children: _jsx(TitleStyled, { children: loading ? st('ide_otp_waiting_title') : st('passcode_title') }) }), _jsx(PasscodeInput, { disableResend: true }), _jsx(OTPSignInStyled, __assign({ onClick: onOTPLoginClick }, { children: st('sign_in_with_otp') })), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: !methods.formState.isValid, isAr: isAr, loading: loading, error: st(error || ''), sx: { marginTop: spacing(2.5) } }, { children: st('next') }))] })) })) }));
+};
+export default React.memo(Passcode);

package/build/features/auth/screens/Passcode/PasscodeInput.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+export interface PasscodeInputProps {
+    disableResend?: boolean;
+}
+declare const _default: React.MemoExoticComponent<({ disableResend }: PasscodeInputProps) => JSX.Element>;
+export default _default;

package/build/features/auth/screens/Passcode/PasscodeInput.js

@@ -0,0 +1,42 @@
+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 { useController, useFormContext } from 'react-hook-form';
+import OTPField from '../../../shared/OTP';
+import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import { authSelector, clearError } from '../../../app/auth/authStore';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        fontFamily: theme.typography.fontFamily
+    });
+});
+var PasscodeInput = function (_a) {
+    var disableResend = _a.disableResend;
+    var dispatch = useAppDispatch();
+    var control = useFormContext().control;
+    var error = useAppSelector(authSelector).error;
+    var _b = useController({ name: 'passcode', control: control }).field, value = _b.value, onChange = _b.onChange;
+    var handleOnPasscodeChange = function (passcode) {
+        if (error)
+            dispatch(clearError());
+        onChange(passcode);
+    };
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, __assign({}, (!disableResend && { timerInSeconds: DEFAULT_TIMER_VALUE }), { value: value, onChange: function (number) { return handleOnPasscodeChange(number.toString()); } })) })));
+};
+export default React.memo(PasscodeInput);

package/build/features/auth/screens/Passcode/index.d.ts

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

package/build/features/auth/screens/Passcode/index.js

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

package/build/features/auth/screens/Passcode/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const validation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    passcode: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    passcode: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    passcode: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/auth/screens/Passcode/validation.js

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var validation = yup.object().shape({
+    passcode: yup.string().min(6).required('passcode_required')
+});

package/build/features/brand/screens/BrandActivities/ExpectedSalesRange.js

@@ -15,7 +15,7 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import Box from '@mui/material/Box';
 import { styled } from '@mui/material/styles';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { useLanguage, useAppSelector, useAppDispatch } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
 import SimpleList from '../../../../components/SimpleList';
@@ -29,6 +29,7 @@ import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import CheckIcon from '../../../shared/CheckIcon';
 import { InputLabelStyled, NameContainer } from './CustomerBase';
 import { MandatoryStyled } from './ActivitiesList';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -71,7 +72,6 @@ var ExpectedSalesRange = function (_a) {
     var brandActivities = data.brandActivities;
     var expectedSales = (brandActivities.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
-    var countryCode = settingsData.businessCountry;
     var handleOpenMainMenu = function (event) {
         if (readOnly)
             return;
@@ -95,9 +95,6 @@ var ExpectedSalesRange = function (_a) {
     var handleCloseSubMenu = function () {
         setSubIndex('');
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
     React.useEffect(function () {
         if ((expectedSales === null || expectedSales === void 0 ? void 0 : expectedSales.length) > 0) {
             setExpectedSalesRangeList(expectedSales);
@@ -126,9 +123,7 @@ var ExpectedSalesRange = function (_a) {
         if (item)
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [t('expected_sales_monthly', {
-                            currency: getCurrency
-                        }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsxs(InputLabelStyled, { children: [_jsx(TextWithCurrency, { text: t('expected_sale_per_month'), countryCode: settingsData.businessCountry.iso2 }), _jsx(MandatoryStyled, { children: "*" })] }), _jsx(InputStyled, { readOnly: readOnly, value: isAr ? (_b = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar) !== null && _b !== void 0 ? _b : '' : (_c = expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) !== null && _c !== void 0 ? _c : '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)
                                     onSelectItem(item);

package/build/features/business/screens/Customers/ExpectedSalesRange.js

@@ -22,12 +22,13 @@ import Collapse from '../../../../components/Collapse';
 import ExpandIcon from '../../../../components/ExpandIcon';
 import { EndAdornmentExpanded } from '../../../shared/EndAdornment';
 import { businessSelector, clearError } from '../../../app/business/businessStore';
-import { getCurrencyByCountryIso2, isExist } from '../../../../utils';
+import { isExist } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Search from '../../../shared/Search';
 import InputSelect from '../../../shared/InputSelect';
 import CheckIcon from '../../../shared/CheckIcon';
 import { InputLabelStyled, NameContainer } from './CustomerLocations';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var InputStyled = styled(InputSelect)(function (_a) {
     var theme = _a.theme;
     return ({
@@ -69,7 +70,6 @@ var ExpectedSalesRange = function (_a) {
     var activitiesData = data.activitiesData;
     var expectedSales = (activitiesData.responseBody || {}).expectedSales;
     var expectedSalesRangeValue = expectedSaleControl.field.value;
-    var countryCode = settingsData.businessCountry;
     var handleOpenMainMenu = function (event) {
         if (readOnly)
             return;
@@ -121,12 +121,7 @@ var ExpectedSalesRange = function (_a) {
         if (item)
             setSubIndex(item.id);
     }, [anchorEl, expectedSalesRangeValue]);
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(countryCode.iso2));
-    }, [countryCode.iso2]);
-    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: t('expected_sales_monthly', {
-                        currency: getCurrency
-                    }) }), _jsx(InputStyled, { readOnly: readOnly, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
+    return (_jsx(Collapse, __assign({ in: show }, { children: _jsxs(ScreenContainer, { children: [_jsx(InputLabelStyled, { children: _jsx(TextWithCurrency, { text: t('expected_sale_per_month'), countryCode: settingsData.businessCountry.iso2 }) }), _jsx(InputStyled, { readOnly: readOnly, value: (isAr ? expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.ar : expectedSalesRangeValue === null || expectedSalesRangeValue === void 0 ? void 0 : expectedSalesRangeValue.name.en) || '', onClick: !!anchorEl ? handleCloseMainMenu : handleOpenMainMenu, placeholder: t('choose_expected_sales'), endAdornment: _jsx(EndAdornmentExpanded, { anchorEl: anchorEl, isVerified: isVerified }) }), _jsxs(Collapse, __assign({ in: !!anchorEl }, { children: [_jsx(Search, { onSearchValue: handleSearch }), _jsx(SimpleListStyled, { sx: { maxHeight: '350px', paddingTop: 0 }, list: expectedSalesRangeList, listItemProps: { sx: { padding: 0 } }, onSelectItem: function (item) {
                                 var isOnlyOneItem = !item.sub || item.sub.length === 1;
                                 if (isOnlyOneItem)
                                     onSelectItem(item);

package/build/features/connectExpress/screens/GenericPrepareDataLoading/GenericPrepareDataLoading.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const GenericPrepareDataLoading: () => JSX.Element;
+export default GenericPrepareDataLoading;

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

@@ -0,0 +1,9 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useAppSelector } from '../../../../hooks';
+import DataLoading from '../../../shared/DataLoading';
+import { connectExpressSelector } from '../../../app/connectExpress/connectExpressStore';
+var GenericPrepareDataLoading = function () {
+    var error = useAppSelector(connectExpressSelector).error;
+    return _jsx(DataLoading, { error: error });
+};
+export default GenericPrepareDataLoading;

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.d.ts

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

package/build/features/connectExpress/screens/GenericPrepareDataLoading/index.js

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

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/OTPInput.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface OTPProps {
+}
+declare const _default: React.MemoExoticComponent<({}: OTPProps) => JSX.Element>;
+export default _default;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/OTPInput.js

@@ -0,0 +1,49 @@
+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 { useController, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import OTPField from '../../../shared/OTP';
+import { DEFAULT_TIMER_VALUE } from '../../../../constants';
+import { connectExpressSelector, clearError, resendLeadMobileAuthOTP } from '../../../app/connectExpress/connectExpressStore';
+import { useAppDispatch, useAppSelector } from '../../../../hooks';
+var BoxStyled = styled(Box)(function (_a) {
+    var theme = _a.theme;
+    return ({
+        display: 'flex',
+        flexDirection: 'column',
+        fontFamily: theme.typography.fontFamily
+    });
+});
+var OTPInput = function (_a) {
+    var _b = useFormContext(), control = _b.control, setValue = _b.setValue;
+    var t = useTranslation().t;
+    var dispatch = useAppDispatch();
+    var otpControl = useController({ name: 'otp', control: control });
+    var error = useAppSelector(connectExpressSelector).error;
+    var handleOnOTPChange = function (otp) {
+        if (error)
+            dispatch(clearError());
+        otpControl.field.onChange(otp);
+    };
+    var handleOnResendOTP = function () {
+        if (otpControl.field.value)
+            setValue('otp', '', { shouldValidate: true });
+        dispatch(resendLeadMobileAuthOTP());
+    };
+    var otpValue = otpControl.field.value;
+    return (_jsx(BoxStyled, __assign({ dir: 'ltr' }, { children: _jsx(OTPField, { timeEndLabel: t('ide_otp_resend_label'), timerInSeconds: DEFAULT_TIMER_VALUE, onResetClick: handleOnResendOTP, value: otpValue, onChange: function (number) { return handleOnOTPChange(number.toString()); } }) })));
+};
+export default React.memo(OTPInput);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/VerifyMobileAuthOTP.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface VerifyMobileAuthOTPProps {
+}
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+export default _default;

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

@@ -0,0 +1,88 @@
+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 Box from '@mui/material/Box/Box';
+import { styled } from '@mui/material/styles';
+import * as React from 'react';
+import { useTranslation } from 'react-i18next';
+import Text from '../../../../components/Text';
+import { clearError, connectExpressSelector, verifyAuthMobileOtpAsync, resetVerifyAuthOTPValue } from '../../../app/connectExpress/connectExpressStore';
+import Button from '../../../shared/Button';
+import { ScreenContainer } from '../../../shared/Containers';
+import { useAppDispatch, useAppSelector, useSanitizedTranslation } from '../../../../hooks';
+import { handlePrevScreenStep } from '../../../../app/settings';
+import { useLanguage } from '../../../../hooks';
+import { useForm, FormProvider } from 'react-hook-form';
+import { yupResolver } from '@hookform/resolvers/yup';
+import Form from '../../../../components/Form';
+import { maskPhone, deepCopy } from '../../../../utils';
+import { AuthForScreen } from '../../../../@types';
+import { OTPValidation } from './validation';
+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)
+    });
+});
+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' }));
+});
+var FormStyled = styled(Form)(function () { return ({
+    display: 'flex',
+    flexDirection: 'column'
+}); });
+var VerifyMobileAuthOTP = function () {
+    var _a, _b, _c, _d, _e, _f;
+    var dispatch = useAppDispatch();
+    var _g = useAppSelector(connectExpressSelector), data = _g.data, loading = _g.loading, error = _g.error;
+    var t = useTranslation().t;
+    var st = useSanitizedTranslation();
+    var isAr = useLanguage().isAr;
+    var methods = useForm({
+        resolver: yupResolver(OTPValidation),
+        defaultValues: data.verifyAuthOtpData,
+        mode: 'onChange'
+    });
+    React.useEffect(function () {
+        if (error)
+            dispatch(clearError());
+    }, [methods.formState.isValid]);
+    React.useEffect(function () {
+        return function () {
+            dispatch(resetVerifyAuthOTPValue());
+        };
+    }, []);
+    var onSubmit = function (formData) {
+        dispatch(verifyAuthMobileOtpAsync(deepCopy(formData)));
+    };
+    var onBack = function () {
+        var authFor = data.verifyAuthOtpData.authFor;
+        var step_name = 'CONNECT_EXPRESS_COLLECT_INDIVIDUAL_INFO_STEP';
+        if (authFor === AuthForScreen.DOB)
+            step_name = 'CONNECT_EXPRESS_COLLECT_DOB_INFO_STEP';
+        else if (authFor === AuthForScreen.MOBILE_OWNERSHIP)
+            step_name = 'COLLECT_MOBILE_OWNERSHIP';
+        dispatch(handlePrevScreenStep(step_name));
+    };
+    var disabled = !methods.formState.isValid;
+    var phone = ((_c = (_b = (_a = data.responseData) === null || _a === void 0 ? void 0 : _a.verifyAuthMobile) === null || _b === void 0 ? void 0 : _b.verification_by) === null || _c === void 0 ? void 0 : _c.sent_to) ? (_f = (_e = (_d = data.responseData) === null || _d === void 0 ? void 0 : _d.verifyAuthMobile) === null || _e === void 0 ? void 0 : _e.verification_by) === null || _f === void 0 ? void 0 : _f.sent_to : '';
+    var title = 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 ? st('ide_otp_waiting_title') : title, !loading && _jsx("span", __assign({ dir: 'ltr' }, { children: maskPhone(phone) }))] }) }), _jsx(OTPInput, {}), _jsx(Button, __assign({ onBackClicked: function () { return onBack(); }, disabled: disabled, isAr: isAr, loading: loading, error: st(error || '') }, { children: t('next') }))] })) })) }));
+};
+export default React.memo(VerifyMobileAuthOTP);

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.d.ts

@@ -0,0 +1,3 @@
+import VerifyMobileAuthOTP, { VerifyMobileAuthOTPProps } from './VerifyMobileAuthOTP';
+export type { VerifyMobileAuthOTPProps };
+export default VerifyMobileAuthOTP;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/index.js

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

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/validation.d.ts

@@ -0,0 +1,8 @@
+import * as yup from 'yup';
+export declare const OTPValidation: yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, {
+    otp: import("yup/lib/string").RequiredStringSchema<string | undefined, import("yup/lib/types").AnyObject>;
+}>>>;

package/build/features/connectExpress/screens/VerifyMobileAuthOTP/validation.js

@@ -0,0 +1,4 @@
+import * as yup from 'yup';
+export var OTPValidation = yup.object().shape({
+    otp: yup.string().min(6, 'otp_min_length').required('otp_required')
+});

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

@@ -4,14 +4,16 @@ import { connectExpressSelector, verifyNafathAsync } from '../../../app/connectE
 import NafathVerification from '../../../shared/NafathVerification';
 import { handlePrevScreenStep } from '../../../../app/settings';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
+import GenericPrepareDataLoading from '../GenericPrepareDataLoading';
 var VerifyNafath = function () {
     var _a = React.useState(false), success = _a[0], setSuccess = _a[1];
     var _b = React.useState(false), failed = _b[0], setFailed = _b[1];
     var _c = React.useState(false), isReady = _c[0], setIsReady = _c[1];
+    var _d = React.useState(false), showLoadingScreen = _d[0], setShowLoadingScreen = _d[1];
     var dispatch = useAppDispatch();
     var data = useAppSelector(connectExpressSelector).data;
     var authData = (data.responseData || {}).authData;
-    var _d = authData || {}, expiry = _d.expiry, app_url_android = _d.app_url_android, app_url_ios = _d.app_url_ios, random = _d.random;
+    var _e = authData || {}, expiry = _e.expiry, app_url_android = _e.app_url_android, app_url_ios = _e.app_url_ios, random = _e.random;
     React.useEffect(function () {
         if (authData && !isReady) {
             setIsReady(true);
@@ -20,7 +22,11 @@ var VerifyNafath = function () {
     React.useEffect(function () {
         if (!isReady)
             return;
-        var promise = dispatch(verifyNafathAsync({ onSuccess: function () { return setSuccess(true); }, onFailure: function () { return setFailed(true); } }));
+        var promise = dispatch(verifyNafathAsync({
+            onSuccess: function () { return setSuccess(true); },
+            onFailure: function () { return setFailed(true); },
+            showLoadingScreenAfterNafathSuccess: function () { return setShowLoadingScreen(true); }
+        }));
         return function () {
             promise === null || promise === void 0 ? void 0 : promise.abort();
         };
@@ -30,6 +36,6 @@ var VerifyNafath = function () {
     }, []);
     if (!isReady)
         return null;
-    return (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
+    return showLoadingScreen ? (_jsx(GenericPrepareDataLoading, {})) : (_jsx(NafathVerification, { randomNumber: random, expiryInSeconds: expiry, success: success, failed: failed, urls: { android: app_url_android, ios: app_url_ios }, onFinish: function () { return onBack(); } }));
 };
 export default React.memo(VerifyNafath);

package/build/features/entity/screens/EntityCapital/CapitalPaid.js

@@ -15,11 +15,12 @@ import { useTranslation } from 'react-i18next';
 import { useController, useFormContext } from 'react-hook-form';
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import { settingsSelector } from '../../../../app/settings';
-import { formatNumberAsCurrency, getCurrencyByCountryIso2, removeAllCharsFromNumber } from '../../../../utils';
+import { formatNumberAsCurrency, removeAllCharsFromNumber } from '../../../../utils';
 import { ScreenContainer } from '../../../shared/Containers';
 import Input from '../../../shared/Input';
 import { clearError } from '../../../app/entity/entityStore';
 import { EndAdornment } from '../../../shared/EndAdornment';
+import TextWithCurrency from '../../../../components/TextWithCurrency';
 var CapitalPaid = function (_a) {
     var _b;
     var readOnly = _a.readOnly, isVerified = _a.isVerified;
@@ -34,14 +35,9 @@ var CapitalPaid = function (_a) {
         var value = formatNumberAsCurrency(removeAllCharsFromNumber(target.value));
         capitalPaidControl.field.onChange(value);
     };
-    var getCurrency = React.useMemo(function () {
-        return t(getCurrencyByCountryIso2(settingsData.businessCountry.iso2));
-    }, [settingsData.businessCountry.iso2]);
     var capitalPaidControl = useController({ control: control, name: 'capitalPaid' });
     var capitalPaidValue = capitalPaidControl.field.value;
     var error = (_b = capitalPaidControl.fieldState.error) === null || _b === void 0 ? void 0 : _b.message;
-    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: t('capital_paid_label', {
-                currency: getCurrency
-            }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
+    return (_jsx(ScreenContainer, __assign({ sx: { mt: 2.5 } }, { children: _jsx(Input, { readOnly: readOnly, label: _jsx(TextWithCurrency, { text: t('capital_paid_input_label'), countryCode: settingsData.businessCountry.iso2 }), required: true, onChange: handleChange, value: capitalPaidValue, sx: { '& .MuiInputBase-input': { cursor: 'auto' } }, placeholder: t('capital_paid_hint'), warningType: 'alert', warningMessage: error && t(error), endAdornment: _jsx(EndAdornment, { value: capitalPaidValue, isVerified: isVerified }) }) })));
 };
 export default React.memo(CapitalPaid);